diff --git a/.gitignore b/.gitignore
index bb631a0971..1cc4e0a9b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,24 +13,25 @@ log.txt
 
 ## jsdoc
 /doc
- 
+
 ### SublimeText ###
 *.sublime-project
 *.sublime-workspace
- 
+
 ### Intellij IDE ###
 .idea/
 atlassian-ide-plugin.xml
- 
+
 ### VisualStudioCode ###
 .vscode/*
 .vscode-upload.json
- 
+.eslintrc.json
+
 ### TextMate ###
 *.tmproj
 *.tmproject
 tmtags
- 
+
 ### Node ###
 npm-debug.log*
 .npmignore
diff --git a/.travis.yml b/.travis.yml
index 01a610b3e2..c35104f8e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,8 @@
 language: node_js
 node_js:
-  - 4
-  - 6
   - 8
-  - 10
+services:
+  - xvfb
 script: npm run $COMMAND
 env:
   - COMMAND=test
@@ -11,8 +10,7 @@ env:
   - COMMAND=integration MONTAGE_VERSION=. MOP_VERSION="#feature/npm3"
 before_install:
   - export CHROME_BIN=chromium-browser
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
+  - export DISPLAY=:0
 jobs:
     include:
       - stage: lint
diff --git a/core/core.js b/core/core.js
index fcd2f05df5..46a1a92dc8 100644
--- a/core/core.js
+++ b/core/core.js
@@ -308,8 +308,8 @@ Object.defineProperty(Montage.prototype, _serializableAttributeProperties, {
 var ObjectAttributeProperties = new Map();
 function getAttributeProperties(proto, attributeName, privateAttributeName) {
     var attributePropertyName = privateAttributeName || (
-        attributeName === SERIALIZABLE ? 
-            _serializableAttributeProperties : 
+        attributeName === SERIALIZABLE ?
+            _serializableAttributeProperties :
                 (UNDERSCORE + attributeName + ATTRIBUTE_PROPERTIES));
 
         if(proto !== Object.prototype) {
@@ -422,7 +422,7 @@ valuePropertyDescriptor.value = function Montage_defineProperty(obj, prop, descr
         if (! (typeof obj === "object" || typeof obj === FUNCTION) || obj === null) {
             throw new TypeError("Object must be an object, not '" + obj + "'");
         }
-        
+
         var isValueDescriptor = (VALUE in descriptor);
 
         // reset defaults appropriately for framework.
@@ -548,8 +548,8 @@ function __findSuperMethodImplementation( method, classFn, isFunctionSuper, meth
             if(!methodPropertyName) {
                 //If methodPropertyNameArg is passed as an argument, we know what to look for,
                 //But it may not be there...
-                propertyNames = methodPropertyNameArg ? 
-                    (_propertyNames[0] = methodPropertyNameArg) && _propertyNames : 
+                propertyNames = methodPropertyNameArg ?
+                    (_propertyNames[0] = methodPropertyNameArg) && _propertyNames :
                         Object.getOwnPropertyNames(context);
 
                 //As we start, we don't really know which property name points to method, we're going to find out:
@@ -675,13 +675,13 @@ function __super(callerFn, methodPropertyName, isValue, isGetter, isSetter) {
  */
 function _super() {
     // Figure out which function called us.
-    var callerFn = ( _super && _super.caller ) ? _super.caller : arguments.callee.caller,        
+    var callerFn = ( _super && _super.caller ) ? _super.caller : arguments.callee.caller,
         superFn = __super.call(this,callerFn);
     return superFn ? superFn.apply(this, arguments) : undefined;
 }
 
 function _superForValue(methodName) {
-    var callerFn = ( _superForValue && _superForValue.caller ) ? _superForValue.caller  : arguments.callee.caller, 
+    var callerFn = ( _superForValue && _superForValue.caller ) ? _superForValue.caller  : arguments.callee.caller,
         superFn = __super.call(this, callerFn, methodName, true, false, false);
 
     //We may need to cache that at some point if it gets called too often
@@ -689,7 +689,7 @@ function _superForValue(methodName) {
 }
 
 function _superForGet(methodName) {
-     var callerFn = ( _superForGet && _superForGet.caller ) ? _superForGet.caller : arguments.callee.caller,       
+     var callerFn = ( _superForGet && _superForGet.caller ) ? _superForGet.caller : arguments.callee.caller,
        superFn = __super.call(this, callerFn, methodName, false, true, false);
 
     //We may need to cache that at some point if it gets called too often
@@ -697,7 +697,7 @@ function _superForGet(methodName) {
 }
 
 function _superForSet(methodName) {
-     var callerFn = ( _superForSet && _superForSet.caller ) ? _superForSet.caller : arguments.callee.caller,     
+     var callerFn = ( _superForSet && _superForSet.caller ) ? _superForSet.caller : arguments.callee.caller,
         superFn = __super.call(this,callerFn,methodName,false,false,true);
 
     //We may need to cache that at some point if it gets called too often
@@ -828,7 +828,7 @@ Montage.defineProperty(Montage, "getPropertyAttributes", {value: function (anObj
     for (var name in attributes) {
         if (hasProperty.call(attributes, name)) {
             attributeValues[name] = attributes[name];
-        // should return the inherited defined attribute values   
+        // should return the inherited defined attribute values
         } else {
             attributeValues[name] = attributes[name];
         }
@@ -979,7 +979,7 @@ Montage.defineProperty(Montage.prototype, "callDelegateMethod", {
 
             var delegateFunctionName = this.identifier + name.toCapitalized();
             if (
-                typeof this.identifier === "string" && 
+                typeof this.identifier === "string" &&
                     typeof delegate[delegateFunctionName] === FUNCTION
             ) {
                 delegateFunction = delegate[delegateFunctionName];
@@ -1666,7 +1666,7 @@ exports._objectDescriptorDescriptor = {
     get: function () {
         var info = Montage.getInfoForObject(this),
             self = info && !info.isInstance ? this : this.constructor;
-        
+
         if (!Object.getOwnPropertyDescriptor(self, "_objectDescriptor") ||
             !self._objectDescriptor
         ) {
diff --git a/core/meta/module-object-descriptor.js b/core/meta/module-object-descriptor.js
index 02a2ef7782..3318edb8af 100644
--- a/core/meta/module-object-descriptor.js
+++ b/core/meta/module-object-descriptor.js
@@ -60,6 +60,9 @@ var ModuleObjectDescriptor = exports.ModuleObjectDescriptor = ObjectDescriptor.s
             this.super(serializer);
             this._setPropertyWithDefaults(serializer, "module", this.module);
             this._setPropertyWithDefaults(serializer, "exportName", this.exportName);
+            if(this.object) {
+                this._setPropertyWithDefaults(serializer, "object", this.object);
+            }
         }
     },
 
@@ -82,6 +85,12 @@ var ModuleObjectDescriptor = exports.ModuleObjectDescriptor = ObjectDescriptor.s
             if (!this.exportName) {
                 throw new Error("Cannot deserialize object descriptor without an exportName");
             }
+
+            value = deserializer.getProperty("object");
+            if (value !== void 0) {
+                this.object = value;
+            }
+
         }
     },
 
@@ -93,6 +102,15 @@ var ModuleObjectDescriptor = exports.ModuleObjectDescriptor = ObjectDescriptor.s
         value: null
     },
 
+    /**
+     * A reference to the actual object that this object descriptor is for.
+     * @type {Object}
+     */
+    object: {
+        value: null
+    },
+
+
     /**
      * The name of the export this object descriptor is for.
      * @type {string}
diff --git a/core/serialization/deserializer/montage-deserializer.js b/core/serialization/deserializer/montage-deserializer.js
index 0679b2c04c..c1b5cc7b3d 100644
--- a/core/serialization/deserializer/montage-deserializer.js
+++ b/core/serialization/deserializer/montage-deserializer.js
@@ -25,24 +25,31 @@ var MontageDeserializer = exports.MontageDeserializer = Montage.specialize({
     },
 
     init: {
-        value: function (serialization, _require, objectRequires, locationId, isSync) {
+        value: function (serialization, _require, objectRequires, module, isSync) {
             if (typeof serialization === "string") {
                 this._serializationString = serialization;
             } else {
                 this._serializationString = JSON.stringify(serialization);
             }
             this._require = _require;
-            this._locationId = locationId ? locationId.indexOf(_require.location) === 0 ? locationId : _require.location + locationId : locationId;
+            this._module = module;
+            var locationId = module && _require.location + module.id;
+            this._locationId = locationId;
 
             this._reviver = new MontageReviver().init(
-                _require, objectRequires, this.constructor, isSync
+                _require, objectRequires, this, isSync, locationId
             );
             this._isSync = isSync;
 
             return this;
         }
     },
-
+    _isSync: {value: false},
+    isSync: {
+        get: function() {
+            return this._isSync;
+        }
+    },
 
     /**
      * @param {Object} instances Map-like object of external user objects to
@@ -55,7 +62,7 @@ var MontageDeserializer = exports.MontageDeserializer = Montage.specialize({
      */
     deserialize: {
         value: function (instances, element) {
-            var context = this._locationId && MontageDeserializer.moduleContexts.get(this._locationId),
+            var context = this._module && MontageDeserializer.moduleContexts.get(this._module),
                 circularError;
             if (context) {
                 if (context._objects.root) {
@@ -79,7 +86,7 @@ var MontageDeserializer = exports.MontageDeserializer = Montage.specialize({
                 context = new MontageContext()
                     .init(serialization, this._reviver, instances, element, this._require, this._isSync);
                 if (this._locationId) {
-                    MontageDeserializer.moduleContexts.set(this._locationId, context);
+                    MontageDeserializer.moduleContexts.set(this._module, context);
                 }
                 try {
                     return context.getObjects();
@@ -102,9 +109,10 @@ var MontageDeserializer = exports.MontageDeserializer = Montage.specialize({
 
     deserializeObject: {
         value: function(objects) {
-            return this.deserialize(objects).then(function(objects) {
-                return objects.root;
-            });
+            return (this._isSync    ? this.deserialize(objects).root
+                                    : this.deserialize(objects).then(function(objects) {
+                                            return objects.root;
+                                        }));
         }
     },
 
diff --git a/core/serialization/deserializer/montage-interpreter.js b/core/serialization/deserializer/montage-interpreter.js
index 760534c126..219f066d38 100644
--- a/core/serialization/deserializer/montage-interpreter.js
+++ b/core/serialization/deserializer/montage-interpreter.js
@@ -2,6 +2,7 @@ var Montage = require("../../core").Montage,
     MontageReviver = require("./montage-reviver").MontageReviver,
     Promise = require("../../promise").Promise,
     deprecate = require("../../deprecate"),
+    Set = require("collections/set"),
     ONE_ASSIGNMENT = "=",
     ONE_WAY = "<-",
     TWO_WAY = "<->";
@@ -77,9 +78,13 @@ var MontageInterpreter = Montage.specialize({
     }
 });
 
+var idCount = 0;
 var MontageContext = Montage.specialize({
     _ELEMENT_ID_ATTRIBUTE: {value: "data-montage-id"},
-    _unitsToDeserialize: {value: null},
+    _ELEMENT_ID_SELECTOR_PREFIX: {value: '*[data-montage-id="'},
+    _ELEMENT_ID_SELECTOR_SUFFIX: {value: '"]'},
+    unitsToDeserialize: {value: null},
+    _mjsonDependencies: {value: null},
     _element: {value: null},
     _require: {value: null},
     _objects: {value: null},
@@ -90,7 +95,7 @@ var MontageContext = Montage.specialize({
 
     constructor: {
         value: function () {
-            this._unitsToDeserialize = [];
+            this.unitsToDeserialize = new Map();
         }
     },
 
@@ -118,6 +123,13 @@ var MontageContext = Montage.specialize({
         }
     },
 
+    _isSync: {value: false},
+    isSync: {
+        get: function() {
+            return this._isSync;
+        }
+    },
+
     setObjectLabel: {
         value: function(object, label) {
             this._objects[label] = object;
@@ -158,22 +170,24 @@ var MontageContext = Montage.specialize({
         value: function() {
             var self = this,
                 serialization = this._serialization,
-                promises = [],
-                result;
+                promises,
+                result,
+                objectKeys;
 
-            for (var label in serialization) {
-                if (serialization.hasOwnProperty(label)) {
+            if(serialization) {
+                objectKeys = Object.keys(serialization);
+                for (var i=0, label;(label = objectKeys[i]); i++) {
                     result = this.getObject(label);
 
                     if (Promise.is(result)) {
-                        promises.push(result);
+                        (promises || (promises = [])).push(result);
                     }
                 }
             }
 
-            if (promises.length === 0) {
+            if (!promises || promises.length === 0) {
                 result = this._invokeDidReviveObjects();
-                return this._isSync ? result : Promise.resolve(result);
+                return this._isSync ? result : Promise.is(result) ? result : Promise.resolve(result);
             } else {
                 // We shouldn't get here if this._isSync is true
                 return Promise.all(promises).then(function() {
@@ -208,11 +222,10 @@ var MontageContext = Montage.specialize({
     _invokeDidReviveObjects: {
         value: function() {
             var self = this,
-                reviver = this._reviver,
-                result;
+                reviver = this._reviver;
 
             if (typeof reviver.didReviveObjects === "function") {
-                reviver.didReviveObjects(this._objects, this);
+                reviver.didReviveObjects(this);
                 return self._objects;
             }
 
@@ -240,31 +253,45 @@ var MontageContext = Montage.specialize({
 
     getElementById: {
         value: function (id) {
-            var selector = '*[' + this._ELEMENT_ID_ATTRIBUTE + '="' + id + '"]';
-
-            return this._element.querySelector(selector);
+            return this._element.querySelector(this._ELEMENT_ID_SELECTOR_PREFIX + id + this._ELEMENT_ID_SELECTOR_SUFFIX);
         }
     },
 
-    _extractBindingsToDeserialize: {
-        value: function (values, bindings) {
-            var value;
-
-            for (var key in values) {
-                if (values.hasOwnProperty(key)) {
-                    value = values[key];
-
-                    if ((typeof value === "object" && value &&
-                        Object.keys(value).length === 1 &&
-                        (ONE_WAY in value || TWO_WAY in value || ONE_ASSIGNMENT in value)) ||
-                        key.indexOf('.') > -1
-                    ) {
-                        bindings[key] = value;
-                        delete values[key];
+    _classifyValuesToDeserialize: {
+        value: function (object, objectDesc) {
+            var values,
+                value,
+                keys,
+                bindings;
+
+
+            //This is where we support backward compatib
+             if((values = objectDesc.properties)) {
+                objectDesc.values = values;
+                delete objectDesc.properties;
+             }
+             else {
+                if((values = objectDesc.values)) {
+                    keys = Object.keys(values);
+                    bindings = objectDesc.bindings || (objectDesc.bindings = {});
+                    for (var i=0, key;(key = keys[i]);i++) {
+                        value = values[key];
+
+                        //An expression based property
+                        if ((typeof value === "object" && value &&
+                            Object.keys(value).length === 1 &&
+                            (ONE_WAY in value || TWO_WAY in value || ONE_ASSIGNMENT in value)) ||
+                            key.indexOf('.') > -1
+                        ) {
+                            bindings[key] = value;
+                            delete values[key];
+                        }
                     }
+
                 }
             }
 
+
             return bindings;
         }
     },
@@ -275,44 +302,83 @@ var MontageContext = Montage.specialize({
         }
     },
 
+    __propertyToReviveForObjectLiteralValue: {
+        value: undefined
+    },
+    _propertyToReviveForObjectLiteralValue: {
+        get: function() {
+            return this.__propertyToReviveForObjectLiteralValue || (this.__propertyToReviveForObjectLiteralValue = new WeakMap());
+        }
+    },
+    propertyToReviveForObjectLiteralValue: {
+        value: function (objectLiteralValue) {
+            var  propertyToRevive;
+            if(!(propertyToRevive = this._propertyToReviveForObjectLiteralValue.get(objectLiteralValue))) {
+                this._propertyToReviveForObjectLiteralValue.set(objectLiteralValue,(propertyToRevive = new Set(Object.keys(objectLiteralValue))));
+            }
+            return propertyToRevive;
+        }
+    },
+
+    _objectDynamicValuesToDeserialize: {
+        value: undefined
+    },
+    _objectValuesToDeserialize: {
+        value: undefined
+    },
+    objectValuesToDeserialize: {
+        get: function() {
+            return this._objectValuesToDeserialize || (this._objectValuesToDeserialize = new Map());
+        }
+    },
+
+
+
     setBindingsToDeserialize: {
         value: function (object, objectDesc) {
-            var bindings = Object.create(null);
+                this._classifyValuesToDeserialize(object, objectDesc);
+        }
+    },
+
+    setUnitsToDeserialize: {
+        value: function (object, objectDesc, unitNames) {
+
+            var moduleId = objectDesc.prototype || objectDesc.object,
+                isMJSONDependency = moduleId && (moduleId.endsWith(".mjson") || moduleId.endsWith(".meta")),
+                unitsDesc = this.unitsToDeserialize.get(object);
 
-            if (objectDesc.values) {
-                this._extractBindingsToDeserialize(objectDesc.values, bindings);
-            } else if (objectDesc.properties) { // deprecated
-                this._extractBindingsToDeserialize(objectDesc.properties, bindings);
+            if(isMJSONDependency) {
+                (this._mjsonDependencies || (this._mjsonDependencies = new Set())).add(moduleId);
             }
 
-            if (Object.keys(bindings).length > 0) {
-                if (!this._bindingsToDeserialize) {
-                    this._bindingsToDeserialize = [];
+            if(unitsDesc) {
+                if(unitNames !== unitsDesc.unitNames || unitsDesc.objectDesc !== objectDesc) {
+                    var unitsDescObjectDesc = unitsDesc.objectDesc,
+                        unitsDescUnitNames = unitsDesc.unitNames;
+
+                    for(var i=0, iUniteName, countI = unitNames.length;(i<countI);i++) {
+                        iUniteName = unitNames[i];
+                        if(objectDesc[iUniteName]) {
+                            Object.assign(unitsDescObjectDesc[iUniteName],objectDesc[iUniteName]);
+                        }
+                        if(!unitsDescUnitNames.has(iUniteName)) {
+                            unitsDescUnitNames.splice(i,0,iUniteName);
+                        }
+                    }
                 }
+            }
+            else {
 
-                this._bindingsToDeserialize.push({
-                    object: object,
-                    bindings: bindings
+                this.unitsToDeserialize.set(object,{
+                    objectDesc: objectDesc,
+                    unitNames: unitNames
                 });
             }
-        }
-    },
 
-    setUnitsToDeserialize: {
-        value: function (object, objectDesc, unitNames) {
-            this._unitsToDeserialize.push({
-                object: object,
-                objectDesc: objectDesc,
-                unitNames: unitNames
-            });
-        }
-    },
-
-    getUnitsToDeserialize: {
-        value: function () {
-            return this._unitsToDeserialize;
         }
     }
+
+
 });
 
 exports.MontageInterpreter = MontageInterpreter;
diff --git a/core/serialization/deserializer/montage-reviver.js b/core/serialization/deserializer/montage-reviver.js
index c8d850a4f3..a81710803f 100644
--- a/core/serialization/deserializer/montage-reviver.js
+++ b/core/serialization/deserializer/montage-reviver.js
@@ -126,14 +126,23 @@ var MontageReviver = exports.MontageReviver = Montage.specialize(/** @lends Mont
      *        that also needs to be deserialized.
      */
     init: {
-        value: function (_require, objectRequires, deserializerConstructor, isSync) {
+        value: function (_require, objectRequires, deserializer, isSync, locationId) {
             this.moduleLoader = new ModuleLoader().init(_require, objectRequires);
             this._require = _require;
-            this._deserializerConstructor = deserializerConstructor;
+            this._deserializer = deserializer;
             this._isSync = isSync;
+            this._locationId = locationId;
             return this;
         }
     },
+    _isSync: {
+        value: false
+    },
+
+    _locationId: {
+        value: null
+    },
+
 
     getTypeOf: {
         value: function (value) {
@@ -459,16 +468,8 @@ var MontageReviver = exports.MontageReviver = Montage.specialize(/** @lends Mont
                 objectName = locationDesc.objectName;
             }
 
-            if (typeof module === "string" && isObjectDescriptor &&
-                this._deserializerConstructor.moduleContexts.has(
-                    (location = context._require.location + locationId)
-                )) {
-                // We have a circular reference. If we wanted to forbid circular
-                // references this is where we would throw an error.
-                return this._deserializerConstructor.moduleContexts.get(location)._objects.root;
-            }
 
-            if (isObjectDescriptor && !Promise.is(module) && !module.montageObject) {
+            if (!this._isSync && isObjectDescriptor && !Promise.is(module) && !module.montageObject) {
                 module = context._require.async(locationDesc.moduleId);
             }
 
@@ -497,55 +498,78 @@ var MontageReviver = exports.MontageReviver = Montage.specialize(/** @lends Mont
 
     instantiateObject: {
         value: function (module, locationDesc, value, objectName, context, label) {
-            var moduleId = value.prototype || value.object,
-                object;
-
-            if (moduleId && (moduleId.endsWith(".mjson") || moduleId.endsWith(".meta"))) {
-                object = value && "prototype" in value ?
-                    Object.create(module.montageObject) : module.montageObject;
-                context.setObjectLabel(object, label);
-                return this.instantiateMJSONObject(value, object, objectName, context, label);
-            } else {
+            var object;
                 object = this.getMontageObject(value, module, objectName, context, label);
                 context.setObjectLabel(object, label);
                 return this.instantiateMontageObject(value, object, objectName, context, label);
+        }
+    },
+
+    _getMJSONObject: {
+        value: function (moduleId, context) {
+            var moduleDescriptor = context._require.getModuleDescriptor(context._require.resolve(moduleId)),
+            dependencyContext = this._deserializer.constructor.moduleContexts.get(moduleDescriptor);
+            if(!dependencyContext && moduleDescriptor.mappingRequire) {
+                //Let's see if the module is known as another in Deserializer.moduleContexts
+                moduleDescriptor = moduleDescriptor.mappingRequire.getModuleDescriptor(moduleDescriptor.mappingRedirect);
+                dependencyContext = this._deserializer.constructor.moduleContexts.get(moduleDescriptor);
+            }
+
+            if(dependencyContext) {
+                return dependencyContext.getObject("root");
             }
+            return null;
         }
     },
 
     getMontageObject: {
         value: function (value, module, objectName, context, label) {
-            var object;
+            var object, moduleId;
 
             if (context.hasUserObject(label)) {
 
                 return context.getUserObject(label);
 
             } else if ("prototype" in value) {
+                moduleId = value.prototype;
+                if (moduleId && (moduleId.endsWith(".mjson") || moduleId.endsWith(".meta"))) {
+                    object = Object.create(this._getMJSONObject(moduleId, context));
+                }
+                else {
+                    if (!(objectName in module)) {
+                        throw new Error('Error deserializing "' + label +
+                            '": object named "' + objectName + '"' +
+                            ' was not found in "' + value.prototype + '".' +
+                            " Available objects are: " + Object.keys(module) + ".");
+                    }
+                    // TODO: For now we need this because we need to set
+                    // isDeserilizing before calling didCreate.
+                    object = module[objectName];
+                    object = (typeof object === "function") ? new object() : Object.create(object);
 
-                if (!(objectName in module)) {
-                    throw new Error('Error deserializing "' + label +
-                        '": object named "' + objectName + '"' +
-                        ' was not found in "' + value.prototype + '".' +
-                        " Available objects are: " + Object.keys(module) + ".");
                 }
-                // TODO: For now we need this because we need to set
-                // isDeserilizing before calling didCreate.
-                object = module[objectName];
-                object = (typeof object === "function") ? new object() : Object.create(object);
                 object.isDeserializing = true;
                 return object;
             } else if ("object" in value) {
-                if (value.object.endsWith(".json")) {
+                moduleId = value.object;
+
+                if (moduleId.endsWith(".json")) {
                     return module;
                 }
+                else if (moduleId && (moduleId.endsWith(".mjson") || moduleId.endsWith(".meta"))) {
+                    object = this._getMJSONObject(moduleId, context);
+                    object.isDeserializing = true;
+                    return object;
+                }
+                else {
+                    if (!(objectName in module)) {
+                        throw new Error('Error deserializing "' + label +
+                            '": object named "' + object +
+                            "' was not found given '" + moduleId + "'");
+                    }
 
-                if (!(objectName in module)) {
-                    throw new Error('Error deserializing "' + label +
-                        '": object named "' + object +
-                        "' was not found given '" + value.object + "'");
+                    return module[objectName];
                 }
-                return module[objectName];
 
             } else {
                 throw new Error("Error deserializing " + JSON.stringify(value) + ", might need \"prototype\" or \"object\" on label " + JSON.stringify(label));
@@ -553,28 +577,6 @@ var MontageReviver = exports.MontageReviver = Montage.specialize(/** @lends Mont
         }
     },
 
-    instantiateMJSONObject: {
-        value: function (serialization, object, objectName, context, label) {
-            var self = this,
-                montageObjectDesc;
-
-            if (object !== null && object !== void 0) {
-                object.isDeserializing = true;
-            }
-
-            context.setBindingsToDeserialize(object, serialization);
-            montageObjectDesc = this.reviveObjectLiteral(serialization, context);
-
-            if (Promise.is(montageObjectDesc)) {
-                return montageObjectDesc.then(function(montageObjectDesc) {
-                    return self.deserializeMontageObject(montageObjectDesc, object, context, label);
-                });
-            } else {
-                return this.deserializeMontageObject(montageObjectDesc, object, context, label);
-            }
-        }
-    },
-
     instantiateMontageObject: {
         value: function (serialization, object, objectName, context, label) {
             var self = this,
@@ -597,40 +599,24 @@ var MontageReviver = exports.MontageReviver = Montage.specialize(/** @lends Mont
                 );
             }
 
-            context.setBindingsToDeserialize(object, serialization);
-            montageObjectDesc = this.reviveObjectLiteral(serialization, context);
+            context.setBindingsToDeserialize(object, serialization);//Looks in values for all "bindings to collect and apply later"
+            montageObjectDesc = this.reviveObjectLiteral(serialization, context,undefined, undefined, object);
 
             if (Promise.is(montageObjectDesc)) {
                 return montageObjectDesc.then(function(montageObjectDesc) {
-                    if (typeof object.deserializeSelf === "function") {
-                        return self.deserializeCustomMontageObject(object, montageObjectDesc, context, label);
-                    } else {
-                        return self.deserializeMontageObject(montageObjectDesc, object, context, label);
-                    }
+                    return self.deserializeMontageObject(montageObjectDesc, object, context, label);
                 });
             } else {
-                if (typeof object.deserializeSelf === "function") {
-                    return this.deserializeCustomMontageObject(object, montageObjectDesc, context, label);
-                } else {
-                    return this.deserializeMontageObject(montageObjectDesc, object, context, label);
-                }
+                return this.deserializeMontageObject(montageObjectDesc, object, context, label);
             }
         }
     },
 
     deserializeMontageObject: {
         value: function (montageObjectDesc, object, context, label) {
-            var values;
-
             // Units are deserialized after all objects have been revived.
             // This happens at didReviveObjects.
             context.setUnitsToDeserialize(object, montageObjectDesc, MontageReviver._unitNames);
-            values = this.deserializeMontageObjectValues(
-                object,
-                montageObjectDesc.values || montageObjectDesc.properties, //deprecated
-                context
-            );
-
             return object;
         }
     },
@@ -665,40 +651,18 @@ var MontageReviver = exports.MontageReviver = Montage.specialize(/** @lends Mont
         }
     },
 
-    deserializeCustomMontageObject: {
-        value: function (object, objectDesc, context, label) {
-            var substituteObject;
-
-            var selfDeserializer = new SelfDeserializer()
-                .initWithObjectAndObjectDescriptorAndContextAndUnitNames(object, objectDesc, context, MontageReviver._unitNames);
-            substituteObject = object.deserializeSelf(selfDeserializer);
-
-            if (Promise.is(substituteObject)) {
-                return substituteObject.then(function(substituteObject) {
-                    context.setObjectLabel(substituteObject, label);
-                    return substituteObject;
-                });
-            } else if (typeof substituteObject !== "undefined") {
-                context.setObjectLabel(substituteObject, label);
-                return substituteObject;
-            } else {
-                return object;
-            }
-        }
-    },
-
     didReviveObjects: {
-        value: function (objects, context) {
-            this._deserializeBindings(context);
+        value: function (context) {
             this._deserializeUnits(context);
-            this._invokeDeserializedFromSerialization(objects, context);
+            this._invokeDeserializedFromSerialization(context);
         }
     },
 
     // TODO: can deserializeSelf make deserializedFromSerialization irrelevant?
     _invokeDeserializedFromSerialization: {
-        value: function (objects, context) {
-            var object;
+        value: function (context) {
+            var objects = context._objects,
+                object;
 
             /* jshint forin: true */
             for (var label in objects) {
@@ -721,6 +685,24 @@ var MontageReviver = exports.MontageReviver = Montage.specialize(/** @lends Mont
         }
     },
 
+    _deserializePropertyValues: {
+        value: function (context) {
+            var object, objects = context._objects,
+                serialization = context._serialization,
+                values, label;
+
+            /* jshint forin: true */
+            for (label in objects) {
+            /* jshint forin: false */
+
+                if((object = objects[label])) {
+                    values = serialization[label];
+                    this.deserializeMontageObject(values, object, context, label);
+                }
+            }
+        }
+    },
+
     _deserializeBindings: {
         value: function (context) {
             var bindingsToDeserialize = context.getBindingsToDeserialize(),
@@ -740,20 +722,113 @@ var MontageReviver = exports.MontageReviver = Montage.specialize(/** @lends Mont
         }
     },
 
+
+    _deserializeObjectUnit: {
+        value: function (context, object, unitsDesc, unitDeserializer) {
+
+            var unitNames = unitsDesc.unitNames,
+                j, unitName;
+
+            for (j = 0; (unitName = unitNames[j]); j++) {
+                this._deserializeObjectUnitNamed(context, object, unitName, unitsDesc, unitDeserializer, j);
+            }
+        }
+    },
+
+    _deserializeObjectUnitNamed: {
+        value: function (context, object, unitName, _unitsDesc, _unitDeserializer, _unitNameIndex) {
+            var unitsDesc = _unitsDesc || context.unitsToDeserialize.get(object),
+            objectDesc,
+            unitNames,
+            unitNameIndex,
+            unitDeserializer,
+            moduleId;
+
+            if(!unitsDesc) {
+                return;
+            }
+
+            objectDesc = unitsDesc.objectDesc;
+            unitNames = unitsDesc.unitNames;
+            unitNameIndex = _unitNameIndex || unitNames.indexOf(unitName);
+            unitDeserializer = _unitDeserializer || new UnitDeserializer();
+
+
+            if(_unitNameIndex || unitNameIndex !== -1) {
+                moduleId = objectDesc.prototype || objectDesc.object;
+                if(!("isMJSON" in unitsDesc)) {
+                    unitsDesc.isMJSON = moduleId && (moduleId.endsWith(".mjson") || moduleId.endsWith(".meta"));
+                }
+
+                /*
+                 * If unitName === "values", but missing in objectDesc, for backward compatibility,
+                 * we should process it nonetheless as objects expect to be called
+                 * deserializeSelf even if there aren't any value to gained.
+                 * But for .mjson this never happened before so let's not.
+                 * TODO: remove in the future as it's a waste of time.
+                 */
+
+                if ((unitName === "values" && !unitsDesc.isMJSON) || unitName in unitsDesc.objectDesc) {
+                    unitDeserializer.initWithContext(context);
+                    //Needs to add the whole unitsDesc.objectDesc as an argument for now as SelfDeserializer currently expects it.
+                    MontageReviver._unitRevivers.get(unitName)(unitDeserializer, object, objectDesc[unitName], unitsDesc);
+                }
+            }
+        }
+    },
+
+    _deserializeMJSONDependencyUnits: {
+        value: function (context) {
+
+            var deserializer = this._deserializer,
+                Deserializer,
+                mjsonDependencies,
+                mjsonDependenciesIteraror,
+                require = context._require,
+                dependencyModuleId, dependencyContext, moduleDescriptor;
+
+            if(deserializer) {
+                Deserializer = deserializer.constructor;
+                mjsonDependencies = context._mjsonDependencies;
+                mjsonDependenciesIteraror = mjsonDependencies ? mjsonDependencies.values() : undefined;
+
+
+                if(mjsonDependencies) {
+                    while((dependencyModuleId = mjsonDependenciesIteraror.next().value)) {
+                        mjsonDependencies.delete(dependencyModuleId);
+                        moduleDescriptor = require.getModuleDescriptor(require.resolve(dependencyModuleId));
+                        dependencyContext = Deserializer.moduleContexts.get(moduleDescriptor);
+                        if(!dependencyContext && moduleDescriptor.mappingRequire) {
+                            //Let's see if the module is known as another in Deserializer.moduleContexts
+                            moduleDescriptor = moduleDescriptor.mappingRequire.getModuleDescriptor(moduleDescriptor.mappingRedirect);
+                            dependencyContext = Deserializer.moduleContexts.get(moduleDescriptor);
+                        }
+                        if(dependencyContext) {
+                            dependencyContext._reviver._deserializeUnits(dependencyContext);
+                        }
+                    }
+                }
+            }
+        }
+    },
+
     _deserializeUnits: {
         value: function (context) {
-            var unitsToDeserialize = context.getUnitsToDeserialize(),
-                unitDeserializer = new UnitDeserializer(),
-                unitNames;
 
-            for (var i = 0, unitsDesc; (unitsDesc = unitsToDeserialize[i]); i++) {
-                unitNames = unitsDesc.unitNames;
+            this._deserializeMJSONDependencyUnits(context);
 
-                for (var j = 0, unitName; (unitName = unitNames[j]); j++) {
-                    if (unitName in unitsDesc.objectDesc) {
-                        unitDeserializer.initWithContext(context);
-                        MontageReviver._unitRevivers.get(unitName)(unitDeserializer, unitsDesc.object, unitsDesc.objectDesc[unitName]);
-                    }
+            var unitsToDeserialize = context.unitsToDeserialize,
+                unitsToDeserializeKeys,
+                unitDeserializer,
+                object;
+
+            if(unitsToDeserialize.size > 0) {
+                unitsToDeserializeKeys = unitsToDeserialize.keys();
+                unitDeserializer = new UnitDeserializer();
+
+                while((object = unitsToDeserializeKeys.next().value)) {
+                            this._deserializeObjectUnit(context, object, unitsToDeserialize.get(object), unitDeserializer);
+                    unitsToDeserialize.delete(object);
                 }
             }
         }
@@ -816,34 +891,40 @@ var MontageReviver = exports.MontageReviver = Montage.specialize(/** @lends Mont
     reviveObjectLiteral: {
         value: function(value, context, label, filterKeys) {
             var item,
-                promises = [];
+                promises,
+                propertyNames = context.propertyToReviveForObjectLiteralValue(value),
+                propertyName,iValue,
+                propertyNamesIterator = propertyNames.values();
+
 
             if (label) {
                 context.setObjectLabel(value, label);
             }
 
-            for (var propertyName in value) {
-                if (value.hasOwnProperty(propertyName) && (!filterKeys || filterKeys.indexOf(propertyName) > -1)) {
-                    if (value[propertyName] === value) {
+            while((propertyName = propertyNamesIterator.next().value)) {
+                if ((!filterKeys || filterKeys.indexOf(propertyName) > -1)) {
+                    if ((iValue = value[propertyName]) === value) {
                         // catch object property that point to its parent
                         return value;
                     }
 
-                    item = this.reviveValue(value[propertyName], context);
+                    item = this.reviveValue(iValue, context);
 
                     if (Promise.is(item)) {
-                        promises.push(
+                        (promises || (promises = [])).push(
                             item.then(this._createAssignValueFunction(
                                     value, propertyName)
                             )
                         );
-                    } else {
+                    } else if(iValue !== item) {
                         value[propertyName] = item;
                     }
+
+                    propertyNames.delete(propertyName);
                 }
             }
 
-            if (promises.length === 0) {
+            if (!promises || (promises && promises.length === 0)) {
                 return value;
             } else {
                 return Promise.all(promises).then(function() {
@@ -1049,6 +1130,53 @@ MontageReviver.findProxyForElement = function (element) {
     return PROXY_ELEMENT_MAP.get(element);
 };
 
+
+MontageReviver.defineUnitReviver("values", function (unitDeserializer, object, values,_unitsDesc) {
+    var context = unitDeserializer.context,
+        montageObjectDesc = _unitsDesc.objectDesc,
+        substituteObject;
+
+    if (typeof object.deserializeSelf === "function") {
+
+
+        var selfDeserializer = new SelfDeserializer();
+        //If the context is sync, we carry the info to the selfDeserializer
+        selfDeserializer.isSync = context.isSync;
+        selfDeserializer.initWithObjectAndObjectDescriptorAndContextAndUnitNames(object, montageObjectDesc, context, MontageReviver._unitNames);
+        substituteObject = (substituteObject || object).deserializeSelf(selfDeserializer);
+
+        if (typeof substituteObject !== "undefined" && substituteObject !== object) {
+            //The deserialization used to be inlined, so it was easy to substitute.
+            //setObjectLabel only replaces the object on the root dictionary. It's possible
+            //that properties pointing to the original object would do after the substitution
+            //even in the previous implementation.
+            //we got to find how to substitute.... We don't know which label it is
+            //This is rare so we're just going to walk objets.
+            var label,
+                context_objects = context._objects;
+
+            for(label in context_objects) {
+                if(context_objects[label] === object) {
+                    context.setObjectLabel(substituteObject, label);
+                    break;
+                }
+            }
+
+        }
+    }
+    else if(values) {
+        context._reviver.deserializeMontageObjectValues(
+            object,
+            montageObjectDesc.values || montageObjectDesc.properties, //deprecated
+            context
+        );
+    }
+
+
+
+});
+
+
 if (typeof exports !== "undefined") {
 
     exports.MontageReviver = MontageReviver;
diff --git a/core/serialization/deserializer/self-deserializer.js b/core/serialization/deserializer/self-deserializer.js
index 59bb87939b..4a4a0cfebe 100644
--- a/core/serialization/deserializer/self-deserializer.js
+++ b/core/serialization/deserializer/self-deserializer.js
@@ -2,6 +2,16 @@ var Montage = require("../../core").Montage,
     deprecate = require("../../deprecate");
 
 var SelfDeserializer = Montage.specialize( {
+    _isSync: {value: false},
+    isSync: {
+        get: function() {
+            return this._isSync;
+        },
+        set: function(value) {
+            this._isSync = value;
+        }
+    },
+
     _object: {value: null},
     _objectDescriptor: {value: null},
     _context: {value: null},
@@ -18,6 +28,7 @@ var SelfDeserializer = Montage.specialize( {
         value: function (object, objectDescriptor, context, unitNames) {
             this._object = object;
             this._objectDescriptor = objectDescriptor;
+            this._objectDescriptorValues = objectDescriptor.values || objectDescriptor.properties || objectDescriptor;
             this._context = context;
             this._unitNames = unitNames;
 
diff --git a/core/serialization/deserializer/unit-deserializer.js b/core/serialization/deserializer/unit-deserializer.js
index 88cc1b6304..29377536c5 100644
--- a/core/serialization/deserializer/unit-deserializer.js
+++ b/core/serialization/deserializer/unit-deserializer.js
@@ -17,6 +17,12 @@ var UnitDeserializer = Montage.specialize(/** @lends UnitDeserializer# */ {
         }
     },
 
+    context: {
+        get: function() {
+            return this._context;
+        }
+    },
+
     _templatePropertyRegExp: {
         value: /^([^:]+)(:.*)$/
     },
diff --git a/data/converter/raw-embedded-value-to-object-converter.js b/data/converter/raw-embedded-value-to-object-converter.js
new file mode 100644
index 0000000000..654277428e
--- /dev/null
+++ b/data/converter/raw-embedded-value-to-object-converter.js
@@ -0,0 +1,106 @@
+var RawValueToObjectConverter = require("./raw-value-to-object-converter").RawValueToObjectConverter,
+Promise = require("core/promise").Promise;
+/**
+ * @class RawEmbeddedRelationshipValueToObjectConverter
+ * @classdesc Converts a property value of raw data to the referenced object.
+ * @extends RawValueToObjectConverter
+ */
+exports.RawEmbeddedValueToObjectConverter = RawValueToObjectConverter.specialize( /** @lends RawEmbeddedValueToObjectConverter# */ {
+
+    /*********************************************************************
+     * Properties
+     */
+
+    /*********************************************************************
+     * Public API
+     */
+
+    /**
+     * Converts the fault for the relationship to an actual object that has an ObjectDescriptor.
+     * @function
+     * @param {Property} v The value to format.
+     * @returns {Promise} A promise for the referenced object.  The promise is
+     * fulfilled after the object is successfully fetched.
+     */
+    convert: {
+        value: function (v) {
+            var self = this,
+                convertedValue,
+                result;
+
+
+            return Promise.all([this._descriptorToFetch, this.service]).then(function (values) {
+                var typeToFetch = values[0],
+                    service = values[1];
+
+                if(Array.isArray(v)) {
+                    if(v.length) {
+                        convertedValue = [];
+                        for(var i=0, countI=v.length, promises;(i<countI);i++) {
+                            result =  self._convertOneValue(v[i],typeToFetch, service, convertedValue, i);
+                            if (Promise.is(result)) {
+                                (promises || (promises = [])).push(result);
+                            }
+                        }
+                        return Promise.all(promises).then(function() {
+                            return convertedValue;
+                        });
+                    }
+                    else {
+                        return Promise.resolve(v);
+                    }
+                }
+                else {
+                    if(v) {
+                        return this._convertOneValue(v,typeToFetch, service);
+                    }
+                }
+            });
+        }
+    },
+
+    _convertOneValue:  {
+        value: function (v, typeToFetch, service, valueArray, index) {
+            var result = service.resolveObjectForTypeRawData(typeToFetch, v);
+
+            if (result) {
+                result = result.then(function (dataObject) {
+                    if(valueArray) {
+                        //Wondering if we need to do this in a property-change compatible way,
+                        //[] direct modification of an Array doesn't send property-changes
+                        valueArray[index] = dataObject;
+                    }
+                    return dataObject;
+                });
+            }
+            else  {
+                result = Promise.resolve();
+            }
+            return result;
+        }
+    },
+
+    /**
+     * Reverts the relationship back to raw data.
+     * @function
+     * @param {Scope} v The value to revert.
+     * @returns {string} v
+     */
+    revert: {
+        value: function (v) {
+            if (v) {
+                if (!this.compiledRevertSyntax) {
+                    return Promise.resolve(v);
+                } else {
+                    var scope = this.scope;
+                    //Parameter is what is accessed as $ in expressions
+                    scope.value = v;
+                    return Promise.resolve(this.compiledRevertSyntax(scope));
+                }
+
+            }
+            return Promise.resolve();
+        }
+    }
+
+});
diff --git a/data/converter/raw-foreign-value-to-object-converter.js b/data/converter/raw-foreign-value-to-object-converter.js
new file mode 100644
index 0000000000..f1abfa6afd
--- /dev/null
+++ b/data/converter/raw-foreign-value-to-object-converter.js
@@ -0,0 +1,80 @@
+var RawValueToObjectConverter = require("./raw-value-to-object-converter").RawValueToObjectConverter,
+    Criteria = require("core/criteria").Criteria,
+    DataQuery = require("data/model/data-query").DataQuery,
+    Promise = require("core/promise").Promise;
+/**
+ * @class RawForeignValueToObjectConverter
+ * @classdesc Converts a property value of raw data to the referenced object.
+ * @extends RawValueToObjectConverter
+ */
+exports.RawForeignValueToObjectConverter = RawValueToObjectConverter.specialize( /** @lends RawForeignValueToObjectConverter# */ {
+
+
+    /*********************************************************************
+     * Public API
+     */
+
+    /**
+     * Converts the fault for the relationship to an actual object that has an ObjectDescriptor.
+     * @function
+     * @param {Property} v The value to format.
+     * @returns {Promise} A promise for the referenced object.  The promise is
+     * fulfilled after the object is successfully fetched.
+     */
+    convert: {
+        value: function (v) {
+
+            if(v) {
+                var self = this,
+                criteria = new Criteria().initWithSyntax(self.convertSyntax, v),
+                query;
+
+                return this._descriptorToFetch.then(function (typeToFetch) {
+                    var type = typeToFetch.module.id;
+
+                    type += "/";
+                    type += typeToFetch.name;
+
+                    if (self.serviceIdentifier) {
+                        criteria.parameters.serviceIdentifier = self.serviceIdentifier;
+                    }
+
+                    query = DataQuery.withTypeAndCriteria(type, criteria);
+
+                    return self.service ? self.service.then(function (service) {
+                        return service.rootService.fetchData(query);
+                    }) : null;
+                });
+            }
+            else {
+                return Promise.resolve();
+            }
+        }
+    },
+
+
+
+    /**
+     * Reverts the relationship back to raw data.
+     * @function
+     * @param {Scope} v The value to revert.
+     * @returns {Promise} v
+     */
+    revert: {
+        value: function (v) {
+            if (v) {
+                if (!this.compiledRevertSyntax) {
+                    return Promise.resolve(v);
+                } else {
+                    var scope = this.scope;
+                    //Parameter is what is accessed as $ in expressions
+                    scope.value = v;
+                    return Promise.resolve(this.compiledRevertSyntax(scope));
+                }
+
+            }
+            return Promise.resolve();
+        }
+    }
+
+});
diff --git a/data/converter/raw-property-value-to-object-converter.js b/data/converter/raw-property-value-to-object-converter.js
index 69ecc3f352..6c3ae5156c 100644
--- a/data/converter/raw-property-value-to-object-converter.js
+++ b/data/converter/raw-property-value-to-object-converter.js
@@ -1,363 +1,3 @@
-var Converter = require("core/converter/converter").Converter,
-    Criteria = require("core/criteria").Criteria,
-    DataQuery = require("data/model/data-query").DataQuery,
-    ObjectDescriptorReference = require("core/meta/object-descriptor-reference").ObjectDescriptorReference,
-    Promise = require("core/promise").Promise,
-    Scope = require("frb/scope"),
-    parse = require("frb/parse"),
-    compile = require("frb/compile-evaluator");
-
-/**
- * @class RawPropertyValueToObjectConverter
- * @classdesc Converts a property value of raw data to the referenced object.
- * @extends Converter
- */
-exports.RawPropertyValueToObjectConverter = Converter.specialize( /** @lends RawPropertyValueToObjectConverter# */ {
-    
-    
-    /*********************************************************************
-     * Serialization
-     */
-    
-    serializeSelf: {
-        value: function (serializer) {
-            
-            serializer.setProperty("convertExpression", this.convertExpression);
-            
-            serializer.setProperty("foreignDescriptor", this._foreignDescriptorReference);
-            
-            serializer.setProperty("revertExpression", this.revertExpression);
-            
-            serializer.setProperty("root", this.owner);
-            
-            serializer.setProperty("serviceIdentifier", this.serviceIdentifier);
-            serializer.setProperty("service", this.service);
-            
-        }
-    },
-    
-    deserializeSelf: {
-        value: function (deserializer) {
-            var value = deserializer.getProperty("convertExpression");
-            if (value) {
-                this.convertExpression = value;
-            }
-            
-            value = deserializer.getProperty("revertExpression");
-            if (value) {
-                this.revertExpression = value;
-            }
-            
-            value = deserializer.getProperty("foreignDescriptor");
-            if (value instanceof ObjectDescriptorReference) {
-                this._foreignDescriptorReference = value;
-            } else if (value) {
-                this.foreignDescriptor = value;
-            }
-            
-            value = deserializer.getProperty("service");
-            if (value) {
-                this.service = value;
-            }
-            
-            value = deserializer.getObjectByLabel("root");
-            if (value) {
-                this.owner = value;
-            }
-            
-            value = deserializer.getProperty("serviceIdentifier");
-            if (value) {
-                this.serviceIdentifier = value;
-            }
-            
-            deserializer.deserializeUnit("bindings");
-        }
-    },
-    
-    /*********************************************************************
-     * Initialization
-     */
-    
-    /**
-     * @param {string} convertExpression the expression to be used for building a criteria to obtain the object corresponding to the value to convert.
-     * @return itself
-     */
-    initWithConvertExpression: {
-        value: function (convertExpression) {
-            this.convertExpression = convertExpression;
-            return this;
-        }
-    },
-    
-    /*********************************************************************
-     * Properties
-     */
-    
-    
-    _convertExpression: {
-        value: null
-    },
-    
-    /**
-     * The expression used to convert a raw value into a modeled one, for example a foreign property value into the objet it represents.
-     * @type {string}
-     * */
-    convertExpression: {
-        get: function() {
-            return this._convertExpression;
-        },
-        set: function(value) {
-            if(value !== this._convertExpression) {
-                this._convertExpression = value;
-                this._convertSyntax = undefined;
-            }
-        }
-    },
-    
-    _convertSyntax: {
-        value: undefined
-    },
-    
-    /**
-     * Object created by parsing .convertExpression using frb/grammar.js that will
-     * be used to initialize the convert query criteria
-     * @type {Object}
-     * */
-    
-    convertSyntax: {
-        get: function() {
-            return this._convertSyntax || (this._convertSyntax = parse(this.convertExpression));
-        }
-    },
-    
-    _revertExpression: {
-        value: null
-    },
-    
-    /**
-     * The expression used to revert the modeled value into a raw one. For example,
-     * reverting an object into it's primary key.
-     * @type {string}
-     * */
-    revertExpression: {
-        get: function() {
-            return this._revertExpression;
-        },
-        set: function(value) {
-            if(value !== this._revertExpression) {
-                this._revertExpression = value;
-                this._revertSyntax = undefined;
-            }
-        }
-    },
-    
-    _revertSyntax: {
-        value: undefined
-    },
-    
-    /**
-     * Object created by parsing .revertExpression using frb/grammar.js that will
-     * be used to revert the modeled value into a raw one
-     * @type {Object}
-     * */
-    revertSyntax: {
-        get: function() {
-            return this._revertSyntax || (this._revertSyntax = parse(this.revertExpression));
-        }
-    },
-
-    _compiledRevertSyntax: {
-        value: undefined
-    },
-
-    compiledRevertSyntax: {
-        get: function () {
-            return this._compiledRevertSyntax || (this._compiledRevertSyntax = compile(this.revertSyntax));
-        }
-    },
-
-
-    /**
-     * The descriptor of the destination object. If one is not provided,
-     * .objectDescriptor will be used. If .objectDescriptor is not provided,
-     * the value descriptor of the property descriptor that defines the
-     * relationship will be used.
-     * @type {?ObjectDescriptorReference}
-     * */
-    foreignDescriptor: {
-        serializable: false,
-        get: function () {
-            var isReference = this._foreignDescriptor instanceof ObjectDescriptorReference;
-            return isReference             ? this._foreignDescriptor :
-                   this._foreignDescriptor ? Promise.resolve(this._foreignDescriptor) :
-                   this._foreignDescriptorReference && this._foreignDescriptorReference.promise(require);
-        },
-        set: function (descriptor) {
-            this._foreignDescriptor = descriptor;
-        }
-    },
-    
-    /**
-     * The descriptor of the source object. It will be used only if it is provided and
-     * .foreignDescriptor is not provided.
-     * @type {?ObjectDescriptorReference}
-     **/
-    objectDescriptor: {
-        get: function () {
-            return  this._objectDescriptor                      ?   Promise.resolve(this._objectDescriptor) :
-                    this.owner && this.owner.objectDescriptor   ?   Promise.resolve(this.owner.objectDescriptor) :
-                    this._isAsync(this.owner)                   ?   this._objectDescriptorReference :
-                                                                    undefined;
-        },
-        set: function (value) {
-            this._objectDescriptor = value;
-        }
-    },
-    
-    _objectDescriptorReference: {
-        get: function () {
-            var self = this;
-            return this.owner.then(function (object) {
-                var objectDescriptor = object.objectDescriptor;
-                self.objectDescriptor = objectDescriptor;
-                return objectDescriptor;
-            });
-        }
-    },
-
-    _isAsync: {
-        value: function (object) {
-            return object && object.then && typeof object.then === "function";
-        }
-    },
-
-    
-    /**
-     * The descriptor for which to perform the fetch.
-     * This returns foreignDescriptor, if it exists, and otherwise
-     * returns objectDescriptor.
-     * @type {?ObjectDescriptorReference}
-     **/
-    _descriptorToFetch: {
-        get: function () {
-            if (!this.__descriptorToFetch) {
-                if (this.foreignDescriptor && this.foreignDescriptor.promise) {
-                    this.__descriptorToFetch = this.foreignDescriptor.promise(require);
-                } else if (this.foreignDescriptor) {
-                    this.__descriptorToFetch = this.foreignDescriptor;
-                } else {
-                    this.__descriptorToFetch = this.objectDescriptor;
-                }
-            }
-            return this.__descriptorToFetch;
-            
-            // this.__descriptorToFetch = this._foreignDescriptor ? this._foreignDescriptor.then(function (descriptor) {
-            //     return descriptor || self.objectDescriptor;
-            // }) : Promise.resolve(this.objectDescriptor);
-            // return this.foreignDescriptor || this.objectDescriptor;
-        }
-    },
-    
-    owner: {
-        get: function () {
-            return this._owner ? this._owner.then ? this._owner : Promise.resolve(this._owner) : undefined;
-        },
-        set: function (value) {
-            this._owner = value;
-        }
-    },
-    
-    __scope: {
-        value: null
-    },
-    
-    /**
-     * Scope with which convert and revert expressions are evaluated.
-     * @type {?Scope}
-     **/
-    scope: {
-        get: function() {
-            return this.__scope || (this.__scope = new Scope(this));
-        }
-    },
-    
-    /**
-     * The service to use to make requests.
-     */
-    service: {
-        get: function () {
-            return  this._service ? this._service :
-                this.owner    ? this.owner.then(function (object) { return object.service; }) :
-                    undefined;
-        },
-        set: function (value) {
-            this._service = !value || value.then ? value : Promise.resolve(value);
-        }
-    },
-    
-    /**
-     * Identifier of the child of .service that the query should be routed to
-     */
-    serviceIdentifier: {
-        value: undefined
-    },
-    
-    /*********************************************************************
-     * Public API
-     */
-    
-    /**
-     * Converts the fault for the relationship to an actual object that has an ObjectDescriptor.
-     * @function
-     * @param {Property} v The value to format.
-     * @returns {Promise} A promise for the referenced object.  The promise is
-     * fulfilled after the object is successfully fetched.
-     */
-    convert: {
-        value: function (v) {
-            var self = this,
-                criteria = new Criteria().initWithSyntax(self.convertSyntax, v),
-                query;
-            
-            return this._descriptorToFetch.then(function (typeToFetch) {
-                var type = [typeToFetch.module.id, typeToFetch.name].join("/");
-                
-                if (self.serviceIdentifier) {
-                    criteria.parameters.serviceIdentifier = self.serviceIdentifier;
-                }
-                
-                query = DataQuery.withTypeAndCriteria(type, criteria);
-                
-                return self.service ? self.service.then(function (service) {
-                    return service.rootService.fetchData(query);
-                }) : null;
-            });
-        }
-    },
-    
-    
-    
-    /**
-     * Reverts the relationship back to raw data.
-     * @function
-     * @param {Scope} v The value to revert.
-     * @returns {string} v
-     */
-    revert: {
-        value: function (v) {
-            if (v) {
-                if (!this.compiledRevertSyntax) {
-                    return Promise.resolve(v);
-                } else {
-                    var scope = this.scope;
-                    //Parameter is what is accessed as $ in expressions
-                    scope.value = v;
-                    return Promise.resolve(this.compiledRevertSyntax(scope));
-                }
-                
-            }
-            return Promise.resolve(undefined);
-        }
-    }
-    
-});
+var deprecate = require("../../core/deprecate");
+exports.RawPropertyValueToObjectConverter = require("./raw-foreign-value-to-object-converter").RawForeignValueToObjectConverter;
+deprecate.deprecationWarningOnce("RawPropertyValueToObjectConverter is deprecated, now use require(\"montage/data/converter/raw-foreign-value-to-object-converter\").RawForeignValueToObjectConverter instead");
diff --git a/data/converter/raw-value-to-object-converter.js b/data/converter/raw-value-to-object-converter.js
new file mode 100644
index 0000000000..e0c893d676
--- /dev/null
+++ b/data/converter/raw-value-to-object-converter.js
@@ -0,0 +1,360 @@
+var Converter = require("core/converter/converter").Converter,
+    ObjectDescriptorReference = require("core/meta/object-descriptor-reference").ObjectDescriptorReference,
+    Promise = require("core/promise").Promise,
+    Scope = require("frb/scope"),
+    parse = require("frb/parse"),
+    compile = require("frb/compile-evaluator");
+
+/**
+ * @class RawValueToObjectConverter
+ * @classdesc Converts a property value of raw data to the referenced object.
+ * @extends Converter
+ */
+exports.RawValueToObjectConverter = Converter.specialize( /** @lends RawValueToObjectConverter# */ {
+
+/*
+                converter.expression = converter.expression || rule.expression;
+                converter.foreignDescriptor = converter.foreignDescriptor || propertyDescriptor.valueDescriptor;
+                converter.objectDescriptor = this.objectDescriptor;
+                converter.serviceIdentifier = rule.serviceIdentifier;
+
+*/
+
+
+    /*********************************************************************
+     * Serialization
+     */
+
+    serializeSelf: {
+        value: function (serializer) {
+
+            serializer.setProperty("convertExpression", this.convertExpression);
+
+            serializer.setProperty("foreignDescriptor", this._foreignDescriptorReference);
+
+            serializer.setProperty("revertExpression", this.revertExpression);
+
+            serializer.setProperty("root", this.owner);
+
+            serializer.setProperty("serviceIdentifier", this.serviceIdentifier);
+            serializer.setProperty("service", this.service);
+
+        }
+    },
+
+    deserializeSelf: {
+        value: function (deserializer) {
+            var value = deserializer.getProperty("convertExpression");
+            if (value) {
+                this.convertExpression = value;
+            }
+
+            value = deserializer.getProperty("revertExpression");
+            if (value) {
+                this.revertExpression = value;
+            }
+
+            value = deserializer.getProperty("foreignDescriptor");
+            if (value instanceof ObjectDescriptorReference) {
+                if(!deserializer.isSync) {
+                    this._foreignDescriptorReference = value;
+                }
+                else {
+                    this.foreignDescriptor = deserializer._context._require(value._reference.objectDescriptorModule.id).montageObject;
+                }
+            } else if (value) {
+                this.foreignDescriptor = value;
+            }
+
+            value = deserializer.getProperty("service");
+            if (value) {
+                this.service = value;
+            }
+
+            value = deserializer.getObjectByLabel("root");
+            if (value) {
+                this.owner = value;
+            }
+
+            value = deserializer.getProperty("serviceIdentifier");
+            if (value) {
+                this.serviceIdentifier = value;
+            }
+
+            deserializer.deserializeUnit("bindings");
+        }
+    },
+
+    /*********************************************************************
+     * Initialization
+     */
+
+    /**
+     * @param {string} convertExpression the expression to be used for building a criteria to obtain the object corresponding to the value to convert.
+     * @return itself
+     */
+    initWithConvertExpression: {
+        value: function (convertExpression) {
+            this.convertExpression = convertExpression;
+            return this;
+        }
+    },
+
+    /*********************************************************************
+     * Properties
+     */
+
+
+    _convertExpression: {
+        value: null
+    },
+
+    /**
+     * The expression used to convert a raw value into a modeled one, for example a foreign property value into the objet it represents.
+     * @type {string}
+     * */
+    convertExpression: {
+        get: function() {
+            return this._convertExpression;
+        },
+        set: function(value) {
+            if(value !== this._convertExpression) {
+                this._convertExpression = value;
+                this._convertSyntax = undefined;
+            }
+        }
+    },
+
+    _convertSyntax: {
+        value: undefined
+    },
+
+    /**
+     * Object created by parsing .convertExpression using frb/grammar.js that will
+     * be used to initialize the convert query criteria
+     * @type {Object}
+     * */
+
+    convertSyntax: {
+        get: function() {
+            return (this._convertSyntax ||
+                ((this._convertSyntax === undefined)    ? (this._convertSyntax = (this.convertExpression ? parse(this.convertExpression) : null))
+                                                        : null));
+        }
+    },
+
+    _revertExpression: {
+        value: null
+    },
+
+    /**
+     * The expression used to revert the modeled value into a raw one. For example,
+     * reverting an object into it's primary key.
+     * @type {string}
+     * */
+    revertExpression: {
+        get: function() {
+            return this._revertExpression;
+        },
+        set: function(value) {
+            if(value !== this._revertExpression) {
+                this._revertExpression = value;
+                this._revertSyntax = undefined;
+            }
+        }
+    },
+
+    _revertSyntax: {
+        value: undefined
+    },
+
+    /**
+     * Object created by parsing .revertExpression using frb/grammar.js that will
+     * be used to revert the modeled value into a raw one
+     * @type {Object}
+     * */
+    revertSyntax: {
+        get: function() {
+            return this._revertSyntax ||
+                (this._revertSyntax === undefined  ? this._revertSyntax = this.revertExpression ? parse(this.revertExpression)
+                                                                                                                        : null
+                                                    : null);
+        }
+    },
+
+    _compiledRevertSyntax: {
+        value: undefined
+    },
+
+    compiledRevertSyntax: {
+        get: function () {
+
+            return this._compiledRevertSyntax ||
+                    (this._compiledRevertSyntax === undefined   ? this._compiledRevertSyntax = this.revertSyntax    ? compile(this.revertSyntax)
+                                                                                                                    : null
+                                                                : null);
+        }
+    },
+
+
+    /**
+     * The descriptor of the destination object. If one is not provided,
+     * .objectDescriptor will be used. If .objectDescriptor is not provided,
+     * the value descriptor of the property descriptor that defines the
+     * relationship will be used.
+     * @type {?ObjectDescriptorReference}
+     * */
+    foreignDescriptor: {
+        serializable: false,
+        get: function () {
+            var isReference = this._foreignDescriptor instanceof ObjectDescriptorReference;
+            return isReference             ? this._foreignDescriptor :
+                   this._foreignDescriptor ? Promise.resolve(this._foreignDescriptor) :
+                   this._foreignDescriptorReference && this._foreignDescriptorReference.promise(require);
+        },
+        set: function (descriptor) {
+            this._foreignDescriptor = descriptor;
+        }
+    },
+
+    /**
+     * The descriptor of the source object. It will be used only if it is provided and
+     * .foreignDescriptor is not provided.
+     * @type {?ObjectDescriptorReference}
+     **/
+    objectDescriptor: {
+        get: function () {
+            return  this._objectDescriptor                      ?   Promise.resolve(this._objectDescriptor) :
+                    this.owner && this.owner.objectDescriptor   ?   Promise.resolve(this.owner.objectDescriptor) :
+                    this._isAsync(this.owner)                   ?   this._objectDescriptorReference :
+                                                                    undefined;
+        },
+        set: function (value) {
+            this._objectDescriptor = value;
+        }
+    },
+
+    _objectDescriptorReference: {
+        get: function () {
+            var self = this;
+            return this.owner.then(function (object) {
+                var objectDescriptor = object.objectDescriptor;
+                self.objectDescriptor = objectDescriptor;
+                return objectDescriptor;
+            });
+        }
+    },
+
+    _isAsync: {
+        value: function (object) {
+            return object && object.then && typeof object.then === "function";
+        }
+    },
+
+
+    /**
+     * The descriptor for which to perform the fetch.
+     * This returns foreignDescriptor, if it exists, and otherwise
+     * returns objectDescriptor.
+     * @type {?ObjectDescriptorReference}
+     **/
+    _descriptorToFetch: {
+        get: function () {
+            if (!this.__descriptorToFetch) {
+                if (this.foreignDescriptor && this.foreignDescriptor.promise) {
+                    this.__descriptorToFetch = this.foreignDescriptor.promise(require);
+                } else if (this.foreignDescriptor) {
+                    this.__descriptorToFetch = this.foreignDescriptor;
+                } else {
+                    this.__descriptorToFetch = this.objectDescriptor;
+                }
+            }
+            return this.__descriptorToFetch;
+
+            // this.__descriptorToFetch = this._foreignDescriptor ? this._foreignDescriptor.then(function (descriptor) {
+            //     return descriptor || self.objectDescriptor;
+            // }) : Promise.resolve(this.objectDescriptor);
+            // return this.foreignDescriptor || this.objectDescriptor;
+        }
+    },
+
+    owner: {
+        get: function () {
+            return this._owner ? this._owner.then ? this._owner : Promise.resolve(this._owner) : undefined;
+        },
+        set: function (value) {
+            this._owner = value;
+        }
+    },
+
+    __scope: {
+        value: null
+    },
+
+    /**
+     * Scope with which convert and revert expressions are evaluated.
+     * @type {?Scope}
+     **/
+    scope: {
+        get: function() {
+            return this.__scope || (this.__scope = new Scope(this));
+        }
+    },
+
+    /**
+     * The service to use to make requests.
+     */
+    service: {
+        get: function () {
+            return  this._service ? this._service :
+                this.owner    ? this.owner.then(function (object) { return object.service; }) :
+                    undefined;
+        },
+        set: function (value) {
+            this._service = !value || value.then ? value : Promise.resolve(value);
+        }
+    },
+
+    /**
+     * Identifier of the child of .service that the query should be routed to
+     */
+    serviceIdentifier: {
+        value: undefined
+    },
+
+    /*********************************************************************
+     * Public API
+     */
+
+    /**
+     * Convert raw data to data objects of an appropriate type.
+     *
+     * Subclasses should override this method to provide a concrete conversion.
+     * @method
+     * @param {Property} v The value to format.
+     * @returns {Promise} A promise for the referenced object.  The promise is
+     * fulfilled after the object is successfully fetched.
+     */
+    convert: {
+        value: function (v) {
+            return Promise.resolve(v);
+        }
+    },
+
+
+
+    /**
+     * Revert object value of a known type to raw data
+     *
+     * Subclasses should override this method to provide a concrete revert.
+     * @function
+     * @param {Scope} v The value to revert.
+     * @returns {string} v
+     */
+    revert: {
+        value: function (v) {
+            return Promise.resolve(v);
+        }
+    }
+
+});
diff --git a/data/model/data-query.js b/data/model/data-query.js
index 13539a39a0..160fe8c8a8 100644
--- a/data/model/data-query.js
+++ b/data/model/data-query.js
@@ -1,5 +1,4 @@
-var Montage = require("montage").Montage,
-    ModuleReference = require("core/module-reference").ModuleReference;
+var Montage = require("montage").Montage;
 
 /**
  * Defines the criteria that objects must satisfy to be included in a set of
@@ -40,7 +39,7 @@ exports.DataQuery = Montage.specialize(/** @lends DataQuery.prototype */ {
                 this.selectExpression = value;
             }
 
-            
+
             value = deserializer.getProperty("type");
             if (value !== void 0) {
                 this.type = value;
@@ -48,7 +47,7 @@ exports.DataQuery = Montage.specialize(/** @lends DataQuery.prototype */ {
                 value = deserializer.getProperty("typeModule");
                 if (value) {
                     var self = this;
-                    
+
                     result = value.require.async(value.id).then(function (exports) {
                         self.type = exports.montageObject;
                         return self;
@@ -67,7 +66,7 @@ exports.DataQuery = Montage.specialize(/** @lends DataQuery.prototype */ {
             serializer.setProperty("prefetchExpressions", this.prefetchExpressions);
             serializer.setProperty("selectBindings", this.selectBindings);
             serializer.setProperty("selectExpression", this.selectExpression);
-            
+
             if (this.type.objectDescriptorInstanceModule) {
                 serializer.setProperty("typeModule", this.type.objectDescriptorInstanceModule);
             } else {
@@ -190,6 +189,15 @@ exports.DataQuery = Montage.specialize(/** @lends DataQuery.prototype */ {
         value: undefined
     },
 
+    /**
+     * An expression that is used in memory client side to further refine the set objects retrieves.
+     * by the query's criteria expression. This useful in cases the origin service doesn't know how to handle such criteria.
+     * That shouldn't be exposed to the end developer, but instead, a RawDataService should be able to analyse a query's criteria
+     * and split the apsects that can be executed by the origin service automatically, to filter the rest itself.
+     * @type {Array}
+     */
+
+
     selectExpression: {
         value: undefined
     },
diff --git a/data/service/data-service.js b/data/service/data-service.js
index c645b2fa35..992379b932 100644
--- a/data/service/data-service.js
+++ b/data/service/data-service.js
@@ -59,12 +59,9 @@ exports.DataService = Montage.specialize(/** @lends DataService.prototype */ {
                 result = this,
                 value;
 
-            value = deserializer.getProperty("childServices");
+            value = deserializer.getProperty("name");
             if (value) {
-                this.registerChildServices(value);
-                result = this._childServiceRegistrationPromise.then(function () {
-                    return self;
-                });
+                this.name = value;
             }
 
             value = deserializer.getProperty("model") || deserializer.getProperty("binder");
@@ -91,8 +88,23 @@ exports.DataService = Montage.specialize(/** @lends DataService.prototype */ {
             if (value !== undefined) {
                 this.isUniquing = value;
             }
-            
-            return result;
+
+            value = deserializer.getProperty("childServices");
+            if (value) {
+                this._childServices = value;
+            }
+
+            return this;
+        }
+    },
+
+    deserializedFromSerialization: {
+        value: function () {
+            if(Array.isArray(this._childServices)) {
+                var childServices = this._childServices;
+                this._childServices = [];
+                this.addChildServices(childServices);
+            }
         }
     },
 
@@ -242,6 +254,49 @@ exports.DataService = Montage.specialize(/** @lends DataService.prototype */ {
         value: undefined
     },
 
+
+
+    addChildServices: {
+        value: function (childServices) {
+            var i, countI, iChild, j, countJ, mappings, jMapping, types, jType, jResult, typesPromises;
+
+            for(i=0, countI = childServices.length;(i<countI);i++) {
+                iChild = childServices[i];
+
+                if((types = iChild.types)) {
+                    this._registerTypesByModuleId(types);
+
+                    for(j=0, countJ = types.length;(j<countJ);j++ ) {
+                        jType = types[j];
+                        jResult = this._makePrototypeForType(iChild, jType);
+                        if(Promise.is(jResult)) {
+                            (typesPromises || (typesPromises = [])).push(jResult);
+                        }
+                    }
+
+                }
+
+                if((mappings = iChild.mappings)) {
+                    for(j=0, countJ = mappings.length;(j<countJ);j++ ) {
+                        jMapping = mappings[j];
+                        iChild.addMappingForType(jMapping, jMapping.objectDescriptor);
+                    }
+                }
+
+                this.addChildService(iChild);
+
+        //Process Mappings
+        //this._childServiceMappings / addMappingForType(mapping, type)
+
+            }
+
+            if(typesPromises) {
+                this._childServiceRegistrationPromise = Promise.all(typesPromises);
+            }
+
+        }
+    },
+
     /**
      * Adds a raw data service as a child of this data service and set it to
      * handle data of the types defined by its [types]{@link DataService#types}
@@ -271,17 +326,23 @@ exports.DataService = Montage.specialize(/** @lends DataService.prototype */ {
 
     _addChildService: {
         value: function (child, types) {
-            var children, type, i, n, nIfEmpty = 1;
-            types = types || child.model && child.model.objectDescriptors || child.types;
+            var children, type, i, n, nIfEmpty = 1, isNotParentService;
+
+            types = types || (child.model && child.model.objectDescriptors) || child.types;
+            isNotParentService = (child._parentService !== this);
             // If the new child service already has a parent, remove it from
             // that parent.
-            if (child._parentService) {
+            // Adding more test to allow a service to register types in multiple
+            // calls, which can happen if the service is deserilized multiple times
+            if (child._parentService && isNotParentService) {
                 child._parentService.removeChildService(child);
             }
 
             // Add the new child to this service's children set.
-            this.childServices.add(child);
-            this._childServicesByIdentifier.set(child.identifier, child);
+            if(isNotParentService) {
+                this.childServices.add(child);
+                this._childServicesByIdentifier.set(child.identifier, child);
+            }
             // Add the new child service to the services array of each of its
             // types or to the "all types" service array identified by the
             // `null` type, and add each of the new child's types to the array
@@ -290,12 +351,17 @@ exports.DataService = Montage.specialize(/** @lends DataService.prototype */ {
             for (i = 0, n = types && types.length || nIfEmpty; i < n; i += 1) {
                 type = types && types.length && types[i] || null;
                 children = this._childServicesByType.get(type) || [];
-                children.push(child);
-                if (children.length === 1) {
-                    this._childServicesByType.set(type, children);
-                    if (type) {
-                        this._childServiceTypes.push(type);
+
+                //Checking in case this is called multiple times
+                if(children.indexOf(child) === -1 ) {
+                    children.push(child);
+                    if (children.length === 1) {
+                        this._childServicesByType.set(type, children);
+                        if (type) {
+                            this._childServiceTypes.push(type);
+                        }
                     }
+
                 }
             }
             // Set the new child service's parent.
@@ -450,20 +516,32 @@ exports.DataService = Montage.specialize(/** @lends DataService.prototype */ {
 
     _makePrototypeForType: {
         value: function (childService, objectDescriptor) {
-            var self = this,
+
+            if(objectDescriptor.object) {
+                return this.__makePrototypeForType(childService, objectDescriptor, objectDescriptor.object);
+            } else {
+                var self = this,
                 module = objectDescriptor.module;
-            return module.require.async(module.id).then(function (exports) {
-                var constructor = exports[objectDescriptor.exportName],
-                    prototype = Object.create(constructor.prototype),
-                    mapping = childService.mappingWithType(objectDescriptor),
-                    requisitePropertyNames = mapping && mapping.requisitePropertyNames || new Set(),
-                    dataTriggers = DataTrigger.addTriggers(self, objectDescriptor, prototype, requisitePropertyNames);
-                self._dataObjectPrototypes.set(constructor, prototype);
-                self._dataObjectPrototypes.set(objectDescriptor, prototype);
-                self._dataObjectTriggers.set(objectDescriptor, dataTriggers);
-                self._constructorToObjectDescriptorMap.set(constructor, objectDescriptor);
-                return null;
-            });
+                return module.require.async(module.id).then(function (exports) {
+                    return self.__makePrototypeForType(childService, objectDescriptor, exports[objectDescriptor.exportName]);
+                });
+            }
+        }
+    },
+
+    __makePrototypeForType: {
+        value: function (childService, objectDescriptor, constructor) {
+            var prototype = Object.create(constructor.prototype),
+            mapping = childService.mappingWithType(objectDescriptor),
+            requisitePropertyNames = mapping && mapping.requisitePropertyNames || new Set(),
+            dataTriggers = DataTrigger.addTriggers(this, objectDescriptor, prototype, requisitePropertyNames);
+
+        this._dataObjectPrototypes.set(constructor, prototype);
+        this._dataObjectPrototypes.set(objectDescriptor, prototype);
+        this._dataObjectTriggers.set(objectDescriptor, dataTriggers);
+        this._constructorToObjectDescriptorMap.set(constructor, objectDescriptor);
+        return null;
+
         }
     },
 
@@ -963,12 +1041,16 @@ exports.DataService = Montage.specialize(/** @lends DataService.prototype */ {
      */
     _getPrototypeForType: {
         value: function (type) {
-            var info, triggers, prototype;
+            var info, triggers, prototypeToExtend, prototype;
             type = this._objectDescriptorForType(type);
             prototype = this._dataObjectPrototypes.get(type);
             if (type && !prototype) {
-                prototype = Object.create(type.objectPrototype || Montage.prototype);
-                prototype.constuctor = type.objectPrototype.constructor;
+                //type.objectPrototype is legacy and should be depreated over time
+                prototypeToExtend = type.objectPrototype || Object.getPrototypeOf(type.module) || Montage.prototype;
+                prototype = Object.create(prototypeToExtend);
+                prototype.constuctor = type.objectPrototype     ? type.objectPrototype.constructor
+                                                                : type.module;
+
                 if(prototype.constuctor.name === "constructor" ) {
                     Object.defineProperty(prototype.constuctor, "name", { value: type.typeName });
                 }
@@ -1324,6 +1406,19 @@ exports.DataService = Montage.specialize(/** @lends DataService.prototype */ {
 
 
             if (mapping) {
+                /*
+                    @marchant: Why aren't we passing this.snapshotForObject(object) instead of copying everying in a new empty object?
+
+                    @tejaede: The criteria source was a first attempt to support derived properties. It's a bucket in which we can put data from the cooked object in order to fetch other cooked properties. The cooked data placed in the criteria source does not belong in the snapshot.
+
+                    For example, take this model:
+
+                    A Foo model includes a bars property and a baz property.
+                    Foo.baz is derived from the value of Foo.bars.
+                    When the application triggers a fetch for Foo.baz, the value of Foo.bars needs to be available to build the criteria for the fetch. However, the value of Foo.bars is cooked and does not belong in the snapshot. Therefore, we create a copy of the snapshot called the "criteria source" into which we can put Foo.bars.
+
+                    All of this said, I don't know this is the right way to solve the problem. The issue at the moment is that this functionality is being used so we cannot remove it without an alternative.
+                */
                 Object.assign(data, this.snapshotForObject(object));
                 result = mapping.mapObjectToCriteriaSourceForProperty(object, data, propertyName);
                 if (this._isAsync(result)) {
@@ -1332,6 +1427,7 @@ exports.DataService = Montage.specialize(/** @lends DataService.prototype */ {
                         return mapping.mapRawDataToObjectProperty(data, object, propertyName);
                     });
                 } else {
+                    //This was already done a few lines up. Why are we re-doing this?
                     Object.assign(data, self.snapshotForObject(object));
                     result = mapping.mapRawDataToObjectProperty(data, object, propertyName);
                     if (!this._isAsync(result)) {
@@ -1770,6 +1866,7 @@ exports.DataService = Montage.specialize(/** @lends DataService.prototype */ {
 
                         service = self.childServiceForType(query.type);
                         if (service) {
+                            //Here we end up creating an extra stream for nothing because it should be third argument.
                             stream = service.fetchData(query, stream) || stream;
                             self._dataServiceByDataStream.set(stream, service);
                         } else {
@@ -1938,7 +2035,7 @@ exports.DataService = Montage.specialize(/** @lends DataService.prototype */ {
             return promise;
         }
     },
-    
+
     /**
      * Save changes made to a data object.
      *
diff --git a/data/service/data-trigger.js b/data/service/data-trigger.js
index 36716bcbcc..c332f70aaa 100644
--- a/data/service/data-trigger.js
+++ b/data/service/data-trigger.js
@@ -73,11 +73,25 @@ exports.DataTrigger.prototype = Object.create({}, /** @lends DataTrigger.prototy
      * @type {string}
      */
     _propertyName: {
+        configurable: true,
+        get: function() {
+            return this.propertyDescriptor.name;
+        }
+    },
+
+        /**
+     * The property descriptor managed by this trigger.
+     *
+     * @private
+     * @type {string}
+     */
+    propertyDescriptor: {
         configurable: true,
         writable: true,
         value: undefined
     },
 
+
     /**
      * The name of the private property corresponding to the public property
      * managed by this trigger.
@@ -212,15 +226,15 @@ exports.DataTrigger.prototype = Object.create({}, /** @lends DataTrigger.prototy
         configurable: true,
         writable: true,
         value: function (object) {
-            var prototype, descriptor, getter;
+            var prototype, descriptor, getter, propertyName = this._propertyName;
             // Start an asynchronous fetch of the property's value if necessary.
             this.getObjectProperty(object);
-            
+
             // Search the prototype chain for a getter for this property,
             // starting just after the prototype that called this method.
             prototype = Object.getPrototypeOf(this._objectPrototype);
             while (prototype) {
-                descriptor = Object.getOwnPropertyDescriptor(prototype, this._propertyName);
+                descriptor = Object.getOwnPropertyDescriptor(prototype, propertyName);
                 getter = descriptor && descriptor.get;
                 prototype = !getter && Object.getPrototypeOf(prototype);
             }
@@ -244,7 +258,7 @@ exports.DataTrigger.prototype = Object.create({}, /** @lends DataTrigger.prototy
         configurable: true,
         writable: true,
         value: function (object, value) {
-            var status, prototype, descriptor, getter, setter, writable;
+            var status, prototype, descriptor, getter, setter, writable, currentValue, isToMany;
             // Get the value's current status and update that status to indicate
             // the value has been obtained. This way if the setter called below
             // requests the property's value it will get the value the property
@@ -262,12 +276,24 @@ exports.DataTrigger.prototype = Object.create({}, /** @lends DataTrigger.prototy
                 writable = !descriptor || setter || descriptor.writable;
                 prototype = writable && !setter && Object.getPrototypeOf(prototype);
             }
+
+
             // Set this trigger's property to the desired value, but only if
             // that property is writable.
             if (setter) {
                 setter.call(object, value);
             } else if (writable) {
-                object[this._privatePropertyName] = value;
+
+                //If Array / to-Many
+                isToMany = this.propertyDescriptor.cardinality !== 1;
+                currentValue = this._getValue(object);
+                if (isToMany && Array.isArray(currentValue)) {
+                    object[this._privatePropertyName].splice.apply(currentValue, [0, Infinity].concat(value));
+                }
+                else {
+                    object[this._privatePropertyName] = value;
+                }
+
             }
             // Resolve any pending promise for this trigger's property value.
             if (status) {
@@ -376,26 +402,26 @@ Object.defineProperties(exports.DataTrigger, /** @lends DataTrigger */ {
      * @returns {Object.<string, DataTrigger>}
      */
     addTriggers: {
-        value: function (service, type, prototype, requisitePropertyNames) {
+        value: function (service, type, prototype, requisitePropertyDescriptors) {
             // This function was split into two to provide backwards compatibility
             // to existing Montage data projects.  Future montage data projects
             // should base their object descriptors on Montage's version of object
             // descriptor.
             var isMontageDataType = type instanceof DataObjectDescriptor || type instanceof ObjectDescriptor;
             return isMontageDataType ?  this._addTriggersForMontageDataType(service, type, prototype, name) :
-                                        this._addTriggers(service, type, prototype, requisitePropertyNames);
+                                        this._addTriggers(service, type, prototype, requisitePropertyDescriptors);
         }
     },
 
     _addTriggersForMontageDataType: {
         value: function (service, type, prototype) {
             var triggers = {},
-                names = Object.keys(type.propertyDescriptors),
-                trigger, name, i;
-            for (i = 0; (name = names[i]); ++i) {
-                trigger = this.addTrigger(service, type, prototype, name);
+            propertyDescriptors = Object.keys(type.propertyDescriptors),
+                trigger, iPropertyDescriptor, i;
+            for (i = 0; (iPropertyDescriptor = propertyDescriptors[i]); ++i) {
+                trigger = this.addTrigger(service, type, prototype, iPropertyDescriptor);
                 if (trigger) {
-                    triggers[name] = trigger;
+                    triggers[iPropertyDescriptor.name] = trigger;
                 }
             }
             return triggers;
@@ -403,14 +429,14 @@ Object.defineProperties(exports.DataTrigger, /** @lends DataTrigger */ {
     },
 
     _addTriggers: {
-        value: function (service, objectDescriptor, prototype, requisitePropertyNames) {
-            var triggers = {}, 
+        value: function (service, objectDescriptor, prototype, requisitePropertyDescriptors) {
+            var triggers = {},
                 propertyDescriptors = objectDescriptor.propertyDescriptors,
                 propertyDescriptor, trigger, name, i;
 
             for (i = 0; (propertyDescriptor = propertyDescriptors[i]); i += 1) {
                 name = propertyDescriptor.name;
-                trigger = this.addTrigger(service, objectDescriptor, prototype, name);
+                trigger = this.addTrigger(service, objectDescriptor, prototype, propertyDescriptor);
                 if (trigger) {
                     triggers[name] = trigger;
                 }
@@ -427,14 +453,14 @@ Object.defineProperties(exports.DataTrigger, /** @lends DataTrigger */ {
      * @returns {?DataTrigger}
      */
     addTrigger: {
-        value: function (service, type, prototype, name) {
+        value: function (service, type, prototype, propertyDescriptor) {
             // This function was split into two to provide backwards compatibility
             // to existing Montage data projects.  Future montage data projects
             // should base their object descriptors on Montage's version of object
             // descriptor.
             var isMontageDataType = type instanceof DataObjectDescriptor || type instanceof ObjectDescriptor;
-            return isMontageDataType ?  this._addTriggerForMontageDataType(service, type, prototype, name) :
-                                        this._addTrigger(service, type, prototype, name);
+            return isMontageDataType ?  this._addTriggerForMontageDataType(service, type, prototype, propertyDescriptor.name) :
+                                        this._addTrigger(service, type, prototype, propertyDescriptor);
         }
     },
 
@@ -445,7 +471,7 @@ Object.defineProperties(exports.DataTrigger, /** @lends DataTrigger */ {
             if (descriptor && descriptor.isRelationship) {
                 trigger = Object.create(this._getTriggerPrototype(service));
                 trigger._objectPrototype = prototype;
-                trigger._propertyName = name;
+                trigger.propertyDescriptor = descriptor;
                 trigger._isGlobal = descriptor.isGlobal;
                 Montage.defineProperty(prototype, name, {
                     get: function () {
@@ -481,7 +507,7 @@ Object.defineProperties(exports.DataTrigger, /** @lends DataTrigger */ {
             var trigger = Object.create(this._getTriggerPrototype(service)),
                 serviceTriggers = service._dataObjectTriggers.get(objectDescriptor);
             trigger._objectPrototype = prototype;
-            trigger._propertyName = name;
+            trigger.propertyDescriptor = propertyDescriptor;
             trigger._isGlobal = propertyDescriptor.isGlobal;
             if(!serviceTriggers) {
                 serviceTriggers = {};
@@ -492,19 +518,19 @@ Object.defineProperties(exports.DataTrigger, /** @lends DataTrigger */ {
         }
     },
     _addTrigger: {
-        value: function (service, objectDescriptor, prototype, name) {
-            var descriptor = objectDescriptor.propertyDescriptorForName(name),
-                trigger;
+        value: function (service, objectDescriptor, prototype, descriptor) {
+            // var descriptor = objectDescriptor.propertyDescriptorForName(name),
+            var trigger;
             if (descriptor) {
                 trigger = Object.create(this._getTriggerPrototype(service));
                 trigger._objectPrototype = prototype;
-                trigger._propertyName = name;
+                trigger.propertyDescriptor = descriptor;
                 trigger._isGlobal = descriptor.isGlobal;
                 if (descriptor.definition) {
-                    Montage.defineProperty(prototype, name, {
+                    Montage.defineProperty(prototype, descriptor.name, {
                         get: function () {
-                            if (!this.getBinding(name)) {
-                                this.defineBinding(name, {"<-": descriptor.definition});
+                            if (!this.getBinding(descriptor.name)) {
+                                this.defineBinding(descriptor.name, {"<-": descriptor.definition});
                             }
                             return trigger._getValue(this);
                             // return (trigger||(trigger = DataTrigger._createTrigger(service, objectDescriptor, prototype, name,descriptor)))._getValue(this);
@@ -515,7 +541,7 @@ Object.defineProperties(exports.DataTrigger, /** @lends DataTrigger */ {
                         }
                     });
                 } else {
-                    Montage.defineProperty(prototype, name, {
+                    Montage.defineProperty(prototype, descriptor.name, {
                         get: function () {
                             return trigger._getValue(this);
                             // return (trigger||(trigger = DataTrigger._createTrigger(service, objectDescriptor, prototype, name,descriptor)))._getValue(this);
diff --git a/data/service/expression-data-mapping.js b/data/service/expression-data-mapping.js
index a86a9a96bd..35d1bf29b8 100644
--- a/data/service/expression-data-mapping.js
+++ b/data/service/expression-data-mapping.js
@@ -70,11 +70,13 @@ exports.ExpressionDataMapping = DataMapping.specialize(/** @lends ExpressionData
                 self = this,
                 hasReferences = false,
                 result = this;
-            if (value instanceof ObjectDescriptorReference) {
-                this.objectDescriptorReference = value;
-                hasReferences = true;
-            } else {
-                this.objectDescriptor = value;
+            if (value) {
+                if (value instanceof ObjectDescriptorReference) {
+                    this.objectDescriptorReference = value;
+                    hasReferences = true;
+                } else {
+                    this.objectDescriptor = value;
+                }
             }
 
             this.schemaReference = deserializer.getProperty("schema");
@@ -92,7 +94,7 @@ exports.ExpressionDataMapping = DataMapping.specialize(/** @lends ExpressionData
                 this.rawDataPrimaryKeys = value;
             }
 
-            if (hasReferences) {
+            if (hasReferences && !deserializer.isSync) {
                 result = this.resolveReferences().then(function () {
                     value = deserializer.getProperty("objectMapping");
                     if (value) {
@@ -105,6 +107,11 @@ exports.ExpressionDataMapping = DataMapping.specialize(/** @lends ExpressionData
                     return self;
                 });
             } else {
+
+                if(!this.objectDescriptor) {
+                    this.objectDescriptor = deserializer._context._require(this._objectDescriptorReference._reference.objectDescriptorModule.id).montageObject;
+                }
+
                 value = deserializer.getProperty("objectMapping");
                 if (value) {
                     self._rawOwnObjectMappingRules = value.rules;
@@ -456,7 +463,7 @@ exports.ExpressionDataMapping = DataMapping.specialize(/** @lends ExpressionData
                 isRelationship = propertyDescriptor && !propertyDescriptor.definition && propertyDescriptor.valueDescriptor,
                 isDerived = propertyDescriptor && !!propertyDescriptor.definition,
                 scope = this._scope,
-                debug = DataService.debugProperties.has(propertyName);
+                debug = DataService.debugProperties.has(propertyName) || (rule && rule.debug === true);
 
 
             // Check if property is included in the DataService.debugProperties collection. Intended for debugging.
@@ -469,6 +476,7 @@ exports.ExpressionDataMapping = DataMapping.specialize(/** @lends ExpressionData
 
             this._prepareRawDataToObjectRule(rule, propertyDescriptor);
 
+
             return  isRelationship ?                                this._resolveRelationship(object, propertyDescriptor, rule, scope) :
                     propertyDescriptor && !isDerived ?              this._resolveProperty(object, propertyDescriptor, rule, scope) :
                                                                     null;
@@ -480,10 +488,13 @@ exports.ExpressionDataMapping = DataMapping.specialize(/** @lends ExpressionData
             var self = this,
                 hasInverse = !!propertyDescriptor.inversePropertyName || !!rule.inversePropertyName,
                 data;
+
             return rule.evaluate(scope).then(function (result) {
                 data = result;
+
                 return hasInverse ? self._assignInversePropertyValue(data, object, propertyDescriptor, rule) : null;
             }).then(function () {
+
                 self._setObjectValueForPropertyDescriptor(object, data, propertyDescriptor);
                 return null;
             });
@@ -497,7 +508,7 @@ exports.ExpressionDataMapping = DataMapping.specialize(/** @lends ExpressionData
 
             return propertyDescriptor.valueDescriptor.then(function (objectDescriptor) {
                 var inversePropertyDescriptor = objectDescriptor.propertyDescriptorForName(inversePropertyName);
-                
+
                 if (data) {
                     self._setObjectsValueForPropertyDescriptor(data, object, inversePropertyDescriptor);
                 }
@@ -607,7 +618,7 @@ exports.ExpressionDataMapping = DataMapping.specialize(/** @lends ExpressionData
     },
 
     /**
-     * Maps the value of a single object property to raw data. Assumes that 
+     * Maps the value of a single object property to raw data. Assumes that
      * the object property has been resolved
      *
      * @method
@@ -640,7 +651,7 @@ exports.ExpressionDataMapping = DataMapping.specialize(/** @lends ExpressionData
     },
 
      /**
-     * Prefetches any object properties required to map the rawData property 
+     * Prefetches any object properties required to map the rawData property
      * and maps once the fetch is complete.
      *
      * @method
@@ -669,7 +680,7 @@ exports.ExpressionDataMapping = DataMapping.specialize(/** @lends ExpressionData
             return result;
         }
     },
-    
+
     /**
      * Convert model object properties to the raw data properties present in the requirements
      * for a given propertyName
@@ -702,7 +713,7 @@ exports.ExpressionDataMapping = DataMapping.specialize(/** @lends ExpressionData
             return promises ? Promise.all(promises) : null;
         }
     },
-    
+
     _prepareObjectToRawDataRule: {
         value: function (rule) {
             var converter = rule.converter,
@@ -750,9 +761,7 @@ exports.ExpressionDataMapping = DataMapping.specialize(/** @lends ExpressionData
 
             if (Array.isArray(value)) {
                 isToMany = propertyDescriptor.cardinality !== 1;
-                if (isToMany && Array.isArray(object[propertyName])) {
-                    object[propertyName].splice.apply(object[propertyName], [0, Infinity].concat(value));
-                } else if (isToMany) {
+                if (isToMany) {
                     object[propertyName] = value;
                 } else if (value.length) {
                     //Cardinality is 1, if data contains more than 1 item, we throw
diff --git a/data/service/raw-data-service.js b/data/service/raw-data-service.js
index 696549f3c1..1f56b52573 100644
--- a/data/service/raw-data-service.js
+++ b/data/service/raw-data-service.js
@@ -435,6 +435,12 @@ exports.RawDataService = DataService.specialize(/** @lends RawDataService.protot
             }
             this._addMapDataPromiseForStream(result, stream);
 
+
+            //TODO: #warning
+            //This method should evolve to use resolveObjectForTypeRawData instead,
+            //however resolveObjectForTypeRawData's promises resolves to object
+            //only after it's been mapped, so this delegate call should only be called then
+            //and not too early as it is now. Not sure if that may create a backward compatibility issue
             if (object) {
                 this.callDelegateMethod("rawDataServiceDidAddOneRawData", this, stream, rawData, object);
             }
@@ -461,10 +467,55 @@ exports.RawDataService = DataService.specialize(/** @lends RawDataService.protot
         }
     },
 
+    /**
+     * Called by [addRawData()]{@link RawDataService#addRawData} to add an object
+     * for the passed record to the stream. This method both takes care of doing
+     * mapRawDataToObject and add the object to the stream.
+     *
+     * @method
+     * @argument {ObjectDescriptor} type
+     *                           - The type of the data object matching rawData.
+     * @argument {Object} rawData - An anonymnous object whose properties'
+     *                             values hold the raw data.
+     * @argument {?} context     - An arbitrary value that will be passed to
+     *                             [getDataObject()]{@link RawDataService#getDataObject}
+     *                             and
+     *                             [mapRawDataToObject()]{@link RawDataService#mapRawDataToObject}
+     *                             if it is provided.
+     *
+     * @returns {Promise<MappedObject>} - A promise resolving to the mapped object.
+     *
+     */
+
+    resolveObjectForTypeRawData: {
+        value:function(type, rawData, context) {
+            var dataIdentifier = this.dataIdentifierForTypeRawData(type,rawData),
+                //Retrieves an existing object is responsible data service is uniquing, or creates one
+                object, result;
+
+            //Record snapshot before we may create an object
+            this.recordSnapshot(dataIdentifier, rawData);
+
+            //Retrieves an existing object is responsible data service is uniquing, or creates one
+            object = this.getDataObject(type, rawData, context, dataIdentifier);
+
+            result = this._mapRawDataToObject(rawData, object, context);
+
+            if (Promise.is(result)) {
+                return result.then(function () {
+                    return object;
+                });
+            } else {
+                return Promise.resolve(object);
+            }
+        }
+    },
+
+
     objectForTypeRawData: {
         value:function(type, rawData, context) {
             var dataIdentifier = this.dataIdentifierForTypeRawData(type,rawData);
-                //Record snapshot before we may create an object
+            //Record snapshot before we may create an object
             this.recordSnapshot(dataIdentifier, rawData);
             //iDataIdentifier argument should be all we need later on
             return this.getDataObject(type, rawData, context, dataIdentifier);
diff --git a/karma.conf.js b/karma.conf.js
index 1981ed82c0..b29fcdf58e 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -3,7 +3,7 @@
 // Karma configuration
 // Generated on Tue Mar 07 2017 13:59:10 GMT-0800 (PST)
 module.exports = function(config) {
-  config.set({
+    var cfg = {
 
     // base path, that will be used to resolve files and exclude
     basePath: '.',
@@ -14,6 +14,8 @@ module.exports = function(config) {
 
     browserNoActivityTimeout: 30000,
 
+    browserSocketTimeout: 80000,
+
     // list of files / patterns to load in the browser
     files: [
         'test/run-karma.js',
@@ -221,5 +223,12 @@ module.exports = function(config) {
         'karma-ie-launcher',
         'karma-phantomjs-launcher'
     ]
-  });
+  };
+
+//   if (process.env.TRAVIS) {
+//     cfg.browsers = ['Chrome_travis_ci'];
+//   }
+
+  config.set(cfg);
+
 };
diff --git a/montage.js b/montage.js
index 1f2cf7a5a9..de5df1fe09 100644
--- a/montage.js
+++ b/montage.js
@@ -18,9 +18,11 @@
 
     // reassigning causes eval to not use lexical scope.
     var globalEval = eval,
-    /*jshint evil:true */
-    global = globalEval('this');
-    /*jshint evil:false */
+        /*jshint evil:true */
+        global = globalEval('this'),
+        /*jshint evil:false */
+        montageExports = exports;
+
 
     // Here we expose global for legacy mop support.
     // TODO move to mr cause it's loader role to expose
@@ -400,12 +402,137 @@
         }
     };
 
-    exports.compileMJSONFile = function (mjson, require, moduleId) {
-        var deserializer = new exports.MontageDeserializer();
-        deserializer.init(mjson, require, void 0, require.location + moduleId);
-        return deserializer.deserializeObject();
+    exports.MJSONCompilerFactory = function MJSONCompilerFactory(require, exports, module, global, moduleFilename, moduleDirectory) {
+
+            //var root =  Require.delegate.compileMJSONFile(module.text, require.config.requireForId(module.id), module.id, /*isSync*/ true);
+
+            if(module.exports.hasOwnProperty("montageObject")) {
+                throw new Error(
+                    'using reserved word as property name, \'montageObject\' at: ' +
+                    module.location
+                );
+            }
+
+            if(!module.deserializer) {
+                // var root =  Require.delegate.compileMJSONFile(module.text, require.config.requireForId(module.id), module, /*isSync*/ true);
+                if(!montageExports.MontageDeserializer) {
+                    montageExports.MontageDeserializer = require("montage/core/serialization/deserializer/montage-deserializer").MontageDeserializer;
+                }
+
+                var deserializer = new montageExports.MontageDeserializer(),
+                    deserializerRequire = require.config.requireForId(module.id),
+                    root;
+                module.deserializer = deserializer;
+                deserializer.init(module.text, deserializerRequire, void 0, module, true);
+                root = deserializer.deserializeObject();
+
+                // console.log("********MJSONCompilerFactory END compileMJSONFile",module.id);
+
+                if (module.exports.montageObject && module.exports.montageObject !== root) {
+                    throw new Error(
+                        'Final deserialized object is different than one set on module ' +
+                        module.location
+                    );
+                }
+                else if(!module.exports.montageObject) {
+                    module.exports.montageObject = root;
+                }
+
+                if(module.exports) {
+                    Object.assign(module.exports, module.parsedText);
+                }
+                else {
+                    module.exports = module.parsedText;
+                }
+
+                module.deserializer = null;
+                module.text = null;
+
+            }
+
+        // console.log("********MJSONCompilerFactory END montageObject THERE",module.id);
+
+
     };
 
+    exports.parseMJSONDependencies = function parseMJSONDependencies(jsonRoot) {
+
+        var rootEntries = Object.keys(jsonRoot),
+            i=0, iLabel, dependencies = [], iLabelObject;
+
+        while ((iLabel = rootEntries[i])) {
+            iLabelObject = jsonRoot[iLabel];
+            if(iLabelObject.hasOwnProperty("prototype")) {
+                dependencies.push(iLabelObject["prototype"]);
+
+                //This is to enable expression-data-mapping to deserialize itself synchronously
+                //despite the fact it may have been serialized using object-descriptor-reference.
+                //This allows us to add the objectDescriptorModule's id ("%") as a dependency upfront.
+                //A stronger version would analyze the whole file for the construct: {"%": "someModuleId"}.
+                //But this would impact performance for a use case that we don't need so far.
+                if(dependencies[dependencies.length-1] === "montage/core/meta/object-descriptor-reference") {
+                    /*
+                        We're adding the module of that referrence, typiacally serialized as:
+                        "ObjectDescriptorReference": {
+                            "prototype": "montage/core/meta/object-descriptor-reference",
+                            "properties": {
+                                "valueReference": {
+                                    "objectDescriptor": "Object_Descriptor_Name",
+                                    "prototypeName": "Object_Descriptor__Prototype_Name",
+                                    "objectDescriptorModule": {"%": "Object_Descriptor__module_id"}
+                                }
+                            }
+                        },
+                    */
+                    dependencies.push(iLabelObject.properties.valueReference.objectDescriptorModule["%"]);
+                }
+
+            }
+            else if(iLabelObject.hasOwnProperty("object")) {
+                dependencies.push(iLabelObject["object"]);
+            }
+
+            i++;
+        }
+        return dependencies;
+    };
+
+    var dotMeta = ".meta",
+        dotMJSON = ".mjson",
+        dotMJSONLoadJs = ".mjson.load.js";
+
+    exports.Compiler = function (config, compile) {
+        return function(module) {
+
+            if (module.exports || module.factory || (typeof module.text !== "string") || (typeof module.exports === "object")) {
+                return module;
+            }
+
+            var location = module.location,
+                isMJSON = (location && (location.endsWith(dotMJSON) || location.endsWith(dotMJSONLoadJs) || location.endsWith(dotMeta)));
+
+            if (isMJSON) {
+                if (typeof module.exports !== "object" && typeof module.text === "string") {
+                    module.parsedText = JSON.parse(module.text);
+                    if (module.parsedText.montageObject) {
+                        throw new Error(
+                            'using reserved word as property name, \'montageObject\' at: ' +
+                            location
+                        );
+                    }
+                }
+                module.dependencies = montageExports.parseMJSONDependencies(module.parsedText);
+                module.factory = exports.MJSONCompilerFactory;
+
+                return module;
+            } else {
+                var result = compile(module);
+                return result;
+            }
+        };
+    };
+
+
     exports.initMontageCustomElement = function () {
         if (typeof window.customElements === 'undefined' || typeof window.Reflect === 'undefined') {
             return void 0;
diff --git a/node.js b/node.js
index 1b93bc16dd..830239ec58 100644
--- a/node.js
+++ b/node.js
@@ -83,17 +83,7 @@ function getMontageMontageDeserializer() {
     }));
 }
 
-exports.compileMJSONFile = function (mjson, require, moduleId) {
-    if (MontageBoot.MontageDeserializer) {
-        return MontageBoot.compileMJSONFile(mjson, require, moduleId);
-    } else {
-        return getMontageMontageDeserializer().then(function () {
-            return MontageBoot.compileMJSONFile(mjson, require, moduleId);
-        });
-    }
-};
-
-Require.delegate = exports;
+Require.delegate = MontageBoot;
 
 function parseHtml(html) {
     var dom, error;
diff --git a/package.json b/package.json
index 13fbf552ea..143058072a 100644
--- a/package.json
+++ b/package.json
@@ -9,8 +9,8 @@
   },
   "main": "montage",
   "engines": {
-    "node": ">=4",
-    "npm": ">=2"
+    "node": ">=10.16.2",
+    "npm": ">=6.9.0"
   },
   "overlay": {
     "browser": {
@@ -48,12 +48,12 @@
   },
   "production": true,
   "dependencies": {
-    "bluebird": "~3.5.0",
+    "bluebird": "~3.5.5",
     "collections": "~5.1.x",
     "frb": "~4.0.x",
     "htmlparser2": "~3.0.5",
     "q-io": "^1.13.3",
-    "mr": "18.0.0-rc2",
+    "mr": "montagejs/mr#master",
     "weak-map": "^1.0.5",
     "lodash.kebabcase": "^4.1.1",
     "lodash.camelcase": "^4.3.0",
@@ -68,13 +68,13 @@
     "jasmine-console-reporter": "^1.2.7",
     "jasmine-core": "^2.5.2",
     "jshint": "^2.9.5",
-    "karma": "^1.5.0",
-    "karma-chrome-launcher": "^2.0.0",
-    "karma-coverage": "^1.1.1",
-    "karma-firefox-launcher": "^1.0.1",
+    "karma": "^4.2.0",
+    "karma-chrome-launcher": "^3.0.0",
+    "karma-coverage": "^1.1.2",
+    "karma-firefox-launcher": "^1.2.0",
     "karma-ie-launcher": "^1.0.0",
-    "karma-jasmine": "^1.1.0",
-    "karma-phantomjs-launcher": "^1.0.2",
+    "karma-jasmine": "^2.0.1",
+    "karma-phantomjs-launcher": "^1.0.4",
     "karma-safari-launcher": "^1.0.0",
     "montage-testing": "git://github.com/montagejs/montage-testing.git#master",
     "mop-integration": "git://github.com/montagejs/mop-integration.git#master",
diff --git a/test/spec/core/module-mjson/package.json b/test/spec/core/module-mjson/package.json
new file mode 100644
index 0000000000..9e26dfeeb6
--- /dev/null
+++ b/test/spec/core/module-mjson/package.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/test/spec/core/module-mjson/program.js b/test/spec/core/module-mjson/program.js
new file mode 100644
index 0000000000..a9007131d5
--- /dev/null
+++ b/test/spec/core/module-mjson/program.js
@@ -0,0 +1,7 @@
+var data = require("spec/core/module-mjson/test.mjson");
+
+describe("core/module-mjson", function () {
+
+    expect(data.Hello === "World", 'parse string').toBe(true);
+
+});
diff --git a/test/spec/core/module-mjson/test.mjson b/test/spec/core/module-mjson/test.mjson
new file mode 100644
index 0000000000..ac4c8c6364
--- /dev/null
+++ b/test/spec/core/module-mjson/test.mjson
@@ -0,0 +1,3 @@
+{
+	"Hello": "World"
+}
\ No newline at end of file
diff --git a/test/spec/data/expression-data-mapping.js b/test/spec/data/expression-data-mapping.js
index 43f238a0cf..ac220b685d 100644
--- a/test/spec/data/expression-data-mapping.js
+++ b/test/spec/data/expression-data-mapping.js
@@ -11,7 +11,7 @@ var ExpressionDataMapping = require("montage/data/service/expression-data-mappin
     PropertyDescriptor = require("montage/core/meta/property-descriptor").PropertyDescriptor,
     RawDataService = require("montage/data/service/raw-data-service").RawDataService,
     RawDataTypeMapping = require("montage/data/service/raw-data-type-mapping").RawDataTypeMapping,
-    RawPropertyValueToObjectConverter = require("montage/data/converter/raw-property-value-to-object-converter").RawPropertyValueToObjectConverter;
+    RawForeignValueToObjectConverter = require("montage/data/converter/raw-foreign-value-to-object-converter").RawForeignValueToObjectConverter;
 
 
 var Movie = require("spec/data/logic/model/movie").Movie,
@@ -60,7 +60,7 @@ describe("An Expression Data Mapping", function() {
         propsPropertyDescriptor,
         propConverter,
         propService,
-        
+
 
 
     dateConverter = Object.create({}, {
@@ -93,7 +93,7 @@ describe("An Expression Data Mapping", function() {
     movieObjectDescriptor.addPropertyDescriptor(new PropertyDescriptor().initWithNameObjectDescriptorAndCardinality("id", movieObjectDescriptor, 1));
     movieSchemaModuleReference = new ModuleReference().initWithIdAndRequire("spec/data/schema/logic/movie", require);
     movieSchema = new ModuleObjectDescriptor().initWithModuleAndExportName(movieSchemaModuleReference, "MovieSchema");
-    
+
 
     actionMovieModuleReference = new ModuleReference().initWithIdAndRequire("spec/data/logic/model/action-movie", require);
     actionMovieObjectDescriptor = new ModuleObjectDescriptor().initWithModuleAndExportName(actionMovieModuleReference, "ActionMovie");
@@ -109,7 +109,7 @@ describe("An Expression Data Mapping", function() {
     categoryPropertyDescriptor = new PropertyDescriptor().initWithNameObjectDescriptorAndCardinality("category", movieObjectDescriptor, 1);
     categoryPropertyDescriptor.valueDescriptor = categoryObjectDescriptor;
     movieObjectDescriptor.addPropertyDescriptor(categoryPropertyDescriptor);
-    
+
 
     countryService = new CountryService();
     countryModuleReference = new ModuleReference().initWithIdAndRequire("spec/data/logic/model/country", require);
@@ -161,24 +161,24 @@ describe("An Expression Data Mapping", function() {
     movieMapping = new ExpressionDataMapping().initWithServiceObjectDescriptorAndSchema(movieService, movieObjectDescriptor, movieSchema);
     movieMapping.addRequisitePropertyName( "title", "category", "budget", "isFeatured", "releaseDate", "id");
     movieMapping.addObjectMappingRule("title", {"<->": "name"});
-    
+
     movieMapping.addObjectMappingRule("id", {"<->": "id"});
 
 
-    categoryConverter = new RawPropertyValueToObjectConverter().initWithConvertExpression("category_id == $");
+    categoryConverter = new RawForeignValueToObjectConverter().initWithConvertExpression("category_id == $");
     categoryConverter.service = categoryService;
     movieMapping.addObjectMappingRule("category", {
         "<-": "{categoryID: category_id}",
         converter: categoryConverter
     });
-    summaryConverter = new RawPropertyValueToObjectConverter().initWithConvertExpression("category_id == $");
+    summaryConverter = new RawForeignValueToObjectConverter().initWithConvertExpression("category_id == $");
     summaryConverter.service = plotSummaryService;
     movieMapping.addObjectMappingRule("plotSummary", {
         "<-": "{movie_id: id}",
         converter: summaryConverter,
         inversePropertyName: "movie"
     });
-    propConverter = new RawPropertyValueToObjectConverter().initWithConvertExpression("category_id == $");
+    propConverter = new RawForeignValueToObjectConverter().initWithConvertExpression("category_id == $");
     propConverter.service = propService;
     movieMapping.addObjectMappingRule("props", {
         "<-": "{}",
@@ -209,7 +209,7 @@ describe("An Expression Data Mapping", function() {
     actionMovieMapping.addRawDataMappingRule("mappedRating", {"<-": "rating"});
     actionMovieMapping.addRawDataMappingRule("mappedScore", {"<-": "criticScore"});
     actionMovieMapping.addRequisitePropertyName("country", "rating");
-    countryConverter = new RawPropertyValueToObjectConverter().initWithConvertExpression("country_id");
+    countryConverter = new RawForeignValueToObjectConverter().initWithConvertExpression("country_id");
     countryConverter.revertExpression = "id";
     countryConverter.owner = actionMovieMapping;
     actionMovieMapping.addObjectMappingRule("country", {
@@ -287,14 +287,14 @@ describe("An Expression Data Mapping", function() {
                 fcc_rating: "pg",
                 country_id: 1
             };
-        
+
         return actionMovieMapping.mapRawDataToObject(data, movie).then(function () {
             //Properties defined in parent descriptor
-            expect(movie.title).toBe("Star Wars"); 
+            expect(movie.title).toBe("Star Wars");
             expect(movie.budget).toEqual(14000000);
 
             //Properties defined in own descriptor
-            expect(movie.country).toBeDefined(); 
+            expect(movie.country).toBeDefined();
             done();
         });
     });
@@ -310,7 +310,7 @@ describe("An Expression Data Mapping", function() {
                 fcc_rating: "pg",
                 country_id: 1
             };
-        
+
         return actionMovieMapping.mapRawDataToObject(data, movie).then(function () {
             //Properties defined in parent descriptor
             return mainService.updateObjectProperties(movie, "plotSummary");
@@ -332,7 +332,7 @@ describe("An Expression Data Mapping", function() {
                 fcc_rating: "pg",
                 country_id: 1
             };
-        
+
         return movieMapping.mapRawDataToObject(data, movie).then(function () {
             //Properties defined in parent descriptor
             return mainService.updateObjectProperties(movie, "props");
@@ -351,7 +351,7 @@ describe("An Expression Data Mapping", function() {
                 category_id: 1,
                 budget: "14000000.00",
                 is_featured: "true",
-                release_date: "05/25/1977"                
+                release_date: "05/25/1977"
             };
         return movieMapping.mapRawDataToObject(data, movie).then(function () {
             expect(typeof movie.budget === "number").toBeTruthy();
@@ -403,9 +403,9 @@ describe("An Expression Data Mapping", function() {
             movie = movieService.rootService.createDataObject(movieObjectDescriptor),
             category = new Category(),
             movieTitle = "The Social Network";
-        
-        
-        var title = movie.title; //Trigger Title Getter 
+
+
+        var title = movie.title; //Trigger Title Getter
         movie.title = movieTitle;
         movie.id = 2;
         category.name = "A Category";
@@ -433,12 +433,12 @@ describe("An Expression Data Mapping", function() {
             country.id = 1;
         actionMovieMapping.mapObjectToRawData(movie, data).then(function () {
             //Properties defined in parent descriptor
-            expect(data.name).toBe("Star Wars"); 
-            expect(data.budget).toBe("14000000"); 
-            expect(data.is_featured).toBe("true"); 
-            expect(data.release_date).toBe("05/25/1977"); 
+            expect(data.name).toBe("Star Wars");
+            expect(data.budget).toBe("14000000");
+            expect(data.is_featured).toBe("true");
+            expect(data.release_date).toBe("05/25/1977");
             //Properties defined in own descriptor
-            expect(data.fcc_rating).toBe("pg"); 
+            expect(data.fcc_rating).toBe("pg");
             expect(data.country_id).toEqual(1);
             done();
         });
@@ -473,7 +473,7 @@ describe("An Expression Data Mapping", function() {
         });
     });
 
-    
+
 
 
 });
diff --git a/test/spec/serialization/montage-deserializer-spec.js b/test/spec/serialization/montage-deserializer-spec.js
index 408b5393a2..465a8a4039 100644
--- a/test/spec/serialization/montage-deserializer-spec.js
+++ b/test/spec/serialization/montage-deserializer-spec.js
@@ -756,7 +756,6 @@ describe("serialization/montage-deserializer-spec", function () {
 
             deserializer.init(serializationString, require);
             deserializer.deserializeObject().then(function (root) {
-                console.log("root", root);
                 expect(root).toBeDefined();
             }).catch(function(reason) {
                 fail(reason);
@@ -785,6 +784,8 @@ describe("serialization/montage-deserializer-spec", function () {
         });
 
         it("should deserialize using prototype: module.mjson", function (done) {
+            //The fact that this is a string created in montage-deserializer-spec
+            //makes harder to assess what moduleId should really be expected.
             var serialization = {
                     "root": {
                         "prototype": "spec/serialization/testmjson.mjson",
@@ -799,7 +800,7 @@ describe("serialization/montage-deserializer-spec", function () {
             deserializer.init(serializationString, require);
             deserializer.deserializeObject().then(function (root) {
                 var info = Montage.getInfoForObject(root);
-                expect(info.moduleId).toBe("core/core");
+                expect(info.moduleId).toBe("spec/serialization/testmjson.mjson");
                 expect(info.isInstance).toBe(true);
                 expect(root.type).toBeUndefined();
                 expect(root.name).toBe("RootObjectDescriptor");
@@ -855,7 +856,7 @@ describe("serialization/montage-deserializer-spec", function () {
             deserializer.init(serializationString, require);
             deserializer.deserializeObject().then(function (root) {
                 var info = Montage.getInfoForObject(root);
-                expect(info.moduleId).toBe("core/core");
+                expect(info.moduleId).toBe("spec/serialization/testmjson.mjson");
                 expect(info.isInstance).toBe(true);
                 expect(root.type).toBeUndefined();
                 expect(root.name).toBe("RootObjectDescriptor");
@@ -868,6 +869,40 @@ describe("serialization/montage-deserializer-spec", function () {
             });
         });
 
+        it("should deserialize using object: module.mjson, object created", function (done) {
+            var serialization = {
+                    "root": {
+                        "object": "spec/serialization/test-object-mjson.mjson",
+                        "values": {
+                            "number": 42,
+                            "string": {"<-": "'a string'"}
+                        }
+                    }
+                },
+                serializationString = JSON.stringify(serialization);
+
+            deserializer.init(serializationString, require);
+            deserializer.deserializeObject().then(function (root) {
+                var info = Montage.getInfoForObject(root);
+                expect(info.moduleId).toBe("core/core");
+                expect(info.isInstance).toBe(false);
+                expect(root.type).toBeUndefined();
+                expect(root.blah).toBe("RootObjectDescriptor");
+                expect(root.number).toBe(42);
+                expect(root.string).toBe("a string");
+            }).catch(function (reason) {
+                fail(reason);
+            }).finally(function () {
+                done();
+            });
+        });
+
+        it("should deserialize mjson synchronously with require", function (done) {
+            var root = require("spec/serialization/test-object-mjson.mjson").montageObject;
+            expect(root.blah).toBe("RootObjectDescriptor");
+            done();
+        });
+
         it("should deserialize singleton using object: module.mjson", function (done) {
             var serialization = {
                     "root": {
@@ -1032,7 +1067,7 @@ describe("serialization/montage-deserializer-spec", function () {
                 }
             };
 
-        it("should only create the object", function (done) {
+        it("Empty deserializeSelf should only create the object and not set values", function (done) {
             var serializationString = JSON.stringify(serialization);
 
             deserializer.init(
diff --git a/test/spec/serialization/test-object-mjson.mjson b/test/spec/serialization/test-object-mjson.mjson
new file mode 100644
index 0000000000..19af4b28f3
--- /dev/null
+++ b/test/spec/serialization/test-object-mjson.mjson
@@ -0,0 +1,8 @@
+{
+    "root": {
+        "object": "montage/core/core[Montage]",
+        "values": {
+            "blah": "RootObjectDescriptor"
+        }
+    }
+}