diff --git a/package-lock.json b/package-lock.json
index d5bd4a73..27506023 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10908,6 +10908,11 @@
         "electron-to-chromium": "1.3.45"
       }
     },
+    "bson": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-1.0.9.tgz",
+      "integrity": "sha512-IQX9/h7WdMBIW/q/++tGd+emQr0XMdeZ6icnT/74Xk9fnabWn+gZgpE+9V+gujL3hhJOoNrnDVY7tWdzc7NUTg=="
+    },
     "bson-objectid": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/bson-objectid/-/bson-objectid-1.2.2.tgz",
@@ -10929,6 +10934,11 @@
       "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==",
       "dev": true
     },
+    "buffer-shims": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz",
+      "integrity": "sha1-mXjOMXOIxkmth5MCjDR37wRKi1E="
+    },
     "buffer-xor": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
@@ -16472,6 +16482,11 @@
         "os-tmpdir": "1.0.1"
       }
     },
+    "hooks-fixed": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hooks-fixed/-/hooks-fixed-2.0.2.tgz",
+      "integrity": "sha512-YurCM4gQSetcrhwEtpQHhQ4M7Zo7poNGqY4kQGeBS6eZtOcT3tnNs01ThFa0jYBByAiYt1MjMjP/YApG0EnAvQ=="
+    },
     "hosted-git-info": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
@@ -18033,6 +18048,11 @@
         "array-includes": "3.0.3"
       }
     },
+    "kareem": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/kareem/-/kareem-1.5.0.tgz",
+      "integrity": "sha1-4+QQHZ3P3imXadr0tNtk2JXRdEg="
+    },
     "kind-of": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -18277,6 +18297,11 @@
       "resolved": "https://registry.npmjs.org/lodash.flow/-/lodash.flow-3.5.0.tgz",
       "integrity": "sha1-h79AKSuM+D5OjOGjrkIJ4gBxZ1o="
     },
+    "lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
+    },
     "lodash.mergewith": {
       "version": "4.6.1",
       "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.1.tgz",
@@ -21763,187 +21788,104 @@
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz",
       "integrity": "sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg=="
     },
-    "mongoose": {
-      "version": "4.4.16",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-4.4.16.tgz",
-      "integrity": "sha1-lgYn8neqa8tUDDbQaBgGLXD4iwY=",
+    "mongodb": {
+      "version": "2.2.34",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.34.tgz",
+      "integrity": "sha1-o09Zu+thdUrsQy3nLD/iFSakTBo=",
       "requires": {
-        "async": "1.5.2",
-        "bson": "0.4.23",
-        "hooks-fixed": "1.1.0",
-        "kareem": "1.0.1",
-        "mongodb": "2.1.18",
-        "mpath": "0.2.1",
-        "mpromise": "0.5.5",
-        "mquery": "1.10.0",
-        "ms": "0.7.1",
-        "muri": "1.1.0",
-        "regexp-clone": "0.0.1",
-        "sliced": "1.0.1"
+        "es6-promise": "3.2.1",
+        "mongodb-core": "2.1.18",
+        "readable-stream": "2.2.7"
       },
       "dependencies": {
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo="
+        "es6-promise": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz",
+          "integrity": "sha1-7FYjOGgDKQkgcXDDlEjiREndH8Q="
         },
-        "bson": {
-          "version": "0.4.23",
-          "resolved": "https://registry.npmjs.org/bson/-/bson-0.4.23.tgz",
-          "integrity": "sha1-5louPHUH/63kEJvHV1p25Q+NqRU="
-        },
-        "hooks-fixed": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/hooks-fixed/-/hooks-fixed-1.1.0.tgz",
-          "integrity": "sha1-DowVM2cI5mERhf45C0RofdUjDbs="
-        },
-        "kareem": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/kareem/-/kareem-1.0.1.tgz",
-          "integrity": "sha1-eAXSFbtTIU7Dr5aaHQsfF+PnuVw="
-        },
-        "mongodb": {
-          "version": "2.1.18",
-          "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.1.18.tgz",
-          "integrity": "sha1-KNQLUVsr5NWmn/3UxTXw30MuQJc=",
+        "readable-stream": {
+          "version": "2.2.7",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.7.tgz",
+          "integrity": "sha1-BwV6y+JGeyIELTb5jFrVBwVOlbE=",
           "requires": {
-            "es6-promise": "3.0.2",
-            "mongodb-core": "1.3.18",
-            "readable-stream": "1.0.31"
-          },
-          "dependencies": {
-            "es6-promise": {
-              "version": "3.0.2",
-              "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz",
-              "integrity": "sha1-AQ1YWEI6XxGJeWZfRkhqlcbuK7Y="
-            },
-            "mongodb-core": {
-              "version": "1.3.18",
-              "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-1.3.18.tgz",
-              "integrity": "sha1-kGhLO3xzVtZa41Y5HTCw8kiATHo=",
-              "requires": {
-                "bson": "0.4.23",
-                "require_optional": "1.0.0"
-              },
-              "dependencies": {
-                "require_optional": {
-                  "version": "1.0.0",
-                  "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.0.tgz",
-                  "integrity": "sha1-UqhhN6hJco62ClVTNhf4+RT1mr8=",
-                  "requires": {
-                    "resolve-from": "2.0.0",
-                    "semver": "5.1.0"
-                  },
-                  "dependencies": {
-                    "resolve-from": {
-                      "version": "2.0.0",
-                      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz",
-                      "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c="
-                    },
-                    "semver": {
-                      "version": "5.1.0",
-                      "resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz",
-                      "integrity": "sha1-hfLPhVBGXE3wAM99hvawVBBqueU="
-                    }
-                  }
-                }
-              }
-            },
-            "readable-stream": {
-              "version": "1.0.31",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
-              "integrity": "sha1-jyUC4LyeOw2huUUgqrtOJgPsr64=",
-              "requires": {
-                "core-util-is": "1.0.2",
-                "inherits": "2.0.1",
-                "isarray": "0.0.1",
-                "string_decoder": "0.10.31"
-              },
-              "dependencies": {
-                "core-util-is": {
-                  "version": "1.0.2",
-                  "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-                  "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
-                },
-                "inherits": {
-                  "version": "2.0.1",
-                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-                  "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
-                },
-                "isarray": {
-                  "version": "0.0.1",
-                  "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-                  "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-                  "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
-                }
-              }
-            }
+            "buffer-shims": "1.0.0",
+            "core-util-is": "1.0.2",
+            "inherits": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "1.0.3",
+            "util-deprecate": "1.0.2"
           }
         },
-        "mpath": {
-          "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.2.1.tgz",
-          "integrity": "sha1-Ok6Ck1mAHeljCcJ6ay4QLon56W4="
-        },
-        "mpromise": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mpromise/-/mpromise-0.5.5.tgz",
-          "integrity": "sha1-9bJCWddjrMIlewoMjG2Gb9UXMuY="
-        },
-        "mquery": {
-          "version": "1.10.0",
-          "resolved": "https://registry.npmjs.org/mquery/-/mquery-1.10.0.tgz",
-          "integrity": "sha1-hgPwKwtSTResBTmoWZYSTuF7fLM=",
+        "string_decoder": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+          "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
           "requires": {
-            "bluebird": "2.10.2",
-            "debug": "2.2.0",
-            "regexp-clone": "0.0.1",
-            "sliced": "0.0.5"
-          },
-          "dependencies": {
-            "bluebird": {
-              "version": "2.10.2",
-              "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz",
-              "integrity": "sha1-AkpVFylTCIV/FPkfEQb8O1VfRGs="
-            },
-            "debug": {
-              "version": "2.2.0",
-              "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
-              "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
-              "requires": {
-                "ms": "0.7.1"
-              }
-            },
-            "sliced": {
-              "version": "0.0.5",
-              "resolved": "https://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz",
-              "integrity": "sha1-XtwETKTrb3gW1Qui/GPiXY/kcH8="
-            }
+            "safe-buffer": "5.1.2"
           }
-        },
-        "ms": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
-          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg="
-        },
-        "muri": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/muri/-/muri-1.1.0.tgz",
-          "integrity": "sha1-o6bXTmiogPQzokmnSWnLtmXMCt0="
-        },
-        "regexp-clone": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz",
-          "integrity": "sha1-p8LgmJH9vzj7sQ03b7cwA+aKxYk="
+        }
+      }
+    },
+    "mongodb-core": {
+      "version": "2.1.18",
+      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.18.tgz",
+      "integrity": "sha1-TEYTm986HwMt7ZHbSfOO7AFlkFA=",
+      "requires": {
+        "bson": "1.0.9",
+        "require_optional": "1.0.1"
+      }
+    },
+    "mongoose": {
+      "version": "4.13.17",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-4.13.17.tgz",
+      "integrity": "sha512-VGeSP5O3k9HUXsNm9AocdAlVbfaHV/RHgHc8Jfvwr0D0ZyzgJ3JJ+MKSmz+omicNOhBsmpBEL1zVHM2uIj8tDQ==",
+      "requires": {
+        "async": "2.6.0",
+        "bson": "1.0.9",
+        "hooks-fixed": "2.0.2",
+        "kareem": "1.5.0",
+        "lodash.get": "4.4.2",
+        "mongodb": "2.2.34",
+        "mpath": "0.5.1",
+        "mpromise": "0.5.5",
+        "mquery": "2.3.3",
+        "ms": "2.0.0",
+        "muri": "1.3.0",
+        "regexp-clone": "0.0.1",
+        "sliced": "1.0.1"
+      }
+    },
+    "mpath": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mpath/-/mpath-0.5.1.tgz",
+      "integrity": "sha512-H8OVQ+QEz82sch4wbODFOz+3YQ61FYz/z3eJ5pIdbMEaUzDqA268Wd+Vt4Paw9TJfvDgVKaayC0gBzMIw2jhsg=="
+    },
+    "mpromise": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mpromise/-/mpromise-0.5.5.tgz",
+      "integrity": "sha1-9bJCWddjrMIlewoMjG2Gb9UXMuY="
+    },
+    "mquery": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/mquery/-/mquery-2.3.3.tgz",
+      "integrity": "sha512-NC8L14kn+qxJbbJ1gbcEMDxF0sC3sv+1cbRReXXwVvowcwY1y9KoVZFq0ebwARibsadu8lx8nWGvm3V0Pf0ZWQ==",
+      "requires": {
+        "bluebird": "3.5.0",
+        "debug": "2.6.9",
+        "regexp-clone": "0.0.1",
+        "sliced": "0.0.5"
+      },
+      "dependencies": {
+        "bluebird": {
+          "version": "3.5.0",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
+          "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw="
         },
         "sliced": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz",
-          "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E="
+          "version": "0.0.5",
+          "resolved": "https://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz",
+          "integrity": "sha1-XtwETKTrb3gW1Qui/GPiXY/kcH8="
         }
       }
     },
@@ -21952,6 +21894,11 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
+    "muri": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/muri/-/muri-1.3.0.tgz",
+      "integrity": "sha512-FiaFwKl864onHFFUV/a2szAl7X0fxVlSKNdhTf+BM8i8goEgYut8u5P9MqQqIYwvaMxjzVESsoEm/2kfkFH1rg=="
+    },
     "mute-stream": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
@@ -26830,6 +26777,11 @@
       "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz",
       "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8="
     },
+    "process-nextick-args": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+      "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M="
+    },
     "progress": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.0.tgz",
@@ -28076,6 +28028,11 @@
         "safe-regex": "1.1.0"
       }
     },
+    "regexp-clone": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz",
+      "integrity": "sha1-p8LgmJH9vzj7sQ03b7cwA+aKxYk="
+    },
     "regexpu-core": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz",
@@ -28549,6 +28506,27 @@
         "resolve-from": "1.0.1"
       }
     },
+    "require_optional": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz",
+      "integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==",
+      "requires": {
+        "resolve-from": "2.0.0",
+        "semver": "5.5.1"
+      },
+      "dependencies": {
+        "resolve-from": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz",
+          "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c="
+        },
+        "semver": {
+          "version": "5.5.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.1.tgz",
+          "integrity": "sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw=="
+        }
+      }
+    },
     "resolve-from": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz",
@@ -29038,6 +29016,11 @@
         }
       }
     },
+    "sliced": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz",
+      "integrity": "sha1-CzpmK10Ewxd7GSa+qCsD+Dei70E="
+    },
     "slugify": {
       "version": "1.2.9",
       "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.2.9.tgz",
diff --git a/package.json b/package.json
index 283983df..14ae46a5 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "loop-protect": "github:catarak/loop-protect",
     "mjml": "^3.3.2",
     "moment": "^2.14.1",
-    "mongoose": "^4.4.16",
+    "mongoose": "^4.6.8",
     "node-uuid": "^1.4.7",
     "nodemailer": "^2.6.4",
     "nodemailer-mailgun-transport": "^1.2.2",
diff --git a/server/models/project.js b/server/models/project.js
index ac70fc5b..c1a255d8 100644
--- a/server/models/project.js
+++ b/server/models/project.js
@@ -11,7 +11,7 @@ const fileSchema = new Schema({
   children: { type: [String], default: [] },
   fileType: { type: String, default: 'file' },
   isSelectedFile: { type: Boolean }
-}, { timestamps: true, _id: true });
+}, { timestamps: true, _id: true, usePushEach: true });
 
 fileSchema.virtual('id').get(function getFileId() {
   return this._id.toHexString();
@@ -28,7 +28,7 @@ const projectSchema = new Schema({
   files: { type: [fileSchema] },
   _id: { type: String, default: shortid.generate },
   slug: { type: String }
-}, { timestamps: true });
+}, { timestamps: true, usePushEach: true });
 
 projectSchema.virtual('id').get(function getProjectId() {
   return this._id;