diff --git a/services/chat/package.json b/services/chat/package.json
index 1c201e4cba..57d468920d 100644
--- a/services/chat/package.json
+++ b/services/chat/package.json
@@ -12,8 +12,8 @@
     "test:acceptance:_run": "mocha --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js",
     "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js",
     "lint": "eslint --max-warnings 0 --format unix .",
-    "format": "prettier --list-different $PWD/'**/*.js'",
-    "format:fix": "prettier --write $PWD/'**/*.js'",
+    "format": "prettier --list-different $PWD/'**/*.*js'",
+    "format:fix": "prettier --write $PWD/'**/*.*js'",
     "lint:fix": "eslint --fix .",
     "types:check": "tsc --noEmit"
   },
diff --git a/services/clsi/package.json b/services/clsi/package.json
index 8df44c7150..980a893803 100644
--- a/services/clsi/package.json
+++ b/services/clsi/package.json
@@ -11,8 +11,8 @@
     "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP",
     "nodemon": "node --watch app.js",
     "lint": "eslint --max-warnings 0 --format unix .",
-    "format": "prettier --list-different $PWD/'**/*.js'",
-    "format:fix": "prettier --write $PWD/'**/*.js'",
+    "format": "prettier --list-different $PWD/'**/*.*js'",
+    "format:fix": "prettier --write $PWD/'**/*.*js'",
     "lint:fix": "eslint --fix .",
     "types:check": "tsc --noEmit"
   },
diff --git a/services/contacts/package.json b/services/contacts/package.json
index 201a6b647f..adbe99104d 100644
--- a/services/contacts/package.json
+++ b/services/contacts/package.json
@@ -12,8 +12,8 @@
     "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP",
     "nodemon": "node --watch app.js",
     "lint": "eslint --max-warnings 0 --format unix .",
-    "format": "prettier --list-different $PWD/'**/*.js'",
-    "format:fix": "prettier --write $PWD/'**/*.js'",
+    "format": "prettier --list-different $PWD/'**/*.*js'",
+    "format:fix": "prettier --write $PWD/'**/*.*js'",
     "lint:fix": "eslint --fix .",
     "types:check": "tsc --noEmit"
   },
diff --git a/services/docstore/package.json b/services/docstore/package.json
index 87f5e0b8d1..dee0ba2494 100644
--- a/services/docstore/package.json
+++ b/services/docstore/package.json
@@ -11,8 +11,8 @@
     "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP",
     "nodemon": "node --watch app.js",
     "lint": "eslint --max-warnings 0 --format unix .",
-    "format": "prettier --list-different $PWD/'**/*.js'",
-    "format:fix": "prettier --write $PWD/'**/*.js'",
+    "format": "prettier --list-different $PWD/'**/*.*js'",
+    "format:fix": "prettier --write $PWD/'**/*.*js'",
     "lint:fix": "eslint --fix .",
     "types:check": "tsc --noEmit"
   },
diff --git a/services/document-updater/package.json b/services/document-updater/package.json
index 1a00f5ead1..5cb49c6de8 100644
--- a/services/document-updater/package.json
+++ b/services/document-updater/package.json
@@ -12,8 +12,8 @@
     "nodemon": "node --watch app.js",
     "benchmark:apply": "node benchmarks/apply",
     "lint": "eslint --max-warnings 0 --format unix .",
-    "format": "prettier --list-different $PWD/'**/*.js'",
-    "format:fix": "prettier --write $PWD/'**/*.js'",
+    "format": "prettier --list-different $PWD/'**/*.*js'",
+    "format:fix": "prettier --write $PWD/'**/*.*js'",
     "lint:fix": "eslint --fix .",
     "types:check": "tsc --noEmit"
   },
diff --git a/services/filestore/package.json b/services/filestore/package.json
index ddf4bf3405..050beecaf9 100644
--- a/services/filestore/package.json
+++ b/services/filestore/package.json
@@ -11,8 +11,8 @@
     "start": "node app.js",
     "nodemon": "node --watch app.js",
     "lint": "eslint --max-warnings 0 --format unix .",
-    "format": "prettier --list-different $PWD/'**/*.js'",
-    "format:fix": "prettier --write $PWD/'**/*.js'",
+    "format": "prettier --list-different $PWD/'**/*.*js'",
+    "format:fix": "prettier --write $PWD/'**/*.*js'",
     "test:acceptance:_run": "mocha --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js",
     "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js",
     "lint:fix": "eslint --fix .",
diff --git a/services/history-v1/package.json b/services/history-v1/package.json
index 34ab6c58a2..fcf09e18de 100644
--- a/services/history-v1/package.json
+++ b/services/history-v1/package.json
@@ -53,8 +53,8 @@
     "start": "node app.js",
     "lint": "eslint --max-warnings 0 --format unix .",
     "lint:fix": "eslint --fix .",
-    "format": "prettier --list-different $PWD/'**/*.js'",
-    "format:fix": "prettier --write $PWD/'**/*.js'",
+    "format": "prettier --list-different $PWD/'**/*.*js'",
+    "format:fix": "prettier --write $PWD/'**/*.*js'",
     "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP",
     "test:acceptance": "npm run test:acceptance:_run -- --grep=$MOCHA_GREP",
     "test:unit:_run": "mocha --recursive --reporter spec $@ test/unit/js",
diff --git a/services/notifications/package.json b/services/notifications/package.json
index 5ae86d0c03..08d50a0448 100644
--- a/services/notifications/package.json
+++ b/services/notifications/package.json
@@ -11,8 +11,8 @@
     "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP",
     "nodemon": "node --watch app.js",
     "lint": "eslint --max-warnings 0 --format unix .",
-    "format": "prettier --list-different $PWD/'**/*.js'",
-    "format:fix": "prettier --write $PWD/'**/*.js'",
+    "format": "prettier --list-different $PWD/'**/*.*js'",
+    "format:fix": "prettier --write $PWD/'**/*.*js'",
     "lint:fix": "eslint --fix .",
     "types:check": "tsc --noEmit"
   },
diff --git a/services/project-history/package.json b/services/project-history/package.json
index 0a77d2556a..69f7b043c5 100644
--- a/services/project-history/package.json
+++ b/services/project-history/package.json
@@ -12,8 +12,8 @@
     "test:acceptance:_run": "LOG_LEVEL=fatal mocha --loader=esmock --recursive --reporter spec --timeout 15000 --exit $@ test/acceptance/js",
     "test:unit:_run": "LOG_LEVEL=fatal mocha --loader=esmock --recursive --reporter spec $@ test/unit/js",
     "lint": "eslint --max-warnings 0 --format unix .",
-    "format": "prettier --list-different $PWD/'**/*.js'",
-    "format:fix": "prettier --write $PWD/'**/*.js'",
+    "format": "prettier --list-different $PWD/'**/*.*js'",
+    "format:fix": "prettier --write $PWD/'**/*.*js'",
     "lint:fix": "eslint --fix .",
     "types:check": "tsc --noEmit"
   },
diff --git a/services/real-time/package.json b/services/real-time/package.json
index 22366ae4c4..69c21f8351 100644
--- a/services/real-time/package.json
+++ b/services/real-time/package.json
@@ -11,8 +11,8 @@
     "test:unit": "npm run test:unit:_run -- --grep=$MOCHA_GREP",
     "nodemon": "node --watch app.js",
     "lint": "eslint --max-warnings 0 --format unix .",
-    "format": "prettier --list-different $PWD/'**/*.js'",
-    "format:fix": "prettier --write $PWD/'**/*.js'",
+    "format": "prettier --list-different $PWD/'**/*.*js'",
+    "format:fix": "prettier --write $PWD/'**/*.*js'",
     "lint:fix": "eslint --fix .",
     "types:check": "tsc --noEmit"
   },
diff --git a/services/spelling/package.json b/services/spelling/package.json
index 8167888aa5..79ff57a690 100644
--- a/services/spelling/package.json
+++ b/services/spelling/package.json
@@ -17,8 +17,8 @@
     "nodemon": "node --watch app.js",
     "compile:smoke_tests": "[ ! -e test/smoke/coffee ] &&  echo 'No smoke tests to compile' || coffee -o test/smoke/js -c test/smoke/coffee",
     "lint": "eslint --max-warnings 0 --format unix .",
-    "format": "prettier --list-different $PWD/'**/*.js'",
-    "format:fix": "prettier --write $PWD/'**/*.js'",
+    "format": "prettier --list-different $PWD/'**/*.*js'",
+    "format:fix": "prettier --write $PWD/'**/*.*js'",
     "lint:fix": "eslint --fix .",
     "types:check": "tsc --noEmit"
   },
diff --git a/tsconfig.backend.json b/tsconfig.backend.json
index 17237dd29a..76f7f3cc5b 100644
--- a/tsconfig.backend.json
+++ b/tsconfig.backend.json
@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "module": "esnext",
     "allowJs": true,
     "esModuleInterop": true,
     "moduleResolution": "node",
@@ -10,6 +11,7 @@
       "@overleaf/fetch-utils": ["./libraries/fetch-utils"],
       "@overleaf/logger": ["./libraries/logger"],
       "@overleaf/metrics": ["./libraries/metrics"],
+      "@overleaf/mongo-utils": ["./libraries/mongo-utils"],
       "@overleaf/object-persistor": ["./libraries/object-persistor"],
       "@overleaf/o-error": ["./libraries/o-error"],
       "overleaf-editor-core": ["./libraries/overleaf-editor-core"],