diff --git a/essentials/assets/rococo_metadata.scale b/essentials/assets/rococo_metadata.scale
new file mode 100644
index 00000000..a084030f
Binary files /dev/null and b/essentials/assets/rococo_metadata.scale differ
diff --git a/essentials/src/collector/candidate_record.rs b/essentials/src/collector/candidate_record.rs
index 58bdd07d..31f60a97 100644
--- a/essentials/src/collector/candidate_record.rs
+++ b/essentials/src/collector/candidate_record.rs
@@ -71,11 +71,11 @@ where
 		let mut state = serializer.serialize_struct("CandidateDescriptor", 9)?;
 		state.serialize_field("para_id", &self.para_id.0)?;
 		state.serialize_field("relay_parent", &self.relay_parent)?;
-		state.serialize_field("collator", &self.collator.0 .0)?;
+		state.serialize_field("collator", &self.collator.0)?;
 		state.serialize_field("persisted_validation_data_hash", &self.persisted_validation_data_hash)?;
 		state.serialize_field("pov_hash", &self.pov_hash)?;
 		state.serialize_field("erasure_root", &self.erasure_root)?;
-		state.serialize_field("signature", Bytes::new(&self.signature.0 .0))?;
+		state.serialize_field("signature", Bytes::new(&self.signature.0))?;
 		state.serialize_field("para_head", &self.para_head)?;
 		state.serialize_field("validation_code_hash", &self.validation_code_hash.0)?;
 		state.end()
diff --git a/essentials/src/metadata.rs b/essentials/src/metadata.rs
index fe8eaad0..6401cc5f 100644
--- a/essentials/src/metadata.rs
+++ b/essentials/src/metadata.rs
@@ -15,7 +15,7 @@
 // along with polkadot-introspector.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#[subxt::subxt(runtime_metadata_path = "assets/polkadot_metadata.scale")]
+#[subxt::subxt(runtime_metadata_path = "assets/rococo_metadata.scale")]
 pub mod polkadot {}
 
-pub use polkadot::runtime_types::polkadot_primitives::v6 as polkadot_primitives;
+pub use polkadot::runtime_types::polkadot_primitives::v7 as polkadot_primitives;
diff --git a/essentials/src/types.rs b/essentials/src/types.rs
index 8a7a63d3..a7af2bb3 100644
--- a/essentials/src/types.rs
+++ b/essentials/src/types.rs
@@ -22,7 +22,7 @@ use subxt::{
 	config::substrate::{BlakeTwo256, SubstrateHeader},
 	utils,
 };
-use subxt_runtime_types::polkadot_runtime as runtime;
+use subxt_runtime_types::rococo_runtime as runtime;
 
 pub type BlockNumber = u32;
 pub type H256 = utils::H256;
diff --git a/parachain-tracer/src/test_utils.rs b/parachain-tracer/src/test_utils.rs
index 53342aef..4dc5fdc9 100644
--- a/parachain-tracer/src/test_utils.rs
+++ b/parachain-tracer/src/test_utils.rs
@@ -27,7 +27,6 @@ use polkadot_introspector_essentials::{
 			bounded_collections::bounded_vec::BoundedVec,
 			polkadot_core_primitives::CandidateHash,
 			polkadot_parachain_primitives::primitives::{HeadData, Id, ValidationCodeHash},
-			sp_core::sr25519::{Public, Signature},
 			sp_runtime::generic::{digest::Digest, header::Header},
 		},
 		polkadot_primitives::{
@@ -59,7 +58,7 @@ pub fn create_backed_candidate(para_id: u32) -> BackedCandidate<H256> {
 			descriptor: CandidateDescriptor {
 				para_id: Id(para_id),
 				relay_parent: H256::random(),
-				collator: collator_app::Public(Public([0; 32])),
+				collator: collator_app::Public([0; 32]),
 				persisted_validation_data_hash: Default::default(),
 				pov_hash: Default::default(),
 				erasure_root: Default::default(),
@@ -188,9 +187,9 @@ pub async fn storage_write<T: Encode>(
 }
 
 fn create_collator_signature() -> collator_app::Signature {
-	collator_app::Signature(Signature([0; 64]))
+	collator_app::Signature([0; 64])
 }
 
 fn create_validator_signature() -> validator_app::Signature {
-	validator_app::Signature(Signature([0; 64]))
+	validator_app::Signature([0; 64])
 }
diff --git a/whois/src/main.rs b/whois/src/main.rs
index 30f31f97..a817dcc3 100644
--- a/whois/src/main.rs
+++ b/whois/src/main.rs
@@ -158,7 +158,7 @@ fn desired_node_id(node: &AddedNode, authority_key: AccountId32) -> bool {
 }
 
 fn get_authority_key(keys: SessionKeys) -> AccountId32 {
-	AccountId32::from(keys.grandpa.0 .0)
+	AccountId32::from(keys.grandpa.0)
 }
 
 fn clear_last_two_lines() {