diff --git a/node/runtime/common/src/impls.rs b/node/runtime/common/src/impls.rs
index b5b2f83fbb..96d8e0fe07 100644
--- a/node/runtime/common/src/impls.rs
+++ b/node/runtime/common/src/impls.rs
@@ -30,9 +30,18 @@ use sp_npos_elections::ExtendedBalance;
 use sp_runtime::{traits::TrailingZeroInput, RuntimeDebug};
 // --- darwinia-network ---
 use crate::*;
-use bp_messages::{source_chain::*, *};
-use bridge_runtime_common::messages::{source::*, *};
-use drml_primitives::*;
+use bp_messages::{
+	source_chain::{LaneMessageVerifier, Sender},
+	LaneId, OutboundLaneData,
+};
+use bridge_runtime_common::messages::{
+	source::{
+		FromThisChainMessagePayload, BAD_ORIGIN, OUTBOUND_LANE_DISABLED, TOO_LOW_FEE,
+		TOO_MANY_PENDING_MESSAGES,
+	},
+	AccountIdOf, BalanceOf, MessageBridge, ThisChain, ThisChainWithMessages,
+};
+use drml_primitives::AccountId;
 
 darwinia_support::impl_account_data! {
 	struct AccountData<Balance>
diff --git a/node/runtime/pangolin/src/bridges_message/pangolin_parachain.rs b/node/runtime/pangolin/src/bridges_message/pangolin_parachain.rs
index 9bc5836e20..bcbb71cfc6 100644
--- a/node/runtime/pangolin/src/bridges_message/pangolin_parachain.rs
+++ b/node/runtime/pangolin/src/bridges_message/pangolin_parachain.rs
@@ -28,16 +28,24 @@ use sp_runtime::{traits::Zero, FixedPointNumber, FixedU128};
 use sp_std::ops::RangeInclusive;
 // --- darwinia-network ---
 use crate::*;
-use bp_messages::{source_chain::*, target_chain::*, *};
+use bp_messages::{
+	source_chain::TargetHeaderChain,
+	target_chain::{ProvedMessages, SourceHeaderChain},
+	InboundLaneData, LaneId, Message, MessageNonce, Parameter,
+};
 use bp_rococo::parachains::ParaId;
-use bp_runtime::{ChainId, *};
+use bp_runtime::{Chain, ChainId, PANGOLIN_CHAIN_ID, PANGOLIN_PARACHAIN_CHAIN_ID};
 use bridge_runtime_common::{
-	lanes::*,
+	lanes::PANGOLIN_PANGOLIN_PARACHAIN_LANE,
 	messages::{
 		self,
-		source::{self, *},
-		target::{self, *},
-		BalanceOf, *,
+		source::{self, FromBridgedChainMessagesDeliveryProof, FromThisChainMessagePayload},
+		target::{
+			self, FromBridgedChainEncodedMessageCall, FromBridgedChainMessageDispatch,
+			FromBridgedChainMessagePayload, FromBridgedChainMessagesProof,
+		},
+		BalanceOf, BridgedChainWithMessages, ChainWithMessages, MessageBridge, MessageTransaction,
+		ThisChainWithMessages,
 	},
 };
 use drml_common_runtime::impls::FromThisChainMessageVerifier;
diff --git a/node/runtime/pangolin/src/bridges_message/pangoro.rs b/node/runtime/pangolin/src/bridges_message/pangoro.rs
index 32ea78b19f..367adfbe5a 100644
--- a/node/runtime/pangolin/src/bridges_message/pangoro.rs
+++ b/node/runtime/pangolin/src/bridges_message/pangoro.rs
@@ -30,15 +30,23 @@ use sp_runtime::{traits::Zero, FixedPointNumber, FixedU128};
 use sp_std::{ops::RangeInclusive, prelude::*};
 // --- darwinia-network ---
 use crate::*;
-use bp_messages::{source_chain::*, target_chain::*, *};
-use bp_runtime::{ChainId, *};
+use bp_messages::{
+	source_chain::TargetHeaderChain,
+	target_chain::{ProvedMessages, SourceHeaderChain},
+	InboundLaneData, LaneId, Message, MessageNonce, Parameter,
+};
+use bp_runtime::{Chain, ChainId, PANGOLIN_CHAIN_ID, PANGORO_CHAIN_ID};
 use bridge_runtime_common::{
-	lanes::*,
+	lanes::PANGORO_PANGOLIN_LANE,
 	messages::{
 		self,
-		source::{self, *},
-		target::{self, *},
-		BalanceOf, *,
+		source::{self, FromBridgedChainMessagesDeliveryProof, FromThisChainMessagePayload},
+		target::{
+			self, FromBridgedChainEncodedMessageCall, FromBridgedChainMessageDispatch,
+			FromBridgedChainMessagePayload, FromBridgedChainMessagesProof,
+		},
+		BalanceOf, BridgedChainWithMessages, ChainWithMessages, MessageBridge, MessageTransaction,
+		ThisChainWithMessages,
 	},
 };
 use drml_common_runtime::impls::FromThisChainMessageVerifier;
@@ -65,9 +73,6 @@ pub type FromPangoroEncodedCall = FromBridgedChainEncodedMessageCall<Call>;
 pub type FromPangoroMessageDispatch =
 	FromBridgedChainMessageDispatch<WithPangoroMessageBridge, Runtime, Ring, WithPangoroDispatch>;
 
-/// The s2s backing pallet index in the pangoro chain runtime.
-pub const PANGORO_S2S_BACKING_PALLET_INDEX: u8 = 20;
-
 /// Initial value of `PangoroToPangolinConversionRate` parameter.
 pub const INITIAL_PANGORO_TO_PANGOLIN_CONVERSION_RATE: FixedU128 =
 	FixedU128::from_inner(FixedU128::DIV);
diff --git a/node/runtime/pangoro/src/bridges_message/pangolin.rs b/node/runtime/pangoro/src/bridges_message/pangolin.rs
index d8ae6d91ba..41b07bb9c2 100644
--- a/node/runtime/pangoro/src/bridges_message/pangolin.rs
+++ b/node/runtime/pangoro/src/bridges_message/pangolin.rs
@@ -30,15 +30,23 @@ use sp_runtime::{traits::Zero, FixedPointNumber, FixedU128};
 use sp_std::{ops::RangeInclusive, prelude::*};
 // --- darwinia-network ---
 use crate::*;
-use bp_messages::{source_chain::*, target_chain::*, *};
-use bp_runtime::{ChainId, *};
+use bp_messages::{
+	source_chain::TargetHeaderChain,
+	target_chain::{ProvedMessages, SourceHeaderChain},
+	InboundLaneData, LaneId, Message, MessageNonce, Parameter,
+};
+use bp_runtime::{Chain, ChainId, PANGOLIN_CHAIN_ID, PANGORO_CHAIN_ID};
 use bridge_runtime_common::{
-	lanes::*,
+	lanes::PANGORO_PANGOLIN_LANE,
 	messages::{
 		self,
-		source::{self, *},
-		target::{self, *},
-		BalanceOf, *,
+		source::{self, FromBridgedChainMessagesDeliveryProof, FromThisChainMessagePayload},
+		target::{
+			self, FromBridgedChainEncodedMessageCall, FromBridgedChainMessageDispatch,
+			FromBridgedChainMessagePayload, FromBridgedChainMessagesProof,
+		},
+		BalanceOf, BridgedChainWithMessages, ChainWithMessages, MessageBridge, MessageTransaction,
+		ThisChainWithMessages,
 	},
 };
 use drml_common_runtime::impls::FromThisChainMessageVerifier;
@@ -65,9 +73,6 @@ pub type FromPangolinEncodedCall = FromBridgedChainEncodedMessageCall<Call>;
 pub type FromPangolinMessageDispatch =
 	FromBridgedChainMessageDispatch<WithPangolinMessageBridge, Runtime, Ring, WithPangolinDispatch>;
 
-/// The s2s issuing pallet index in the pangolin chain runtime
-pub const PANGOLIN_S2S_ISSUING_PALLET_INDEX: u8 = 49;
-
 /// Initial value of `PangolinToPangoroConversionRate` parameter.
 pub const INITIAL_PANGOLIN_TO_PANGORO_CONVERSION_RATE: FixedU128 =
 	FixedU128::from_inner(FixedU128::DIV);