diff --git a/sdk/core/src/bucket.rs b/sdk/core/src/bucket.rs
index 40adbbf..b7cba77 100644
--- a/sdk/core/src/bucket.rs
+++ b/sdk/core/src/bucket.rs
@@ -13,7 +13,7 @@ use cap_common::{
 /// contract is created using multiple bucket canisters, which are interconnected using a root bucket
 /// and router system. Querying buckets also features pagination.
 #[derive(Copy, Clone)]
-pub struct Bucket(pub(crate) Principal);
+pub struct Bucket(pub Principal);
 
 impl Bucket {
     /// Returns the list of canisters which have different pages of data.
diff --git a/sdk/core/src/root.rs b/sdk/core/src/root.rs
index b36075d..b60a713 100644
--- a/sdk/core/src/root.rs
+++ b/sdk/core/src/root.rs
@@ -19,7 +19,7 @@ use serde::{Deserialize, Serialize};
 ///
 /// Use [`RootBucket`]'s [`Into<Bucket>`] implementation to use a [`RootBucket`] as a [`Bucket`].
 #[derive(Copy, Clone, Serialize, Deserialize, CandidType)]
-pub struct RootBucket(pub(crate) Principal);
+pub struct RootBucket(pub Principal);
 
 impl RootBucket {
     /// Returns a bucket that be used to query for the given transaction ID.
diff --git a/sdk/src/transaction/query.rs b/sdk/src/transaction/query.rs
index b23a5da..e72b472 100644
--- a/sdk/src/transaction/query.rs
+++ b/sdk/src/transaction/query.rs
@@ -1,4 +1,4 @@
-use cap_sdk_core::GetTransactionResponse;
+use cap_sdk_core::{Bucket, GetTransactionResponse};
 
 use crate::{CapEnv, GetTransactionError, Transaction, TransactionId};
 
@@ -28,19 +28,21 @@ pub async fn get_transaction(id: TransactionId) -> Result<Transaction, GetTransa
         .await
         .map_err(|(code, details)| GetTransactionError::Unexpected(code, details))?;
 
-    let transaction = bucket
+    let mut transaction = bucket
         .get_transaction(id)
         .await
         .map_err(|(code, details)| GetTransactionError::Unexpected(code, details))?;
 
-    if let GetTransactionResponse::Found(event, _) = transaction {
-        if let Some(event) = event {
-            Ok(event)
-        } else {
-            Err(GetTransactionError::InvalidId)
-        }
+    while let GetTransactionResponse::Delegate(bucket, _) = transaction {
+        transaction = Bucket(bucket)
+            .get_transaction(id)
+            .await
+            .map_err(|(code, details)| GetTransactionError::Unexpected(code, details))?;
+    }
+
+    if let GetTransactionResponse::Found(Some(event), _) = transaction {
+        Ok(event)
     } else {
-        // TODO: Delegate
-        unimplemented!("This version of cap-sdk does not support multi-canister.")
+        Err(GetTransactionError::InvalidId)
     }
 }