diff --git a/solana/modules/token_bridge/program/src/accounts.rs b/solana/modules/token_bridge/program/src/accounts.rs
index a2980d29..807afbe1 100644
--- a/solana/modules/token_bridge/program/src/accounts.rs
+++ b/solana/modules/token_bridge/program/src/accounts.rs
@@ -1,6 +1,7 @@
 use crate::types::*;
 use bridge::{
     api::ForeignAddress,
+    types::BridgeData,
     vaa::{
         DeserializePayload,
         PayloadMessage,
@@ -16,6 +17,8 @@ pub type AuthoritySigner<'b> = Derive<Info<'b>, "authority_signer">;
 pub type CustodySigner<'b> = Derive<Info<'b>, "custody_signer">;
 pub type MintSigner<'b> = Derive<Info<'b>, "mint_signer">;
 
+pub type CoreBridge<'a, const State: AccountState> = Data<'a, BridgeData, { State }>;
+
 pub type EmitterAccount<'b> = Derive<Info<'b>, "emitter">;
 
 pub type ConfigAccount<'b, const State: AccountState> =
diff --git a/solana/modules/token_bridge/program/src/api/attest.rs b/solana/modules/token_bridge/program/src/api/attest.rs
index f0113bd2..b0786fcc 100644
--- a/solana/modules/token_bridge/program/src/api/attest.rs
+++ b/solana/modules/token_bridge/program/src/api/attest.rs
@@ -1,6 +1,7 @@
 use crate::{
     accounts::{
         ConfigAccount,
+        CoreBridge,
         EmitterAccount,
         SplTokenMeta,
         SplTokenMetaDerivationData,
@@ -77,7 +78,7 @@ pub struct AttestToken<'b> {
     pub spl_metadata: SplTokenMeta<'b>,
 
     /// CPI Context
-    pub bridge: Mut<Bridge<'b, { AccountState::Initialized }>>,
+    pub bridge: Mut<CoreBridge<'b, { AccountState::Initialized }>>,
 
     /// Account to store the posted message
     pub message: Signer<Mut<Info<'b>>>,
diff --git a/solana/modules/token_bridge/program/src/api/transfer.rs b/solana/modules/token_bridge/program/src/api/transfer.rs
index eeb6c2b3..c38859ec 100644
--- a/solana/modules/token_bridge/program/src/api/transfer.rs
+++ b/solana/modules/token_bridge/program/src/api/transfer.rs
@@ -2,6 +2,7 @@ use crate::{
     accounts::{
         AuthoritySigner,
         ConfigAccount,
+        CoreBridge,
         CustodyAccount,
         CustodyAccountDerivationData,
         CustodySigner,
@@ -81,7 +82,7 @@ pub struct TransferNative<'b> {
     pub custody_signer: CustodySigner<'b>,
 
     /// CPI Context
-    pub bridge: Mut<Bridge<'b, { AccountState::Initialized }>>,
+    pub bridge: Mut<CoreBridge<'b, { AccountState::Initialized }>>,
 
     /// Account to store the posted message
     pub message: Signer<Mut<Info<'b>>>,
@@ -230,7 +231,7 @@ pub struct TransferWrapped<'b> {
     pub authority_signer: AuthoritySigner<'b>,
 
     /// CPI Context
-    pub bridge: Mut<Bridge<'b, { AccountState::Initialized }>>,
+    pub bridge: Mut<CoreBridge<'b, { AccountState::Initialized }>>,
 
     /// Account to store the posted message
     pub message: Signer<Mut<Info<'b>>>,