diff --git a/dist/parse-angular.js b/dist/parse-angular.js
index fa014bc..b5ea167 100644
--- a/dist/parse-angular.js
+++ b/dist/parse-angular.js
@@ -1 +1 @@
-!function(t,e){var r=t.angular;if(r!==e){var n=r.module("parse-angular",[]);n.run(["$q","$window",function(t,e){if(!r.isUndefined(e.Parse)&&r.isObject(e.Parse)){var n=e.Parse,o={Object:{prototype:["save","fetch","destroy"],"static":["saveAll","destroyAll"]},Collection:{prototype:["fetch"],"static":[]},Query:{prototype:["find","first","count","get"],"static":[]},Cloud:{prototype:[],"static":["run"]},User:{prototype:["signUp"],"static":["requestPasswordReset","logIn"]},FacebookUtils:{prototype:[],"static":["logIn","link","unlink"]}};for(var i in o){var s=i,a=o[i],c=a.prototype,u=a.static;c.forEach(function(e){var r=n[s].prototype[e];n[s].prototype[e]=function(){return r.apply(this,arguments).then(function(e){var r=t.defer();return r.resolve(e),r.promise},function(e){var r=t.defer();return r.reject(e),r.promise})}}),u.forEach(function(e){var r=n[s][e];n[s][e]=function(){return r.apply(this,arguments).then(function(e){var r=t.defer();return r.resolve(e),r.promise},function(e){var r=t.defer();return r.reject(e),r.promise})}})}}}]),r.module("parse-angular.enhance",["parse-angular"]).run(["$q","$window",function(t,e){function n(t){return t.charAt(0).toUpperCase()+t.slice(1)}if(!r.isUndefined(e.Parse)&&r.isObject(e.Parse)){var o=e.Parse;o.Object.getClass=function(t){return o.Object._classMap[t]};var i=o.Object.extend;o.Object.extend=function(t){var e=i.apply(this,arguments);if(o._.isObject(t)&&o._.isArray(t.attrs)){var r=t.attrs;o._.each(r,function(t){var r=n(t);e.prototype["get"+r]||(e.prototype["get"+r]=function(){return this.get(t)}),e.prototype["set"+r]||(e.prototype["set"+r]=function(e){return this.set(t,e),this})})}return e},o.Collection._classMap={};var s=o.Collection.extend;o.Collection.extend=function(t){var e=s.apply(this,arguments);return t&&t.className&&(o.Collection._classMap[t.className]=e),e},o.Collection.getClass=function(t){return o.Collection._classMap[t]},o.Collection.prototype=r.extend(o.Collection.prototype,{loadMore:function(t){if(!r.isUndefined(this.query)){var e=-1==this.query._limit?100:this.query._limit,n=this.query._skip;n+=e,this.query.skip(n);var o=this;return this.query.find().then(function(r){return t&&t.add===!1||o.add(r),r.length<e&&(o.hasMoreToLoad=!1),r})}}})}}])}}(this);
\ No newline at end of file
+!function(t,e){var r=t.angular;if(r!==e){var n=r.module("parse-angular",[]);n.run(["$q","$window",function(t,e){if(!r.isUndefined(e.Parse)&&r.isObject(e.Parse)){var n=e.Parse,o={Object:{prototype:["save","fetch","destroy"],"static":["saveAll","destroyAll"]},Collection:{prototype:["fetch"],"static":[]},Query:{prototype:["find","first","count","get"],"static":[]},Cloud:{prototype:[],"static":["run"]},User:{prototype:["signUp"],"static":["requestPasswordReset","logIn"]},FacebookUtils:{prototype:[],"static":["logIn","link","unlink"]},Config:{prototype:[],"static":["get"]}};for(var i in o){var s=i,a=o[i],c=a.prototype,p=a["static"];c.forEach(function(e){var r=n[s].prototype[e];n[s].prototype[e]=function(){return r.apply(this,arguments).then(function(e){var r=t.defer();return r.resolve(e),r.promise},function(e){var r=t.defer();return r.reject(e),r.promise})}}),p.forEach(function(e){var r=n[s][e];n[s][e]=function(){return r.apply(this,arguments).then(function(e){var r=t.defer();return r.resolve(e),r.promise},function(e){var r=t.defer();return r.reject(e),r.promise})}})}}}]),r.module("parse-angular.enhance",["parse-angular"]).run(["$q","$window",function(t,e){if(!r.isUndefined(e.Parse)&&r.isObject(e.Parse)){var n=e.Parse;n.Object.getClass=function(t){return n.Object._classMap[t]};var o=function(t){return t.charAt(0).toUpperCase()+t.slice(1)},i=n.Object.extend;n.Object.extend=function(t){var e=i.apply(this,arguments);if(n._.isObject(t)&&n._.isArray(t.attrs)){var r=t.attrs;n._.each(r,function(t){var r=o(t);e.prototype["get"+r]||(e.prototype["get"+r]=function(){return this.get(t)}),e.prototype["set"+r]||(e.prototype["set"+r]=function(e){return this.set(t,e),this});var n=Object.getOwnPropertyDescriptor(e.prototype,t);n||(e.prototype.__defineGetter__(t,function(){return this.get(t)}),e.prototype.__defineSetter__(t,function(e){return this.set(t,e)}))})}return e},n.Collection._classMap={};var s=n.Collection.extend;n.Collection.extend=function(t){var e=s.apply(this,arguments);return t&&t.className&&(n.Collection._classMap[t.className]=e),e},n.Collection.getClass=function(t){return n.Collection._classMap[t]},n.Collection.prototype=r.extend(n.Collection.prototype,{loadMore:function(t){if(!r.isUndefined(this.query)){var e=-1==this.query._limit?100:this.query._limit,n=this.query._skip;n+=e,this.query.skip(n);var o=this;return this.query.find().then(function(r){return t&&t.add===!1||o.add(r),r.length<e&&(o.hasMoreToLoad=!1),r})}}})}}])}}(this);
\ No newline at end of file
diff --git a/src/parse-angular.js b/src/parse-angular.js
index 685b943..eb43893 100644
--- a/src/parse-angular.js
+++ b/src/parse-angular.js
@@ -1,4 +1,4 @@
-(function(window, undef){
+(function (window, undef) {
 
 	var angular = window.angular;
 
@@ -6,7 +6,7 @@
 
 		var module = angular.module('parse-angular', []);
 
-		module.run(['$q', '$window', function($q, $window){
+		module.run(['$q', '$window', function ($q, $window) {
 
 
 			// Process only if Parse exist on the global window, do nothing otherwise
@@ -61,176 +61,175 @@
 
 
 					/// Patching prototypes
-					currentProtoMethods.forEach(function(method){
+					currentProtoMethods.forEach(function (method) {
 
 						var origMethod = Parse[currentClass].prototype[method];
 
 						// Overwrite original function by wrapping it with $q
-						Parse[currentClass].prototype[method] = function() {
+						Parse[currentClass].prototype[method] = function () {
 
 							return origMethod.apply(this, arguments)
-							.then(function(data){
-								var defer = $q.defer();
-								defer.resolve(data);
-								return defer.promise;
-							}, function(err){
-								var defer = $q.defer();
-								defer.reject(err);
-								return defer.promise;
-							});
-
-
+								.then(function (data) {
+									var defer = $q.defer();
+									defer.resolve(data);
+									return defer.promise;
+								}, function (err) {
+									var defer = $q.defer();
+									defer.reject(err);
+									return defer.promise;
+								});
 						};
-
 					});
 
 
 					///Patching static methods too
-					currentStaticMethods.forEach(function(method){
+					currentStaticMethods.forEach(function (method) {
 
 						var origMethod = Parse[currentClass][method];
 
 						// Overwrite original function by wrapping it with $q
-						Parse[currentClass][method] = function() {
+						Parse[currentClass][method] = function () {
 
 							return origMethod.apply(this, arguments)
-							.then(function(data){
-								var defer = $q.defer();
-								defer.resolve(data);
-								return defer.promise;
-							}, function(err){
-								var defer = $q.defer();
-								defer.reject(err);
-								return defer.promise;
-							});
-
+								.then(function (data) {
+									var defer = $q.defer();
+									defer.resolve(data);
+									return defer.promise;
+								}, function (err) {
+									var defer = $q.defer();
+									defer.reject(err);
+									return defer.promise;
+								});
 						};
-
 					});
-
-
 				}
 			}
 
 		}]);
 
 
-
 		angular.module('parse-angular.enhance', ['parse-angular'])
-		.run(['$q', '$window', function($q, $window){
+			.run(['$q', '$window', function ($q, $window) {
 
 
-			if (!angular.isUndefined($window.Parse) && angular.isObject($window.Parse)) {
+				if (!angular.isUndefined($window.Parse) && angular.isObject($window.Parse)) {
 
-				var Parse = $window.Parse;
+					var Parse = $window.Parse;
 
-				/// Create a method to easily access our object
-				/// Because Parse.Object("xxxx") is actually creating an object and we can't access static methods
+					/// Create a method to easily access our object
+					/// Because Parse.Object("xxxx") is actually creating an object and we can't access static methods
 
-				Parse.Object.getClass = function(className) {
-					return Parse.Object._classMap[className];
-				};
+					Parse.Object.getClass = function (className) {
+						return Parse.Object._classMap[className];
+					};
 
-				///// CamelCaseIsh Helper
-				function capitaliseFirstLetter(string) {
-		        return string.charAt(0).toUpperCase() + string.slice(1);
-		    }
+					///// CamelCaseIsh Helper
+					var capitaliseFirstLetter = function (string) {
+						return string.charAt(0).toUpperCase() + string.slice(1);
+					};
 
 
-				///// Override orig extend
-				var origObjectExtend = Parse.Object.extend;
+					///// Override orig extend
+					var origObjectExtend = Parse.Object.extend;
 
-				Parse.Object.extend = function(protoProps) {
+					Parse.Object.extend = function (protoProps) {
 
-					var newClass = origObjectExtend.apply(this, arguments);
+						var newClass = origObjectExtend.apply(this, arguments);
 
-					if (Parse._.isObject(protoProps) && Parse._.isArray(protoProps.attrs)) {
-						var attrs = protoProps.attrs;
-						/// Generate setters & getters
-						Parse._.each(attrs, function(currentAttr){
+						if (Parse._.isObject(protoProps) && Parse._.isArray(protoProps.attrs)) {
+							var attrs = protoProps.attrs;
+							/// Generate setters & getters
+							Parse._.each(attrs, function (currentAttr) {
 
-							var field = capitaliseFirstLetter(currentAttr);
+								var field = capitaliseFirstLetter(currentAttr);
 
-							// Don't override if we set a custom setters or getters
-							if(!newClass.prototype['get' + field]) {
-								newClass.prototype['get' + field] = function() {
-									return this.get(currentAttr);
-								};
-							}
-							if(!newClass.prototype['set' + field]) {
-								newClass.prototype['set' + field] = function(data) {
-									this.set(currentAttr, data);
-									return this;
+								// Don't override if we set a custom setters or getters
+								if (!newClass.prototype['get' + field]) {
+									newClass.prototype['get' + field] = function () {
+										return this.get(currentAttr);
+									};
+								}
+								if (!newClass.prototype['set' + field]) {
+									newClass.prototype['set' + field] = function (data) {
+										this.set(currentAttr, data);
+										return this;
+									};
 								}
-							}
 
-						});
-					}
+								var prop = Object.getOwnPropertyDescriptor(newClass.prototype, currentAttr);
+								if (!prop) {
+									newClass.prototype.__defineGetter__(currentAttr, function () {
+										return this.get(currentAttr);
+									});
+									newClass.prototype.__defineSetter__(currentAttr, function (value) {
+										return this.set(currentAttr, value);
+									});
+								}
+							});
+						}
 
 
-					return newClass;
-				}
+						return newClass;
+					};
 
 
+					/// Keep references & init collection class map
+					Parse.Collection._classMap = {};
 
-				/// Keep references & init collection class map
-				Parse.Collection._classMap = {};
+					var origExtend = Parse.Collection.extend;
 
-				var origExtend = Parse.Collection.extend;
+					/// Enhance Collection 'extend' to store their subclass in a map
+					Parse.Collection.extend = function (opts) {
 
-				/// Enhance Collection 'extend' to store their subclass in a map
-				Parse.Collection.extend = function(opts) {
+						var extended = origExtend.apply(this, arguments);
 
-					var extended = origExtend.apply(this, arguments);
+						if (opts && opts.className) {
+							Parse.Collection._classMap[opts.className] = extended;
+						}
 
-					if (opts && opts.className) {
-						Parse.Collection._classMap[opts.className] = extended;
-					}
+						return extended;
 
-					return extended;
+					};
 
-				};
 
+					Parse.Collection.getClass = function (className) {
+						return Parse.Collection._classMap[className];
+					};
 
-				Parse.Collection.getClass = function(className) {
-					return Parse.Collection._classMap[className];
-				}
 
+					/// Enhance Collection prototype
+					Parse.Collection.prototype = angular.extend(Parse.Collection.prototype, {
+						// Simple paginator
+						loadMore: function (opts) {
 
-				/// Enhance Collection prototype
-				Parse.Collection.prototype = angular.extend(Parse.Collection.prototype, {
-					// Simple paginator
-					loadMore: function(opts) {
+							if (!angular.isUndefined(this.query)) {
 
-						if (!angular.isUndefined(this.query)) {
+								// Default Parse limit is 100
+								var currentLimit = this.query._limit == -1 ? 100 : this.query._limit;
+								var currentSkip = this.query._skip;
 
-							// Default Parse limit is 100
-							var currentLimit = this.query._limit == -1 ? 100 : this.query._limit;
-							var currentSkip = this.query._skip;
+								currentSkip += currentLimit;
 
-							currentSkip += currentLimit;
+								this.query.skip(currentSkip);
 
-							this.query.skip(currentSkip);
+								var _this = this;
 
-							var _this = this;
+								return this.query.find()
+									.then(function (newModels) {
+										if (!opts || opts.add !== false) _this.add(newModels);
+										if (newModels.length < currentLimit) _this.hasMoreToLoad = false;
+										return newModels;
+									});
 
-							return this.query.find()
-							.then(function(newModels){
-								if (!opts || opts.add !== false) _this.add(newModels)
-								if (newModels.length < currentLimit) _this.hasMoreToLoad = false;
-								return newModels;
-							});
+							}
 
 						}
 
-					}
-
-				});
-
-			}
+					});
 
-		}]);
+				}
 
+			}]);
 
 
 	}