diff --git a/crates/relayer-all-in-one/src/all_for_one/birelay.rs b/crates/relayer-all-in-one/src/all_for_one/birelay.rs
index 8483c5d176..a0f8eb3d75 100644
--- a/crates/relayer-all-in-one/src/all_for_one/birelay.rs
+++ b/crates/relayer-all-in-one/src/all_for_one/birelay.rs
@@ -1,5 +1,5 @@
 use ibc_relayer_components::logger::traits::level::HasLoggerWithBaseLevels;
-use ibc_relayer_components::relay::traits::auto_relayer::CanAutoRelay;
+use ibc_relayer_components::relay::traits::auto_relayer::{BiRelayMode, CanAutoRelay};
 use ibc_relayer_components::relay::traits::two_way::HasTwoWayRelay;
 
 use crate::all_for_one::relay::AfoRelay;
@@ -8,7 +8,7 @@ use crate::all_for_one::runtime::HasAfoRuntime;
 pub trait AfoBiRelay:
     HasAfoRuntime
     + HasLoggerWithBaseLevels
-    + CanAutoRelay
+    + CanAutoRelay<BiRelayMode>
     + HasTwoWayRelay<RelayAToB = Self::AfoRelayAToB, RelayBToA = Self::AfoRelayBToA>
 {
     type AfoRelayAToB: AfoRelay;
@@ -26,7 +26,7 @@ where
     BiRelay: Clone
         + HasAfoRuntime
         + HasLoggerWithBaseLevels
-        + CanAutoRelay
+        + CanAutoRelay<BiRelayMode>
         + HasTwoWayRelay<RelayAToB = RelayAToB, RelayBToA = RelayBToA>,
 {
     type AfoRelayAToB = RelayAToB;
diff --git a/crates/relayer-all-in-one/src/all_for_one/chain.rs b/crates/relayer-all-in-one/src/all_for_one/chain.rs
index 59044ba491..ffe886fcef 100644
--- a/crates/relayer-all-in-one/src/all_for_one/chain.rs
+++ b/crates/relayer-all-in-one/src/all_for_one/chain.rs
@@ -13,6 +13,7 @@ use ibc_relayer_components::chain::traits::types::connection::{
     HasConnectionHandshakePayloads, HasInitConnectionOptionsType,
 };
 use ibc_relayer_components::chain::traits::types::consensus_state::HasConsensusStateType;
+use ibc_relayer_components::chain::traits::types::ibc::HasIbcChainTypes;
 use ibc_relayer_components::chain::traits::types::ibc_events::write_ack::HasWriteAcknowledgementEvent;
 use ibc_relayer_components::chain::traits::types::packet::{HasIbcPacketFields, HasIbcPacketTypes};
 use ibc_relayer_components::logger::traits::level::HasLoggerWithBaseLevels;
@@ -27,6 +28,7 @@ pub trait AfoChain<Counterparty>:
     + HasTelemetry
     + HasChainTypes
     + CanQueryChainStatus
+    + HasIbcChainTypes<Counterparty>
     + HasIbcPacketFields<Counterparty>
     + HasWriteAcknowledgementEvent<Counterparty>
     + HasConsensusStateType<Counterparty>
@@ -46,7 +48,8 @@ where
 }
 
 pub trait AfoCounterpartyChain<Chain>:
-    HasConsensusStateType<Chain>
+    HasIbcChainTypes<Chain>
+    + HasConsensusStateType<Chain>
     + HasIbcPacketTypes<
         Chain,
         IncomingPacket = Chain::OutgoingPacket,
diff --git a/crates/relayer-all-in-one/src/all_for_one/relay.rs b/crates/relayer-all-in-one/src/all_for_one/relay.rs
index 65334a7bfe..44aa845401 100644
--- a/crates/relayer-all-in-one/src/all_for_one/relay.rs
+++ b/crates/relayer-all-in-one/src/all_for_one/relay.rs
@@ -1,14 +1,14 @@
 use ibc_relayer_components::chain::types::aliases::{IncomingPacket, OutgoingPacket};
 use ibc_relayer_components::logger::traits::level::HasLoggerWithBaseLevels;
 use ibc_relayer_components::relay::impls::client::create::CanCreateClient;
-use ibc_relayer_components::relay::traits::auto_relayer::CanAutoRelay;
+use ibc_relayer_components::relay::traits::auto_relayer::{CanAutoRelay, RelayMode};
 use ibc_relayer_components::relay::traits::chains::HasRelayChains;
 use ibc_relayer_components::relay::traits::channel::open_handshake::CanRelayChannelOpenHandshake;
 use ibc_relayer_components::relay::traits::channel::open_init::CanInitChannel;
 use ibc_relayer_components::relay::traits::connection::open_handshake::CanRelayConnectionOpenHandshake;
 use ibc_relayer_components::relay::traits::connection::open_init::CanInitConnection;
 use ibc_relayer_components::relay::traits::event_relayer::CanRelayEvent;
-use ibc_relayer_components::relay::traits::ibc_message_sender::CanSendIbcMessages;
+use ibc_relayer_components::relay::traits::ibc_message_sender::{CanSendIbcMessages, MainSink};
 use ibc_relayer_components::relay::traits::messages::update_client::CanBuildUpdateClientMessage;
 use ibc_relayer_components::relay::traits::packet::HasRelayPacket;
 use ibc_relayer_components::relay::traits::packet_clear::CanClearReceivePackets;
@@ -18,8 +18,7 @@ use ibc_relayer_components::relay::traits::packet_relayers::ack_packet::CanRelay
 use ibc_relayer_components::relay::traits::packet_relayers::receive_packet::CanRelayReceivePacket;
 use ibc_relayer_components::relay::traits::packet_relayers::timeout_unordered_packet::CanRelayTimeoutUnorderedPacket;
 use ibc_relayer_components::relay::traits::target::{DestinationTarget, SourceTarget};
-use ibc_relayer_components_extra::batch::traits::send_messages_from_batch::CanSendIbcMessagesFromBatchWorker;
-use ibc_relayer_components_extra::relay::impls::packet_relayers::retry::SupportsPacketRetry;
+use ibc_relayer_components_extra::relay::components::packet_relayers::retry::SupportsPacketRetry;
 
 use crate::all_for_one::chain::AfoChain;
 use crate::all_for_one::runtime::HasAfoRuntime;
@@ -34,18 +33,16 @@ pub trait AfoRelay:
     + HasRelayPacket<SrcChainWithPacket = Self::AfoSrcChain, DstChainWithPacket = Self::AfoDstChain>
     + CanBuildUpdateClientMessage<SourceTarget>
     + CanBuildUpdateClientMessage<DestinationTarget>
-    + CanSendIbcMessages<SourceTarget>
-    + CanSendIbcMessages<DestinationTarget>
+    + CanSendIbcMessages<MainSink, SourceTarget>
+    + CanSendIbcMessages<MainSink, DestinationTarget>
     + CanRelayEvent<SourceTarget>
     + CanRelayEvent<DestinationTarget>
-    + CanAutoRelay
+    + CanAutoRelay<RelayMode>
     + CanFilterPackets
     + CanRelayReceivePacket
     + CanRelayPacket
     + CanRelayAckPacket
     + CanRelayTimeoutUnorderedPacket
-    + CanSendIbcMessagesFromBatchWorker<SourceTarget>
-    + CanSendIbcMessagesFromBatchWorker<DestinationTarget>
     + CanCreateClient<SourceTarget>
     + CanCreateClient<DestinationTarget>
     + CanInitConnection
@@ -75,18 +72,16 @@ where
         + HasRelayPacket<SrcChainWithPacket = SrcChain, DstChainWithPacket = DstChain>
         + CanBuildUpdateClientMessage<SourceTarget>
         + CanBuildUpdateClientMessage<DestinationTarget>
-        + CanSendIbcMessages<SourceTarget>
-        + CanSendIbcMessages<DestinationTarget>
+        + CanSendIbcMessages<MainSink, SourceTarget>
+        + CanSendIbcMessages<MainSink, DestinationTarget>
         + CanRelayEvent<SourceTarget>
         + CanRelayEvent<DestinationTarget>
-        + CanAutoRelay
+        + CanAutoRelay<RelayMode>
         + CanFilterPackets
         + CanRelayReceivePacket
         + CanRelayPacket
         + CanRelayAckPacket
         + CanRelayTimeoutUnorderedPacket
-        + CanSendIbcMessagesFromBatchWorker<SourceTarget>
-        + CanSendIbcMessagesFromBatchWorker<DestinationTarget>
         + CanCreateClient<SourceTarget>
         + CanCreateClient<DestinationTarget>
         + CanInitConnection
diff --git a/crates/relayer-all-in-one/src/one_for_all/components.rs b/crates/relayer-all-in-one/src/one_for_all/components.rs
deleted file mode 100644
index 1eebd0ca4c..0000000000
--- a/crates/relayer-all-in-one/src/one_for_all/components.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-use ibc_relayer_components::relay::impls::client::update::BuildUpdateClientMessages;
-use ibc_relayer_components::relay::impls::message_senders::chain_sender::SendIbcMessagesToChain;
-use ibc_relayer_components::relay::impls::message_senders::update_client::SendIbcMessagesWithUpdateClient;
-use ibc_relayer_components::relay::impls::messages::skip_update_client::SkipUpdateClient;
-use ibc_relayer_components::relay::impls::messages::wait_update_client::WaitUpdateClient;
-use ibc_relayer_components::relay::impls::packet_relayers::ack::base_ack_packet::BaseAckPacketRelayer;
-use ibc_relayer_components::relay::impls::packet_relayers::general::filter_relayer::FilterRelayer;
-use ibc_relayer_components::relay::impls::packet_relayers::general::full_relay::FullCycleRelayer;
-use ibc_relayer_components::relay::impls::packet_relayers::general::lock::LockPacketRelayer;
-use ibc_relayer_components::relay::impls::packet_relayers::general::log::LoggerRelayer;
-use ibc_relayer_components::relay::impls::packet_relayers::receive::base_receive_packet::BaseReceivePacketRelayer;
-use ibc_relayer_components::relay::impls::packet_relayers::receive::skip_received_packet::SkipReceivedPacketRelayer;
-use ibc_relayer_components::relay::impls::packet_relayers::timeout_unordered::timeout_unordered_packet::BaseTimeoutUnorderedPacketRelayer;
-use ibc_relayer_components_extra::batch::impls::message_sender::SendMessagesToBatchWorker;
-use ibc_relayer_components_extra::relay::impls::auto_relayers::parallel_bidirectional::ParallelBidirectionalRelayer;
-use ibc_relayer_components_extra::relay::impls::auto_relayers::parallel_event::ParallelEventSubscriptionRelayer;
-use ibc_relayer_components_extra::relay::impls::auto_relayers::parallel_two_way::ParallelTwoWayAutoRelay;
-use ibc_relayer_components_extra::relay::impls::packet_relayers::retry::RetryRelayer;
-use ibc_relayer_components_extra::telemetry::impls::consensus_state::ConsensusStateTelemetryQuerier;
-use ibc_relayer_components_extra::telemetry::impls::status::ChainStatusTelemetryQuerier;
-
-use crate::one_for_all::impls::chain::queries::consensus_state::SendConsensusStateQueryToOfa;
-use crate::one_for_all::impls::chain::queries::status::SendChainStatusQueryToOfa;
-use crate::one_for_all::impls::relay::packet_filter::FilterPacketFromOfa;
-
-pub type ChainStatusQuerier = ChainStatusTelemetryQuerier<SendChainStatusQueryToOfa>;
-
-pub type ConsensusStateQuerier = ConsensusStateTelemetryQuerier<SendConsensusStateQueryToOfa>;
-
-pub type UpdateClientMessageBuilder = SkipUpdateClient<WaitUpdateClient<BuildUpdateClientMessages>>;
-
-pub type AckPacketRelayer = BaseAckPacketRelayer;
-
-pub type ReceivePacketRelayer = SkipReceivedPacketRelayer<BaseReceivePacketRelayer>;
-
-pub type TimeoutUnorderedPacketRelayer = BaseTimeoutUnorderedPacketRelayer;
-
-pub type PacketRelayer =
-    LockPacketRelayer<LoggerRelayer<FilterRelayer<RetryRelayer<FullCycleRelayer>>>>;
-
-pub type AutoRelayer = ParallelBidirectionalRelayer<ParallelEventSubscriptionRelayer>;
-
-pub type PacketFilter = FilterPacketFromOfa;
-
-pub type IbcMessageSender = SendMessagesToBatchWorker;
-
-pub type IbcMessageSenderForBatchWorker = SendIbcMessagesWithUpdateClient<SendIbcMessagesToChain>;
-
-pub type TwoWayAutoRelayer = ParallelTwoWayAutoRelay;
diff --git a/crates/relayer-all-in-one/src/one_for_all/impls/birelay/auto_relay.rs b/crates/relayer-all-in-one/src/one_for_all/impls/birelay/auto_relay.rs
deleted file mode 100644
index 148a7cf5ae..0000000000
--- a/crates/relayer-all-in-one/src/one_for_all/impls/birelay/auto_relay.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use async_trait::async_trait;
-use ibc_relayer_components::relay::traits::auto_relayer::{AutoRelayer, CanAutoRelay};
-
-use crate::one_for_all::components;
-use crate::one_for_all::traits::birelay::OfaBiRelay;
-use crate::one_for_all::types::birelay::OfaBiRelayWrapper;
-use crate::std_prelude::*;
-
-#[async_trait]
-impl<BiRelay> CanAutoRelay for OfaBiRelayWrapper<BiRelay>
-where
-    BiRelay: OfaBiRelay,
-{
-    async fn auto_relay(&self) -> Result<(), BiRelay::Error> {
-        components::TwoWayAutoRelayer::auto_relay(self).await
-    }
-}
diff --git a/crates/relayer-all-in-one/src/one_for_all/impls/birelay/components.rs b/crates/relayer-all-in-one/src/one_for_all/impls/birelay/components.rs
new file mode 100644
index 0000000000..e4499c23f0
--- /dev/null
+++ b/crates/relayer-all-in-one/src/one_for_all/impls/birelay/components.rs
@@ -0,0 +1,15 @@
+use async_trait::async_trait;
+use ibc_relayer_components::core::traits::component::HasComponents;
+use ibc_relayer_components::core::traits::sync::Async;
+use ibc_relayer_components_extra::components::extra::ExtraComponents;
+
+use crate::one_for_all::types::birelay::OfaBiRelayWrapper;
+use crate::one_for_all::types::component::OfaComponents;
+
+#[async_trait]
+impl<BiRelay> HasComponents for OfaBiRelayWrapper<BiRelay>
+where
+    BiRelay: Async,
+{
+    type Components = ExtraComponents<OfaComponents>;
+}
diff --git a/crates/relayer-all-in-one/src/one_for_all/impls/birelay/mod.rs b/crates/relayer-all-in-one/src/one_for_all/impls/birelay/mod.rs
index 55b7735c52..7d47a6f099 100644
--- a/crates/relayer-all-in-one/src/one_for_all/impls/birelay/mod.rs
+++ b/crates/relayer-all-in-one/src/one_for_all/impls/birelay/mod.rs
@@ -1,4 +1,4 @@
-pub mod auto_relay;
+pub mod components;
 pub mod error;
 pub mod logger;
 pub mod runtime;
diff --git a/crates/relayer-all-in-one/src/one_for_all/impls/chain/queries/consensus_state.rs b/crates/relayer-all-in-one/src/one_for_all/impls/chain/queries/consensus_state.rs
index e8d0d646bb..5aee079784 100644
--- a/crates/relayer-all-in-one/src/one_for_all/impls/chain/queries/consensus_state.rs
+++ b/crates/relayer-all-in-one/src/one_for_all/impls/chain/queries/consensus_state.rs
@@ -1,12 +1,10 @@
 use async_trait::async_trait;
-use ibc_relayer_components::chain::traits::queries::consensus_state::{
-    CanQueryConsensusState, ConsensusStateQuerier,
-};
+use ibc_relayer_components::chain::traits::queries::consensus_state::ConsensusStateQuerier;
 use ibc_relayer_components::chain::traits::types::consensus_state::HasConsensusStateType;
 
-use crate::one_for_all::components;
 use crate::one_for_all::traits::chain::{OfaChainTypes, OfaIbcChain};
 use crate::one_for_all::types::chain::OfaChainWrapper;
+use crate::one_for_all::types::component::OfaComponents;
 use crate::std_prelude::*;
 
 impl<Chain, Counterparty> HasConsensusStateType<OfaChainWrapper<Counterparty>>
@@ -18,12 +16,9 @@ where
     type ConsensusState = Chain::ConsensusState;
 }
 
-pub struct SendConsensusStateQueryToOfa;
-
 #[async_trait]
 impl<Chain, Counterparty>
-    ConsensusStateQuerier<OfaChainWrapper<Chain>, OfaChainWrapper<Counterparty>>
-    for SendConsensusStateQueryToOfa
+    ConsensusStateQuerier<OfaChainWrapper<Chain>, OfaChainWrapper<Counterparty>> for OfaComponents
 where
     Chain: OfaIbcChain<Counterparty>,
     Counterparty: OfaChainTypes,
@@ -38,19 +33,3 @@ where
         Ok(consensus_state)
     }
 }
-
-#[async_trait]
-impl<Chain, Counterparty> CanQueryConsensusState<OfaChainWrapper<Counterparty>>
-    for OfaChainWrapper<Chain>
-where
-    Chain: OfaIbcChain<Counterparty>,
-    Counterparty: OfaChainTypes,
-{
-    async fn query_consensus_state(
-        &self,
-        client_id: &Self::ClientId,
-        height: &Counterparty::Height,
-    ) -> Result<Counterparty::ConsensusState, Self::Error> {
-        components::ConsensusStateQuerier::query_consensus_state(self, client_id, height).await
-    }
-}
diff --git a/crates/relayer-all-in-one/src/one_for_all/impls/chain/queries/status.rs b/crates/relayer-all-in-one/src/one_for_all/impls/chain/queries/status.rs
index 6644c10852..4d835a8bc0 100644
--- a/crates/relayer-all-in-one/src/one_for_all/impls/chain/queries/status.rs
+++ b/crates/relayer-all-in-one/src/one_for_all/impls/chain/queries/status.rs
@@ -1,16 +1,12 @@
 use async_trait::async_trait;
-use ibc_relayer_components::chain::traits::queries::status::{
-    CanQueryChainStatus, ChainStatusQuerier,
-};
+use ibc_relayer_components::chain::traits::queries::status::ChainStatusQuerier;
 use ibc_relayer_components::chain::traits::types::status::HasChainStatusType;
 
-use crate::one_for_all::components;
 use crate::one_for_all::traits::chain::OfaChain;
 use crate::one_for_all::types::chain::OfaChainWrapper;
+use crate::one_for_all::types::component::OfaComponents;
 use crate::std_prelude::*;
 
-pub struct SendChainStatusQueryToOfa;
-
 impl<Chain> HasChainStatusType for OfaChainWrapper<Chain>
 where
     Chain: OfaChain,
@@ -27,7 +23,7 @@ where
 }
 
 #[async_trait]
-impl<Chain> ChainStatusQuerier<OfaChainWrapper<Chain>> for SendChainStatusQueryToOfa
+impl<Chain> ChainStatusQuerier<OfaChainWrapper<Chain>> for OfaComponents
 where
     Chain: OfaChain,
 {
@@ -39,13 +35,3 @@ where
         Ok(status)
     }
 }
-
-#[async_trait]
-impl<Chain> CanQueryChainStatus for OfaChainWrapper<Chain>
-where
-    Chain: OfaChain,
-{
-    async fn query_chain_status(&self) -> Result<Self::ChainStatus, Self::Error> {
-        components::ChainStatusQuerier::query_chain_status(self).await
-    }
-}
diff --git a/crates/relayer-all-in-one/src/one_for_all/impls/chain/types.rs b/crates/relayer-all-in-one/src/one_for_all/impls/chain/types.rs
index db3ddd31a0..c545aefa67 100644
--- a/crates/relayer-all-in-one/src/one_for_all/impls/chain/types.rs
+++ b/crates/relayer-all-in-one/src/one_for_all/impls/chain/types.rs
@@ -13,14 +13,25 @@ use ibc_relayer_components::chain::traits::types::message::{
 };
 use ibc_relayer_components::chain::traits::types::packet::{HasIbcPacketFields, HasIbcPacketTypes};
 use ibc_relayer_components::chain::traits::types::timestamp::HasTimestampType;
+use ibc_relayer_components::core::traits::component::HasComponents;
 use ibc_relayer_components::core::traits::error::HasErrorType;
+use ibc_relayer_components::core::traits::sync::Async;
 use ibc_relayer_components::runtime::traits::runtime::HasRuntime;
+use ibc_relayer_components_extra::components::extra::ExtraComponents;
 
 use crate::one_for_all::traits::chain::{OfaChain, OfaChainTypes, OfaIbcChain};
 use crate::one_for_all::types::chain::OfaChainWrapper;
+use crate::one_for_all::types::component::OfaComponents;
 use crate::one_for_all::types::runtime::OfaRuntimeWrapper;
 use crate::std_prelude::*;
 
+impl<Chain> HasComponents for OfaChainWrapper<Chain>
+where
+    Chain: Async,
+{
+    type Components = ExtraComponents<OfaComponents>;
+}
+
 impl<Chain: OfaChain> HasRuntime for OfaChainWrapper<Chain> {
     type Runtime = OfaRuntimeWrapper<Chain::Runtime>;
 
diff --git a/crates/relayer-all-in-one/src/one_for_all/impls/relay/auto_relayer.rs b/crates/relayer-all-in-one/src/one_for_all/impls/relay/auto_relayer.rs
deleted file mode 100644
index 460dcb3f0d..0000000000
--- a/crates/relayer-all-in-one/src/one_for_all/impls/relay/auto_relayer.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use async_trait::async_trait;
-use ibc_relayer_components::relay::traits::auto_relayer::{AutoRelayer, CanAutoRelay};
-
-use crate::one_for_all::components;
-use crate::one_for_all::traits::relay::OfaRelay;
-use crate::one_for_all::types::relay::OfaRelayWrapper;
-use crate::std_prelude::*;
-
-#[async_trait]
-impl<Relay> CanAutoRelay for OfaRelayWrapper<Relay>
-where
-    Relay: OfaRelay,
-{
-    async fn auto_relay(&self) -> Result<(), Relay::Error> {
-        components::AutoRelayer::auto_relay(self).await
-    }
-}
diff --git a/crates/relayer-all-in-one/src/one_for_all/impls/relay/batch.rs b/crates/relayer-all-in-one/src/one_for_all/impls/relay/batch.rs
index b1e438691e..852ad6fdcf 100644
--- a/crates/relayer-all-in-one/src/one_for_all/impls/relay/batch.rs
+++ b/crates/relayer-all-in-one/src/one_for_all/impls/relay/batch.rs
@@ -1,31 +1,9 @@
-use async_trait::async_trait;
-use ibc_relayer_components::chain::types::aliases::{Event, Message};
-use ibc_relayer_components::relay::traits::ibc_message_sender::IbcMessageSender;
-use ibc_relayer_components::relay::traits::target::ChainTarget;
 use ibc_relayer_components::relay::traits::target::{DestinationTarget, SourceTarget};
 use ibc_relayer_components_extra::batch::traits::channel::HasMessageBatchSender;
-use ibc_relayer_components_extra::batch::traits::send_messages_from_batch::CanSendIbcMessagesFromBatchWorker;
 use ibc_relayer_components_extra::batch::types::aliases::MessageBatchSender;
 
-use crate::one_for_all::components;
 use crate::one_for_all::traits::relay::OfaRelay;
 use crate::one_for_all::types::relay::OfaRelayWrapper;
-use crate::std_prelude::*;
-
-#[async_trait]
-impl<Relay, Target> CanSendIbcMessagesFromBatchWorker<Target> for OfaRelayWrapper<Relay>
-where
-    Relay: OfaRelay,
-    Target: ChainTarget<Self>,
-    components::IbcMessageSenderForBatchWorker: IbcMessageSender<Self, Target>,
-{
-    async fn send_messages_from_batch_worker(
-        &self,
-        messages: Vec<Message<Target::TargetChain>>,
-    ) -> Result<Vec<Vec<Event<Target::TargetChain>>>, Self::Error> {
-        components::IbcMessageSenderForBatchWorker::send_messages(self, messages).await
-    }
-}
 
 impl<Relay> HasMessageBatchSender<SourceTarget> for OfaRelayWrapper<Relay>
 where
diff --git a/crates/relayer-all-in-one/src/one_for_all/impls/relay/error.rs b/crates/relayer-all-in-one/src/one_for_all/impls/relay/error.rs
index 78078fa852..de6e80cd0d 100644
--- a/crates/relayer-all-in-one/src/one_for_all/impls/relay/error.rs
+++ b/crates/relayer-all-in-one/src/one_for_all/impls/relay/error.rs
@@ -1,4 +1,4 @@
-use ibc_relayer_components_extra::relay::impls::packet_relayers::retry::SupportsPacketRetry;
+use ibc_relayer_components_extra::relay::components::packet_relayers::retry::SupportsPacketRetry;
 
 use crate::one_for_all::traits::relay::OfaRelay;
 use crate::one_for_all::types::relay::OfaRelayWrapper;
diff --git a/crates/relayer-all-in-one/src/one_for_all/impls/relay/message_builders/mod.rs b/crates/relayer-all-in-one/src/one_for_all/impls/relay/message_builders/mod.rs
deleted file mode 100644
index 4a9b38e378..0000000000
--- a/crates/relayer-all-in-one/src/one_for_all/impls/relay/message_builders/mod.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod update_client;
diff --git a/crates/relayer-all-in-one/src/one_for_all/impls/relay/message_builders/update_client.rs b/crates/relayer-all-in-one/src/one_for_all/impls/relay/message_builders/update_client.rs
deleted file mode 100644
index a070e6577f..0000000000
--- a/crates/relayer-all-in-one/src/one_for_all/impls/relay/message_builders/update_client.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-use async_trait::async_trait;
-use ibc_relayer_components::chain::types::aliases::{Height, Message};
-use ibc_relayer_components::relay::traits::messages::update_client::{
-    CanBuildUpdateClientMessage, UpdateClientMessageBuilder,
-};
-use ibc_relayer_components::relay::traits::target::ChainTarget;
-
-use crate::one_for_all::components;
-use crate::one_for_all::traits::relay::OfaRelay;
-use crate::one_for_all::types::relay::OfaRelayWrapper;
-use crate::std_prelude::*;
-
-#[async_trait]
-impl<Relay, Target> CanBuildUpdateClientMessage<Target> for OfaRelayWrapper<Relay>
-where
-    Relay: OfaRelay,
-    Target: ChainTarget<Self>,
-    components::UpdateClientMessageBuilder: UpdateClientMessageBuilder<Self, Target>,
-{
-    async fn build_update_client_messages(
-        &self,
-        target: Target,
-        height: &Height<Target::CounterpartyChain>,
-    ) -> Result<Vec<Message<Target::TargetChain>>, Self::Error> {
-        components::UpdateClientMessageBuilder::build_update_client_messages(self, target, height)
-            .await
-    }
-}
diff --git a/crates/relayer-all-in-one/src/one_for_all/impls/relay/message_sender.rs b/crates/relayer-all-in-one/src/one_for_all/impls/relay/message_sender.rs
deleted file mode 100644
index 6971f573c0..0000000000
--- a/crates/relayer-all-in-one/src/one_for_all/impls/relay/message_sender.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use async_trait::async_trait;
-use ibc_relayer_components::relay::traits::ibc_message_sender::{
-    CanSendIbcMessages, IbcMessageSender,
-};
-use ibc_relayer_components::relay::traits::target::{DestinationTarget, SourceTarget};
-
-use crate::one_for_all::components;
-use crate::one_for_all::traits::chain::OfaChainTypes;
-use crate::one_for_all::traits::relay::OfaRelay;
-use crate::one_for_all::types::relay::OfaRelayWrapper;
-use crate::std_prelude::*;
-
-#[async_trait]
-impl<Relay> CanSendIbcMessages<SourceTarget> for OfaRelayWrapper<Relay>
-where
-    Relay: OfaRelay,
-{
-    async fn send_messages(
-        &self,
-        _target: SourceTarget,
-        messages: Vec<<Relay::SrcChain as OfaChainTypes>::Message>,
-    ) -> Result<Vec<Vec<<Relay::SrcChain as OfaChainTypes>::Event>>, Self::Error> {
-        <components::IbcMessageSender as IbcMessageSender<Self, SourceTarget>>::send_messages(
-            self, messages,
-        )
-        .await
-    }
-}
-
-#[async_trait]
-impl<Relay> CanSendIbcMessages<DestinationTarget> for OfaRelayWrapper<Relay>
-where
-    Relay: OfaRelay,
-{
-    async fn send_messages(
-        &self,
-        _target: DestinationTarget,
-        messages: Vec<<Relay::DstChain as OfaChainTypes>::Message>,
-    ) -> Result<Vec<Vec<<Relay::DstChain as OfaChainTypes>::Event>>, Self::Error> {
-        <components::IbcMessageSender as IbcMessageSender<Self, DestinationTarget>>::send_messages(
-            self, messages,
-        )
-        .await
-    }
-}
diff --git a/crates/relayer-all-in-one/src/one_for_all/impls/relay/mod.rs b/crates/relayer-all-in-one/src/one_for_all/impls/relay/mod.rs
index a558b0aef5..d9a20a6f4f 100644
--- a/crates/relayer-all-in-one/src/one_for_all/impls/relay/mod.rs
+++ b/crates/relayer-all-in-one/src/one_for_all/impls/relay/mod.rs
@@ -1,4 +1,3 @@
-pub mod auto_relayer;
 pub mod batch;
 pub mod channel;
 pub mod clear_packet;
@@ -7,8 +6,6 @@ pub mod connection;
 pub mod error;
 pub mod event_relayer;
 pub mod logger;
-pub mod message_builders;
-pub mod message_sender;
 pub mod packet_filter;
 pub mod packet_relayers;
 pub mod types;
diff --git a/crates/relayer-all-in-one/src/one_for_all/impls/relay/packet_filter.rs b/crates/relayer-all-in-one/src/one_for_all/impls/relay/packet_filter.rs
index 85c9ed68d1..42128c9d6f 100644
--- a/crates/relayer-all-in-one/src/one_for_all/impls/relay/packet_filter.rs
+++ b/crates/relayer-all-in-one/src/one_for_all/impls/relay/packet_filter.rs
@@ -1,15 +1,13 @@
 use async_trait::async_trait;
-use ibc_relayer_components::relay::traits::packet_filter::{CanFilterPackets, PacketFilter};
+use ibc_relayer_components::relay::traits::packet_filter::PacketFilter;
 
-use crate::one_for_all::components;
 use crate::one_for_all::traits::relay::OfaRelay;
+use crate::one_for_all::types::component::OfaComponents;
 use crate::one_for_all::types::relay::OfaRelayWrapper;
 use crate::std_prelude::*;
 
-pub struct FilterPacketFromOfa;
-
 #[async_trait]
-impl<Relay> PacketFilter<OfaRelayWrapper<Relay>> for FilterPacketFromOfa
+impl<Relay> PacketFilter<OfaRelayWrapper<Relay>> for OfaComponents
 where
     Relay: OfaRelay,
 {
@@ -20,13 +18,3 @@ where
         relay.relay.should_relay_packet(packet).await
     }
 }
-
-#[async_trait]
-impl<Relay> CanFilterPackets for OfaRelayWrapper<Relay>
-where
-    Relay: OfaRelay,
-{
-    async fn should_relay_packet(&self, packet: &Self::Packet) -> Result<bool, Self::Error> {
-        components::PacketFilter::should_relay_packet(self, packet).await
-    }
-}
diff --git a/crates/relayer-all-in-one/src/one_for_all/impls/relay/packet_relayers/ack.rs b/crates/relayer-all-in-one/src/one_for_all/impls/relay/packet_relayers/ack.rs
deleted file mode 100644
index 715aaa6e18..0000000000
--- a/crates/relayer-all-in-one/src/one_for_all/impls/relay/packet_relayers/ack.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-use async_trait::async_trait;
-use ibc_relayer_components::relay::traits::packet_relayers::ack_packet::{
-    AckPacketRelayer, CanRelayAckPacket,
-};
-
-use crate::one_for_all::components;
-use crate::one_for_all::traits::chain::OfaChainTypes;
-use crate::one_for_all::traits::relay::OfaRelay;
-use crate::one_for_all::types::relay::OfaRelayWrapper;
-use crate::std_prelude::*;
-
-#[async_trait]
-impl<Relay> CanRelayAckPacket for OfaRelayWrapper<Relay>
-where
-    Relay: OfaRelay,
-    components::AckPacketRelayer: AckPacketRelayer<Self>,
-{
-    async fn relay_ack_packet(
-        &self,
-        destination_height: &<Relay::DstChain as OfaChainTypes>::Height,
-        packet: &Self::Packet,
-        ack: &<Relay::DstChain as OfaChainTypes>::WriteAcknowledgementEvent,
-    ) -> Result<(), Relay::Error> {
-        components::AckPacketRelayer::relay_ack_packet(self, destination_height, packet, ack).await
-    }
-}
diff --git a/crates/relayer-all-in-one/src/one_for_all/impls/relay/packet_relayers/base.rs b/crates/relayer-all-in-one/src/one_for_all/impls/relay/packet_relayers/base.rs
deleted file mode 100644
index f50197858d..0000000000
--- a/crates/relayer-all-in-one/src/one_for_all/impls/relay/packet_relayers/base.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use async_trait::async_trait;
-use ibc_relayer_components::relay::traits::packet_relayer::{CanRelayPacket, PacketRelayer};
-
-use crate::one_for_all::components;
-use crate::one_for_all::traits::relay::OfaRelay;
-use crate::one_for_all::types::relay::OfaRelayWrapper;
-use crate::std_prelude::*;
-
-#[async_trait]
-impl<Relay> CanRelayPacket for OfaRelayWrapper<Relay>
-where
-    Relay: OfaRelay,
-{
-    async fn relay_packet(&self, packet: &Self::Packet) -> Result<(), Self::Error> {
-        components::PacketRelayer::relay_packet(self, packet).await
-    }
-}
diff --git a/crates/relayer-all-in-one/src/one_for_all/impls/relay/packet_relayers/mod.rs b/crates/relayer-all-in-one/src/one_for_all/impls/relay/packet_relayers/mod.rs
index a23d25d061..e949e6a93d 100644
--- a/crates/relayer-all-in-one/src/one_for_all/impls/relay/packet_relayers/mod.rs
+++ b/crates/relayer-all-in-one/src/one_for_all/impls/relay/packet_relayers/mod.rs
@@ -1,5 +1 @@
-pub mod ack;
-pub mod base;
 pub mod lock;
-pub mod receive;
-pub mod timeout_unordered;
diff --git a/crates/relayer-all-in-one/src/one_for_all/impls/relay/packet_relayers/receive.rs b/crates/relayer-all-in-one/src/one_for_all/impls/relay/packet_relayers/receive.rs
deleted file mode 100644
index 88cfca3eff..0000000000
--- a/crates/relayer-all-in-one/src/one_for_all/impls/relay/packet_relayers/receive.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-use async_trait::async_trait;
-use ibc_relayer_components::relay::traits::packet_relayers::receive_packet::{
-    CanRelayReceivePacket, ReceivePacketRelayer,
-};
-
-use crate::one_for_all::components;
-use crate::one_for_all::traits::chain::OfaChainTypes;
-use crate::one_for_all::traits::relay::OfaRelay;
-use crate::one_for_all::types::relay::OfaRelayWrapper;
-use crate::std_prelude::*;
-
-#[async_trait]
-impl<Relay> CanRelayReceivePacket for OfaRelayWrapper<Relay>
-where
-    Relay: OfaRelay,
-    components::ReceivePacketRelayer: ReceivePacketRelayer<Self>,
-{
-    async fn relay_receive_packet(
-        &self,
-        source_height: &<Relay::SrcChain as OfaChainTypes>::Height,
-        packet: &Relay::Packet,
-    ) -> Result<Option<<Relay::DstChain as OfaChainTypes>::WriteAcknowledgementEvent>, Relay::Error>
-    {
-        components::ReceivePacketRelayer::relay_receive_packet(self, source_height, packet).await
-    }
-}
diff --git a/crates/relayer-all-in-one/src/one_for_all/impls/relay/packet_relayers/timeout_unordered.rs b/crates/relayer-all-in-one/src/one_for_all/impls/relay/packet_relayers/timeout_unordered.rs
deleted file mode 100644
index b16a994fea..0000000000
--- a/crates/relayer-all-in-one/src/one_for_all/impls/relay/packet_relayers/timeout_unordered.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-use async_trait::async_trait;
-
-use crate::one_for_all::components;
-use crate::one_for_all::traits::chain::OfaChainTypes;
-use crate::one_for_all::traits::relay::OfaRelay;
-use crate::one_for_all::types::relay::OfaRelayWrapper;
-use crate::std_prelude::*;
-use ibc_relayer_components::relay::traits::packet_relayers::timeout_unordered_packet::{
-    CanRelayTimeoutUnorderedPacket, TimeoutUnorderedPacketRelayer,
-};
-
-#[async_trait]
-impl<Relay> CanRelayTimeoutUnorderedPacket for OfaRelayWrapper<Relay>
-where
-    Relay: OfaRelay,
-    components::TimeoutUnorderedPacketRelayer: TimeoutUnorderedPacketRelayer<Self>,
-{
-    async fn relay_timeout_unordered_packet(
-        &self,
-        destination_height: &<Relay::DstChain as OfaChainTypes>::Height,
-        packet: &Self::Packet,
-    ) -> Result<(), Self::Error> {
-        components::TimeoutUnorderedPacketRelayer::relay_timeout_unordered_packet(
-            self,
-            destination_height,
-            packet,
-        )
-        .await
-    }
-}
diff --git a/crates/relayer-all-in-one/src/one_for_all/impls/relay/types.rs b/crates/relayer-all-in-one/src/one_for_all/impls/relay/types.rs
index aadd6a472c..7dc6925213 100644
--- a/crates/relayer-all-in-one/src/one_for_all/impls/relay/types.rs
+++ b/crates/relayer-all-in-one/src/one_for_all/impls/relay/types.rs
@@ -1,13 +1,24 @@
+use ibc_relayer_components::core::traits::component::HasComponents;
 use ibc_relayer_components::core::traits::error::HasErrorType;
+use ibc_relayer_components::core::traits::sync::Async;
 use ibc_relayer_components::relay::traits::chains::HasRelayChains;
 use ibc_relayer_components::runtime::traits::runtime::HasRuntime;
+use ibc_relayer_components_extra::components::extra::ExtraComponents;
 
 use crate::one_for_all::traits::chain::OfaChainTypes;
 use crate::one_for_all::traits::relay::OfaRelay;
 use crate::one_for_all::types::chain::OfaChainWrapper;
+use crate::one_for_all::types::component::OfaComponents;
 use crate::one_for_all::types::relay::OfaRelayWrapper;
 use crate::one_for_all::types::runtime::OfaRuntimeWrapper;
 
+impl<Relay> HasComponents for OfaRelayWrapper<Relay>
+where
+    Relay: Async,
+{
+    type Components = ExtraComponents<OfaComponents>;
+}
+
 impl<Relay: OfaRelay> HasErrorType for OfaRelayWrapper<Relay>
 where
     Relay: OfaRelay,
diff --git a/crates/relayer-all-in-one/src/one_for_all/mod.rs b/crates/relayer-all-in-one/src/one_for_all/mod.rs
index f20f274146..bb294d36dc 100644
--- a/crates/relayer-all-in-one/src/one_for_all/mod.rs
+++ b/crates/relayer-all-in-one/src/one_for_all/mod.rs
@@ -17,7 +17,6 @@
 //! implement in order to use the APIs provided by the framework, which are
 //! encapsulated in the `all_for_one` trait.
 
-pub mod components;
 pub mod impls;
 pub mod traits;
 pub mod types;
diff --git a/crates/relayer-all-in-one/src/one_for_all/traits/birelay.rs b/crates/relayer-all-in-one/src/one_for_all/traits/birelay.rs
index cda2c43d86..068a1b0ef1 100644
--- a/crates/relayer-all-in-one/src/one_for_all/traits/birelay.rs
+++ b/crates/relayer-all-in-one/src/one_for_all/traits/birelay.rs
@@ -21,6 +21,7 @@ pub trait OfaBiRelay: Async {
         SrcChain = <Self::RelayAToB as OfaRelay>::DstChain,
         DstChain = <Self::RelayAToB as OfaRelay>::SrcChain,
         Error = <Self::RelayAToB as OfaRelay>::Error,
+        Logger = <Self::RelayAToB as OfaRelay>::Logger,
     >;
 
     fn runtime(&self) -> &OfaRuntimeWrapper<Self::Runtime>;
diff --git a/crates/relayer-all-in-one/src/one_for_all/types/component.rs b/crates/relayer-all-in-one/src/one_for_all/types/component.rs
new file mode 100644
index 0000000000..cbb2187e7d
--- /dev/null
+++ b/crates/relayer-all-in-one/src/one_for_all/types/component.rs
@@ -0,0 +1 @@
+pub struct OfaComponents;
diff --git a/crates/relayer-all-in-one/src/one_for_all/types/mod.rs b/crates/relayer-all-in-one/src/one_for_all/types/mod.rs
index ca23848af5..2061b7ec84 100644
--- a/crates/relayer-all-in-one/src/one_for_all/types/mod.rs
+++ b/crates/relayer-all-in-one/src/one_for_all/types/mod.rs
@@ -2,6 +2,7 @@ pub mod batch;
 pub mod birelay;
 pub mod builder;
 pub mod chain;
+pub mod component;
 pub mod relay;
 pub mod runtime;
 pub mod telemetry;
diff --git a/crates/relayer-components-extra/src/batch/impls/message_sender.rs b/crates/relayer-components-extra/src/batch/components/message_sender.rs
similarity index 84%
rename from crates/relayer-components-extra/src/batch/impls/message_sender.rs
rename to crates/relayer-components-extra/src/batch/components/message_sender.rs
index 88f8a98319..9bdaefa350 100644
--- a/crates/relayer-components-extra/src/batch/impls/message_sender.rs
+++ b/crates/relayer-components-extra/src/batch/components/message_sender.rs
@@ -1,12 +1,14 @@
 use async_trait::async_trait;
 use ibc_relayer_components::chain::traits::types::ibc::HasIbcChainTypes;
 use ibc_relayer_components::relay::traits::chains::HasRelayChains;
-use ibc_relayer_components::relay::traits::ibc_message_sender::IbcMessageSender;
+use ibc_relayer_components::relay::traits::ibc_message_sender::{
+    CanSendIbcMessages, IbcMessageSender,
+};
 use ibc_relayer_components::relay::traits::target::ChainTarget;
 use ibc_relayer_components::runtime::traits::runtime::HasRuntime;
 
 use crate::batch::traits::channel::HasMessageBatchSender;
-use crate::batch::traits::send_messages_from_batch::CanSendIbcMessagesFromBatchWorker;
+use crate::batch::types::sink::BatchWorkerSink;
 use crate::runtime::traits::channel::CanUseChannels;
 use crate::runtime::traits::channel_once::{CanCreateChannelsOnce, CanUseChannelsOnce};
 use crate::std_prelude::*;
@@ -14,11 +16,11 @@ use crate::std_prelude::*;
 pub struct SendMessagesToBatchWorker;
 
 #[async_trait]
-impl<Relay, Target, TargetChain, Runtime> IbcMessageSender<Relay, Target>
+impl<Relay, Sink, Target, TargetChain, Runtime> IbcMessageSender<Relay, Sink, Target>
     for SendMessagesToBatchWorker
 where
     Relay: HasRelayChains,
-    Relay: CanSendIbcMessagesFromBatchWorker<Target>,
+    Relay: CanSendIbcMessages<BatchWorkerSink, Target>,
     Target: ChainTarget<Relay, TargetChain = TargetChain>,
     TargetChain: HasIbcChainTypes<Target::CounterpartyChain>,
     TargetChain: HasRuntime<Runtime = Runtime>,
diff --git a/crates/relayer-components-extra/src/batch/impls/mod.rs b/crates/relayer-components-extra/src/batch/components/mod.rs
similarity index 100%
rename from crates/relayer-components-extra/src/batch/impls/mod.rs
rename to crates/relayer-components-extra/src/batch/components/mod.rs
diff --git a/crates/relayer-components-extra/src/batch/mod.rs b/crates/relayer-components-extra/src/batch/mod.rs
index 35e02c0c8e..fbfd97c2d0 100644
--- a/crates/relayer-components-extra/src/batch/mod.rs
+++ b/crates/relayer-components-extra/src/batch/mod.rs
@@ -1,4 +1,4 @@
-pub mod impls;
+pub mod components;
 pub mod traits;
 pub mod types;
 pub mod worker;
diff --git a/crates/relayer-components-extra/src/batch/traits/mod.rs b/crates/relayer-components-extra/src/batch/traits/mod.rs
index 6a72619714..81ad882b9e 100644
--- a/crates/relayer-components-extra/src/batch/traits/mod.rs
+++ b/crates/relayer-components-extra/src/batch/traits/mod.rs
@@ -1,3 +1,2 @@
 pub mod channel;
 pub mod config;
-pub mod send_messages_from_batch;
diff --git a/crates/relayer-components-extra/src/batch/traits/send_messages_from_batch.rs b/crates/relayer-components-extra/src/batch/traits/send_messages_from_batch.rs
deleted file mode 100644
index c2c97887f0..0000000000
--- a/crates/relayer-components-extra/src/batch/traits/send_messages_from_batch.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-use async_trait::async_trait;
-use ibc_relayer_components::chain::types::aliases::{Event, Message};
-use ibc_relayer_components::relay::traits::chains::HasRelayChains;
-use ibc_relayer_components::relay::traits::target::ChainTarget;
-
-use crate::std_prelude::*;
-
-#[async_trait]
-pub trait CanSendIbcMessagesFromBatchWorker<Target>: HasRelayChains
-where
-    Target: ChainTarget<Self>,
-{
-    async fn send_messages_from_batch_worker(
-        &self,
-        messages: Vec<Message<Target::TargetChain>>,
-    ) -> Result<Vec<Vec<Event<Target::TargetChain>>>, Self::Error>;
-}
diff --git a/crates/relayer-components-extra/src/batch/types/mod.rs b/crates/relayer-components-extra/src/batch/types/mod.rs
index 1aa3529c34..c8d3625875 100644
--- a/crates/relayer-components-extra/src/batch/types/mod.rs
+++ b/crates/relayer-components-extra/src/batch/types/mod.rs
@@ -1,2 +1,3 @@
 pub mod aliases;
 pub mod config;
+pub mod sink;
diff --git a/crates/relayer-components-extra/src/batch/types/sink.rs b/crates/relayer-components-extra/src/batch/types/sink.rs
new file mode 100644
index 0000000000..99195c2488
--- /dev/null
+++ b/crates/relayer-components-extra/src/batch/types/sink.rs
@@ -0,0 +1 @@
+pub struct BatchWorkerSink;
diff --git a/crates/relayer-components-extra/src/batch/worker.rs b/crates/relayer-components-extra/src/batch/worker.rs
index ca65542f72..df2ee2e013 100644
--- a/crates/relayer-components-extra/src/batch/worker.rs
+++ b/crates/relayer-components-extra/src/batch/worker.rs
@@ -1,5 +1,6 @@
 use alloc::collections::VecDeque;
 use core::mem;
+use ibc_relayer_components::relay::traits::ibc_message_sender::CanSendIbcMessages;
 use ibc_relayer_components::relay::traits::logs::logger::CanLogRelayTarget;
 
 use async_trait::async_trait;
@@ -17,9 +18,9 @@ use ibc_relayer_components::runtime::traits::sleep::CanSleep;
 use ibc_relayer_components::runtime::traits::time::HasTime;
 use ibc_relayer_components::runtime::types::aliases::Runtime;
 
-use crate::batch::traits::send_messages_from_batch::CanSendIbcMessagesFromBatchWorker;
 use crate::batch::types::aliases::{BatchSubmission, EventResultSender, MessageBatchReceiver};
 use crate::batch::types::config::BatchConfig;
+use crate::batch::types::sink::BatchWorkerSink;
 use crate::runtime::traits::channel::{CanUseChannels, HasChannelTypes};
 use crate::runtime::traits::channel_once::{CanUseChannelsOnce, HasChannelOnceTypes};
 use crate::runtime::traits::spawn::{HasSpawner, Spawner, TaskHandle};
@@ -285,7 +286,7 @@ where
 #[async_trait]
 impl<Relay, Target, Runtime> CanSendReadyBatches<Target> for Relay
 where
-    Relay: CanLogRelayTarget<Target> + CanSendIbcMessagesFromBatchWorker<Target>,
+    Relay: CanLogRelayTarget<Target> + CanSendIbcMessages<BatchWorkerSink, Target>,
     Target: ChainTarget<Relay>,
     Target::TargetChain: HasRuntime<Runtime = Runtime>,
     Runtime: CanUseChannelsOnce + CanUseChannels,
@@ -315,7 +316,7 @@ where
             },
         );
 
-        let send_result = self.send_messages_from_batch_worker(in_messages).await;
+        let send_result = self.send_messages(Target::default(), in_messages).await;
 
         match send_result {
             Err(e) => {
diff --git a/crates/relayer-components-extra/src/components/extra.rs b/crates/relayer-components-extra/src/components/extra.rs
new file mode 100644
index 0000000000..2e99952555
--- /dev/null
+++ b/crates/relayer-components-extra/src/components/extra.rs
@@ -0,0 +1,90 @@
+use core::marker::PhantomData;
+
+use ibc_relayer_components::relay::components::message_senders::chain_sender::SendIbcMessagesToChain;
+use ibc_relayer_components::relay::components::message_senders::update_client::SendIbcMessagesWithUpdateClient;
+use ibc_relayer_components::relay::components::update_client::build::BuildUpdateClientMessages;
+use ibc_relayer_components::relay::components::update_client::skip::SkipUpdateClient;
+use ibc_relayer_components::relay::components::update_client::wait::WaitUpdateClient;
+use ibc_relayer_components::relay::components::packet_relayers::general::filter_relayer::FilterRelayer;
+use ibc_relayer_components::relay::components::packet_relayers::ack::base_ack_packet::BaseAckPacketRelayer;
+use ibc_relayer_components::relay::components::packet_relayers::general::lock::LockPacketRelayer;
+use ibc_relayer_components::relay::components::packet_relayers::general::full_relay::FullCycleRelayer;
+use ibc_relayer_components::relay::components::packet_relayers::receive::base_receive_packet::BaseReceivePacketRelayer;
+use ibc_relayer_components::relay::components::packet_relayers::general::log::LoggerRelayer;
+use ibc_relayer_components::relay::components::packet_relayers::timeout_unordered::timeout_unordered_packet::BaseTimeoutUnorderedPacketRelayer;
+use ibc_relayer_components::relay::components::packet_relayers::receive::skip_received_packet::SkipReceivedPacketRelayer;
+use ibc_relayer_components::relay::traits::auto_relayer::{RelayMode, BiRelayMode};
+use ibc_relayer_components::relay::traits::ibc_message_sender::MainSink;
+
+use crate::batch::components::message_sender::SendMessagesToBatchWorker;
+use crate::batch::types::sink::BatchWorkerSink;
+use crate::relay::components::auto_relayers::parallel_bidirectional::ParallelBidirectionalRelayer;
+use crate::relay::components::auto_relayers::parallel_event::ParallelEventSubscriptionRelayer;
+use crate::relay::components::auto_relayers::parallel_two_way::ParallelTwoWayAutoRelay;
+use crate::relay::components::packet_relayers::retry::RetryRelayer;
+use crate::std_prelude::*;
+use crate::telemetry::components::consensus_state::ConsensusStateTelemetryQuerier;
+use crate::telemetry::components::status::ChainStatusTelemetryQuerier;
+
+pub struct ExtraComponents<BaseComponents>(pub PhantomData<BaseComponents>);
+
+ibc_relayer_components::derive_chain_status_querier!(
+    ExtraComponents<BaseComponents>,
+    ChainStatusTelemetryQuerier<BaseComponents>,
+);
+
+ibc_relayer_components::derive_consensus_state_querier!(
+    ExtraComponents<BaseComponents>,
+    ConsensusStateTelemetryQuerier<BaseComponents>,
+);
+
+ibc_relayer_components::derive_ibc_message_sender!(
+    MainSink,
+    ExtraComponents<BaseComponents>,
+    SendMessagesToBatchWorker,
+);
+
+ibc_relayer_components::derive_ibc_message_sender!(
+    BatchWorkerSink,
+    ExtraComponents<BaseComponents>,
+    SendIbcMessagesWithUpdateClient<SendIbcMessagesToChain>,
+);
+
+ibc_relayer_components::derive_update_client_message_builder!(
+    ExtraComponents<BaseComponents>,
+    SkipUpdateClient<WaitUpdateClient<BuildUpdateClientMessages>>,
+);
+
+ibc_relayer_components::derive_packet_relayer!(
+    ExtraComponents<BaseComponents>,
+    LockPacketRelayer<LoggerRelayer<FilterRelayer<RetryRelayer<FullCycleRelayer>>>>,
+);
+
+ibc_relayer_components::derive_packet_filter!(ExtraComponents<BaseComponents>, BaseComponents);
+
+ibc_relayer_components::derive_receive_packet_relayer!(
+    ExtraComponents<BaseComponents>,
+    SkipReceivedPacketRelayer<BaseReceivePacketRelayer>,
+);
+
+ibc_relayer_components::derive_ack_packet_relayer!(
+    ExtraComponents<BaseComponents>,
+    BaseAckPacketRelayer,
+);
+
+ibc_relayer_components::derive_timeout_unordered_packet_relayer!(
+    ExtraComponents<BaseComponents>,
+    BaseTimeoutUnorderedPacketRelayer,
+);
+
+ibc_relayer_components::derive_auto_relayer!(
+    RelayMode,
+    ExtraComponents<BaseComponents>,
+    ParallelBidirectionalRelayer<ParallelEventSubscriptionRelayer>,
+);
+
+ibc_relayer_components::derive_auto_relayer!(
+    BiRelayMode,
+    ExtraComponents<BaseComponents>,
+    ParallelTwoWayAutoRelay,
+);
diff --git a/crates/relayer-components-extra/src/components/mod.rs b/crates/relayer-components-extra/src/components/mod.rs
new file mode 100644
index 0000000000..d5d7148613
--- /dev/null
+++ b/crates/relayer-components-extra/src/components/mod.rs
@@ -0,0 +1 @@
+pub mod extra;
diff --git a/crates/relayer-components-extra/src/lib.rs b/crates/relayer-components-extra/src/lib.rs
index 02634b48a9..b241aca428 100644
--- a/crates/relayer-components-extra/src/lib.rs
+++ b/crates/relayer-components-extra/src/lib.rs
@@ -7,6 +7,7 @@ extern crate alloc;
 
 pub mod batch;
 pub mod builder;
+pub mod components;
 pub mod packet_clear;
 pub mod relay;
 pub mod runtime;
diff --git a/crates/relayer-components-extra/src/relay/impls/auto_relayers/mod.rs b/crates/relayer-components-extra/src/relay/components/auto_relayers/mod.rs
similarity index 100%
rename from crates/relayer-components-extra/src/relay/impls/auto_relayers/mod.rs
rename to crates/relayer-components-extra/src/relay/components/auto_relayers/mod.rs
diff --git a/crates/relayer-components-extra/src/relay/impls/auto_relayers/parallel_bidirectional.rs b/crates/relayer-components-extra/src/relay/components/auto_relayers/parallel_bidirectional.rs
similarity index 94%
rename from crates/relayer-components-extra/src/relay/impls/auto_relayers/parallel_bidirectional.rs
rename to crates/relayer-components-extra/src/relay/components/auto_relayers/parallel_bidirectional.rs
index 3e43dac716..2f9bbad8a8 100644
--- a/crates/relayer-components-extra/src/relay/impls/auto_relayers/parallel_bidirectional.rs
+++ b/crates/relayer-components-extra/src/relay/components/auto_relayers/parallel_bidirectional.rs
@@ -17,7 +17,8 @@ use crate::std_prelude::*;
 pub struct ParallelBidirectionalRelayer<InRelayer>(pub PhantomData<InRelayer>);
 
 #[async_trait]
-impl<Relay, InRelayer, Runtime> AutoRelayer<Relay> for ParallelBidirectionalRelayer<InRelayer>
+impl<Relay, Mode, InRelayer, Runtime> AutoRelayer<Relay, Mode>
+    for ParallelBidirectionalRelayer<InRelayer>
 where
     Relay: HasRelayChains + HasRuntime<Runtime = Runtime> + Clone,
     InRelayer: AutoRelayerWithTarget<Relay, SourceTarget>,
diff --git a/crates/relayer-components-extra/src/relay/impls/auto_relayers/parallel_event.rs b/crates/relayer-components-extra/src/relay/components/auto_relayers/parallel_event.rs
similarity index 100%
rename from crates/relayer-components-extra/src/relay/impls/auto_relayers/parallel_event.rs
rename to crates/relayer-components-extra/src/relay/components/auto_relayers/parallel_event.rs
diff --git a/crates/relayer-components-extra/src/relay/impls/auto_relayers/parallel_two_way.rs b/crates/relayer-components-extra/src/relay/components/auto_relayers/parallel_two_way.rs
similarity index 81%
rename from crates/relayer-components-extra/src/relay/impls/auto_relayers/parallel_two_way.rs
rename to crates/relayer-components-extra/src/relay/components/auto_relayers/parallel_two_way.rs
index 931e2441f4..e926fca64c 100644
--- a/crates/relayer-components-extra/src/relay/impls/auto_relayers/parallel_two_way.rs
+++ b/crates/relayer-components-extra/src/relay/components/auto_relayers/parallel_two_way.rs
@@ -1,5 +1,7 @@
 use async_trait::async_trait;
-use ibc_relayer_components::relay::traits::auto_relayer::{AutoRelayer, CanAutoRelay};
+use ibc_relayer_components::relay::traits::auto_relayer::{
+    AutoRelayer, BiRelayMode, CanAutoRelay, RelayMode,
+};
 use ibc_relayer_components::relay::traits::two_way::HasTwoWayRelay;
 use ibc_relayer_components::runtime::traits::runtime::HasRuntime;
 
@@ -18,12 +20,12 @@ use crate::std_prelude::*;
 pub struct ParallelTwoWayAutoRelay;
 
 #[async_trait]
-impl<BiRelay, Runtime> AutoRelayer<BiRelay> for ParallelTwoWayAutoRelay
+impl<BiRelay, Runtime> AutoRelayer<BiRelay, BiRelayMode> for ParallelTwoWayAutoRelay
 where
     BiRelay: HasTwoWayRelay,
     Runtime: HasSpawner,
-    BiRelay::RelayAToB: CanAutoRelay + HasRuntime<Runtime = Runtime> + Clone,
-    BiRelay::RelayBToA: CanAutoRelay + Clone,
+    BiRelay::RelayAToB: CanAutoRelay<RelayMode> + HasRuntime<Runtime = Runtime> + Clone,
+    BiRelay::RelayBToA: CanAutoRelay<RelayMode> + Clone,
 {
     async fn auto_relay(birelay: &BiRelay) -> Result<(), BiRelay::Error> {
         let relay_a_to_b = birelay.relay_a_to_b().clone();
diff --git a/crates/relayer-components-extra/src/relay/impls/mod.rs b/crates/relayer-components-extra/src/relay/components/mod.rs
similarity index 100%
rename from crates/relayer-components-extra/src/relay/impls/mod.rs
rename to crates/relayer-components-extra/src/relay/components/mod.rs
diff --git a/crates/relayer-components-extra/src/relay/impls/packet_relayers/mod.rs b/crates/relayer-components-extra/src/relay/components/packet_relayers/mod.rs
similarity index 100%
rename from crates/relayer-components-extra/src/relay/impls/packet_relayers/mod.rs
rename to crates/relayer-components-extra/src/relay/components/packet_relayers/mod.rs
diff --git a/crates/relayer-components-extra/src/relay/impls/packet_relayers/retry.rs b/crates/relayer-components-extra/src/relay/components/packet_relayers/retry.rs
similarity index 100%
rename from crates/relayer-components-extra/src/relay/impls/packet_relayers/retry.rs
rename to crates/relayer-components-extra/src/relay/components/packet_relayers/retry.rs
diff --git a/crates/relayer-components-extra/src/relay/mod.rs b/crates/relayer-components-extra/src/relay/mod.rs
index b132bc2556..f188f2c26d 100644
--- a/crates/relayer-components-extra/src/relay/mod.rs
+++ b/crates/relayer-components-extra/src/relay/mod.rs
@@ -1 +1 @@
-pub mod impls;
+pub mod components;
diff --git a/crates/relayer-components-extra/src/telemetry/impls/consensus_state.rs b/crates/relayer-components-extra/src/telemetry/components/consensus_state.rs
similarity index 91%
rename from crates/relayer-components-extra/src/telemetry/impls/consensus_state.rs
rename to crates/relayer-components-extra/src/telemetry/components/consensus_state.rs
index 3f3641a3fb..139eaf719f 100644
--- a/crates/relayer-components-extra/src/telemetry/impls/consensus_state.rs
+++ b/crates/relayer-components-extra/src/telemetry/components/consensus_state.rs
@@ -1,6 +1,7 @@
 use async_trait::async_trait;
 use ibc_relayer_components::chain::traits::queries::consensus_state::ConsensusStateQuerier;
 use ibc_relayer_components::chain::traits::types::consensus_state::HasConsensusStateType;
+use ibc_relayer_components::chain::traits::types::height::HasHeightType;
 use ibc_relayer_components::chain::traits::types::ibc::HasIbcChainTypes;
 use ibc_relayer_components::core::traits::error::HasErrorType;
 
@@ -17,7 +18,7 @@ impl<InQuerier, Chain, Counterparty, Telemetry> ConsensusStateQuerier<Chain, Cou
     for ConsensusStateTelemetryQuerier<InQuerier>
 where
     Chain: HasIbcChainTypes<Counterparty> + HasTelemetry<Telemetry = Telemetry> + HasErrorType,
-    Counterparty: HasConsensusStateType<Chain>,
+    Counterparty: HasConsensusStateType<Chain> + HasHeightType,
     InQuerier: ConsensusStateQuerier<Chain, Counterparty>,
     Telemetry: HasMetric<TelemetryCounter>,
     Telemetry::Value: From<u64>,
diff --git a/crates/relayer-components-extra/src/telemetry/impls/mod.rs b/crates/relayer-components-extra/src/telemetry/components/mod.rs
similarity index 100%
rename from crates/relayer-components-extra/src/telemetry/impls/mod.rs
rename to crates/relayer-components-extra/src/telemetry/components/mod.rs
diff --git a/crates/relayer-components-extra/src/telemetry/impls/status.rs b/crates/relayer-components-extra/src/telemetry/components/status.rs
similarity index 100%
rename from crates/relayer-components-extra/src/telemetry/impls/status.rs
rename to crates/relayer-components-extra/src/telemetry/components/status.rs
diff --git a/crates/relayer-components-extra/src/telemetry/mod.rs b/crates/relayer-components-extra/src/telemetry/mod.rs
index d44cc4a184..1f44d235ab 100644
--- a/crates/relayer-components-extra/src/telemetry/mod.rs
+++ b/crates/relayer-components-extra/src/telemetry/mod.rs
@@ -1,2 +1,2 @@
-pub mod impls;
+pub mod components;
 pub mod traits;
diff --git a/crates/relayer-components/src/chain/traits/queries/consensus_state.rs b/crates/relayer-components/src/chain/traits/queries/consensus_state.rs
index 4b21e02076..a55f8512d6 100644
--- a/crates/relayer-components/src/chain/traits/queries/consensus_state.rs
+++ b/crates/relayer-components/src/chain/traits/queries/consensus_state.rs
@@ -1,7 +1,9 @@
 use async_trait::async_trait;
 
 use crate::chain::traits::types::consensus_state::HasConsensusStateType;
+use crate::chain::traits::types::height::HasHeightType;
 use crate::chain::traits::types::ibc::HasIbcChainTypes;
+use crate::core::traits::component::HasComponents;
 use crate::core::traits::error::HasErrorType;
 use crate::std_prelude::*;
 
@@ -9,7 +11,7 @@ use crate::std_prelude::*;
 pub trait ConsensusStateQuerier<Chain, Counterparty>
 where
     Chain: HasIbcChainTypes<Counterparty> + HasErrorType,
-    Counterparty: HasConsensusStateType<Chain>,
+    Counterparty: HasConsensusStateType<Chain> + HasHeightType,
 {
     async fn query_consensus_state(
         chain: &Chain,
@@ -22,7 +24,7 @@ where
 pub trait CanQueryConsensusState<Counterparty>:
     HasIbcChainTypes<Counterparty> + HasErrorType
 where
-    Counterparty: HasConsensusStateType<Self>,
+    Counterparty: HasConsensusStateType<Self> + HasHeightType,
 {
     async fn query_consensus_state(
         &self,
@@ -30,3 +32,47 @@ where
         height: &Counterparty::Height,
     ) -> Result<Counterparty::ConsensusState, Self::Error>;
 }
+
+#[async_trait]
+impl<Chain, Counterparty> CanQueryConsensusState<Counterparty> for Chain
+where
+    Chain: HasIbcChainTypes<Counterparty> + HasErrorType + HasComponents,
+    Counterparty: HasConsensusStateType<Self> + HasHeightType,
+    Chain::Components: ConsensusStateQuerier<Chain, Counterparty>,
+{
+    async fn query_consensus_state(
+        &self,
+        client_id: &Self::ClientId,
+        height: &Counterparty::Height,
+    ) -> Result<Counterparty::ConsensusState, Self::Error> {
+        Chain::Components::query_consensus_state(self, client_id, height).await
+    }
+}
+
+#[macro_export]
+macro_rules! derive_consensus_state_querier {
+    ( $target:ident $( < $( $param:ident ),* $(,)? > )?, $source:ty $(,)?  ) => {
+        #[$crate::vendor::async_trait::async_trait]
+        impl<Chain, Counterparty, $( $( $param ),* )*>
+            $crate::chain::traits::queries::consensus_state::ConsensusStateQuerier<Chain, Counterparty>
+            for $target $( < $( $param ),* > )*
+        where
+            Chain:
+                $crate::chain::traits::types::ibc::HasIbcChainTypes<Counterparty>
+                + $crate::core::traits::error::HasErrorType,
+            Counterparty:
+                $crate::chain::traits::types::consensus_state::HasConsensusStateType<Chain>
+                + $crate::chain::traits::types::height::HasHeightType,
+            $source: $crate::chain::traits::queries::consensus_state::ConsensusStateQuerier<Chain, Counterparty>,
+        {
+            async fn query_consensus_state(
+                chain: &Chain,
+                client_id: &Chain::ClientId,
+                height: &Counterparty::Height,
+            ) -> Result<Counterparty::ConsensusState, Chain::Error> {
+                <$source as $crate::chain::traits::queries::consensus_state::ConsensusStateQuerier<Chain, Counterparty>>
+                    ::query_consensus_state(chain, client_id, height).await
+            }
+        }
+    };
+}
diff --git a/crates/relayer-components/src/chain/traits/queries/status.rs b/crates/relayer-components/src/chain/traits/queries/status.rs
index d8cca826c4..27d24412bb 100644
--- a/crates/relayer-components/src/chain/traits/queries/status.rs
+++ b/crates/relayer-components/src/chain/traits/queries/status.rs
@@ -2,9 +2,21 @@ use async_trait::async_trait;
 
 use crate::chain::traits::types::height::HasHeightType;
 use crate::chain::traits::types::status::HasChainStatusType;
+use crate::core::traits::component::HasComponents;
 use crate::core::traits::error::HasErrorType;
 use crate::std_prelude::*;
 
+/**
+   The provider trait for [`ChainStatusQuerier`].
+*/
+#[async_trait]
+pub trait ChainStatusQuerier<Chain>
+where
+    Chain: HasChainStatusType + HasErrorType,
+{
+    async fn query_chain_status(chain: &Chain) -> Result<Chain::ChainStatus, Chain::Error>;
+}
+
 /**
    Implemented by a chain context to provide method for querying the
    [current status](HasChainStatusType::ChainStatus) of the blockchain.
@@ -30,15 +42,15 @@ pub trait CanQueryChainStatus: HasChainStatusType + HasErrorType {
     async fn query_chain_status(&self) -> Result<Self::ChainStatus, Self::Error>;
 }
 
-/**
-   The provider trait for [`ChainStatusQuerier`].
-*/
 #[async_trait]
-pub trait ChainStatusQuerier<Chain>
+impl<Chain> CanQueryChainStatus for Chain
 where
-    Chain: HasChainStatusType + HasErrorType,
+    Chain: HasChainStatusType + HasErrorType + HasComponents,
+    Chain::Components: ChainStatusQuerier<Chain>,
 {
-    async fn query_chain_status(context: &Chain) -> Result<Chain::ChainStatus, Chain::Error>;
+    async fn query_chain_status(&self) -> Result<Chain::ChainStatus, Chain::Error> {
+        Chain::Components::query_chain_status(self).await
+    }
 }
 
 #[async_trait]
@@ -58,3 +70,23 @@ where
         Ok(height.clone())
     }
 }
+
+#[macro_export]
+macro_rules! derive_chain_status_querier {
+    ( $target:ident $( < $( $param:ident ),* $(,)? > )?, $source:ty $(,)?  ) => {
+        #[$crate::vendor::async_trait::async_trait]
+        impl<Chain, $( $( $param ),* )*>
+            $crate::chain::traits::queries::status::ChainStatusQuerier<Chain>
+            for $target $( < $( $param ),* > )*
+        where
+            Chain: $crate::chain::traits::types::status::HasChainStatusType
+                + $crate::core::traits::error::HasErrorType,
+            $source: $crate::chain::traits::queries::status::ChainStatusQuerier<Chain>,
+        {
+            async fn query_chain_status(chain: &Chain) -> Result<Chain::ChainStatus, Chain::Error> {
+                <$source as $crate::chain::traits::queries::status::ChainStatusQuerier<Chain>>
+                    ::query_chain_status(chain).await
+            }
+        }
+    };
+}
diff --git a/crates/relayer-components/src/chain/traits/types/consensus_state.rs b/crates/relayer-components/src/chain/traits/types/consensus_state.rs
index 28cb41c5f4..d6b3017bc3 100644
--- a/crates/relayer-components/src/chain/traits/types/consensus_state.rs
+++ b/crates/relayer-components/src/chain/traits/types/consensus_state.rs
@@ -1,7 +1,6 @@
-use crate::chain::traits::types::ibc::HasIbcChainTypes;
 use crate::core::traits::sync::Async;
 
-pub trait HasConsensusStateType<Counterparty>: HasIbcChainTypes<Counterparty> {
+pub trait HasConsensusStateType<Counterparty>: Async {
     /**
         The consensus state of the `Self` chain's client on the `Counterparty` chain
     */
diff --git a/crates/relayer-components/src/components/default.rs b/crates/relayer-components/src/components/default.rs
new file mode 100644
index 0000000000..e5a1782f56
--- /dev/null
+++ b/crates/relayer-components/src/components/default.rs
@@ -0,0 +1,62 @@
+use core::marker::PhantomData;
+
+use crate::relay::components::auto_relayers::concurrent_bidirectional::ConcurrentBidirectionalRelayer;
+use crate::relay::components::auto_relayers::concurrent_event::ConcurrentEventSubscriptionRelayer;
+use crate::relay::components::message_senders::chain_sender::SendIbcMessagesToChain;
+use crate::relay::components::message_senders::update_client::SendIbcMessagesWithUpdateClient;
+use crate::relay::components::packet_relayers::ack::base_ack_packet::BaseAckPacketRelayer;
+use crate::relay::components::packet_relayers::general::filter_relayer::FilterRelayer;
+use crate::relay::components::packet_relayers::general::full_relay::FullCycleRelayer;
+use crate::relay::components::packet_relayers::general::lock::LockPacketRelayer;
+use crate::relay::components::packet_relayers::general::log::LoggerRelayer;
+use crate::relay::components::packet_relayers::receive::base_receive_packet::BaseReceivePacketRelayer;
+use crate::relay::components::packet_relayers::receive::skip_received_packet::SkipReceivedPacketRelayer;
+use crate::relay::components::packet_relayers::timeout_unordered::timeout_unordered_packet::BaseTimeoutUnorderedPacketRelayer;
+use crate::relay::components::update_client::build::BuildUpdateClientMessages;
+use crate::relay::components::update_client::skip::SkipUpdateClient;
+use crate::relay::components::update_client::wait::WaitUpdateClient;
+use crate::relay::traits::auto_relayer::RelayMode;
+use crate::relay::traits::ibc_message_sender::MainSink;
+use crate::std_prelude::*;
+
+pub struct DefaultComponents<BaseComponents>(pub PhantomData<BaseComponents>);
+
+crate::derive_chain_status_querier!(DefaultComponents<BaseComponents>, BaseComponents);
+
+crate::derive_consensus_state_querier!(DefaultComponents<BaseComponents>, BaseComponents);
+
+crate::derive_ibc_message_sender!(
+    MainSink,
+    DefaultComponents<BaseComponents>,
+    SendIbcMessagesWithUpdateClient<SendIbcMessagesToChain>,
+);
+
+crate::derive_update_client_message_builder!(
+    DefaultComponents<BaseComponents>,
+    SkipUpdateClient<WaitUpdateClient<BuildUpdateClientMessages>>,
+);
+
+crate::derive_packet_relayer!(
+    DefaultComponents<BaseComponents>,
+    LockPacketRelayer<LoggerRelayer<FilterRelayer<FullCycleRelayer>>>,
+);
+
+crate::derive_packet_filter!(DefaultComponents<BaseComponents>, BaseComponents);
+
+crate::derive_receive_packet_relayer!(
+    DefaultComponents<BaseComponents>,
+    SkipReceivedPacketRelayer<BaseReceivePacketRelayer>,
+);
+
+crate::derive_ack_packet_relayer!(DefaultComponents<BaseComponents>, BaseAckPacketRelayer,);
+
+crate::derive_timeout_unordered_packet_relayer!(
+    DefaultComponents<BaseComponents>,
+    BaseTimeoutUnorderedPacketRelayer,
+);
+
+crate::derive_auto_relayer!(
+    RelayMode,
+    DefaultComponents<BaseComponents>,
+    ConcurrentBidirectionalRelayer<ConcurrentEventSubscriptionRelayer>,
+);
diff --git a/crates/relayer-components/src/components/mod.rs b/crates/relayer-components/src/components/mod.rs
new file mode 100644
index 0000000000..1be8d340b8
--- /dev/null
+++ b/crates/relayer-components/src/components/mod.rs
@@ -0,0 +1 @@
+pub mod default;
diff --git a/crates/relayer-components/src/core/traits/component.rs b/crates/relayer-components/src/core/traits/component.rs
new file mode 100644
index 0000000000..bdb423ef89
--- /dev/null
+++ b/crates/relayer-components/src/core/traits/component.rs
@@ -0,0 +1,5 @@
+use crate::core::traits::sync::Async;
+
+pub trait HasComponents: Async {
+    type Components: Async;
+}
diff --git a/crates/relayer-components/src/core/traits/mod.rs b/crates/relayer-components/src/core/traits/mod.rs
index e322f4686c..cce358faaa 100644
--- a/crates/relayer-components/src/core/traits/mod.rs
+++ b/crates/relayer-components/src/core/traits/mod.rs
@@ -1,2 +1,3 @@
+pub mod component;
 pub mod error;
 pub mod sync;
diff --git a/crates/relayer-components/src/lib.rs b/crates/relayer-components/src/lib.rs
index 16d624b48c..2ca5ee51ab 100644
--- a/crates/relayer-components/src/lib.rs
+++ b/crates/relayer-components/src/lib.rs
@@ -8,8 +8,10 @@ extern crate alloc;
 
 pub mod builder;
 pub mod chain;
+pub mod components;
 pub mod core;
 pub mod logger;
 pub mod relay;
 pub mod runtime;
 pub mod transaction;
+pub mod vendor;
diff --git a/crates/relayer-components/src/relay/impls/auto_relayers/concurrent_bidirectional.rs b/crates/relayer-components/src/relay/components/auto_relayers/concurrent_bidirectional.rs
similarity index 93%
rename from crates/relayer-components/src/relay/impls/auto_relayers/concurrent_bidirectional.rs
rename to crates/relayer-components/src/relay/components/auto_relayers/concurrent_bidirectional.rs
index ab5881af19..6ffa39a2bd 100644
--- a/crates/relayer-components/src/relay/impls/auto_relayers/concurrent_bidirectional.rs
+++ b/crates/relayer-components/src/relay/components/auto_relayers/concurrent_bidirectional.rs
@@ -12,7 +12,7 @@ use crate::std_prelude::*;
 
 /// A concurrent bidirectional relay context that supports auto-relaying between two
 /// targets, a `SourceTarget` and a `DestinationTarget`. It is composed of two
-/// unidirectional relay contexts.   
+/// unidirectional relay contexts.
 ///
 /// Note that the `InRelayer` parameter is constrained such that the two sub-relay
 /// contexts must relay between the same two connected chains, the `SourceTarget`
@@ -25,7 +25,7 @@ use crate::std_prelude::*;
 pub struct ConcurrentBidirectionalRelayer<InRelayer>(pub PhantomData<InRelayer>);
 
 #[async_trait]
-impl<Relay, InRelayer> AutoRelayer<Relay> for ConcurrentBidirectionalRelayer<InRelayer>
+impl<Relay, Mode, InRelayer> AutoRelayer<Relay, Mode> for ConcurrentBidirectionalRelayer<InRelayer>
 where
     Relay: HasRelayChains,
     InRelayer: AutoRelayerWithTarget<Relay, SourceTarget>,
diff --git a/crates/relayer-components/src/relay/impls/auto_relayers/concurrent_event.rs b/crates/relayer-components/src/relay/components/auto_relayers/concurrent_event.rs
similarity index 100%
rename from crates/relayer-components/src/relay/impls/auto_relayers/concurrent_event.rs
rename to crates/relayer-components/src/relay/components/auto_relayers/concurrent_event.rs
diff --git a/crates/relayer-components/src/relay/impls/auto_relayers/concurrent_two_way.rs b/crates/relayer-components/src/relay/components/auto_relayers/concurrent_two_way.rs
similarity index 81%
rename from crates/relayer-components/src/relay/impls/auto_relayers/concurrent_two_way.rs
rename to crates/relayer-components/src/relay/components/auto_relayers/concurrent_two_way.rs
index 5bac3a1e8e..3fe8fb09ba 100644
--- a/crates/relayer-components/src/relay/impls/auto_relayers/concurrent_two_way.rs
+++ b/crates/relayer-components/src/relay/components/auto_relayers/concurrent_two_way.rs
@@ -4,7 +4,7 @@ use core::pin::Pin;
 use async_trait::async_trait;
 use futures_util::stream::{self, StreamExt};
 
-use crate::relay::traits::auto_relayer::{AutoRelayer, CanAutoRelay};
+use crate::relay::traits::auto_relayer::{AutoRelayer, BiRelayMode, CanAutoRelay, RelayMode};
 use crate::relay::traits::two_way::HasTwoWayRelay;
 use crate::std_prelude::*;
 
@@ -16,11 +16,11 @@ use crate::std_prelude::*;
 pub struct ConcurrentTwoWayAutoRelay;
 
 #[async_trait]
-impl<BiRelay> AutoRelayer<BiRelay> for ConcurrentTwoWayAutoRelay
+impl<BiRelay> AutoRelayer<BiRelay, BiRelayMode> for ConcurrentTwoWayAutoRelay
 where
     BiRelay: HasTwoWayRelay,
-    BiRelay::RelayAToB: CanAutoRelay,
-    BiRelay::RelayBToA: CanAutoRelay,
+    BiRelay::RelayAToB: CanAutoRelay<RelayMode>,
+    BiRelay::RelayBToA: CanAutoRelay<RelayMode>,
 {
     async fn auto_relay(birelay: &BiRelay) -> Result<(), BiRelay::Error> {
         let a_to_b_task: Pin<Box<dyn Future<Output = ()> + Send>> = Box::pin(async move {
diff --git a/crates/relayer-components/src/relay/impls/auto_relayers/mod.rs b/crates/relayer-components/src/relay/components/auto_relayers/mod.rs
similarity index 100%
rename from crates/relayer-components/src/relay/impls/auto_relayers/mod.rs
rename to crates/relayer-components/src/relay/components/auto_relayers/mod.rs
diff --git a/crates/relayer-components/src/relay/impls/auto_relayers/sequential_event.rs b/crates/relayer-components/src/relay/components/auto_relayers/sequential_event.rs
similarity index 100%
rename from crates/relayer-components/src/relay/impls/auto_relayers/sequential_event.rs
rename to crates/relayer-components/src/relay/components/auto_relayers/sequential_event.rs
diff --git a/crates/relayer-components/src/relay/impls/message_senders/chain_sender.rs b/crates/relayer-components/src/relay/components/message_senders/chain_sender.rs
similarity index 89%
rename from crates/relayer-components/src/relay/impls/message_senders/chain_sender.rs
rename to crates/relayer-components/src/relay/components/message_senders/chain_sender.rs
index 145240d683..0f2f1f46b1 100644
--- a/crates/relayer-components/src/relay/impls/message_senders/chain_sender.rs
+++ b/crates/relayer-components/src/relay/components/message_senders/chain_sender.rs
@@ -10,7 +10,8 @@ use crate::std_prelude::*;
 pub struct SendIbcMessagesToChain;
 
 #[async_trait]
-impl<Relay, Target, TargetChain> IbcMessageSender<Relay, Target> for SendIbcMessagesToChain
+impl<Relay, Sink, Target, TargetChain> IbcMessageSender<Relay, Sink, Target>
+    for SendIbcMessagesToChain
 where
     Relay: HasRelayChains,
     Target: ChainTarget<Relay, TargetChain = TargetChain>,
diff --git a/crates/relayer-components/src/relay/impls/message_senders/mod.rs b/crates/relayer-components/src/relay/components/message_senders/mod.rs
similarity index 100%
rename from crates/relayer-components/src/relay/impls/message_senders/mod.rs
rename to crates/relayer-components/src/relay/components/message_senders/mod.rs
diff --git a/crates/relayer-components/src/relay/impls/message_senders/update_client.rs b/crates/relayer-components/src/relay/components/message_senders/update_client.rs
similarity index 89%
rename from crates/relayer-components/src/relay/impls/message_senders/update_client.rs
rename to crates/relayer-components/src/relay/components/message_senders/update_client.rs
index 7f93806569..bf2c45df7e 100644
--- a/crates/relayer-components/src/relay/impls/message_senders/update_client.rs
+++ b/crates/relayer-components/src/relay/components/message_senders/update_client.rs
@@ -14,12 +14,12 @@ use crate::std_prelude::*;
 pub struct SendIbcMessagesWithUpdateClient<Sender>(pub Sender);
 
 #[async_trait]
-impl<Sender, Relay, Target, TargetChain, CounterpartyChain> IbcMessageSender<Relay, Target>
-    for SendIbcMessagesWithUpdateClient<Sender>
+impl<InSender, Relay, Sink, Target, TargetChain, CounterpartyChain>
+    IbcMessageSender<Relay, Sink, Target> for SendIbcMessagesWithUpdateClient<InSender>
 where
     Relay: CanLogRelayTarget<Target>,
     Target: ChainTarget<Relay, TargetChain = TargetChain, CounterpartyChain = CounterpartyChain>,
-    Sender: IbcMessageSender<Relay, Target>,
+    InSender: IbcMessageSender<Relay, Sink, Target>,
     TargetChain: HasIbcChainTypes<CounterpartyChain>,
     TargetChain: HasCounterpartyMessageHeight<CounterpartyChain>,
     CounterpartyChain: HasIbcChainTypes<TargetChain> + CanIncrementHeight,
@@ -61,7 +61,7 @@ where
 
         in_messages.extend(messages);
 
-        let in_events = Sender::send_messages(relay, in_messages).await?;
+        let in_events = InSender::send_messages(relay, in_messages).await?;
 
         let events = in_events.into_iter().skip(update_messages_count).collect();
 
diff --git a/crates/relayer-components/src/relay/components/mod.rs b/crates/relayer-components/src/relay/components/mod.rs
new file mode 100644
index 0000000000..142e9502a2
--- /dev/null
+++ b/crates/relayer-components/src/relay/components/mod.rs
@@ -0,0 +1,4 @@
+pub mod auto_relayers;
+pub mod message_senders;
+pub mod packet_relayers;
+pub mod update_client;
diff --git a/crates/relayer-components/src/relay/impls/packet_relayers/ack/base_ack_packet.rs b/crates/relayer-components/src/relay/components/packet_relayers/ack/base_ack_packet.rs
similarity index 93%
rename from crates/relayer-components/src/relay/impls/packet_relayers/ack/base_ack_packet.rs
rename to crates/relayer-components/src/relay/components/packet_relayers/ack/base_ack_packet.rs
index 595b122ada..801a5359a0 100644
--- a/crates/relayer-components/src/relay/impls/packet_relayers/ack/base_ack_packet.rs
+++ b/crates/relayer-components/src/relay/components/packet_relayers/ack/base_ack_packet.rs
@@ -7,7 +7,7 @@ use crate::chain::traits::message_builders::ack_packet::{
 use crate::chain::traits::types::client_state::HasClientStateType;
 use crate::chain::traits::types::packet::HasIbcPacketTypes;
 use crate::core::traits::sync::Async;
-use crate::relay::traits::ibc_message_sender::CanSendSingleIbcMessage;
+use crate::relay::traits::ibc_message_sender::{CanSendSingleIbcMessage, MainSink};
 use crate::relay::traits::packet::HasRelayPacket;
 use crate::relay::traits::packet_relayers::ack_packet::AckPacketRelayer;
 use crate::relay::traits::target::SourceTarget;
@@ -26,7 +26,7 @@ where
         DstChainWithPacket = DstChain,
         Packet = Packet,
     >,
-    Relay: CanSendSingleIbcMessage<SourceTarget>,
+    Relay: CanSendSingleIbcMessage<MainSink, SourceTarget>,
     SrcChain: CanQueryClientState<DstChain>
         + CanBuildAckPacketMessage<DstChain>
         + HasIbcPacketTypes<DstChain, OutgoingPacket = Packet>,
diff --git a/crates/relayer-components/src/relay/impls/packet_relayers/ack/mod.rs b/crates/relayer-components/src/relay/components/packet_relayers/ack/mod.rs
similarity index 100%
rename from crates/relayer-components/src/relay/impls/packet_relayers/ack/mod.rs
rename to crates/relayer-components/src/relay/components/packet_relayers/ack/mod.rs
diff --git a/crates/relayer-components/src/relay/impls/packet_relayers/general/filter_relayer.rs b/crates/relayer-components/src/relay/components/packet_relayers/general/filter_relayer.rs
similarity index 100%
rename from crates/relayer-components/src/relay/impls/packet_relayers/general/filter_relayer.rs
rename to crates/relayer-components/src/relay/components/packet_relayers/general/filter_relayer.rs
diff --git a/crates/relayer-components/src/relay/impls/packet_relayers/general/full_relay.rs b/crates/relayer-components/src/relay/components/packet_relayers/general/full_relay.rs
similarity index 100%
rename from crates/relayer-components/src/relay/impls/packet_relayers/general/full_relay.rs
rename to crates/relayer-components/src/relay/components/packet_relayers/general/full_relay.rs
diff --git a/crates/relayer-components/src/relay/impls/packet_relayers/general/lock.rs b/crates/relayer-components/src/relay/components/packet_relayers/general/lock.rs
similarity index 100%
rename from crates/relayer-components/src/relay/impls/packet_relayers/general/lock.rs
rename to crates/relayer-components/src/relay/components/packet_relayers/general/lock.rs
diff --git a/crates/relayer-components/src/relay/impls/packet_relayers/general/log.rs b/crates/relayer-components/src/relay/components/packet_relayers/general/log.rs
similarity index 100%
rename from crates/relayer-components/src/relay/impls/packet_relayers/general/log.rs
rename to crates/relayer-components/src/relay/components/packet_relayers/general/log.rs
diff --git a/crates/relayer-components/src/relay/impls/packet_relayers/general/mod.rs b/crates/relayer-components/src/relay/components/packet_relayers/general/mod.rs
similarity index 100%
rename from crates/relayer-components/src/relay/impls/packet_relayers/general/mod.rs
rename to crates/relayer-components/src/relay/components/packet_relayers/general/mod.rs
diff --git a/crates/relayer-components/src/relay/impls/packet_relayers/mod.rs b/crates/relayer-components/src/relay/components/packet_relayers/mod.rs
similarity index 100%
rename from crates/relayer-components/src/relay/impls/packet_relayers/mod.rs
rename to crates/relayer-components/src/relay/components/packet_relayers/mod.rs
diff --git a/crates/relayer-components/src/relay/impls/packet_relayers/receive/base_receive_packet.rs b/crates/relayer-components/src/relay/components/packet_relayers/receive/base_receive_packet.rs
similarity index 93%
rename from crates/relayer-components/src/relay/impls/packet_relayers/receive/base_receive_packet.rs
rename to crates/relayer-components/src/relay/components/packet_relayers/receive/base_receive_packet.rs
index 0ded7cf3ab..4ee8b4c084 100644
--- a/crates/relayer-components/src/relay/impls/packet_relayers/receive/base_receive_packet.rs
+++ b/crates/relayer-components/src/relay/components/packet_relayers/receive/base_receive_packet.rs
@@ -7,7 +7,7 @@ use crate::chain::traits::message_builders::receive_packet::{
 use crate::chain::traits::types::ibc_events::write_ack::HasWriteAcknowledgementEvent;
 use crate::chain::types::aliases::Height;
 use crate::relay::traits::chains::HasRelayChains;
-use crate::relay::traits::ibc_message_sender::CanSendSingleIbcMessage;
+use crate::relay::traits::ibc_message_sender::{CanSendSingleIbcMessage, MainSink};
 use crate::relay::traits::packet_relayers::receive_packet::ReceivePacketRelayer;
 use crate::relay::traits::target::DestinationTarget;
 use crate::relay::types::aliases::Packet;
@@ -19,7 +19,7 @@ pub struct BaseReceivePacketRelayer;
 impl<Relay, AckEvent> ReceivePacketRelayer<Relay> for BaseReceivePacketRelayer
 where
     Relay::SrcChain: CanBuildReceivePacketPayload<Relay::DstChain>,
-    Relay: CanSendSingleIbcMessage<DestinationTarget>,
+    Relay: CanSendSingleIbcMessage<MainSink, DestinationTarget>,
     Relay: HasRelayChains,
     Relay::DstChain: CanQueryClientState<Relay::SrcChain>
         + CanBuildReceivePacketMessage<Relay::SrcChain>
diff --git a/crates/relayer-components/src/relay/impls/packet_relayers/receive/mod.rs b/crates/relayer-components/src/relay/components/packet_relayers/receive/mod.rs
similarity index 100%
rename from crates/relayer-components/src/relay/impls/packet_relayers/receive/mod.rs
rename to crates/relayer-components/src/relay/components/packet_relayers/receive/mod.rs
diff --git a/crates/relayer-components/src/relay/impls/packet_relayers/receive/skip_received_packet.rs b/crates/relayer-components/src/relay/components/packet_relayers/receive/skip_received_packet.rs
similarity index 100%
rename from crates/relayer-components/src/relay/impls/packet_relayers/receive/skip_received_packet.rs
rename to crates/relayer-components/src/relay/components/packet_relayers/receive/skip_received_packet.rs
diff --git a/crates/relayer-components/src/relay/impls/packet_relayers/timeout_unordered/mod.rs b/crates/relayer-components/src/relay/components/packet_relayers/timeout_unordered/mod.rs
similarity index 100%
rename from crates/relayer-components/src/relay/impls/packet_relayers/timeout_unordered/mod.rs
rename to crates/relayer-components/src/relay/components/packet_relayers/timeout_unordered/mod.rs
diff --git a/crates/relayer-components/src/relay/impls/packet_relayers/timeout_unordered/timeout_unordered_packet.rs b/crates/relayer-components/src/relay/components/packet_relayers/timeout_unordered/timeout_unordered_packet.rs
similarity index 93%
rename from crates/relayer-components/src/relay/impls/packet_relayers/timeout_unordered/timeout_unordered_packet.rs
rename to crates/relayer-components/src/relay/components/packet_relayers/timeout_unordered/timeout_unordered_packet.rs
index 47495c9828..b29e099afe 100644
--- a/crates/relayer-components/src/relay/impls/packet_relayers/timeout_unordered/timeout_unordered_packet.rs
+++ b/crates/relayer-components/src/relay/components/packet_relayers/timeout_unordered/timeout_unordered_packet.rs
@@ -6,7 +6,7 @@ use crate::chain::traits::message_builders::timeout_unordered_packet::{
 };
 use crate::chain::types::aliases::Height;
 use crate::relay::traits::chains::HasRelayChains;
-use crate::relay::traits::ibc_message_sender::CanSendSingleIbcMessage;
+use crate::relay::traits::ibc_message_sender::{CanSendSingleIbcMessage, MainSink};
 use crate::relay::traits::packet_relayers::timeout_unordered_packet::TimeoutUnorderedPacketRelayer;
 use crate::relay::traits::target::SourceTarget;
 use crate::relay::types::aliases::Packet;
@@ -21,7 +21,7 @@ pub struct BaseTimeoutUnorderedPacketRelayer;
 impl<Relay> TimeoutUnorderedPacketRelayer<Relay> for BaseTimeoutUnorderedPacketRelayer
 where
     Relay: HasRelayChains,
-    Relay: CanSendSingleIbcMessage<SourceTarget>,
+    Relay: CanSendSingleIbcMessage<MainSink, SourceTarget>,
     Relay::SrcChain: CanQueryClientState<Relay::DstChain>
         + CanBuildTimeoutUnorderedPacketMessage<Relay::DstChain>,
     Relay::DstChain: CanBuildTimeoutUnorderedPacketPayload<Relay::SrcChain>,
diff --git a/crates/relayer-components/src/relay/impls/packet_relayers/timeout_unordered/wait_timeout.rs b/crates/relayer-components/src/relay/components/packet_relayers/timeout_unordered/wait_timeout.rs
similarity index 100%
rename from crates/relayer-components/src/relay/impls/packet_relayers/timeout_unordered/wait_timeout.rs
rename to crates/relayer-components/src/relay/components/packet_relayers/timeout_unordered/wait_timeout.rs
diff --git a/crates/relayer-components/src/relay/impls/client/update.rs b/crates/relayer-components/src/relay/components/update_client/build.rs
similarity index 100%
rename from crates/relayer-components/src/relay/impls/client/update.rs
rename to crates/relayer-components/src/relay/components/update_client/build.rs
diff --git a/crates/relayer-components/src/relay/components/update_client/mod.rs b/crates/relayer-components/src/relay/components/update_client/mod.rs
new file mode 100644
index 0000000000..9a20ef44f3
--- /dev/null
+++ b/crates/relayer-components/src/relay/components/update_client/mod.rs
@@ -0,0 +1,3 @@
+pub mod build;
+pub mod skip;
+pub mod wait;
diff --git a/crates/relayer-components/src/relay/impls/messages/skip_update_client.rs b/crates/relayer-components/src/relay/components/update_client/skip.rs
similarity index 94%
rename from crates/relayer-components/src/relay/impls/messages/skip_update_client.rs
rename to crates/relayer-components/src/relay/components/update_client/skip.rs
index 9285d4d51e..ab3ede1cce 100644
--- a/crates/relayer-components/src/relay/impls/messages/skip_update_client.rs
+++ b/crates/relayer-components/src/relay/components/update_client/skip.rs
@@ -4,6 +4,7 @@ use async_trait::async_trait;
 
 use crate::chain::traits::queries::consensus_state::CanQueryConsensusState;
 use crate::chain::traits::types::consensus_state::HasConsensusStateType;
+use crate::chain::traits::types::height::HasHeightType;
 use crate::chain::types::aliases::Height;
 use crate::logger::traits::level::HasBaseLogLevels;
 use crate::relay::traits::chains::HasRelayChains;
@@ -21,7 +22,7 @@ where
     Relay: HasRelayChains + CanLogRelayTarget<Target>,
     Target: ChainTarget<Relay, TargetChain = TargetChain, CounterpartyChain = CounterpartyChain>,
     InUpdateClient: UpdateClientMessageBuilder<Relay, Target>,
-    CounterpartyChain: HasConsensusStateType<TargetChain>,
+    CounterpartyChain: HasConsensusStateType<TargetChain> + HasHeightType,
     TargetChain: CanQueryConsensusState<CounterpartyChain>,
 {
     async fn build_update_client_messages(
diff --git a/crates/relayer-components/src/relay/impls/messages/wait_update_client.rs b/crates/relayer-components/src/relay/components/update_client/wait.rs
similarity index 100%
rename from crates/relayer-components/src/relay/impls/messages/wait_update_client.rs
rename to crates/relayer-components/src/relay/components/update_client/wait.rs
diff --git a/crates/relayer-components/src/relay/impls/channel/open_ack.rs b/crates/relayer-components/src/relay/impls/channel/open_ack.rs
index 5d7ebab38e..b07664440d 100644
--- a/crates/relayer-components/src/relay/impls/channel/open_ack.rs
+++ b/crates/relayer-components/src/relay/impls/channel/open_ack.rs
@@ -7,7 +7,7 @@ use crate::chain::traits::message_builders::channel::{
 use crate::chain::traits::queries::status::CanQueryChainHeight;
 use crate::relay::traits::chains::HasRelayChains;
 use crate::relay::traits::channel::open_ack::ChannelOpenAckRelayer;
-use crate::relay::traits::ibc_message_sender::CanSendSingleIbcMessage;
+use crate::relay::traits::ibc_message_sender::{CanSendSingleIbcMessage, MainSink};
 use crate::relay::traits::target::SourceTarget;
 use crate::relay::types::aliases::{DstChannelId, DstPortId, SrcChannelId, SrcPortId};
 use crate::std_prelude::*;
@@ -31,7 +31,7 @@ pub struct RelayChannelOpenAck;
 impl<Relay, SrcChain, DstChain> ChannelOpenAckRelayer<Relay> for RelayChannelOpenAck
 where
     Relay: HasRelayChains<SrcChain = SrcChain, DstChain = DstChain>
-        + CanSendSingleIbcMessage<SourceTarget>,
+        + CanSendSingleIbcMessage<MainSink, SourceTarget>,
     SrcChain: CanQueryClientState<DstChain> + CanBuildChannelHandshakeMessages<DstChain>,
     DstChain: CanQueryChainHeight + CanBuildChannelHandshakePayloads<SrcChain>,
 {
diff --git a/crates/relayer-components/src/relay/impls/channel/open_confirm.rs b/crates/relayer-components/src/relay/impls/channel/open_confirm.rs
index 007bb91ed6..9b4b21982e 100644
--- a/crates/relayer-components/src/relay/impls/channel/open_confirm.rs
+++ b/crates/relayer-components/src/relay/impls/channel/open_confirm.rs
@@ -7,7 +7,7 @@ use crate::chain::traits::message_builders::channel::{
 use crate::chain::traits::queries::status::CanQueryChainHeight;
 use crate::relay::traits::chains::HasRelayChains;
 use crate::relay::traits::channel::open_confirm::ChannelOpenConfirmRelayer;
-use crate::relay::traits::ibc_message_sender::CanSendSingleIbcMessage;
+use crate::relay::traits::ibc_message_sender::{CanSendSingleIbcMessage, MainSink};
 use crate::relay::traits::target::DestinationTarget;
 use crate::relay::types::aliases::{DstChannelId, DstPortId, SrcChannelId, SrcPortId};
 use crate::std_prelude::*;
@@ -31,7 +31,7 @@ pub struct RelayChannelOpenConfirm;
 impl<Relay, SrcChain, DstChain> ChannelOpenConfirmRelayer<Relay> for RelayChannelOpenConfirm
 where
     Relay: HasRelayChains<SrcChain = SrcChain, DstChain = DstChain>
-        + CanSendSingleIbcMessage<DestinationTarget>,
+        + CanSendSingleIbcMessage<MainSink, DestinationTarget>,
     SrcChain: CanQueryChainHeight + CanBuildChannelHandshakePayloads<DstChain>,
     DstChain: CanQueryClientState<SrcChain> + CanBuildChannelHandshakeMessages<SrcChain>,
 {
diff --git a/crates/relayer-components/src/relay/impls/channel/open_try.rs b/crates/relayer-components/src/relay/impls/channel/open_try.rs
index 8a4f7dc0c8..03932a144a 100644
--- a/crates/relayer-components/src/relay/impls/channel/open_try.rs
+++ b/crates/relayer-components/src/relay/impls/channel/open_try.rs
@@ -9,7 +9,7 @@ use crate::chain::traits::types::ibc::HasIbcChainTypes;
 use crate::chain::traits::types::ibc_events::channel::HasChannelOpenTryEvent;
 use crate::relay::traits::chains::HasRelayChains;
 use crate::relay::traits::channel::open_try::ChannelOpenTryRelayer;
-use crate::relay::traits::ibc_message_sender::CanSendSingleIbcMessage;
+use crate::relay::traits::ibc_message_sender::{CanSendSingleIbcMessage, MainSink};
 use crate::relay::traits::target::DestinationTarget;
 use crate::relay::types::aliases::{DstChannelId, DstPortId, SrcChannelId, SrcPortId};
 use crate::std_prelude::*;
@@ -40,7 +40,7 @@ pub struct RelayChannelOpenTry;
 impl<Relay, SrcChain, DstChain> ChannelOpenTryRelayer<Relay> for RelayChannelOpenTry
 where
     Relay: HasRelayChains<SrcChain = SrcChain, DstChain = DstChain>
-        + CanSendSingleIbcMessage<DestinationTarget>
+        + CanSendSingleIbcMessage<MainSink, DestinationTarget>
         + InjectMissingChannelTryEventError,
     SrcChain: CanQueryChainHeight + CanBuildChannelHandshakePayloads<DstChain>,
     DstChain: CanQueryClientState<SrcChain>
diff --git a/crates/relayer-components/src/relay/impls/client/mod.rs b/crates/relayer-components/src/relay/impls/client/mod.rs
index 82a5ce72ba..c5fb369c1d 100644
--- a/crates/relayer-components/src/relay/impls/client/mod.rs
+++ b/crates/relayer-components/src/relay/impls/client/mod.rs
@@ -1,2 +1 @@
 pub mod create;
-pub mod update;
diff --git a/crates/relayer-components/src/relay/impls/connection/open_ack.rs b/crates/relayer-components/src/relay/impls/connection/open_ack.rs
index 497f7032be..8105aad10e 100644
--- a/crates/relayer-components/src/relay/impls/connection/open_ack.rs
+++ b/crates/relayer-components/src/relay/impls/connection/open_ack.rs
@@ -8,7 +8,7 @@ use crate::chain::traits::queries::status::CanQueryChainHeight;
 use crate::relay::impls::update_client::CanSendUpdateClientMessage;
 use crate::relay::traits::chains::HasRelayChains;
 use crate::relay::traits::connection::open_ack::ConnectionOpenAckRelayer;
-use crate::relay::traits::ibc_message_sender::CanSendSingleIbcMessage;
+use crate::relay::traits::ibc_message_sender::{CanSendSingleIbcMessage, MainSink};
 use crate::relay::traits::target::{DestinationTarget, SourceTarget};
 use crate::std_prelude::*;
 
@@ -30,7 +30,7 @@ impl<Relay, SrcChain, DstChain> ConnectionOpenAckRelayer<Relay> for RelayConnect
 where
     Relay: HasRelayChains<SrcChain = SrcChain, DstChain = DstChain>
         + CanSendUpdateClientMessage<DestinationTarget>
-        + CanSendSingleIbcMessage<SourceTarget>,
+        + CanSendSingleIbcMessage<MainSink, SourceTarget>,
     SrcChain: CanBuildConnectionHandshakeMessages<DstChain> + CanQueryClientState<DstChain>,
     DstChain: CanQueryChainHeight + CanBuildConnectionHandshakePayloads<SrcChain>,
     DstChain::ConnectionId: Clone,
diff --git a/crates/relayer-components/src/relay/impls/connection/open_confirm.rs b/crates/relayer-components/src/relay/impls/connection/open_confirm.rs
index 6e9fba351b..5b574a2596 100644
--- a/crates/relayer-components/src/relay/impls/connection/open_confirm.rs
+++ b/crates/relayer-components/src/relay/impls/connection/open_confirm.rs
@@ -7,7 +7,7 @@ use crate::chain::traits::message_builders::connection::{
 use crate::chain::traits::queries::status::CanQueryChainHeight;
 use crate::relay::traits::chains::HasRelayChains;
 use crate::relay::traits::connection::open_confirm::ConnectionOpenConfirmRelayer;
-use crate::relay::traits::ibc_message_sender::CanSendSingleIbcMessage;
+use crate::relay::traits::ibc_message_sender::{CanSendSingleIbcMessage, MainSink};
 use crate::relay::traits::messages::update_client::CanBuildUpdateClientMessage;
 use crate::relay::traits::target::DestinationTarget;
 use crate::std_prelude::*;
@@ -30,7 +30,7 @@ impl<Relay, SrcChain, DstChain> ConnectionOpenConfirmRelayer<Relay> for RelayCon
 where
     Relay: HasRelayChains<SrcChain = SrcChain, DstChain = DstChain>
         + CanBuildUpdateClientMessage<DestinationTarget>
-        + CanSendSingleIbcMessage<DestinationTarget>,
+        + CanSendSingleIbcMessage<MainSink, DestinationTarget>,
     SrcChain: CanQueryChainHeight + CanBuildConnectionHandshakePayloads<DstChain>,
     DstChain: CanBuildConnectionHandshakeMessages<SrcChain> + CanQueryClientState<SrcChain>,
     DstChain::ConnectionId: Clone,
diff --git a/crates/relayer-components/src/relay/impls/connection/open_try.rs b/crates/relayer-components/src/relay/impls/connection/open_try.rs
index f3f9c31df0..0288884e74 100644
--- a/crates/relayer-components/src/relay/impls/connection/open_try.rs
+++ b/crates/relayer-components/src/relay/impls/connection/open_try.rs
@@ -11,7 +11,7 @@ use crate::chain::traits::types::ibc_events::connection::HasConnectionOpenTryEve
 use crate::relay::impls::update_client::CanSendUpdateClientMessage;
 use crate::relay::traits::chains::HasRelayChains;
 use crate::relay::traits::connection::open_try::ConnectionOpenTryRelayer;
-use crate::relay::traits::ibc_message_sender::CanSendSingleIbcMessage;
+use crate::relay::traits::ibc_message_sender::{CanSendSingleIbcMessage, MainSink};
 use crate::relay::traits::target::{DestinationTarget, SourceTarget};
 use crate::std_prelude::*;
 
@@ -40,7 +40,7 @@ impl<Relay, SrcChain, DstChain> ConnectionOpenTryRelayer<Relay> for RelayConnect
 where
     Relay: HasRelayChains<SrcChain = SrcChain, DstChain = DstChain>
         + CanSendUpdateClientMessage<SourceTarget>
-        + CanSendSingleIbcMessage<DestinationTarget>
+        + CanSendSingleIbcMessage<MainSink, DestinationTarget>
         + InjectMissingConnectionTryEventError,
     SrcChain: CanQueryChainHeight + CanBuildConnectionHandshakePayloads<DstChain>,
     DstChain: CanQueryClientState<SrcChain>
diff --git a/crates/relayer-components/src/relay/impls/messages/mod.rs b/crates/relayer-components/src/relay/impls/messages/mod.rs
deleted file mode 100644
index dce39379df..0000000000
--- a/crates/relayer-components/src/relay/impls/messages/mod.rs
+++ /dev/null
@@ -1,2 +0,0 @@
-pub mod skip_update_client;
-pub mod wait_update_client;
diff --git a/crates/relayer-components/src/relay/impls/mod.rs b/crates/relayer-components/src/relay/impls/mod.rs
index 8607aab777..aca81e02b1 100644
--- a/crates/relayer-components/src/relay/impls/mod.rs
+++ b/crates/relayer-components/src/relay/impls/mod.rs
@@ -1,11 +1,7 @@
-pub mod auto_relayers;
 pub mod channel;
 pub mod client;
 pub mod connection;
 pub mod event_relayers;
-pub mod message_senders;
-pub mod messages;
 pub mod packet_clear;
 pub mod packet_filters;
-pub mod packet_relayers;
 pub mod update_client;
diff --git a/crates/relayer-components/src/relay/mod.rs b/crates/relayer-components/src/relay/mod.rs
index cf708e876b..69a42f92ea 100644
--- a/crates/relayer-components/src/relay/mod.rs
+++ b/crates/relayer-components/src/relay/mod.rs
@@ -29,6 +29,7 @@
    chains.
 */
 
+pub mod components;
 pub mod impls;
 pub mod traits;
 pub mod types;
diff --git a/crates/relayer-components/src/relay/traits/auto_relayer.rs b/crates/relayer-components/src/relay/traits/auto_relayer.rs
index dc00163102..10941c4909 100644
--- a/crates/relayer-components/src/relay/traits/auto_relayer.rs
+++ b/crates/relayer-components/src/relay/traits/auto_relayer.rs
@@ -1,11 +1,25 @@
 use async_trait::async_trait;
 
+use crate::core::traits::component::HasComponents;
 use crate::core::traits::error::HasErrorType;
 use crate::core::traits::sync::Async;
 use crate::relay::traits::chains::HasRelayChains;
 use crate::relay::traits::target::ChainTarget;
 use crate::std_prelude::*;
 
+pub struct RelayMode;
+pub struct BiRelayMode;
+
+/// Provider trait for the `CanAutoRelay` trait.
+#[async_trait]
+pub trait AutoRelayer<Relay, Mode>: Async
+where
+    Relay: HasErrorType,
+{
+    /// Starts the auto-relaying process for the given `Relay`.
+    async fn auto_relay(relay: &Relay) -> Result<(), Relay::Error>;
+}
+
 /// Trait that encodes the capability of a relayer to relay
 /// in a "set it and forget it" manner. This trait is agnostic
 /// as far as the provided context is concerned, i.e., it doesn't
@@ -18,19 +32,41 @@ use crate::std_prelude::*;
 /// auto-relay process will relay in one direction as appropriate for
 /// the implementing context.
 #[async_trait]
-pub trait CanAutoRelay: HasErrorType {
+pub trait CanAutoRelay<Mode>: HasErrorType {
     /// Starts the auto-relaying process.
     async fn auto_relay(&self) -> Result<(), Self::Error>;
 }
 
-/// Provider trait for the `CanAutoRelay` trait.
 #[async_trait]
-pub trait AutoRelayer<Context>: Async
+impl<Relay, Mode> CanAutoRelay<Mode> for Relay
 where
-    Context: HasErrorType,
+    Relay: HasErrorType + HasComponents,
+    Relay::Components: AutoRelayer<Relay, Mode>,
 {
-    /// Starts the auto-relaying process for the given `Context`.
-    async fn auto_relay(context: &Context) -> Result<(), Context::Error>;
+    async fn auto_relay(&self) -> Result<(), Self::Error> {
+        Relay::Components::auto_relay(self).await
+    }
+}
+
+#[macro_export]
+macro_rules! derive_auto_relayer {
+    ( $mode:ty, $target:ident $( < $( $param:ident ),* $(,)? > )?, $source:ty $(,)?  ) => {
+        #[$crate::vendor::async_trait::async_trait]
+        impl<Relay, $( $( $param ),* )*>
+            $crate::relay::traits::auto_relayer::AutoRelayer<Relay, $mode>
+            for $target $( < $( $param ),* > )*
+        where
+            Relay: $crate::core::traits::error::HasErrorType,
+            $source: $crate::relay::traits::auto_relayer::AutoRelayer<Relay, $mode>,
+            $target $( < $( $param ),* > )*: $crate::core::traits::sync::Async,
+        {
+            async fn auto_relay(relay: &Relay) -> Result<(), Relay::Error> {
+                <$source as $crate::relay::traits::auto_relayer::AutoRelayer<Relay, $mode>>
+                    ::auto_relay(relay).await
+            }
+        }
+
+    };
 }
 
 /// Similar to the `CanAutoRelay` trait, the main differences are that this
diff --git a/crates/relayer-components/src/relay/traits/ibc_message_sender.rs b/crates/relayer-components/src/relay/traits/ibc_message_sender.rs
index 4e0206517f..62617c67f4 100644
--- a/crates/relayer-components/src/relay/traits/ibc_message_sender.rs
+++ b/crates/relayer-components/src/relay/traits/ibc_message_sender.rs
@@ -3,13 +3,28 @@ use async_trait::async_trait;
 use crate::chain::traits::message_sender::InjectMismatchIbcEventsCountError;
 use crate::chain::traits::types::ibc::HasIbcChainTypes;
 use crate::chain::types::aliases::{Event, Message};
+use crate::core::traits::component::HasComponents;
 use crate::core::traits::sync::Async;
 use crate::relay::traits::chains::HasRelayChains;
 use crate::relay::traits::target::ChainTarget;
 use crate::std_prelude::*;
 
+pub struct MainSink;
+
 #[async_trait]
-pub trait CanSendIbcMessages<Target>: HasRelayChains
+pub trait IbcMessageSender<Relay, Sink, Target>: Async
+where
+    Relay: HasRelayChains,
+    Target: ChainTarget<Relay>,
+{
+    async fn send_messages(
+        relay: &Relay,
+        messages: Vec<Message<Target::TargetChain>>,
+    ) -> Result<Vec<Vec<Event<Target::TargetChain>>>, Relay::Error>;
+}
+
+#[async_trait]
+pub trait CanSendIbcMessages<Sink, Target>: HasRelayChains
 where
     Target: ChainTarget<Self>,
 {
@@ -21,19 +36,48 @@ where
 }
 
 #[async_trait]
-pub trait IbcMessageSender<Context, Target>: Async
+impl<Relay, Sink, Target> CanSendIbcMessages<Sink, Target> for Relay
 where
-    Context: HasRelayChains,
-    Target: ChainTarget<Context>,
+    Relay: HasRelayChains + HasComponents,
+    Target: ChainTarget<Relay>,
+    Relay::Components: IbcMessageSender<Relay, Sink, Target>,
 {
     async fn send_messages(
-        context: &Context,
+        &self,
+        _target: Target,
         messages: Vec<Message<Target::TargetChain>>,
-    ) -> Result<Vec<Vec<Event<Target::TargetChain>>>, Context::Error>;
+    ) -> Result<Vec<Vec<Event<Target::TargetChain>>>, Self::Error> {
+        Relay::Components::send_messages(self, messages).await
+    }
+}
+
+#[macro_export]
+macro_rules! derive_ibc_message_sender {
+    ( $sink:ty, $target:ident $( < $( $param:ident ),* $(,)? > )?, $source:ty $(,)?  ) => {
+        #[$crate::vendor::async_trait::async_trait]
+        impl<Relay, Target, $( $( $param ),* )*>
+            $crate::relay::traits::ibc_message_sender::IbcMessageSender<Relay, $sink, Target>
+            for $target $( < $( $param ),* > )*
+        where
+            Relay: $crate::relay::traits::chains::HasRelayChains,
+            Target: $crate::relay::traits::target::ChainTarget<Relay>,
+            $source: $crate::relay::traits::ibc_message_sender::IbcMessageSender<Relay, $sink, Target>,
+            $target $( < $( $param ),* > )*: $crate::core::traits::sync::Async,
+        {
+            async fn send_messages(
+                relay: &Relay,
+                messages: Vec<<Target::TargetChain as $crate::chain::traits::types::message::HasMessageType>::Message>,
+            ) -> Result<Vec<Vec<<Target::TargetChain as $crate::chain::traits::types::event::HasEventType>::Event>>, Relay::Error> {
+                <$source as $crate::relay::traits::ibc_message_sender::IbcMessageSender<Relay, $sink, Target>>
+                    ::send_messages(relay, messages).await
+            }
+        }
+
+    };
 }
 
 #[async_trait]
-pub trait CanSendFixSizedIbcMessages<Target>: HasRelayChains
+pub trait CanSendFixSizedIbcMessages<Sink, Target>: HasRelayChains
 where
     Target: ChainTarget<Self>,
 {
@@ -45,7 +89,7 @@ where
 }
 
 #[async_trait]
-pub trait CanSendSingleIbcMessage<Target>: HasRelayChains
+pub trait CanSendSingleIbcMessage<Sink, Target>: HasRelayChains
 where
     Target: ChainTarget<Self>,
 {
@@ -57,9 +101,10 @@ where
 }
 
 #[async_trait]
-impl<Relay, Target, TargetChain, Event, Message> CanSendFixSizedIbcMessages<Target> for Relay
+impl<Relay, Sink, Target, TargetChain, Event, Message> CanSendFixSizedIbcMessages<Sink, Target>
+    for Relay
 where
-    Relay: CanSendIbcMessages<Target> + InjectMismatchIbcEventsCountError,
+    Relay: CanSendIbcMessages<Sink, Target> + InjectMismatchIbcEventsCountError,
     Target: ChainTarget<Relay, TargetChain = TargetChain>,
     TargetChain: HasIbcChainTypes<Target::CounterpartyChain, Event = Event, Message = Message>,
     Message: Async,
@@ -80,9 +125,10 @@ where
 }
 
 #[async_trait]
-impl<Relay, Target, TargetChain, Event, Message> CanSendSingleIbcMessage<Target> for Relay
+impl<Relay, Sink, Target, TargetChain, Event, Message> CanSendSingleIbcMessage<Sink, Target>
+    for Relay
 where
-    Relay: CanSendIbcMessages<Target>,
+    Relay: CanSendIbcMessages<Sink, Target>,
     Target: ChainTarget<Relay, TargetChain = TargetChain>,
     TargetChain: HasIbcChainTypes<Target::CounterpartyChain, Event = Event, Message = Message>,
     Message: Async,
diff --git a/crates/relayer-components/src/relay/traits/messages/update_client.rs b/crates/relayer-components/src/relay/traits/messages/update_client.rs
index e6a2fe41da..f5401aebd3 100644
--- a/crates/relayer-components/src/relay/traits/messages/update_client.rs
+++ b/crates/relayer-components/src/relay/traits/messages/update_client.rs
@@ -1,10 +1,24 @@
 use async_trait::async_trait;
 
 use crate::chain::types::aliases::{Height, Message};
+use crate::core::traits::component::HasComponents;
 use crate::relay::traits::chains::HasRelayChains;
 use crate::relay::traits::target::ChainTarget;
 use crate::std_prelude::*;
 
+#[async_trait]
+pub trait UpdateClientMessageBuilder<Relay, Target>
+where
+    Relay: HasRelayChains,
+    Target: ChainTarget<Relay>,
+{
+    async fn build_update_client_messages(
+        relay: &Relay,
+        _target: Target,
+        height: &Height<Target::CounterpartyChain>,
+    ) -> Result<Vec<Message<Target::TargetChain>>, Relay::Error>;
+}
+
 #[async_trait]
 pub trait CanBuildUpdateClientMessage<Target>: HasRelayChains
 where
@@ -18,14 +32,42 @@ where
 }
 
 #[async_trait]
-pub trait UpdateClientMessageBuilder<Relay, Target>
+impl<Relay, Target> CanBuildUpdateClientMessage<Target> for Relay
 where
-    Relay: HasRelayChains,
+    Relay: HasRelayChains + HasComponents,
     Target: ChainTarget<Relay>,
+    Relay::Components: UpdateClientMessageBuilder<Relay, Target>,
 {
     async fn build_update_client_messages(
-        relay: &Relay,
-        _target: Target,
+        &self,
+        target: Target,
         height: &Height<Target::CounterpartyChain>,
-    ) -> Result<Vec<Message<Target::TargetChain>>, Relay::Error>;
+    ) -> Result<Vec<Message<Target::TargetChain>>, Self::Error> {
+        Relay::Components::build_update_client_messages(self, target, height).await
+    }
+}
+
+#[macro_export]
+macro_rules! derive_update_client_message_builder {
+    ( $target:ident $( < $( $param:ident ),* $(,)? > )?, $source:ty $(,)?  ) => {
+        #[$crate::vendor::async_trait::async_trait]
+        impl<Relay, Target, $( $( $param ),* )*>
+            $crate::relay::traits::messages::update_client::UpdateClientMessageBuilder<Relay, Target>
+            for $target $( < $( $param ),* > )*
+        where
+            Relay: $crate::relay::traits::chains::HasRelayChains,
+            Target: $crate::relay::traits::target::ChainTarget<Relay>,
+            $source: $crate::relay::traits::messages::update_client::UpdateClientMessageBuilder<Relay, Target>,
+        {
+            async fn build_update_client_messages(
+                relay: &Relay,
+                target: Target,
+                height: &<Target::CounterpartyChain as $crate::chain::traits::types::height::HasHeightType>::Height,
+            ) -> Result<Vec<<Target::TargetChain as $crate::chain::traits::types::message::HasMessageType>::Message>, Relay::Error> {
+                <$source as $crate::relay::traits::messages::update_client::UpdateClientMessageBuilder<Relay, Target>>
+                    ::build_update_client_messages(relay, target, height).await
+            }
+        }
+
+    };
 }
diff --git a/crates/relayer-components/src/relay/traits/packet_filter.rs b/crates/relayer-components/src/relay/traits/packet_filter.rs
index c2e47a7790..e7501a215e 100644
--- a/crates/relayer-components/src/relay/traits/packet_filter.rs
+++ b/crates/relayer-components/src/relay/traits/packet_filter.rs
@@ -1,5 +1,6 @@
 use async_trait::async_trait;
 
+use crate::core::traits::component::HasComponents;
 use crate::core::traits::sync::Async;
 use crate::relay::traits::packet::HasRelayPacket;
 use crate::std_prelude::*;
@@ -19,3 +20,38 @@ where
 pub trait CanFilterPackets: HasRelayPacket {
     async fn should_relay_packet(&self, packet: &Self::Packet) -> Result<bool, Self::Error>;
 }
+
+#[async_trait]
+impl<Relay> CanFilterPackets for Relay
+where
+    Relay: HasRelayPacket + HasComponents,
+    Relay::Components: PacketFilter<Relay>,
+{
+    async fn should_relay_packet(&self, packet: &Self::Packet) -> Result<bool, Self::Error> {
+        Relay::Components::should_relay_packet(self, packet).await
+    }
+}
+
+#[macro_export]
+macro_rules! derive_packet_filter {
+    ( $target:ident $( < $( $param:ident ),* $(,)? > )?, $source:ty $(,)?  ) => {
+        #[$crate::vendor::async_trait::async_trait]
+        impl<Relay, $( $( $param ),* )*>
+            $crate::relay::traits::packet_filter::PacketFilter<Relay>
+            for $target $( < $( $param ),* > )*
+        where
+            Relay: $crate::relay::traits::packet::HasRelayPacket,
+            $source: $crate::relay::traits::packet_filter::PacketFilter<Relay>,
+            $target $( < $( $param ),* > )*: $crate::core::traits::sync::Async,
+        {
+            async fn should_relay_packet(
+                relay: &Relay,
+                packet: &Relay::Packet,
+            ) -> Result<bool, Relay::Error> {
+                <$source as $crate::relay::traits::packet_filter::PacketFilter<Relay>>
+                    ::should_relay_packet(relay, packet).await
+            }
+        }
+
+    };
+}
diff --git a/crates/relayer-components/src/relay/traits/packet_relayer.rs b/crates/relayer-components/src/relay/traits/packet_relayer.rs
index 543ea9b954..41d83b1b70 100644
--- a/crates/relayer-components/src/relay/traits/packet_relayer.rs
+++ b/crates/relayer-components/src/relay/traits/packet_relayer.rs
@@ -1,5 +1,6 @@
 use async_trait::async_trait;
 
+use crate::core::traits::component::HasComponents;
 use crate::core::traits::sync::Async;
 use crate::relay::traits::packet::HasRelayPacket;
 use crate::std_prelude::*;
@@ -16,3 +17,35 @@ where
 pub trait CanRelayPacket: HasRelayPacket {
     async fn relay_packet(&self, packet: &Self::Packet) -> Result<(), Self::Error>;
 }
+
+#[async_trait]
+impl<Relay> CanRelayPacket for Relay
+where
+    Relay: HasRelayPacket + HasComponents,
+    Relay::Components: PacketRelayer<Relay>,
+{
+    async fn relay_packet(&self, packet: &Self::Packet) -> Result<(), Self::Error> {
+        Relay::Components::relay_packet(self, packet).await
+    }
+}
+
+#[macro_export]
+macro_rules! derive_packet_relayer {
+    ( $target:ident $( < $( $param:ident ),* $(,)? > )?, $source:ty $(,)?  ) => {
+        #[$crate::vendor::async_trait::async_trait]
+        impl<Relay, $( $( $param ),* )*>
+            $crate::relay::traits::packet_relayer::PacketRelayer<Relay>
+            for $target $( < $( $param ),* > )*
+        where
+            Relay: $crate::relay::traits::packet::HasRelayPacket,
+            $source: $crate::relay::traits::packet_relayer::PacketRelayer<Relay>,
+            $target $( < $( $param ),* > )*: $crate::core::traits::sync::Async,
+        {
+            async fn relay_packet(relay: &Relay, packet: &Relay::Packet) -> Result<(), Relay::Error> {
+                <$source as $crate::relay::traits::packet_relayer::PacketRelayer<Relay>>
+                    ::relay_packet(relay, packet).await
+            }
+        }
+
+    };
+}
diff --git a/crates/relayer-components/src/relay/traits/packet_relayers/ack_packet.rs b/crates/relayer-components/src/relay/traits/packet_relayers/ack_packet.rs
index 111b3ca0e3..e59873ca5f 100644
--- a/crates/relayer-components/src/relay/traits/packet_relayers/ack_packet.rs
+++ b/crates/relayer-components/src/relay/traits/packet_relayers/ack_packet.rs
@@ -2,10 +2,25 @@ use async_trait::async_trait;
 
 use crate::chain::traits::types::ibc_events::write_ack::HasWriteAcknowledgementEvent;
 use crate::chain::types::aliases::{Height, WriteAcknowledgementEvent};
+use crate::core::traits::component::HasComponents;
 use crate::core::traits::sync::Async;
 use crate::relay::traits::packet::HasRelayPacket;
 use crate::std_prelude::*;
 
+#[async_trait]
+pub trait AckPacketRelayer<Relay>: Async
+where
+    Relay: HasRelayPacket,
+    Relay::DstChain: HasWriteAcknowledgementEvent<Relay::SrcChain>,
+{
+    async fn relay_ack_packet(
+        context: &Relay,
+        destination_height: &Height<Relay::DstChain>,
+        packet: &Relay::Packet,
+        ack: &WriteAcknowledgementEvent<Relay::DstChain, Relay::SrcChain>,
+    ) -> Result<(), Relay::Error>;
+}
+
 #[async_trait]
 pub trait CanRelayAckPacket: HasRelayPacket
 where
@@ -20,15 +35,45 @@ where
 }
 
 #[async_trait]
-pub trait AckPacketRelayer<Relay>: Async
+impl<Relay> CanRelayAckPacket for Relay
 where
-    Relay: HasRelayPacket,
+    Relay: HasRelayPacket + HasComponents,
     Relay::DstChain: HasWriteAcknowledgementEvent<Relay::SrcChain>,
+    Relay::Components: AckPacketRelayer<Relay>,
 {
     async fn relay_ack_packet(
-        context: &Relay,
-        destination_height: &Height<Relay::DstChain>,
-        packet: &Relay::Packet,
-        ack: &WriteAcknowledgementEvent<Relay::DstChain, Relay::SrcChain>,
-    ) -> Result<(), Relay::Error>;
+        &self,
+        destination_height: &Height<Self::DstChain>,
+        packet: &Self::Packet,
+        ack: &WriteAcknowledgementEvent<Self::DstChain, Self::SrcChain>,
+    ) -> Result<(), Self::Error> {
+        Relay::Components::relay_ack_packet(self, destination_height, packet, ack).await
+    }
+}
+
+#[macro_export]
+macro_rules! derive_ack_packet_relayer {
+    ( $target:ident $( < $( $param:ident ),* $(,)? > )?, $source:ty $(,)?  ) => {
+        #[$crate::vendor::async_trait::async_trait]
+        impl<Relay, $( $( $param ),* )*>
+            $crate::relay::traits::packet_relayers::ack_packet::AckPacketRelayer<Relay>
+            for $target $( < $( $param ),* > )*
+        where
+            Relay: $crate::relay::traits::packet::HasRelayPacket,
+            Relay::DstChain: $crate::chain::traits::types::ibc_events::write_ack::HasWriteAcknowledgementEvent<Relay::SrcChain>,
+            $source: $crate::relay::traits::packet_relayers::ack_packet::AckPacketRelayer<Relay>,
+            $target $( < $( $param ),* > )*: $crate::core::traits::sync::Async,
+        {
+            async fn relay_ack_packet(
+                relay: &Relay,
+                destination_height: &<Relay::DstChain as $crate::chain::traits::types::height::HasHeightType>::Height,
+                packet: &Relay::Packet,
+                ack: &<Relay::DstChain as $crate::chain::traits::types::ibc_events::write_ack::HasWriteAcknowledgementEvent<Relay::SrcChain>>::WriteAcknowledgementEvent,
+            ) -> Result<(), Relay::Error> {
+                <$source as $crate::relay::traits::packet_relayers::ack_packet::AckPacketRelayer<Relay>>
+                    ::relay_ack_packet(relay, destination_height, packet, ack).await
+            }
+        }
+
+    };
 }
diff --git a/crates/relayer-components/src/relay/traits/packet_relayers/receive_packet.rs b/crates/relayer-components/src/relay/traits/packet_relayers/receive_packet.rs
index 4a0f05696d..e9806d4276 100644
--- a/crates/relayer-components/src/relay/traits/packet_relayers/receive_packet.rs
+++ b/crates/relayer-components/src/relay/traits/packet_relayers/receive_packet.rs
@@ -2,10 +2,24 @@ use async_trait::async_trait;
 
 use crate::chain::traits::types::ibc_events::write_ack::HasWriteAcknowledgementEvent;
 use crate::chain::types::aliases::{Height, WriteAcknowledgementEvent};
+use crate::core::traits::component::HasComponents;
 use crate::core::traits::sync::Async;
 use crate::relay::traits::packet::HasRelayPacket;
 use crate::std_prelude::*;
 
+#[async_trait]
+pub trait ReceivePacketRelayer<Relay>: Async
+where
+    Relay: HasRelayPacket,
+    Relay::DstChain: HasWriteAcknowledgementEvent<Relay::SrcChain>,
+{
+    async fn relay_receive_packet(
+        relay: &Relay,
+        source_height: &Height<Relay::SrcChain>,
+        packet: &Relay::Packet,
+    ) -> Result<Option<WriteAcknowledgementEvent<Relay::DstChain, Relay::SrcChain>>, Relay::Error>;
+}
+
 #[async_trait]
 pub trait CanRelayReceivePacket: HasRelayPacket
 where
@@ -19,14 +33,44 @@ where
 }
 
 #[async_trait]
-pub trait ReceivePacketRelayer<Relay>: Async
+impl<Relay> CanRelayReceivePacket for Relay
 where
-    Relay: HasRelayPacket,
-    Relay::DstChain: HasWriteAcknowledgementEvent<Relay::SrcChain>,
+    Relay: HasRelayPacket + HasComponents,
+    Relay::DstChain: HasWriteAcknowledgementEvent<Self::SrcChain>,
+    Relay::Components: ReceivePacketRelayer<Relay>,
 {
     async fn relay_receive_packet(
-        context: &Relay,
+        &self,
         source_height: &Height<Relay::SrcChain>,
         packet: &Relay::Packet,
-    ) -> Result<Option<WriteAcknowledgementEvent<Relay::DstChain, Relay::SrcChain>>, Relay::Error>;
+    ) -> Result<Option<WriteAcknowledgementEvent<Relay::DstChain, Relay::SrcChain>>, Relay::Error>
+    {
+        Relay::Components::relay_receive_packet(self, source_height, packet).await
+    }
+}
+
+#[macro_export]
+macro_rules! derive_receive_packet_relayer {
+    ( $target:ident $( < $( $param:ident ),* $(,)? > )?, $source:ty $(,)?  ) => {
+        #[$crate::vendor::async_trait::async_trait]
+        impl<Relay, $( $( $param ),* )*>
+            $crate::relay::traits::packet_relayers::receive_packet::ReceivePacketRelayer<Relay>
+            for $target $( < $( $param ),* > )*
+        where
+            Relay: $crate::relay::traits::packet::HasRelayPacket,
+            Relay::DstChain: $crate::chain::traits::types::ibc_events::write_ack::HasWriteAcknowledgementEvent<Relay::SrcChain>,
+            $source: $crate::relay::traits::packet_relayers::receive_packet::ReceivePacketRelayer<Relay>,
+            $target $( < $( $param ),* > )*: $crate::core::traits::sync::Async,
+        {
+            async fn relay_receive_packet(
+                relay: &Relay,
+                source_height: &<Relay::SrcChain as $crate::chain::traits::types::height::HasHeightType>::Height,
+                packet: &Relay::Packet,
+            ) -> Result<Option<<Relay::DstChain as $crate::chain::traits::types::ibc_events::write_ack::HasWriteAcknowledgementEvent<Relay::SrcChain>>::WriteAcknowledgementEvent>, Relay::Error> {
+                <$source as $crate::relay::traits::packet_relayers::receive_packet::ReceivePacketRelayer<Relay>>
+                    ::relay_receive_packet(relay, source_height, packet).await
+            }
+        }
+
+    };
 }
diff --git a/crates/relayer-components/src/relay/traits/packet_relayers/timeout_unordered_packet.rs b/crates/relayer-components/src/relay/traits/packet_relayers/timeout_unordered_packet.rs
index fc3fb528a8..b7bb0fbd8a 100644
--- a/crates/relayer-components/src/relay/traits/packet_relayers/timeout_unordered_packet.rs
+++ b/crates/relayer-components/src/relay/traits/packet_relayers/timeout_unordered_packet.rs
@@ -1,10 +1,23 @@
 use async_trait::async_trait;
 
 use crate::chain::types::aliases::Height;
+use crate::core::traits::component::HasComponents;
 use crate::core::traits::sync::Async;
 use crate::relay::traits::packet::HasRelayPacket;
 use crate::std_prelude::*;
 
+#[async_trait]
+pub trait TimeoutUnorderedPacketRelayer<Relay>: Async
+where
+    Relay: HasRelayPacket,
+{
+    async fn relay_timeout_unordered_packet(
+        context: &Relay,
+        destination_height: &Height<Relay::DstChain>,
+        packet: &Relay::Packet,
+    ) -> Result<(), Relay::Error>;
+}
+
 /// Encapsulates the capability of a relayer to send timeout packets over
 /// unordered channels.
 ///
@@ -25,13 +38,41 @@ pub trait CanRelayTimeoutUnorderedPacket: HasRelayPacket {
 }
 
 #[async_trait]
-pub trait TimeoutUnorderedPacketRelayer<Relay>: Async
+impl<Relay> CanRelayTimeoutUnorderedPacket for Relay
 where
-    Relay: HasRelayPacket,
+    Relay: HasRelayPacket + HasComponents,
+    Relay::Components: TimeoutUnorderedPacketRelayer<Relay>,
 {
     async fn relay_timeout_unordered_packet(
-        context: &Relay,
-        destination_height: &Height<Relay::DstChain>,
-        packet: &Relay::Packet,
-    ) -> Result<(), Relay::Error>;
+        &self,
+        destination_height: &Height<Self::DstChain>,
+        packet: &Self::Packet,
+    ) -> Result<(), Self::Error> {
+        Relay::Components::relay_timeout_unordered_packet(self, destination_height, packet).await
+    }
+}
+
+#[macro_export]
+macro_rules! derive_timeout_unordered_packet_relayer {
+    ( $target:ident $( < $( $param:ident ),* $(,)? > )?, $source:ty $(,)?  ) => {
+        #[$crate::vendor::async_trait::async_trait]
+        impl<Relay, $( $( $param ),* )*>
+            $crate::relay::traits::packet_relayers::timeout_unordered_packet::TimeoutUnorderedPacketRelayer<Relay>
+            for $target $( < $( $param ),* > )*
+        where
+            Relay: $crate::relay::traits::packet::HasRelayPacket,
+            $source: $crate::relay::traits::packet_relayers::timeout_unordered_packet::TimeoutUnorderedPacketRelayer<Relay>,
+            $target $( < $( $param ),* > )*: $crate::core::traits::sync::Async,
+        {
+            async fn relay_timeout_unordered_packet(
+                relay: &Relay,
+                destination_height: &<Relay::DstChain as $crate::chain::traits::types::height::HasHeightType>::Height,
+                packet: &Relay::Packet,
+            ) -> Result<(), Relay::Error> {
+                <$source as $crate::relay::traits::packet_relayers::timeout_unordered_packet::TimeoutUnorderedPacketRelayer<Relay>>
+                    ::relay_timeout_unordered_packet(relay, destination_height, packet).await
+            }
+        }
+
+    };
 }
diff --git a/crates/relayer-components/src/vendor/async_trait.rs b/crates/relayer-components/src/vendor/async_trait.rs
new file mode 100644
index 0000000000..8f89eebc8e
--- /dev/null
+++ b/crates/relayer-components/src/vendor/async_trait.rs
@@ -0,0 +1 @@
+pub use async_trait::async_trait;
diff --git a/crates/relayer-components/src/vendor/mod.rs b/crates/relayer-components/src/vendor/mod.rs
new file mode 100644
index 0000000000..cd31a2855c
--- /dev/null
+++ b/crates/relayer-components/src/vendor/mod.rs
@@ -0,0 +1 @@
+pub mod async_trait;
diff --git a/crates/relayer-mock/src/relayer_mock/base/impls/relay.rs b/crates/relayer-mock/src/relayer_mock/base/impls/relay.rs
index 830fe1a2ac..ec6e1cd9b3 100644
--- a/crates/relayer-mock/src/relayer_mock/base/impls/relay.rs
+++ b/crates/relayer-mock/src/relayer_mock/base/impls/relay.rs
@@ -1,26 +1,12 @@
 use alloc::boxed::Box;
 use alloc::string::ToString;
 use alloc::vec::Vec;
+use ibc_relayer_components::core::traits::component::HasComponents;
 use ibc_relayer_components::core::traits::error::HasErrorType;
 use ibc_relayer_components::logger::traits::has_logger::{HasLogger, HasLoggerType};
 use ibc_relayer_components::relay::traits::chains::HasRelayChains;
-use ibc_relayer_components::relay::traits::ibc_message_sender::{
-    CanSendIbcMessages, IbcMessageSender,
-};
-use ibc_relayer_components::relay::traits::messages::update_client::{
-    CanBuildUpdateClientMessage, UpdateClientMessageBuilder,
-};
-use ibc_relayer_components::relay::traits::packet_relayer::{CanRelayPacket, PacketRelayer};
-use ibc_relayer_components::relay::traits::packet_relayers::ack_packet::{
-    AckPacketRelayer, CanRelayAckPacket,
-};
+use ibc_relayer_components::relay::traits::messages::update_client::UpdateClientMessageBuilder;
 use ibc_relayer_components::relay::traits::packet_relayers::lock::HasPacketLock;
-use ibc_relayer_components::relay::traits::packet_relayers::receive_packet::{
-    CanRelayReceivePacket, ReceivePacketRelayer,
-};
-use ibc_relayer_components::relay::traits::packet_relayers::timeout_unordered_packet::{
-    CanRelayTimeoutUnorderedPacket, TimeoutUnorderedPacketRelayer,
-};
 use ibc_relayer_components::relay::traits::target::{DestinationTarget, SourceTarget};
 use ibc_relayer_components::runtime::traits::runtime::HasRuntime;
 use ibc_relayer_runtime::tokio::logger::tracing::TracingLogger;
@@ -31,15 +17,18 @@ use ibc_relayer_runtime::tokio::error::Error as TokioError;
 
 use crate::relayer_mock::base::error::{BaseError, Error};
 use crate::relayer_mock::base::types::aliases::ClientId;
-use crate::relayer_mock::base::types::events::{Event, WriteAcknowledgementEvent};
 use crate::relayer_mock::base::types::height::Height as MockHeight;
 use crate::relayer_mock::base::types::message::Message as MockMessage;
 use crate::relayer_mock::base::types::packet::PacketKey;
 use crate::relayer_mock::base::types::runtime::MockRuntimeContext;
-use crate::relayer_mock::components;
+use crate::relayer_mock::components::MockComponents;
 use crate::relayer_mock::contexts::chain::MockChainContext;
 use crate::relayer_mock::contexts::relay::MockRelayContext;
 
+impl HasComponents for MockRelayContext {
+    type Components = MockComponents;
+}
+
 impl HasErrorType for MockRelayContext {
     type Error = Error;
 }
@@ -132,30 +121,6 @@ impl UpdateClientMessageBuilder<MockRelayContext, DestinationTarget>
     }
 }
 
-#[async_trait]
-impl CanBuildUpdateClientMessage<SourceTarget> for MockRelayContext {
-    async fn build_update_client_messages(
-        &self,
-        target: SourceTarget,
-        height: &MockHeight,
-    ) -> Result<Vec<MockMessage>, Error> {
-        components::UpdateClientMessageBuilder::build_update_client_messages(self, target, height)
-            .await
-    }
-}
-
-#[async_trait]
-impl CanBuildUpdateClientMessage<DestinationTarget> for MockRelayContext {
-    async fn build_update_client_messages(
-        &self,
-        target: DestinationTarget,
-        height: &MockHeight,
-    ) -> Result<Vec<MockMessage>, Error> {
-        components::UpdateClientMessageBuilder::build_update_client_messages(self, target, height)
-            .await
-    }
-}
-
 #[async_trait]
 impl HasPacketLock for MockRelayContext {
     type PacketLock<'a> = ();
@@ -164,71 +129,3 @@ impl HasPacketLock for MockRelayContext {
         Some(())
     }
 }
-
-#[async_trait]
-impl CanSendIbcMessages<SourceTarget> for MockRelayContext {
-    async fn send_messages(
-        &self,
-        _target: SourceTarget,
-        messages: Vec<MockMessage>,
-    ) -> Result<Vec<Vec<Event>>, Error> {
-        <components::IbcMessageSender as IbcMessageSender<MockRelayContext, SourceTarget>>::send_messages(self, messages).await
-    }
-}
-
-#[async_trait]
-impl CanSendIbcMessages<DestinationTarget> for MockRelayContext {
-    async fn send_messages(
-        &self,
-        _target: DestinationTarget,
-        messages: Vec<MockMessage>,
-    ) -> Result<Vec<Vec<Event>>, Error> {
-        <components::IbcMessageSender as IbcMessageSender<MockRelayContext, DestinationTarget>>::send_messages(self, messages).await
-    }
-}
-
-#[async_trait]
-impl CanRelayAckPacket for MockRelayContext {
-    async fn relay_ack_packet(
-        &self,
-        destination_height: &MockHeight,
-        packet: &PacketKey,
-        ack: &WriteAcknowledgementEvent,
-    ) -> Result<(), Error> {
-        components::AckPacketRelayer::relay_ack_packet(self, destination_height, packet, ack).await
-    }
-}
-
-#[async_trait]
-impl CanRelayReceivePacket for MockRelayContext {
-    async fn relay_receive_packet(
-        &self,
-        source_height: &MockHeight,
-        packet: &PacketKey,
-    ) -> Result<Option<WriteAcknowledgementEvent>, Error> {
-        components::ReceivePacketRelayer::relay_receive_packet(self, source_height, packet).await
-    }
-}
-
-#[async_trait]
-impl CanRelayTimeoutUnorderedPacket for MockRelayContext {
-    async fn relay_timeout_unordered_packet(
-        &self,
-        destination_height: &MockHeight,
-        packet: &PacketKey,
-    ) -> Result<(), Self::Error> {
-        components::TimeoutUnorderedPacketRelayer::relay_timeout_unordered_packet(
-            self,
-            destination_height,
-            packet,
-        )
-        .await
-    }
-}
-
-#[async_trait]
-impl CanRelayPacket for MockRelayContext {
-    async fn relay_packet(&self, packet: &PacketKey) -> Result<(), Error> {
-        components::PacketRelayer::relay_packet(self, packet).await
-    }
-}
diff --git a/crates/relayer-mock/src/relayer_mock/components.rs b/crates/relayer-mock/src/relayer_mock/components.rs
index f37558c153..af6a05d2a0 100644
--- a/crates/relayer-mock/src/relayer_mock/components.rs
+++ b/crates/relayer-mock/src/relayer_mock/components.rs
@@ -1,24 +1,39 @@
-use ibc_relayer_components::relay::impls::message_senders::chain_sender::SendIbcMessagesToChain;
-use ibc_relayer_components::relay::impls::message_senders::update_client::SendIbcMessagesWithUpdateClient;
-use ibc_relayer_components::relay::impls::messages::skip_update_client::SkipUpdateClient;
-use ibc_relayer_components::relay::impls::messages::wait_update_client::WaitUpdateClient;
-use ibc_relayer_components::relay::impls::packet_relayers::ack::base_ack_packet::BaseAckPacketRelayer;
-use ibc_relayer_components::relay::impls::packet_relayers::general::full_relay::FullCycleRelayer;
-use ibc_relayer_components::relay::impls::packet_relayers::receive::base_receive_packet::BaseReceivePacketRelayer;
-use ibc_relayer_components::relay::impls::packet_relayers::receive::skip_received_packet::SkipReceivedPacketRelayer;
-use ibc_relayer_components::relay::impls::packet_relayers::timeout_unordered::timeout_unordered_packet::BaseTimeoutUnorderedPacketRelayer;
+use ibc_relayer_components::relay::components::message_senders::chain_sender::SendIbcMessagesToChain;
+use ibc_relayer_components::relay::components::message_senders::update_client::SendIbcMessagesWithUpdateClient;
+use ibc_relayer_components::relay::components::update_client::skip::SkipUpdateClient;
+use ibc_relayer_components::relay::components::update_client::wait::WaitUpdateClient;
+use ibc_relayer_components::relay::components::packet_relayers::ack::base_ack_packet::BaseAckPacketRelayer;
+use ibc_relayer_components::relay::components::packet_relayers::general::full_relay::FullCycleRelayer;
+use ibc_relayer_components::relay::components::packet_relayers::receive::base_receive_packet::BaseReceivePacketRelayer;
+use ibc_relayer_components::relay::components::packet_relayers::receive::skip_received_packet::SkipReceivedPacketRelayer;
+use ibc_relayer_components::relay::components::packet_relayers::timeout_unordered::timeout_unordered_packet::BaseTimeoutUnorderedPacketRelayer;
+use ibc_relayer_components::relay::traits::ibc_message_sender::MainSink;
 
 use crate::relayer_mock::base::impls::relay::MockBuildUpdateClientMessage;
 
-pub type IbcMessageSender = SendIbcMessagesWithUpdateClient<SendIbcMessagesToChain>;
+pub struct MockComponents;
 
-pub type PacketRelayer = FullCycleRelayer;
+ibc_relayer_components::derive_ibc_message_sender!(
+    MainSink,
+    MockComponents,
+    SendIbcMessagesWithUpdateClient<SendIbcMessagesToChain>,
+);
 
-pub type AckPacketRelayer = BaseAckPacketRelayer;
+ibc_relayer_components::derive_packet_relayer!(MockComponents, FullCycleRelayer,);
 
-pub type ReceivePacketRelayer = SkipReceivedPacketRelayer<BaseReceivePacketRelayer>;
+ibc_relayer_components::derive_receive_packet_relayer!(
+    MockComponents,
+    SkipReceivedPacketRelayer<BaseReceivePacketRelayer>,
+);
 
-pub type TimeoutUnorderedPacketRelayer = BaseTimeoutUnorderedPacketRelayer;
+ibc_relayer_components::derive_ack_packet_relayer!(MockComponents, BaseAckPacketRelayer,);
 
-pub type UpdateClientMessageBuilder =
-    SkipUpdateClient<WaitUpdateClient<MockBuildUpdateClientMessage>>;
+ibc_relayer_components::derive_timeout_unordered_packet_relayer!(
+    MockComponents,
+    BaseTimeoutUnorderedPacketRelayer,
+);
+
+ibc_relayer_components::derive_update_client_message_builder!(
+    MockComponents,
+    SkipUpdateClient<WaitUpdateClient<MockBuildUpdateClientMessage>>,
+);