diff --git a/vendor/nim-chronos b/vendor/nim-chronos
index 41f77d261..92acf68b0 160000
--- a/vendor/nim-chronos
+++ b/vendor/nim-chronos
@@ -1 +1 @@
-Subproject commit 41f77d261ead2508acdd3bd3f88a5cbbcefff05f
+Subproject commit 92acf68b04070dfe8eb65bab71fbf63804979a16
diff --git a/vendor/nim-eth b/vendor/nim-eth
index 5aaeb67eb..11049fb87 160000
--- a/vendor/nim-eth
+++ b/vendor/nim-eth
@@ -1 +1 @@
-Subproject commit 5aaeb67ebedbefaae2f719f245a96c1a80c42f81
+Subproject commit 11049fb87d076a25e0fa8e2fda95acaf119738da
diff --git a/vendor/nim-json-serialization b/vendor/nim-json-serialization
index 3f1ce24ee..9c74b885e 160000
--- a/vendor/nim-json-serialization
+++ b/vendor/nim-json-serialization
@@ -1 +1 @@
-Subproject commit 3f1ce24ee116daedbc9c8be525e63ec03e185a28
+Subproject commit 9c74b885eaeb6726543e69fde2f7d8837357c1d7
diff --git a/vendor/nim-metrics b/vendor/nim-metrics
index 51f1227d0..f51401566 160000
--- a/vendor/nim-metrics
+++ b/vendor/nim-metrics
@@ -1 +1 @@
-Subproject commit 51f1227d0fd04ce84b1ef784b11280cb7875348c
+Subproject commit f51401566ff7719185f52b5efe61d551e479f676
diff --git a/vendor/nim-regex b/vendor/nim-regex
index 577c4ec3b..a3f5389e8 160000
--- a/vendor/nim-regex
+++ b/vendor/nim-regex
@@ -1 +1 @@
-Subproject commit 577c4ec3b235c5fd2653a9c86cbc4a576cfc0869
+Subproject commit a3f5389e872e45a664aff3dfb80eab8069c688c5
diff --git a/vendor/nim-toml-serialization b/vendor/nim-toml-serialization
index 43c546c36..2bdfec0eb 160000
--- a/vendor/nim-toml-serialization
+++ b/vendor/nim-toml-serialization
@@ -1 +1 @@
-Subproject commit 43c546c365af4d291c33b7d94b5b730300165aaf
+Subproject commit 2bdfec0eb7156d5773bc5d25fca3b3b77d0869f1
diff --git a/vendor/nimbus-build-system b/vendor/nimbus-build-system
index 6cdd14282..cf0c9cfa4 160000
--- a/vendor/nimbus-build-system
+++ b/vendor/nimbus-build-system
@@ -1 +1 @@
-Subproject commit 6cdd14282b7c813c2ae4b9a9d749c3ff5ce1b54a
+Subproject commit cf0c9cfa408189c6d428799bf2e9da8d0c0f7f08
diff --git a/waku/utils/collector.nim b/waku/utils/collector.nim
index 29310eb62..9bb26b8a1 100644
--- a/waku/utils/collector.nim
+++ b/waku/utils/collector.nim
@@ -6,14 +6,15 @@ else:
 import
   metrics
 
-proc parseCollectorIntoF64(collector: Collector): float64 {.gcsafe, raises: [Defect] } = 
+proc parseCollectorIntoF64(collector: SimpleCollector): float64 {.gcsafe, raises: [Defect] } = 
   {.gcsafe.}:
     var total = 0.float64
-    for key in collector.metrics.keys():
-      try:
-        total = total + collector.value(key)
-      except KeyError:
-        discard
+    for metrics in collector.metrics:
+      for metric in metrics:
+        try:
+          total = total + metric.value
+        except KeyError:
+          discard
     return total
 
 template parseAndAccumulate*(collector: Collector, cumulativeValue: float64): float64 =
diff --git a/waku/waku_dnsdisc.nim b/waku/waku_dnsdisc.nim
index 1836f883c..21f5c6d57 100644
--- a/waku/waku_dnsdisc.nim
+++ b/waku/waku_dnsdisc.nim
@@ -21,7 +21,6 @@ import
   libp2p/multiaddress,
   libp2p/peerid,
   dnsdisc/client
-
 import
   ./waku_core