diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e8ffc5..9f323e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+##### 2.1.0 - 10 July 2015
+
+###### Backwards compatible API changes
+- #15 - Add support for loading relations in find()
+- #16 - Add support for loading relations in findAll()
+
 ##### 2.0.0 - 02 July 2015
 
 Stable Version 2.0.0
diff --git a/dist/js-data-firebase.js b/dist/js-data-firebase.js
index c03da66..098b277 100644
--- a/dist/js-data-firebase.js
+++ b/dist/js-data-firebase.js
@@ -1,6 +1,6 @@
 /*!
  * js-data-firebase
- * @version 2.0.0 - Homepage <http://www.js-data.io/docs/dsfirebaseadapter>
+ * @version 2.1.0 - Homepage <http://www.js-data.io/docs/dsfirebaseadapter>
  * @author Jason Dobry <jason.dobry@gmail.com>
  * @copyright (c) 2014-2015 Jason Dobry 
  * @license MIT <https://github.com/js-data/js-data-firebase/blob/master/LICENSE>
@@ -65,19 +65,18 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	var _createClass = (function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ('value' in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; })();
 
+	function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 	function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError('Cannot call a class as a function'); } }
 
 	var JSData = __webpack_require__(1);
 	var Firebase = __webpack_require__(2);
 	var values = __webpack_require__(3);
+	var map = __webpack_require__(4);
+	var unique = __webpack_require__(5);
 
 	var emptyStore = new JSData.DS();
 	var DSUtils = JSData.DSUtils;
-	var omit = DSUtils.omit;
-	var deepMixIn = DSUtils.deepMixIn;
-	var removeCircular = DSUtils.removeCircular;
-	var forOwn = DSUtils.forOwn;
-
 	var filter = emptyStore.defaults.defaultFilter;
 
 	var Defaults = function Defaults() {
@@ -129,7 +128,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	    options = options || {};
 	    this.defaults = new Defaults();
-	    deepMixIn(this.defaults, options);
+	    DSUtils.deepMixIn(this.defaults, options);
 	    this.ref = new Firebase(options.basePath || this.defaults.basePath);
 	  }
 
@@ -144,18 +143,90 @@ return /******/ (function(modules) { // webpackBootstrap
 	    value: function find(resourceConfig, id, options) {
 	      var _this = this;
 
-	      return createTask(function (resolve, reject) {
-	        queueTask(function () {
-	          _this.getRef(resourceConfig, options).child(id).once('value', function (dataSnapshot) {
-	            var item = dataSnapshot.val();
-	            if (!item) {
-	              reject(new Error('Not Found!'));
-	            } else {
-	              item[resourceConfig.idAttribute] = item[resourceConfig.idAttribute] || id;
-	              resolve(item);
-	            }
-	          }, reject, _this);
+	      var instance = undefined;
+	      options = options || {};
+	      options['with'] = options['with'] || [];
+	      return new DSUtils.Promise(function (resolve, reject) {
+	        _this.getRef(resourceConfig, options).child(id).once('value', function (dataSnapshot) {
+	          var item = dataSnapshot.val();
+	          if (!item) {
+	            reject(new Error('Not Found!'));
+	          } else {
+	            item[resourceConfig.idAttribute] = item[resourceConfig.idAttribute] || id;
+	            resolve(item);
+	          }
+	        }, reject, _this);
+	      }).then(function (_instance) {
+	        instance = _instance;
+	        var tasks = [];
+
+	        DSUtils.forEach(resourceConfig.relationList, function (def) {
+	          var relationName = def.relation;
+	          var relationDef = resourceConfig.getResource(relationName);
+	          var containedName = null;
+	          if (DSUtils.contains(options['with'], relationName)) {
+	            containedName = relationName;
+	          } else if (DSUtils.contains(options['with'], def.localField)) {
+	            containedName = def.localField;
+	          }
+	          if (containedName) {
+	            (function () {
+	              var __options = DSUtils.deepMixIn({}, options.orig ? options.orig() : options);
+	              __options = DSUtils._(relationDef, __options);
+	              DSUtils.remove(__options['with'], containedName);
+	              DSUtils.forEach(__options['with'], function (relation, i) {
+	                if (relation && relation.indexOf(containedName) === 0 && relation.length >= containedName.length && relation[containedName.length] === '.') {
+	                  __options['with'][i] = relation.substr(containedName.length + 1);
+	                }
+	              });
+
+	              var task = undefined;
+
+	              if ((def.type === 'hasOne' || def.type === 'hasMany') && def.foreignKey) {
+	                task = _this.findAll(resourceConfig.getResource(relationName), {
+	                  where: _defineProperty({}, def.foreignKey, {
+	                    '==': instance[resourceConfig.idAttribute]
+	                  })
+	                }, __options).then(function (relatedItems) {
+	                  if (def.type === 'hasOne' && relatedItems.length) {
+	                    DSUtils.set(instance, def.localField, relatedItems[0]);
+	                  } else {
+	                    DSUtils.set(instance, def.localField, relatedItems);
+	                  }
+	                  return relatedItems;
+	                });
+	              } else if (def.type === 'hasMany' && def.localKeys) {
+	                var localKeys = [];
+	                var itemKeys = instance[def.localKeys] || [];
+	                itemKeys = Array.isArray(itemKeys) ? itemKeys : DSUtils.keys(itemKeys);
+	                localKeys = localKeys.concat(itemKeys || []);
+	                task = _this.findAll(resourceConfig.getResource(relationName), {
+	                  where: _defineProperty({}, relationDef.idAttribute, {
+	                    'in': DSUtils.filter(unique(localKeys), function (x) {
+	                      return x;
+	                    })
+	                  })
+	                }, __options).then(function (relatedItems) {
+	                  DSUtils.set(instance, def.localField, relatedItems);
+	                  return relatedItems;
+	                });
+	              } else if (def.type === 'belongsTo' || def.type === 'hasOne' && def.localKey) {
+	                task = _this.find(resourceConfig.getResource(relationName), DSUtils.get(instance, def.localKey), __options).then(function (relatedItem) {
+	                  DSUtils.set(instance, def.localField, relatedItem);
+	                  return relatedItem;
+	                });
+	              }
+
+	              if (task) {
+	                tasks.push(task);
+	              }
+	            })();
+	          }
 	        });
+
+	        return DSUtils.Promise.all(tasks);
+	      }).then(function () {
+	        return instance;
 	      });
 	    }
 	  }, {
@@ -163,18 +234,132 @@ return /******/ (function(modules) { // webpackBootstrap
 	    value: function findAll(resourceConfig, params, options) {
 	      var _this2 = this;
 
-	      return createTask(function (resolve, reject) {
-	        queueTask(function () {
-	          _this2.getRef(resourceConfig, options).once('value', function (dataSnapshot) {
-	            var data = dataSnapshot.val();
-	            forOwn(data, function (value, key) {
-	              if (!value[resourceConfig.idAttribute]) {
-	                value[resourceConfig.idAttribute] = '/' + key;
+	      var items = null;
+	      options = options || {};
+	      options['with'] = options['with'] || [];
+	      return new DSUtils.Promise(function (resolve, reject) {
+	        _this2.getRef(resourceConfig, options).once('value', function (dataSnapshot) {
+	          var data = dataSnapshot.val();
+	          DSUtils.forOwn(data, function (value, key) {
+	            if (!value[resourceConfig.idAttribute]) {
+	              value[resourceConfig.idAttribute] = '/' + key;
+	            }
+	          });
+	          resolve(filter.call(emptyStore, values(data), resourceConfig.name, params, options));
+	        }, reject, _this2);
+	      }).then(function (_items) {
+	        items = _items;
+	        var tasks = [];
+	        DSUtils.forEach(resourceConfig.relationList, function (def) {
+	          var relationName = def.relation;
+	          var relationDef = resourceConfig.getResource(relationName);
+	          var containedName = null;
+	          if (DSUtils.contains(options['with'], relationName)) {
+	            containedName = relationName;
+	          } else if (DSUtils.contains(options['with'], def.localField)) {
+	            containedName = def.localField;
+	          }
+	          if (containedName) {
+	            (function () {
+	              var __options = DSUtils.deepMixIn({}, options.orig ? options.orig() : options);
+	              __options['with'] = options['with'].slice();
+	              __options = DSUtils._(relationDef, __options);
+	              DSUtils.remove(__options['with'], containedName);
+
+	              DSUtils.forEach(__options['with'], function (relation, i) {
+	                if (relation && relation.indexOf(containedName) === 0 && relation.length >= containedName.length && relation[containedName.length] === '.') {
+	                  __options['with'][i] = relation.substr(containedName.length + 1);
+	                } else {
+	                  __options['with'][i] = '';
+	                }
+	              });
+
+	              var task = undefined;
+
+	              if ((def.type === 'hasOne' || def.type === 'hasMany') && def.foreignKey) {
+	                task = _this2.findAll(resourceConfig.getResource(relationName), {
+	                  where: _defineProperty({}, def.foreignKey, {
+	                    'in': DSUtils.filter(map(items, function (item) {
+	                      return DSUtils.get(item, resourceConfig.idAttribute);
+	                    }), function (x) {
+	                      return x;
+	                    })
+	                  })
+	                }, __options).then(function (relatedItems) {
+	                  DSUtils.forEach(items, function (item) {
+	                    var attached = [];
+	                    DSUtils.forEach(relatedItems, function (relatedItem) {
+	                      if (DSUtils.get(relatedItem, def.foreignKey) === item[resourceConfig.idAttribute]) {
+	                        attached.push(relatedItem);
+	                      }
+	                    });
+	                    if (def.type === 'hasOne' && attached.length) {
+	                      DSUtils.set(item, def.localField, attached[0]);
+	                    } else {
+	                      DSUtils.set(item, def.localField, attached);
+	                    }
+	                  });
+	                  return relatedItems;
+	                });
+	              } else if (def.type === 'hasMany' && def.localKeys) {
+	                (function () {
+	                  var localKeys = [];
+	                  DSUtils.forEach(items, function (item) {
+	                    var itemKeys = item[def.localKeys] || [];
+	                    itemKeys = Array.isArray(itemKeys) ? itemKeys : DSUtils.keys(itemKeys);
+	                    localKeys = localKeys.concat(itemKeys || []);
+	                  });
+	                  task = _this2.findAll(resourceConfig.getResource(relationName), {
+	                    where: _defineProperty({}, relationDef.idAttribute, {
+	                      'in': DSUtils.filter(unique(localKeys), function (x) {
+	                        return x;
+	                      })
+	                    })
+	                  }, __options).then(function (relatedItems) {
+	                    DSUtils.forEach(items, function (item) {
+	                      var attached = [];
+	                      var itemKeys = item[def.localKeys] || [];
+	                      itemKeys = Array.isArray(itemKeys) ? itemKeys : DSUtils.keys(itemKeys);
+	                      DSUtils.forEach(relatedItems, function (relatedItem) {
+	                        if (itemKeys && DSUtils.contains(itemKeys, relatedItem[relationDef.idAttribute])) {
+	                          attached.push(relatedItem);
+	                        }
+	                      });
+	                      DSUtils.set(item, def.localField, attached);
+	                    });
+	                    return relatedItems;
+	                  });
+	                })();
+	              } else if (def.type === 'belongsTo' || def.type === 'hasOne' && def.localKey) {
+	                task = _this2.findAll(resourceConfig.getResource(relationName), {
+	                  where: _defineProperty({}, relationDef.idAttribute, {
+	                    'in': DSUtils.filter(map(items, function (item) {
+	                      return DSUtils.get(item, def.localKey);
+	                    }), function (x) {
+	                      return x;
+	                    })
+	                  })
+	                }, __options).then(function (relatedItems) {
+	                  DSUtils.forEach(items, function (item) {
+	                    DSUtils.forEach(relatedItems, function (relatedItem) {
+	                      if (relatedItem[relationDef.idAttribute] === item[def.localKey]) {
+	                        DSUtils.set(item, def.localField, relatedItem);
+	                      }
+	                    });
+	                  });
+	                  return relatedItems;
+	                });
 	              }
-	            });
-	            resolve(filter.call(emptyStore, values(data), resourceConfig.name, params, options));
-	          }, reject, _this2);
+
+	              if (task) {
+	                tasks.push(task);
+	              }
+	            })();
+	          }
 	        });
+	        return DSUtils.Promise.all(tasks);
+	      }).then(function () {
+	        return items;
 	      });
 	    }
 	  }, {
@@ -189,7 +374,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        return createTask(function (resolve, reject) {
 	          queueTask(function () {
 	            var resourceRef = _this3.getRef(resourceConfig, options);
-	            var itemRef = resourceRef.push(removeCircular(omit(attrs, resourceConfig.relationFields || [])), function (err) {
+	            var itemRef = resourceRef.push(DSUtils.removeCircular(DSUtils.omit(attrs, resourceConfig.relationFields || [])), function (err) {
 	              if (err) {
 	                return reject(err);
 	              } else {
@@ -220,7 +405,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	      return createTask(function (resolve, reject) {
 	        queueTask(function () {
-	          attrs = removeCircular(omit(attrs || {}, resourceConfig.relationFields || []));
+	          attrs = DSUtils.removeCircular(DSUtils.omit(attrs || {}, resourceConfig.relationFields || []));
 	          var itemRef = _this4.getRef(resourceConfig, options).child(id);
 	          itemRef.once('value', function (dataSnapshot) {
 	            try {
@@ -237,7 +422,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	                    delete attrs[fields[i]];
 	                  }
 	                }
-	                deepMixIn(item, attrs);
+	                DSUtils.deepMixIn(item, attrs);
 	                if (resourceConfig.relations) {
 	                  fields = resourceConfig.relationFields;
 	                  for (i = 0; i < fields.length; i++) {
@@ -328,7 +513,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /* 3 */
 /***/ function(module, exports, __webpack_require__) {
 
-	var forOwn = __webpack_require__(4);
+	var forOwn = __webpack_require__(6);
 
 	    /**
 	     * Get object values
@@ -350,8 +535,67 @@ return /******/ (function(modules) { // webpackBootstrap
 /* 4 */
 /***/ function(module, exports, __webpack_require__) {
 
-	var hasOwn = __webpack_require__(5);
-	var forIn = __webpack_require__(6);
+	var makeIterator = __webpack_require__(7);
+
+	    /**
+	     * Array map
+	     */
+	    function map(arr, callback, thisObj) {
+	        callback = makeIterator(callback, thisObj);
+	        var results = [];
+	        if (arr == null){
+	            return results;
+	        }
+
+	        var i = -1, len = arr.length;
+	        while (++i < len) {
+	            results[i] = callback(arr[i], i, arr);
+	        }
+
+	        return results;
+	    }
+
+	     module.exports = map;
+
+
+
+/***/ },
+/* 5 */
+/***/ function(module, exports, __webpack_require__) {
+
+	var filter = __webpack_require__(8);
+
+	    /**
+	     * @return {array} Array of unique items
+	     */
+	    function unique(arr, compare){
+	        compare = compare || isEqual;
+	        return filter(arr, function(item, i, arr){
+	            var n = arr.length;
+	            while (++i < n) {
+	                if ( compare(item, arr[i]) ) {
+	                    return false;
+	                }
+	            }
+	            return true;
+	        });
+	    }
+
+	    function isEqual(a, b){
+	        return a === b;
+	    }
+
+	    module.exports = unique;
+
+
+
+
+/***/ },
+/* 6 */
+/***/ function(module, exports, __webpack_require__) {
+
+	var hasOwn = __webpack_require__(9);
+	var forIn = __webpack_require__(10);
 
 	    /**
 	     * Similar to Array/forEach but works over object properties and fixes Don't
@@ -372,7 +616,79 @@ return /******/ (function(modules) { // webpackBootstrap
 
 
 /***/ },
-/* 5 */
+/* 7 */
+/***/ function(module, exports, __webpack_require__) {
+
+	var identity = __webpack_require__(11);
+	var prop = __webpack_require__(12);
+	var deepMatches = __webpack_require__(13);
+
+	    /**
+	     * Converts argument into a valid iterator.
+	     * Used internally on most array/object/collection methods that receives a
+	     * callback/iterator providing a shortcut syntax.
+	     */
+	    function makeIterator(src, thisObj){
+	        if (src == null) {
+	            return identity;
+	        }
+	        switch(typeof src) {
+	            case 'function':
+	                // function is the first to improve perf (most common case)
+	                // also avoid using `Function#call` if not needed, which boosts
+	                // perf a lot in some cases
+	                return (typeof thisObj !== 'undefined')? function(val, i, arr){
+	                    return src.call(thisObj, val, i, arr);
+	                } : src;
+	            case 'object':
+	                return function(val){
+	                    return deepMatches(val, src);
+	                };
+	            case 'string':
+	            case 'number':
+	                return prop(src);
+	        }
+	    }
+
+	    module.exports = makeIterator;
+
+
+
+
+/***/ },
+/* 8 */
+/***/ function(module, exports, __webpack_require__) {
+
+	var makeIterator = __webpack_require__(7);
+
+	    /**
+	     * Array filter
+	     */
+	    function filter(arr, callback, thisObj) {
+	        callback = makeIterator(callback, thisObj);
+	        var results = [];
+	        if (arr == null) {
+	            return results;
+	        }
+
+	        var i = -1, len = arr.length, value;
+	        while (++i < len) {
+	            value = arr[i];
+	            if (callback(value, i, arr)) {
+	                results.push(value);
+	            }
+	        }
+
+	        return results;
+	    }
+
+	    module.exports = filter;
+
+
+
+
+/***/ },
+/* 9 */
 /***/ function(module, exports, __webpack_require__) {
 
 	
@@ -390,10 +706,10 @@ return /******/ (function(modules) { // webpackBootstrap
 
 
 /***/ },
-/* 6 */
+/* 10 */
 /***/ function(module, exports, __webpack_require__) {
 
-	var hasOwn = __webpack_require__(5);
+	var hasOwn = __webpack_require__(9);
 
 	    var _hasDontEnumBug,
 	        _dontEnums;
@@ -471,6 +787,160 @@ return /******/ (function(modules) { // webpackBootstrap
 
 
 
+/***/ },
+/* 11 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    /**
+	     * Returns the first argument provided to it.
+	     */
+	    function identity(val){
+	        return val;
+	    }
+
+	    module.exports = identity;
+
+
+
+
+/***/ },
+/* 12 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    /**
+	     * Returns a function that gets a property of the passed object
+	     */
+	    function prop(name){
+	        return function(obj){
+	            return obj[name];
+	        };
+	    }
+
+	    module.exports = prop;
+
+
+
+
+/***/ },
+/* 13 */
+/***/ function(module, exports, __webpack_require__) {
+
+	var forOwn = __webpack_require__(6);
+	var isArray = __webpack_require__(14);
+
+	    function containsMatch(array, pattern) {
+	        var i = -1, length = array.length;
+	        while (++i < length) {
+	            if (deepMatches(array[i], pattern)) {
+	                return true;
+	            }
+	        }
+
+	        return false;
+	    }
+
+	    function matchArray(target, pattern) {
+	        var i = -1, patternLength = pattern.length;
+	        while (++i < patternLength) {
+	            if (!containsMatch(target, pattern[i])) {
+	                return false;
+	            }
+	        }
+
+	        return true;
+	    }
+
+	    function matchObject(target, pattern) {
+	        var result = true;
+	        forOwn(pattern, function(val, key) {
+	            if (!deepMatches(target[key], val)) {
+	                // Return false to break out of forOwn early
+	                return (result = false);
+	            }
+	        });
+
+	        return result;
+	    }
+
+	    /**
+	     * Recursively check if the objects match.
+	     */
+	    function deepMatches(target, pattern){
+	        if (target && typeof target === 'object') {
+	            if (isArray(target) && isArray(pattern)) {
+	                return matchArray(target, pattern);
+	            } else {
+	                return matchObject(target, pattern);
+	            }
+	        } else {
+	            return target === pattern;
+	        }
+	    }
+
+	    module.exports = deepMatches;
+
+
+
+
+/***/ },
+/* 14 */
+/***/ function(module, exports, __webpack_require__) {
+
+	var isKind = __webpack_require__(15);
+	    /**
+	     */
+	    var isArray = Array.isArray || function (val) {
+	        return isKind(val, 'Array');
+	    };
+	    module.exports = isArray;
+
+
+
+/***/ },
+/* 15 */
+/***/ function(module, exports, __webpack_require__) {
+
+	var kindOf = __webpack_require__(16);
+	    /**
+	     * Check if value is from a specific "kind".
+	     */
+	    function isKind(val, kind){
+	        return kindOf(val) === kind;
+	    }
+	    module.exports = isKind;
+
+
+
+/***/ },
+/* 16 */
+/***/ function(module, exports, __webpack_require__) {
+
+	
+
+	    var _rKind = /^\[object (.*)\]$/,
+	        _toString = Object.prototype.toString,
+	        UNDEF;
+
+	    /**
+	     * Gets the "kind" of value. (e.g. "String", "Number", etc)
+	     */
+	    function kindOf(val) {
+	        if (val === null) {
+	            return 'Null';
+	        } else if (val === UNDEF) {
+	            return 'Undefined';
+	        } else {
+	            return _rKind.exec( _toString.call(val) )[1];
+	        }
+	    }
+	    module.exports = kindOf;
+
+
+
 /***/ }
 /******/ ])
 });
diff --git a/dist/js-data-firebase.min.js b/dist/js-data-firebase.min.js
index d4144f3..025806b 100644
--- a/dist/js-data-firebase.min.js
+++ b/dist/js-data-firebase.min.js
@@ -1,6 +1,6 @@
 /*!
 * js-data-firebase
-* @version 2.0.0 - Homepage <http://wwwjs-data.io/docs/dsfirebaseadapter>
+* @version 2.1.0 - Homepage <http://wwwjs-data.io/docs/dsfirebaseadapter>
 * @author Jason Dobry <jason.dobry@gmail.com>
 * @copyright (c) 2014-2015 Jason Dobry
 * @license MIT <https://github.com/js-data/js-data-firebase/blob/master/LICENSE>
@@ -8,5 +8,5 @@
 * @overview Firebase adapter for js-data.
 */
 
-!function(a,b){"object"==typeof exports&&"object"==typeof module?module.exports=b(require("js-data"),require("firebase")):"function"==typeof define&&define.amd?define(["js-data","firebase"],b):"object"==typeof exports?exports.DSFirebaseAdapter=b(require("js-data"),require("firebase")):a.DSFirebaseAdapter=b(a.JSData,a.Firebase)}(this,function(a,b){return function(a){function b(d){if(c[d])return c[d].exports;var e=c[d]={exports:{},id:d,loaded:!1};return a[d].call(e.exports,e,e.exports,b),e.loaded=!0,e.exports}var c={};return b.m=a,b.c=c,b.p="",b(0)}([function(a,b,c){function d(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function e(a){u.push(a)}function f(){u.length&&!v&&(v=!0,u[0]())}function g(a){u.length?e(a):(e(a),f())}function h(a){return new n.Promise(a).then(function(a){return v=!1,u.shift(),setTimeout(f,0),a},function(a){return v=!1,u.shift(),setTimeout(f,0),n.Promise.reject(a)})}var i=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),j=c(1),k=c(2),l=c(3),m=new j.DS,n=j.DSUtils,o=n.omit,p=n.deepMixIn,q=n.removeCircular,r=n.forOwn,s=m.defaults.defaultFilter,t=function x(){d(this,x)};t.prototype.basePath="";var u=[],v=!1,w=function(){function a(b){d(this,a),b=b||{},this.defaults=new t,p(this.defaults,b),this.ref=new k(b.basePath||this.defaults.basePath)}return i(a,[{key:"getRef",value:function(a,b){return b=b||{},this.ref.child(b.endpoint||a.endpoint)}},{key:"find",value:function(a,b,c){var d=this;return h(function(e,f){g(function(){d.getRef(a,c).child(b).once("value",function(c){var d=c.val();d?(d[a.idAttribute]=d[a.idAttribute]||b,e(d)):f(new Error("Not Found!"))},f,d)})})}},{key:"findAll",value:function(a,b,c){var d=this;return h(function(e,f){g(function(){d.getRef(a,c).once("value",function(d){var f=d.val();r(f,function(b,c){b[a.idAttribute]||(b[a.idAttribute]="/"+c)}),e(s.call(m,l(f),a.name,b,c))},f,d)})})}},{key:"create",value:function(a,b,c){var d=this,e=b[a.idAttribute];return n.isString(e)||n.isNumber(e)?this.update(a,e,b,c):h(function(e,f){g(function(){var g=d.getRef(a,c),h=g.push(q(o(b,a.relationFields||[])),function(b){if(b)return f(b);var c=h.toString().replace(g.toString(),"");h.child(a.idAttribute).set(c,function(a){a?f(a):h.once("value",function(a){try{e(a.val())}catch(b){f(b)}},f,d)})})})})}},{key:"update",value:function(a,b,c,d){var e=this;return h(function(f,h){g(function(){c=q(o(c||{},a.relationFields||[]));var g=e.getRef(a,d).child(b);g.once("value",function(b){try{!function(){var d=b.val()||{},e=void 0,i=void 0,j=void 0;if(a.relations)for(e=a.relationFields,i=[],j=0;j<e.length;j++)i.push(c[e[j]]),delete c[e[j]];if(p(d,c),a.relations)for(e=a.relationFields,j=0;j<e.length;j++){var k=i.shift();k&&(c[e[j]]=k)}g.set(d,function(a){a?h(a):f(d)})}()}catch(d){h(d)}},h,e)})})}},{key:"updateAll",value:function(a,b,c,d){var e=this;return this.findAll(a,c,d).then(function(c){var f=[];return n.forEach(c,function(c){f.push(e.update(a,c[a.idAttribute],b,d))}),n.Promise.all(f)})}},{key:"destroy",value:function(a,b,c){var d=this;return h(function(e,f){g(function(){d.getRef(a,c).child(b).remove(function(a){a?f(a):e()})})})}},{key:"destroyAll",value:function(a,b,c){var d=this;return this.findAll(a,b,c).then(function(b){var e=[];return n.forEach(b,function(b){e.push(d.destroy(a,b[a.idAttribute],c))}),n.Promise.all(e)})}}]),a}();a.exports=w},function(b,c,d){b.exports=a},function(a,c,d){a.exports=b},function(a,b,c){function d(a){var b=[];return e(a,function(a,c){b.push(a)}),b}var e=c(4);a.exports=d},function(a,b,c){function d(a,b,c){f(a,function(d,f){return e(a,f)?b.call(c,a[f],f,a):void 0})}var e=c(5),f=c(6);a.exports=d},function(a,b,c){function d(a,b){return Object.prototype.hasOwnProperty.call(a,b)}a.exports=d},function(a,b,c){function d(){h=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],g=!0;for(var a in{toString:null})g=!1}function e(a,b,c){var e,j=0;null==g&&d();for(e in a)if(f(b,a,e,c)===!1)break;if(g)for(var k=a.constructor,l=!!k&&a===k.prototype;(e=h[j++])&&("constructor"===e&&(l||!i(a,e))||a[e]===Object.prototype[e]||f(b,a,e,c)!==!1););}function f(a,b,c,d){return a.call(d,b[c],c,b)}var g,h,i=c(5);a.exports=e}])});
+!function(a,b){"object"==typeof exports&&"object"==typeof module?module.exports=b(require("js-data"),require("firebase")):"function"==typeof define&&define.amd?define(["js-data","firebase"],b):"object"==typeof exports?exports.DSFirebaseAdapter=b(require("js-data"),require("firebase")):a.DSFirebaseAdapter=b(a.JSData,a.Firebase)}(this,function(a,b){return function(a){function b(d){if(c[d])return c[d].exports;var e=c[d]={exports:{},id:d,loaded:!1};return a[d].call(e.exports,e,e.exports,b),e.loaded=!0,e.exports}var c={};return b.m=a,b.c=c,b.p="",b(0)}([function(a,b,c){function d(a,b,c){return b in a?Object.defineProperty(a,b,{value:c,enumerable:!0,configurable:!0,writable:!0}):a[b]=c,a}function e(a,b){if(!(a instanceof b))throw new TypeError("Cannot call a class as a function")}function f(a){t.push(a)}function g(){t.length&&!u&&(u=!0,t[0]())}function h(a){t.length?f(a):(f(a),g())}function i(a){return new q.Promise(a).then(function(a){return u=!1,t.shift(),setTimeout(g,0),a},function(a){return u=!1,t.shift(),setTimeout(g,0),q.Promise.reject(a)})}var j=function(){function a(a,b){for(var c=0;c<b.length;c++){var d=b[c];d.enumerable=d.enumerable||!1,d.configurable=!0,"value"in d&&(d.writable=!0),Object.defineProperty(a,d.key,d)}}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}(),k=c(1),l=c(2),m=c(3),n=c(4),o=c(5),p=new k.DS,q=k.DSUtils,r=p.defaults.defaultFilter,s=function w(){e(this,w)};s.prototype.basePath="";var t=[],u=!1,v=function(){function a(b){e(this,a),b=b||{},this.defaults=new s,q.deepMixIn(this.defaults,b),this.ref=new l(b.basePath||this.defaults.basePath)}return j(a,[{key:"getRef",value:function(a,b){return b=b||{},this.ref.child(b.endpoint||a.endpoint)}},{key:"find",value:function(a,b,c){var e=this,f=void 0;return c=c||{},c["with"]=c["with"]||[],new q.Promise(function(d,f){e.getRef(a,c).child(b).once("value",function(c){var e=c.val();e?(e[a.idAttribute]=e[a.idAttribute]||b,d(e)):f(new Error("Not Found!"))},f,e)}).then(function(b){f=b;var g=[];return q.forEach(a.relationList,function(b){var h=b.relation,i=a.getResource(h),j=null;q.contains(c["with"],h)?j=h:q.contains(c["with"],b.localField)&&(j=b.localField),j&&!function(){var k=q.deepMixIn({},c.orig?c.orig():c);k=q._(i,k),q.remove(k["with"],j),q.forEach(k["with"],function(a,b){a&&0===a.indexOf(j)&&a.length>=j.length&&"."===a[j.length]&&(k["with"][b]=a.substr(j.length+1))});var l=void 0;if("hasOne"!==b.type&&"hasMany"!==b.type||!b.foreignKey)if("hasMany"===b.type&&b.localKeys){var m=[],n=f[b.localKeys]||[];n=Array.isArray(n)?n:q.keys(n),m=m.concat(n||[]),l=e.findAll(a.getResource(h),{where:d({},i.idAttribute,{"in":q.filter(o(m),function(a){return a})})},k).then(function(a){return q.set(f,b.localField,a),a})}else("belongsTo"===b.type||"hasOne"===b.type&&b.localKey)&&(l=e.find(a.getResource(h),q.get(f,b.localKey),k).then(function(a){return q.set(f,b.localField,a),a}));else l=e.findAll(a.getResource(h),{where:d({},b.foreignKey,{"==":f[a.idAttribute]})},k).then(function(a){return"hasOne"===b.type&&a.length?q.set(f,b.localField,a[0]):q.set(f,b.localField,a),a});l&&g.push(l)}()}),q.Promise.all(g)}).then(function(){return f})}},{key:"findAll",value:function(a,b,c){var e=this,f=null;return c=c||{},c["with"]=c["with"]||[],new q.Promise(function(d,f){e.getRef(a,c).once("value",function(e){var f=e.val();q.forOwn(f,function(b,c){b[a.idAttribute]||(b[a.idAttribute]="/"+c)}),d(r.call(p,m(f),a.name,b,c))},f,e)}).then(function(b){f=b;var g=[];return q.forEach(a.relationList,function(b){var h=b.relation,i=a.getResource(h),j=null;q.contains(c["with"],h)?j=h:q.contains(c["with"],b.localField)&&(j=b.localField),j&&!function(){var k=q.deepMixIn({},c.orig?c.orig():c);k["with"]=c["with"].slice(),k=q._(i,k),q.remove(k["with"],j),q.forEach(k["with"],function(a,b){a&&0===a.indexOf(j)&&a.length>=j.length&&"."===a[j.length]?k["with"][b]=a.substr(j.length+1):k["with"][b]=""});var l=void 0;"hasOne"!==b.type&&"hasMany"!==b.type||!b.foreignKey?"hasMany"===b.type&&b.localKeys?!function(){var c=[];q.forEach(f,function(a){var d=a[b.localKeys]||[];d=Array.isArray(d)?d:q.keys(d),c=c.concat(d||[])}),l=e.findAll(a.getResource(h),{where:d({},i.idAttribute,{"in":q.filter(o(c),function(a){return a})})},k).then(function(a){return q.forEach(f,function(c){var d=[],e=c[b.localKeys]||[];e=Array.isArray(e)?e:q.keys(e),q.forEach(a,function(a){e&&q.contains(e,a[i.idAttribute])&&d.push(a)}),q.set(c,b.localField,d)}),a})}():("belongsTo"===b.type||"hasOne"===b.type&&b.localKey)&&(l=e.findAll(a.getResource(h),{where:d({},i.idAttribute,{"in":q.filter(n(f,function(a){return q.get(a,b.localKey)}),function(a){return a})})},k).then(function(a){return q.forEach(f,function(c){q.forEach(a,function(a){a[i.idAttribute]===c[b.localKey]&&q.set(c,b.localField,a)})}),a})):l=e.findAll(a.getResource(h),{where:d({},b.foreignKey,{"in":q.filter(n(f,function(b){return q.get(b,a.idAttribute)}),function(a){return a})})},k).then(function(c){return q.forEach(f,function(d){var e=[];q.forEach(c,function(c){q.get(c,b.foreignKey)===d[a.idAttribute]&&e.push(c)}),"hasOne"===b.type&&e.length?q.set(d,b.localField,e[0]):q.set(d,b.localField,e)}),c}),l&&g.push(l)}()}),q.Promise.all(g)}).then(function(){return f})}},{key:"create",value:function(a,b,c){var d=this,e=b[a.idAttribute];return q.isString(e)||q.isNumber(e)?this.update(a,e,b,c):i(function(e,f){h(function(){var g=d.getRef(a,c),h=g.push(q.removeCircular(q.omit(b,a.relationFields||[])),function(b){if(b)return f(b);var c=h.toString().replace(g.toString(),"");h.child(a.idAttribute).set(c,function(a){a?f(a):h.once("value",function(a){try{e(a.val())}catch(b){f(b)}},f,d)})})})})}},{key:"update",value:function(a,b,c,d){var e=this;return i(function(f,g){h(function(){c=q.removeCircular(q.omit(c||{},a.relationFields||[]));var h=e.getRef(a,d).child(b);h.once("value",function(b){try{!function(){var d=b.val()||{},e=void 0,i=void 0,j=void 0;if(a.relations)for(e=a.relationFields,i=[],j=0;j<e.length;j++)i.push(c[e[j]]),delete c[e[j]];if(q.deepMixIn(d,c),a.relations)for(e=a.relationFields,j=0;j<e.length;j++){var k=i.shift();k&&(c[e[j]]=k)}h.set(d,function(a){a?g(a):f(d)})}()}catch(d){g(d)}},g,e)})})}},{key:"updateAll",value:function(a,b,c,d){var e=this;return this.findAll(a,c,d).then(function(c){var f=[];return q.forEach(c,function(c){f.push(e.update(a,c[a.idAttribute],b,d))}),q.Promise.all(f)})}},{key:"destroy",value:function(a,b,c){var d=this;return i(function(e,f){h(function(){d.getRef(a,c).child(b).remove(function(a){a?f(a):e()})})})}},{key:"destroyAll",value:function(a,b,c){var d=this;return this.findAll(a,b,c).then(function(b){var e=[];return q.forEach(b,function(b){e.push(d.destroy(a,b[a.idAttribute],c))}),q.Promise.all(e)})}}]),a}();a.exports=v},function(b,c,d){b.exports=a},function(a,c,d){a.exports=b},function(a,b,c){function d(a){var b=[];return e(a,function(a,c){b.push(a)}),b}var e=c(6);a.exports=d},function(a,b,c){function d(a,b,c){b=e(b,c);var d=[];if(null==a)return d;for(var f=-1,g=a.length;++f<g;)d[f]=b(a[f],f,a);return d}var e=c(7);a.exports=d},function(a,b,c){function d(a,b){return b=b||e,f(a,function(a,c,d){for(var e=d.length;++c<e;)if(b(a,d[c]))return!1;return!0})}function e(a,b){return a===b}var f=c(8);a.exports=d},function(a,b,c){function d(a,b,c){f(a,function(d,f){return e(a,f)?b.call(c,a[f],f,a):void 0})}var e=c(9),f=c(10);a.exports=d},function(a,b,c){function d(a,b){if(null==a)return e;switch(typeof a){case"function":return"undefined"!=typeof b?function(c,d,e){return a.call(b,c,d,e)}:a;case"object":return function(b){return g(b,a)};case"string":case"number":return f(a)}}var e=c(11),f=c(12),g=c(13);a.exports=d},function(a,b,c){function d(a,b,c){b=e(b,c);var d=[];if(null==a)return d;for(var f,g=-1,h=a.length;++g<h;)f=a[g],b(f,g,a)&&d.push(f);return d}var e=c(7);a.exports=d},function(a,b,c){function d(a,b){return Object.prototype.hasOwnProperty.call(a,b)}a.exports=d},function(a,b,c){function d(){h=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],g=!0;for(var a in{toString:null})g=!1}function e(a,b,c){var e,j=0;null==g&&d();for(e in a)if(f(b,a,e,c)===!1)break;if(g)for(var k=a.constructor,l=!!k&&a===k.prototype;(e=h[j++])&&("constructor"===e&&(l||!i(a,e))||a[e]===Object.prototype[e]||f(b,a,e,c)!==!1););}function f(a,b,c,d){return a.call(d,b[c],c,b)}var g,h,i=c(9);a.exports=e},function(a,b,c){function d(a){return a}a.exports=d},function(a,b,c){function d(a){return function(b){return b[a]}}a.exports=d},function(a,b,c){function d(a,b){for(var c=-1,d=a.length;++c<d;)if(g(a[c],b))return!0;return!1}function e(a,b){for(var c=-1,e=b.length;++c<e;)if(!d(a,b[c]))return!1;return!0}function f(a,b){var c=!0;return h(b,function(b,d){return g(a[d],b)?void 0:c=!1}),c}function g(a,b){return a&&"object"==typeof a?i(a)&&i(b)?e(a,b):f(a,b):a===b}var h=c(6),i=c(14);a.exports=g},function(a,b,c){var d=c(15),e=Array.isArray||function(a){return d(a,"Array")};a.exports=e},function(a,b,c){function d(a,b){return e(a)===b}var e=c(16);a.exports=d},function(a,b,c){function d(a){return null===a?"Null":a===e?"Undefined":f.exec(g.call(a))[1]}var e,f=/^\[object (.*)\]$/,g=Object.prototype.toString;a.exports=d}])});
 //# sourceMappingURL=js-data-firebase.min.map
\ No newline at end of file
diff --git a/dist/js-data-firebase.min.map b/dist/js-data-firebase.min.map
index f5c08cd..714b44f 100644
--- a/dist/js-data-firebase.min.map
+++ b/dist/js-data-firebase.min.map
@@ -1 +1 @@
-{"version":3,"file":"js-data-firebase.min.js","sources":["js-data-firebase.js"],"names":["root","factory","exports","module","require","define","amd","this","__WEBPACK_EXTERNAL_MODULE_1__","__WEBPACK_EXTERNAL_MODULE_2__","modules","__webpack_require__","moduleId","installedModules","id","loaded","call","m","c","p","_classCallCheck","instance","Constructor","TypeError","enqueue","task","queue","push","dequeue","length","taskInProcess","queueTask","createTask","fn","DSUtils","Promise","then","result","shift","setTimeout","err","reject","_createClass","defineProperties","target","props","i","descriptor","enumerable","configurable","writable","Object","defineProperty","key","protoProps","staticProps","prototype","JSData","Firebase","values","emptyStore","DS","omit","deepMixIn","removeCircular","forOwn","filter","defaults","defaultFilter","Defaults","basePath","DSFirebaseAdapter","options","ref","value","resourceConfig","child","endpoint","_this","resolve","getRef","once","dataSnapshot","item","val","idAttribute","Error","params","_this2","data","name","attrs","_this3","isString","isNumber","update","resourceRef","itemRef","relationFields","_id","toString","replace","set","_this4","fields","undefined","removed","relations","toAddBack","_this5","findAll","items","tasks","forEach","all","_this6","remove","_this7","destroy","obj","vals","thisObj","forIn","hasOwn","prop","hasOwnProperty","checkDontEnum","_dontEnums","_hasDontEnumBug","exec","ctor","constructor","isProto"],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"js-data-firebase.min.js","sources":["js-data-firebase.js"],"names":["root","factory","exports","module","require","define","amd","this","__WEBPACK_EXTERNAL_MODULE_1__","__WEBPACK_EXTERNAL_MODULE_2__","modules","__webpack_require__","moduleId","installedModules","id","loaded","call","m","c","p","_defineProperty","obj","key","value","Object","defineProperty","enumerable","configurable","writable","_classCallCheck","instance","Constructor","TypeError","enqueue","task","queue","push","dequeue","length","taskInProcess","queueTask","createTask","fn","DSUtils","Promise","then","result","shift","setTimeout","err","reject","_createClass","defineProperties","target","props","i","descriptor","protoProps","staticProps","prototype","JSData","Firebase","values","map","unique","emptyStore","DS","filter","defaults","defaultFilter","Defaults","basePath","DSFirebaseAdapter","options","deepMixIn","ref","resourceConfig","child","endpoint","_this","undefined","resolve","getRef","once","dataSnapshot","item","val","idAttribute","Error","_instance","tasks","forEach","relationList","def","relationName","relation","relationDef","getResource","containedName","contains","localField","__options","orig","_","remove","indexOf","substr","type","foreignKey","localKeys","itemKeys","Array","isArray","keys","concat","findAll","where","in","x","relatedItems","set","localKey","find","get","relatedItem","==","all","params","_this2","items","data","forOwn","name","_items","slice","attached","attrs","_this3","isString","isNumber","update","resourceRef","itemRef","removeCircular","omit","relationFields","_id","toString","replace","_this4","fields","removed","relations","toAddBack","_this5","_this6","_this7","destroy","vals","arr","callback","thisObj","makeIterator","results","len","compare","isEqual","n","a","b","forIn","hasOwn","src","identity","deepMatches","prop","hasOwnProperty","checkDontEnum","_dontEnums","_hasDontEnumBug","exec","ctor","constructor","isProto","containsMatch","array","pattern","matchArray","patternLength","matchObject","isKind","kind","kindOf","UNDEF","_rKind","_toString"],"mappings":"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"}
\ No newline at end of file
diff --git a/karma.start.js b/karma.start.js
index d08653d..51abdc3 100644
--- a/karma.start.js
+++ b/karma.start.js
@@ -1,5 +1,8 @@
 // Setup global test variables
-var dsFirebaseAdapter, store, User;
+var dsFirebaseAdapter, store, Profile, User, Post, Comment;
+assert.equalObjects = function (a, b, m) {
+  assert.deepEqual(JSON.parse(JSON.stringify(a)), JSON.parse(JSON.stringify(b)), m || 'Objects should be equal!');
+};
 
 // Helper globals
 var fail = function (msg) {
@@ -38,17 +41,80 @@ beforeEach(function (done) {
     basePath: 'https://js-data-firebase.firebaseio.com'
   });
 
-  store.registerAdapter('DSFirebaseAdapter', dsFirebaseAdapter, { default: true });
+  store.registerAdapter('DSFirebaseAdapter', dsFirebaseAdapter, {default: true});
 
-  User = store.defineResource('user');
+  Profile = store.defineResource({
+    name: 'profile'
+  });
+  User = store.defineResource({
+    name: 'user',
+    relations: {
+      hasMany: {
+        post: {
+          localField: 'posts',
+          foreignKey: 'post'
+        }
+      },
+      hasOne: {
+        profile: {
+          localField: 'profile',
+          localKey: 'profileId'
+        }
+      }
+    }
+  });
+  Post = store.defineResource({
+    name: 'post',
+    relations: {
+      belongsTo: {
+        user: {
+          localField: 'user',
+          localKey: 'userId'
+        }
+      },
+      hasMany: {
+        comment: {
+          localField: 'comments',
+          foreignKey: 'postId'
+        }
+      }
+    }
+  });
+  Comment = store.defineResource({
+    name: 'comment',
+    relations: {
+      belongsTo: {
+        post: {
+          localField: 'post',
+          localKey: 'postId'
+        },
+        user: {
+          localField: 'user',
+          localKey: 'userId'
+        }
+      }
+    }
+  });
 
-  dsFirebaseAdapter.destroyAll(User).then(function () {
+  dsFirebaseAdapter.destroyAll(Profile).then(function () {
+    return dsFirebaseAdapter.destroyAll(User);
+  }).then(function () {
+    return dsFirebaseAdapter.destroyAll(Post);
+  }).then(function () {
+    return dsFirebaseAdapter.destroyAll(Comment);
+  }).then(function () {
     done();
   }).catch(done);
 });
 
 afterEach(function (done) {
-  dsFirebaseAdapter.destroyAll(User).then(function () {
+  dsFirebaseAdapter.destroyAll(Profile).then(function () {
+    return dsFirebaseAdapter.destroyAll(User);
+  }).then(function () {
+    return dsFirebaseAdapter.destroyAll(Post);
+  }).then(function () {
+    return dsFirebaseAdapter.destroyAll(Comment);
+  }).then(function () {
     done();
   }).catch(done);
 });
diff --git a/package.json b/package.json
index 190f536..9b0b4b8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "js-data-firebase",
   "description": "Firebase adapter for js-data.",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "homepage": "http://www.js-data.io/docs/dsfirebaseadapter",
   "repository": {
     "type": "git",
diff --git a/src/index.js b/src/index.js
index d2663f8..88db723 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,10 +1,11 @@
 let JSData = require('js-data');
 let Firebase = require('firebase');
 let values = require('mout/object/values');
+let map = require('mout/array/map');
+let unique = require('mout/array/unique');
 
 let emptyStore = new JSData.DS();
 let DSUtils = JSData.DSUtils;
-let { omit, deepMixIn, removeCircular, forOwn  } = DSUtils;
 let filter = emptyStore.defaults.defaultFilter;
 
 class Defaults {
@@ -54,7 +55,7 @@ class DSFirebaseAdapter {
   constructor(options) {
     options = options || {};
     this.defaults = new Defaults();
-    deepMixIn(this.defaults, options);
+    DSUtils.deepMixIn(this.defaults, options);
     this.ref = new Firebase(options.basePath || this.defaults.basePath);
   }
 
@@ -64,35 +65,210 @@ class DSFirebaseAdapter {
   }
 
   find(resourceConfig, id, options) {
-    return createTask((resolve, reject) => {
-      queueTask(() => {
-        this.getRef(resourceConfig, options).child(id).once('value', dataSnapshot => {
-          let item = dataSnapshot.val();
-          if (!item) {
-            reject(new Error('Not Found!'));
-          } else {
-            item[resourceConfig.idAttribute] = item[resourceConfig.idAttribute] || id;
-            resolve(item);
+    let instance;
+    options = options || {};
+    options.with = options.with || [];
+    return new DSUtils.Promise((resolve, reject) => {
+      this.getRef(resourceConfig, options).child(id).once('value', dataSnapshot => {
+        let item = dataSnapshot.val();
+        if (!item) {
+          reject(new Error('Not Found!'));
+        } else {
+          item[resourceConfig.idAttribute] = item[resourceConfig.idAttribute] || id;
+          resolve(item);
+        }
+      }, reject, this);
+    }).then(_instance => {
+        instance = _instance;
+        let tasks = [];
+
+        DSUtils.forEach(resourceConfig.relationList, def => {
+          let relationName = def.relation;
+          let relationDef = resourceConfig.getResource(relationName);
+          let containedName = null;
+          if (DSUtils.contains(options.with, relationName)) {
+            containedName = relationName;
+          } else if (DSUtils.contains(options.with, def.localField)) {
+            containedName = def.localField;
           }
-        }, reject, this);
-      });
-    });
+          if (containedName) {
+            let __options = DSUtils.deepMixIn({}, options.orig ? options.orig() : options);
+            __options = DSUtils._(relationDef, __options);
+            DSUtils.remove(__options.with, containedName);
+            DSUtils.forEach(__options.with, (relation, i) => {
+              if (relation && relation.indexOf(containedName) === 0 && relation.length >= containedName.length && relation[containedName.length] === '.') {
+                __options.with[i] = relation.substr(containedName.length + 1);
+              }
+            });
+
+            let task;
+
+            if ((def.type === 'hasOne' || def.type === 'hasMany') && def.foreignKey) {
+              task = this.findAll(resourceConfig.getResource(relationName), {
+                where: {
+                  [def.foreignKey]: {
+                    '==': instance[resourceConfig.idAttribute]
+                  }
+                }
+              }, __options).then(relatedItems => {
+                if (def.type === 'hasOne' && relatedItems.length) {
+                  DSUtils.set(instance, def.localField, relatedItems[0]);
+                } else {
+                  DSUtils.set(instance, def.localField, relatedItems);
+                }
+                return relatedItems;
+              });
+            } else if (def.type === 'hasMany' && def.localKeys) {
+              let localKeys = [];
+              let itemKeys = instance[def.localKeys] || [];
+              itemKeys = Array.isArray(itemKeys) ? itemKeys : DSUtils.keys(itemKeys);
+              localKeys = localKeys.concat(itemKeys || []);
+              task = this.findAll(resourceConfig.getResource(relationName), {
+                where: {
+                  [relationDef.idAttribute]: {
+                    'in': DSUtils.filter(unique(localKeys), x => x)
+                  }
+                }
+              }, __options).then(relatedItems => {
+                DSUtils.set(instance, def.localField, relatedItems);
+                return relatedItems;
+              });
+            } else if (def.type === 'belongsTo' || (def.type === 'hasOne' && def.localKey)) {
+              task = this.find(resourceConfig.getResource(relationName), DSUtils.get(instance, def.localKey), __options).then(relatedItem => {
+                DSUtils.set(instance, def.localField, relatedItem);
+                return relatedItem;
+              });
+            }
+
+            if (task) {
+              tasks.push(task);
+            }
+          }
+        });
+
+        return DSUtils.Promise.all(tasks);
+      })
+      .then(() => instance);
   }
 
   findAll(resourceConfig, params, options) {
-    return createTask((resolve, reject) => {
-      queueTask(() => {
-        this.getRef(resourceConfig, options).once('value', dataSnapshot => {
-          let data = dataSnapshot.val();
-          forOwn(data, (value, key) => {
-            if (!value[resourceConfig.idAttribute]) {
-              value[resourceConfig.idAttribute] = `/${key}`;
+    let items = null;
+    options = options || {};
+    options.with = options.with || [];
+    return new DSUtils.Promise((resolve, reject) => {
+      this.getRef(resourceConfig, options).once('value', dataSnapshot => {
+        let data = dataSnapshot.val();
+        DSUtils.forOwn(data, (value, key) => {
+          if (!value[resourceConfig.idAttribute]) {
+            value[resourceConfig.idAttribute] = `/${key}`;
+          }
+        });
+        resolve(filter.call(emptyStore, values(data), resourceConfig.name, params, options));
+      }, reject, this);
+    }).then(_items => {
+        items = _items;
+        let tasks = [];
+        DSUtils.forEach(resourceConfig.relationList, def => {
+          let relationName = def.relation;
+          let relationDef = resourceConfig.getResource(relationName);
+          let containedName = null;
+          if (DSUtils.contains(options.with, relationName)) {
+            containedName = relationName;
+          } else if (DSUtils.contains(options.with, def.localField)) {
+            containedName = def.localField;
+          }
+          if (containedName) {
+            let __options = DSUtils.deepMixIn({}, options.orig ? options.orig() : options);
+            __options.with = options.with.slice();
+            __options = DSUtils._(relationDef, __options);
+            DSUtils.remove(__options.with, containedName);
+
+            DSUtils.forEach(__options.with, (relation, i) => {
+              if (relation && relation.indexOf(containedName) === 0 && relation.length >= containedName.length && relation[containedName.length] === '.') {
+                __options.with[i] = relation.substr(containedName.length + 1);
+              } else {
+                __options.with[i] = '';
+              }
+            });
+
+            let task;
+
+            if ((def.type === 'hasOne' || def.type === 'hasMany') && def.foreignKey) {
+              task = this.findAll(resourceConfig.getResource(relationName), {
+                where: {
+                  [def.foreignKey]: {
+                    'in': DSUtils.filter(map(items, item => DSUtils.get(item, resourceConfig.idAttribute)), x => x)
+                  }
+                }
+              }, __options).then(relatedItems => {
+                DSUtils.forEach(items, item => {
+                  let attached = [];
+                  DSUtils.forEach(relatedItems, relatedItem => {
+                    if (DSUtils.get(relatedItem, def.foreignKey) === item[resourceConfig.idAttribute]) {
+                      attached.push(relatedItem);
+                    }
+                  });
+                  if (def.type === 'hasOne' && attached.length) {
+                    DSUtils.set(item, def.localField, attached[0]);
+                  } else {
+                    DSUtils.set(item, def.localField, attached);
+                  }
+                });
+                return relatedItems;
+              });
+            } else if (def.type === 'hasMany' && def.localKeys) {
+              let localKeys = [];
+              DSUtils.forEach(items, item => {
+                let itemKeys = item[def.localKeys] || [];
+                itemKeys = Array.isArray(itemKeys) ? itemKeys : DSUtils.keys(itemKeys);
+                localKeys = localKeys.concat(itemKeys || []);
+              });
+              task = this.findAll(resourceConfig.getResource(relationName), {
+                where: {
+                  [relationDef.idAttribute]: {
+                    'in': DSUtils.filter(unique(localKeys), x => x)
+                  }
+                }
+              }, __options).then(relatedItems => {
+                DSUtils.forEach(items, item => {
+                  let attached = [];
+                  let itemKeys = item[def.localKeys] || [];
+                  itemKeys = Array.isArray(itemKeys) ? itemKeys : DSUtils.keys(itemKeys);
+                  DSUtils.forEach(relatedItems, relatedItem => {
+                    if (itemKeys && DSUtils.contains(itemKeys, relatedItem[relationDef.idAttribute])) {
+                      attached.push(relatedItem);
+                    }
+                  });
+                  DSUtils.set(item, def.localField, attached);
+                });
+                return relatedItems;
+              });
+            } else if (def.type === 'belongsTo' || (def.type === 'hasOne' && def.localKey)) {
+              task = this.findAll(resourceConfig.getResource(relationName), {
+                where: {
+                  [relationDef.idAttribute]: {
+                    'in': DSUtils.filter(map(items, item => DSUtils.get(item, def.localKey)), x => x)
+                  }
+                }
+              }, __options).then(relatedItems => {
+                DSUtils.forEach(items, item => {
+                  DSUtils.forEach(relatedItems, relatedItem => {
+                    if (relatedItem[relationDef.idAttribute] === item[def.localKey]) {
+                      DSUtils.set(item, def.localField, relatedItem);
+                    }
+                  });
+                });
+                return relatedItems;
+              });
             }
-          });
-          resolve(filter.call(emptyStore, values(data), resourceConfig.name, params, options));
-        }, reject, this);
-      });
-    });
+
+            if (task) {
+              tasks.push(task);
+            }
+          }
+        });
+        return DSUtils.Promise.all(tasks);
+      }).then(() => items);
   }
 
   create(resourceConfig, attrs, options) {
@@ -103,7 +279,7 @@ class DSFirebaseAdapter {
       return createTask((resolve, reject) => {
         queueTask(() => {
           let resourceRef = this.getRef(resourceConfig, options);
-          var itemRef = resourceRef.push(removeCircular(omit(attrs, resourceConfig.relationFields || [])), err => {
+          var itemRef = resourceRef.push(DSUtils.removeCircular(DSUtils.omit(attrs, resourceConfig.relationFields || [])), err => {
             if (err) {
               return reject(err);
             } else {
@@ -131,7 +307,7 @@ class DSFirebaseAdapter {
   update(resourceConfig, id, attrs, options) {
     return createTask((resolve, reject) => {
       queueTask(() => {
-        attrs = removeCircular(omit(attrs || {}, resourceConfig.relationFields || []));
+        attrs = DSUtils.removeCircular(DSUtils.omit(attrs || {}, resourceConfig.relationFields || []));
         let itemRef = this.getRef(resourceConfig, options).child(id);
         itemRef.once('value', dataSnapshot => {
           try {
@@ -145,7 +321,7 @@ class DSFirebaseAdapter {
                 delete attrs[fields[i]];
               }
             }
-            deepMixIn(item, attrs);
+            DSUtils.deepMixIn(item, attrs);
             if (resourceConfig.relations) {
               fields = resourceConfig.relationFields;
               for (i = 0; i < fields.length; i++) {
diff --git a/test/find.spec.js b/test/find.spec.js
index 2c6e96b..693a423 100644
--- a/test/find.spec.js
+++ b/test/find.spec.js
@@ -14,4 +14,74 @@ describe('dsFirebaseAdapter#find', function () {
         assert.deepEqual(user, { id: id, name: 'John' });
       });
   });
+  it('should find a user with relations', function () {
+    var id, id2, _user, _post, _comments;
+    return dsFirebaseAdapter.create(User, {name: 'John'})
+      .then(function (user) {
+        _user = user;
+        id = user.id;
+        assert.equal(user.name, 'John');
+        assert.isDefined(user.id);
+        return dsFirebaseAdapter.find(User, user.id);
+      })
+      .then(function (user) {
+        assert.equal(user.name, 'John');
+        assert.isDefined(user.id);
+        assert.equalObjects(user, {id: id, name: 'John'});
+        return dsFirebaseAdapter.create(Post, {
+          content: 'test',
+          userId: user.id
+        });
+      })
+      .then(function (post) {
+        _post = post;
+        id2 = post.id;
+        assert.equal(post.content, 'test');
+        assert.isDefined(post.id);
+        assert.isDefined(post.userId);
+        return Promise.all([
+          dsFirebaseAdapter.create(Comment, {
+            content: 'test2',
+            postId: post.id,
+            userId: _user.id
+          }),
+          dsFirebaseAdapter.create(Comment, {
+            content: 'test3',
+            postId: post.id,
+            userId: _user.id
+          })
+        ]);
+      })
+      .then(function (comments) {
+        _comments = comments;
+        _comments.sort(function (a, b) {
+          return a.content > b.content;
+        });
+        return dsFirebaseAdapter.find(Post, _post.id, {'with': ['user', 'comment']});
+      })
+      .then(function (post) {
+        post.comments.sort(function (a, b) {
+          return a.content > b.content;
+        });
+        assert.equalObjects(post.user, _user, 'post.user should equal _user');
+        assert.equalObjects(post.comments, _comments, 'post.comments should equal _comments');
+        return dsFirebaseAdapter.destroyAll(Comment);
+      })
+      .then(function () {
+        return dsFirebaseAdapter.destroy(Post, id2);
+      })
+      .then(function () {
+        return dsFirebaseAdapter.destroy(User, id);
+      })
+      .then(function (user) {
+        assert.isFalse(!!user);
+        return dsFirebaseAdapter.find(User, id);
+      })
+      .then(function () {
+        throw new Error('Should not have reached here!');
+      })
+      .catch(function (err) {
+        assert.equal(err.message, 'Not Found!');
+      });
+  });
 });
diff --git a/test/findAll.spec.js b/test/findAll.spec.js
index 9b5d365..7d381df 100644
--- a/test/findAll.spec.js
+++ b/test/findAll.spec.js
@@ -21,4 +21,88 @@ describe('dsFirebaseAdapter#findAll', function () {
         assert.deepEqual(JSON.stringify(users, null, 2), JSON.stringify([u, u2], null, 2));
       });
   });
+  it('should load belongsTo relations', function () {
+    return dsFirebaseAdapter.create(Profile, {
+      email: 'foo@test.com'
+    }).then(function (profile) {
+      return Promise.all([
+        dsFirebaseAdapter.create(User, {name: 'John', profileId: profile.id}).then(function (user) {
+          return dsFirebaseAdapter.create(Post, {content: 'foo', userId: user.id});
+        }),
+        dsFirebaseAdapter.create(User, {name: 'Sally'}).then(function (user) {
+          return dsFirebaseAdapter.create(Post, {content: 'bar', userId: user.id});
+        })
+      ])
+    })
+      .spread(function (post1, post2) {
+        return Promise.all([
+          dsFirebaseAdapter.create(Comment, {
+            content: 'test2',
+            postId: post1.id,
+            userId: post1.userId
+          }),
+          dsFirebaseAdapter.create(Comment, {
+            content: 'test3',
+            postId: post2.id,
+            userId: post2.userId
+          })
+        ]);
+      })
+      .then(function () {
+        return dsFirebaseAdapter.findAll(Comment, {}, {'with': ['post', 'post.user', 'user', 'user.profile']});
+      })
+      .then(function (comments) {
+        assert.isDefined(comments[0].post);
+        assert.isDefined(comments[0].post.user);
+        assert.isDefined(comments[0].user);
+        assert.isDefined(comments[0].user.profile || comments[1].user.profile);
+        assert.isDefined(comments[1].post);
+        assert.isDefined(comments[1].post.user);
+        assert.isDefined(comments[1].user);
+      })
+      .catch(function (err) {
+        console.log(err.stack);
+        throw err;
+      });
+  });
+  it('should load hasMany and belongsTo relations', function () {
+    return dsFirebaseAdapter.create(Profile, {
+      email: 'foo@test.com'
+    }).then(function (profile) {
+      return Promise.all([
+        dsFirebaseAdapter.create(User, {name: 'John', profileId: profile.id}).then(function (user) {
+          return dsFirebaseAdapter.create(Post, {content: 'foo', userId: user.id});
+        }),
+        dsFirebaseAdapter.create(User, {name: 'Sally'}).then(function (user) {
+          return dsFirebaseAdapter.create(Post, {content: 'bar', userId: user.id});
+        })
+      ]);
+    })
+      .spread(function (post1, post2) {
+        return Promise.all([
+          dsFirebaseAdapter.create(Comment, {
+            content: 'test2',
+            postId: post1.id,
+            userId: post1.userId
+          }),
+          dsFirebaseAdapter.create(Comment, {
+            content: 'test3',
+            postId: post2.id,
+            userId: post2.userId
+          })
+        ]);
+      })
+      .then(function () {
+        return dsFirebaseAdapter.findAll(Post, {}, {'with': ['user', 'comment', 'comment.user', 'comment.user.profile']});
+      })
+      .then(function (posts) {
+        assert.isDefined(posts[0].comments);
+        assert.isDefined(posts[0].comments[0].user);
+        assert.isDefined(posts[0].comments[0].user.profile || posts[1].comments[0].user.profile);
+        assert.isDefined(posts[0].user);
+        assert.isDefined(posts[1].comments);
+        assert.isDefined(posts[1].comments[0].user);
+        assert.isDefined(posts[1].user);
+      });
+  });
 });