diff --git a/Cargo.lock b/Cargo.lock
index 05fc7e0..4e190fd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1396,7 +1396,6 @@ version = "0.1.0"
 dependencies = [
  "clap",
  "futures",
- "once_cell",
  "parity-scale-codec",
  "subxt",
  "tokio",
@@ -2298,8 +2297,8 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "subxt"
-version = "0.18.1"
-source = "git+https://github.com/paritytech/subxt.git?branch=at-block-stats#16d4306dfa7725d11c1c7f0539b4b3e3f0d99443"
+version = "0.19.0"
+source = "git+https://github.com/paritytech/subxt.git?branch=master#cc0b1ec84acae528a5172ce87398bfef48e9cf2d"
 dependencies = [
  "async-trait",
  "bitvec",
@@ -2322,8 +2321,8 @@ dependencies = [
 
 [[package]]
 name = "subxt-codegen"
-version = "0.18.1"
-source = "git+https://github.com/paritytech/subxt.git?branch=at-block-stats#16d4306dfa7725d11c1c7f0539b4b3e3f0d99443"
+version = "0.19.0"
+source = "git+https://github.com/paritytech/subxt.git?branch=master#cc0b1ec84acae528a5172ce87398bfef48e9cf2d"
 dependencies = [
  "async-trait",
  "darling",
@@ -2340,8 +2339,8 @@ dependencies = [
 
 [[package]]
 name = "subxt-macro"
-version = "0.18.1"
-source = "git+https://github.com/paritytech/subxt.git?branch=at-block-stats#16d4306dfa7725d11c1c7f0539b4b3e3f0d99443"
+version = "0.19.0"
+source = "git+https://github.com/paritytech/subxt.git?branch=master#cc0b1ec84acae528a5172ce87398bfef48e9cf2d"
 dependencies = [
  "async-trait",
  "darling",
diff --git a/Cargo.toml b/Cargo.toml
index e2a71ba..0eb7701 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,6 +7,5 @@ edition = "2021"
 clap = { version = "3", features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3"  }
 futures = "0.3"
-subxt = { git = "https://github.com/paritytech/subxt.git", branch = "at-block-stats" }
+subxt = { git = "https://github.com/paritytech/subxt.git", branch = "master" }
 tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
-once_cell = "1"
diff --git a/src/lib.rs b/src/lib.rs
index c1fdd91..7ada924 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,7 +1,8 @@
 use futures::{TryStream, TryStreamExt};
 use std::{boxed::Box, fmt, sync::Arc};
 use subxt::{
-    rpc::RpcError, sp_runtime::traits::Header, ClientBuilder, DefaultConfig, DefaultExtra,
+    rpc::RpcError, sp_runtime::traits::Header, ClientBuilder, DefaultConfig,
+    SubstrateExtrinsicParams,
 };
 
 /// 50% of what is stored in configuration::activeConfig::maxPovSize at the relay chain.
@@ -10,7 +11,8 @@ const POV_MAX: u64 = 5_242_880 / 2;
 #[subxt::subxt(runtime_metadata_path = "metadata/substrate.scale")]
 pub mod substrate {}
 
-type SubstrateRuntime = substrate::RuntimeApi<DefaultConfig, DefaultExtra<DefaultConfig>>;
+type SubstrateRuntime =
+    substrate::RuntimeApi<DefaultConfig, SubstrateExtrinsicParams<DefaultConfig>>;
 
 #[derive(Debug)]
 pub struct BlockStats {
@@ -29,7 +31,7 @@ impl fmt::Display for BlockStats {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(
             f,
-            "{:04}: PoV Size={:04}KiB({:03}%) Weight={:07}µs({:03}%) Witness={:04}KiB Block={:04}KiB NumExtrinsics={:04}",
+            "{:04}: PoV Size={:04}KiB({:03}%) Weight={:07}ms({:03}%) Witness={:04}KiB Block={:04}KiB NumExtrinsics={:04}",
             self.number,
             self.pov_len / 1024,
             self.pov_len * 100 / self.max_pov,