diff --git a/.gitmodules b/.gitmodules
index e70cc563b..819a84983 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -120,3 +120,13 @@
 	url = https://github.com/status-im/nim-unittest2.git
 	ignore = untracked
 	branch = master
+[submodule "vendor/nim-websock"]
+	path = vendor/nim-websock
+	url = https://github.com/status-im/nim-websock.git
+	ignore = untracked
+	branch = master
+[submodule "vendor/nim-zlib"]
+	path = vendor/nim-zlib
+	url = https://github.com/status-im/nim-zlib.git
+	ignore = untracked
+	branch = master
diff --git a/waku/common/wakubridge.nim b/waku/common/wakubridge.nim
index 8d899233d..44652340f 100644
--- a/waku/common/wakubridge.nim
+++ b/waku/common/wakubridge.nim
@@ -4,7 +4,7 @@ import
   std/[tables, hashes, sequtils],
   chronos, confutils, chronicles, chronicles/topics_registry, 
   metrics, metrics/chronos_httpserver,
-  stew/[byteutils, objects],
+  stew/byteutils,
   stew/shims/net as stewNet, json_rpc/rpcserver,
   # Waku v1 imports
   eth/[keys, p2p], eth/common/utils,
diff --git a/waku/v2/node/jsonrpc/debug_api.nim b/waku/v2/node/jsonrpc/debug_api.nim
index 9dcbf388c..c6c8986c5 100644
--- a/waku/v2/node/jsonrpc/debug_api.nim
+++ b/waku/v2/node/jsonrpc/debug_api.nim
@@ -1,3 +1,5 @@
+{.push raises: [Defect, CatchableError].}
+
 import
   chronicles,
   json_rpc/rpcserver,
diff --git a/waku/v2/node/jsonrpc/jsonrpc_types.nim b/waku/v2/node/jsonrpc/jsonrpc_types.nim
index ef1bd9dc2..fa4219744 100644
--- a/waku/v2/node/jsonrpc/jsonrpc_types.nim
+++ b/waku/v2/node/jsonrpc/jsonrpc_types.nim
@@ -1,3 +1,5 @@
+{.push raises: [Defect].}
+
 import
   std/[options,tables],
   eth/keys,
diff --git a/waku/v2/node/jsonrpc/jsonrpc_utils.nim b/waku/v2/node/jsonrpc/jsonrpc_utils.nim
index 01a900f08..d4ddaa237 100644
--- a/waku/v2/node/jsonrpc/jsonrpc_utils.nim
+++ b/waku/v2/node/jsonrpc/jsonrpc_utils.nim
@@ -1,3 +1,5 @@
+{.push raises: [Defect].}
+
 import
   std/[options, json],
   eth/keys,
diff --git a/waku/v2/node/storage/message/waku_message_store.nim b/waku/v2/node/storage/message/waku_message_store.nim
index 3b7a0952a..ddc24b3fe 100644
--- a/waku/v2/node/storage/message/waku_message_store.nim
+++ b/waku/v2/node/storage/message/waku_message_store.nim
@@ -1,7 +1,7 @@
 {.push raises: [Defect].}
 
 import 
-  std/[tables, strutils],
+  std/tables,
   sqlite3_abi,
   stew/[byteutils, results],
   ./message_store,
diff --git a/waku/v2/protocol/waku_lightpush/waku_lightpush.nim b/waku/v2/protocol/waku_lightpush/waku_lightpush.nim
index f3afa991f..79970de1c 100644
--- a/waku/v2/protocol/waku_lightpush/waku_lightpush.nim
+++ b/waku/v2/protocol/waku_lightpush/waku_lightpush.nim
@@ -1,7 +1,7 @@
 {.push raises: [Defect].}
 
 import
-  std/[tables, sequtils, options],
+  std/[tables, options],
   bearssl,
   chronos, chronicles, metrics, stew/results,
   libp2p/protocols/pubsub/pubsubpeer,
diff --git a/waku/v2/protocol/waku_rln_relay/waku_rln_relay_types.nim b/waku/v2/protocol/waku_rln_relay/waku_rln_relay_types.nim
index 28cdfe45b..5a444092d 100644
--- a/waku/v2/protocol/waku_rln_relay/waku_rln_relay_types.nim
+++ b/waku/v2/protocol/waku_rln_relay/waku_rln_relay_types.nim
@@ -1,5 +1,7 @@
+{.push raises: [Defect].}
+
 import 
-  chronicles, options, chronos, stint,
+  options, chronos, stint,
   web3,
   eth/keys
 
diff --git a/waku/v2/protocol/waku_store/waku_store_types.nim b/waku/v2/protocol/waku_store/waku_store_types.nim
index 5e915d422..0c3d43130 100644
--- a/waku/v2/protocol/waku_store/waku_store_types.nim
+++ b/waku/v2/protocol/waku_store/waku_store_types.nim
@@ -1,5 +1,7 @@
 ## Types for waku_store protocol.
 
+{.push raises: [Defect].}
+
 # Group by std, external then internal imports
 import
   # external imports
diff --git a/waku/v2/utils/pagination.nim b/waku/v2/utils/pagination.nim
index 115b0e955..d2c617e7a 100644
--- a/waku/v2/utils/pagination.nim
+++ b/waku/v2/utils/pagination.nim
@@ -2,6 +2,8 @@
 ##
 ## Used by both message store and store protocol.
 
+{.push raises: [Defect].}
+
 import nimcrypto/hash
 
 type
diff --git a/waku/v2/utils/requests.nim b/waku/v2/utils/requests.nim
index f0da4962c..0b8db18f7 100644
--- a/waku/v2/utils/requests.nim
+++ b/waku/v2/utils/requests.nim
@@ -1,5 +1,7 @@
 # Request utils.
 
+{.push raises: [Defect].}
+
 import bearssl, stew/byteutils
 
 proc generateRequestId*(rng: ref BrHmacDrbgContext): string =