diff --git a/pallets/did/src/lib.rs b/pallets/did/src/lib.rs
index 777b20e89e..249fd5886f 100644
--- a/pallets/did/src/lib.rs
+++ b/pallets/did/src/lib.rs
@@ -1159,12 +1159,13 @@ pub mod pallet {
 			Ok(())
 		}
 
+		#[allow(clippy::boxed_local)]
 		#[pallet::call_index(15)]
 		#[pallet::weight(1000)]
 		pub fn dispatch_as(
 			origin: OriginFor<T>,
 			did_identifier: DidIdentifierOf<T>,
-			call: DidCallableOf<T>,
+			call: Box<DidCallableOf<T>>,
 		) -> DispatchResultWithPostInfo {
 			let who = ensure_signed(origin)?;
 
diff --git a/pallets/did/src/mock.rs b/pallets/did/src/mock.rs
index 0521533153..a2d338fd95 100644
--- a/pallets/did/src/mock.rs
+++ b/pallets/did/src/mock.rs
@@ -349,7 +349,7 @@ pub fn get_ecdsa_delegation_key(default: bool) -> ecdsa::Pair {
 	}
 }
 
-pub fn generate_key_id(key: &DidPublicKey) -> KeyIdOf<Test> {
+pub fn generate_key_id(key: &DidPublicKey<AccountId>) -> KeyIdOf<Test> {
 	crate_utils::calculate_key_id::<Test>(key)
 }
 
diff --git a/pallets/did/src/mock_utils.rs b/pallets/did/src/mock_utils.rs
index 09a1a89a61..684955d184 100644
--- a/pallets/did/src/mock_utils.rs
+++ b/pallets/did/src/mock_utils.rs
@@ -98,7 +98,7 @@ pub fn generate_base_did_creation_details<T: Config>(
 }
 
 pub fn generate_base_did_details<T>(
-	authentication_key: DidVerificationKey,
+	authentication_key: DidVerificationKey<AccountIdOf<T>>,
 	deposit_owner: Option<AccountIdOf<T>>,
 ) -> DidDetails<T>
 where
diff --git a/runtime-api/did/src/did_details.rs b/runtime-api/did/src/did_details.rs
index 82f6e2fd6f..c4e6722173 100644
--- a/runtime-api/did/src/did_details.rs
+++ b/runtime-api/did/src/did_details.rs
@@ -29,7 +29,7 @@ pub struct DidDetails<Key: Ord, BlockNumber: MaxEncodedLen, AccountId, Balance>
 	pub key_agreement_keys: BTreeSet<Key>,
 	pub delegation_key: Option<Key>,
 	pub attestation_key: Option<Key>,
-	pub public_keys: BTreeMap<Key, DidPublicKeyDetails<BlockNumber>>,
+	pub public_keys: BTreeMap<Key, DidPublicKeyDetails<BlockNumber, AccountId>>,
 	pub last_tx_counter: u64,
 	pub deposit: Deposit<AccountId, Balance>,
 }
diff --git a/runtimes/peregrine/src/tests.rs b/runtimes/peregrine/src/tests.rs
index 9f994c5dbe..5eab813d96 100644
--- a/runtimes/peregrine/src/tests.rs
+++ b/runtimes/peregrine/src/tests.rs
@@ -68,7 +68,7 @@ fn did_storage_sizes() {
 	assert_eq!(max_did_endpoint_size, MAX_SERVICE_ENDPOINT_BYTE_LENGTH as usize);
 
 	// DID key
-	let max_did_key_size = did::did_details::DidPublicKey::max_encoded_len();
+	let max_did_key_size = did::did_details::DidPublicKey::<AccountId>::max_encoded_len();
 	assert_eq!(max_did_key_size, MAX_KEY_LENGTH as usize);
 }
 
diff --git a/runtimes/spiritnet/src/tests.rs b/runtimes/spiritnet/src/tests.rs
index 4a8adfcf92..2341c1b88c 100644
--- a/runtimes/spiritnet/src/tests.rs
+++ b/runtimes/spiritnet/src/tests.rs
@@ -68,7 +68,7 @@ fn did_storage_sizes() {
 	assert_eq!(max_did_endpoint_size, MAX_SERVICE_ENDPOINT_BYTE_LENGTH as usize);
 
 	// DID key
-	let max_did_key_size = did::did_details::DidPublicKey::max_encoded_len();
+	let max_did_key_size = did::did_details::DidPublicKey::<AccountId>::max_encoded_len();
 	assert_eq!(max_did_key_size, MAX_KEY_LENGTH as usize);
 }