diff --git a/package-lock.json b/package-lock.json
index 7060f09..da79214 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,8 +15,8 @@
         "cors": "2.8.5",
         "dotenv": "16.5.0",
         "express": "5.1.0",
-        "mongodb": "6.15.0",
-        "mongoose": "8.13.2",
+        "mongodb": "6.17.0",
+        "mongoose": "8.16.2",
         "threads": "1.7.0",
         "winston": "3.17.0"
       },
@@ -4675,9 +4675,9 @@
       }
     },
     "node_modules/bson": {
-      "version": "6.10.3",
-      "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.3.tgz",
-      "integrity": "sha512-MTxGsqgYTwfshYWTRdmZRC+M7FnG1b4y7RO7p2k3X24Wq0yv1m77Wsj0BzlPzd/IowgESfsruQCUToa7vbOpPQ==",
+      "version": "6.10.4",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.4.tgz",
+      "integrity": "sha512-WIsKqkSC0ABoBJuT1LEX+2HEvNmNKKgnTAyd0fL8qzK4SH2i9NXg+t08YtdZp/V9IZ33cxe3iV4yM0qg8lMQng==",
       "license": "Apache-2.0",
       "engines": {
         "node": ">=16.20.1"
@@ -8882,13 +8882,13 @@
       "license": "MIT"
     },
     "node_modules/mongodb": {
-      "version": "6.15.0",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.15.0.tgz",
-      "integrity": "sha512-ifBhQ0rRzHDzqp9jAQP6OwHSH7dbYIQjD3SbJs9YYk9AikKEettW/9s/tbSFDTpXcRbF+u1aLrhHxDFaYtZpFQ==",
+      "version": "6.17.0",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.17.0.tgz",
+      "integrity": "sha512-neerUzg/8U26cgruLysKEjJvoNSXhyID3RvzvdcpsIi2COYM3FS3o9nlH7fxFtefTb942dX3W9i37oPfCVj4wA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@mongodb-js/saslprep": "^1.1.9",
-        "bson": "^6.10.3",
+        "bson": "^6.10.4",
         "mongodb-connection-string-url": "^3.0.0"
       },
       "engines": {
@@ -8938,14 +8938,14 @@
       }
     },
     "node_modules/mongoose": {
-      "version": "8.13.2",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.13.2.tgz",
-      "integrity": "sha512-riCBqZmNkYBWjXpM3qWLDQw7QmTKsVZDPhLXFJqC87+OjocEVpvS3dA2BPPUiLAu+m0/QmEj5pSXKhH+/DgerQ==",
+      "version": "8.16.2",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.16.2.tgz",
+      "integrity": "sha512-52T4XPhDgJL4cqooBsOORzYBH3ddMwABMEF/LV7TgvD2DEKZlnYTc2HF9ch1U2lcKjhE4pQ+WuInfLFJbguGcQ==",
       "license": "MIT",
       "dependencies": {
-        "bson": "^6.10.3",
+        "bson": "^6.10.4",
         "kareem": "2.6.3",
-        "mongodb": "~6.15.0",
+        "mongodb": "~6.17.0",
         "mpath": "0.9.0",
         "mquery": "5.0.0",
         "ms": "2.1.3",
diff --git a/package.json b/package.json
index 18dc01b..c80164f 100644
--- a/package.json
+++ b/package.json
@@ -30,8 +30,8 @@
     "cors": "2.8.5",
     "dotenv": "16.5.0",
     "express": "5.1.0",
-    "mongodb": "6.15.0",
-    "mongoose": "8.13.2",
+    "mongodb": "6.17.0",
+    "mongoose": "8.16.2",
     "threads": "1.7.0",
     "winston": "3.17.0"
   },
diff --git a/src/RoundManager.ts b/src/RoundManager.ts
index 59946d8..02394fb 100644
--- a/src/RoundManager.ts
+++ b/src/RoundManager.ts
@@ -79,11 +79,6 @@ export class RoundManager {
       throw error;
     }
 
-    // Add leaves to the SMT tree
-    if (smtLeaves.length > 0) {
-      await this.smt.addLeaves(smtLeaves);
-    }
-
     try {
       await Promise.all([recordStoragePromise, smtLeafStoragePromise]);
     } catch (error) {
@@ -91,6 +86,11 @@ export class RoundManager {
       throw error;
     }
 
+    // Add leaves to the SMT tree
+    if (smtLeaves.length > 0) {
+      await this.smt.addLeaves(smtLeaves);
+    }
+
     let submitHashResponse;
     const rootHash = this.smt.rootHash;
     try {
diff --git a/tsconfig.json b/tsconfig.json
index b007483..0f2f025 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -13,12 +13,7 @@
     "moduleResolution": "nodenext",
     "resolveJsonModule": true,
     "isolatedModules": true,
-    "baseUrl": ".",
-    "paths": {
-      "threads": ["./node_modules/threads/dist/index.d.ts"],
-      "threads/worker": ["./node_modules/threads/dist/worker/index.d.ts"],
-      "threads/*": ["./node_modules/threads/dist/*"]
-    }
+    "baseUrl": "."
   },
   "exclude": [
     "node_modules",