diff --git a/blockbuster/src/programs/bubblegum/mod.rs b/blockbuster/src/programs/bubblegum/mod.rs
index 042bf72..54b9daf 100644
--- a/blockbuster/src/programs/bubblegum/mod.rs
+++ b/blockbuster/src/programs/bubblegum/mod.rs
@@ -28,6 +28,8 @@ pub enum Payload {
     Unknown,
     MintV1 {
         args: MetadataArgs,
+        authority: [u8; 32],
+        tree_id: [u8; 32],
     },
     Decompress {
         args: MetadataArgs,
@@ -46,6 +48,7 @@ pub enum Payload {
     UpdateMetadata {
         current_metadata: MetadataArgs,
         update_args: UpdateArgs,
+        tree_id: [u8; 32],
     },
 }
 //TODO add more of the parsing here to minimize program transformer code
@@ -182,15 +185,11 @@ impl ProgramParser for BubblegumParser {
             if !ix_data.is_empty() {
                 match b_inst.instruction {
                     InstructionName::MintV1 => {
-                        let args: MetadataArgs = MetadataArgs::try_from_slice(ix_data)?;
-                        b_inst.payload = Some(Payload::MintV1 { args });
+                        b_inst.payload = Some(build_mint_v1_payload(keys, ix_data, false)?);
                     }
+
                     InstructionName::MintToCollectionV1 => {
-                        let mut args: MetadataArgs = MetadataArgs::try_from_slice(ix_data)?;
-                        if let Some(ref mut col) = args.collection {
-                            col.verified = true;
-                        }
-                        b_inst.payload = Some(Payload::MintV1 { args });
+                        b_inst.payload = Some(build_mint_v1_payload(keys, ix_data, true)?);
                     }
                     InstructionName::DecompressV1 => {
                         let args: MetadataArgs = MetadataArgs::try_from_slice(ix_data)?;
@@ -215,11 +214,7 @@ impl ProgramParser for BubblegumParser {
                         b_inst.payload = Some(build_collection_verification_payload(keys, false)?);
                     }
                     InstructionName::UpdateMetadata => {
-                        let args = UpdateMetadataInstructionArgs::try_from_slice(ix_data)?;
-                        b_inst.payload = Some(Payload::UpdateMetadata {
-                            current_metadata: args.current_metadata,
-                            update_args: args.update_args,
-                        });
+                        b_inst.payload = Some(build_update_metadata_payload(keys, ix_data)?);
                     }
                     _ => {}
                 };
@@ -260,3 +255,54 @@ fn build_collection_verification_payload(
     let collection: Pubkey = Pubkey::try_from_slice(&collection_raw)?;
     Ok(Payload::CollectionVerification { collection, verify })
 }
+
+// See Bubblegum for offsets and positions:
+// https://github.com/metaplex-foundation/mpl-bubblegum/blob/main/programs/bubblegum/README.md
+fn build_mint_v1_payload(
+    keys: &[plerkle_serialization::Pubkey],
+    ix_data: &[u8],
+    set_verify: bool,
+) -> Result<Payload, BlockbusterError> {
+    let mut args: MetadataArgs = MetadataArgs::try_from_slice(ix_data)?;
+    if set_verify {
+        if let Some(ref mut col) = args.collection {
+            col.verified = true;
+        }
+    }
+
+    let authority = keys
+        .get(0)
+        .ok_or(BlockbusterError::InstructionParsingError)?
+        .0;
+
+    let tree_id = keys
+        .get(3)
+        .ok_or(BlockbusterError::InstructionParsingError)?
+        .0;
+
+    Ok(Payload::MintV1 {
+        args,
+        authority,
+        tree_id,
+    })
+}
+
+// See Bubblegum for offsets and positions:
+// https://github.com/metaplex-foundation/mpl-bubblegum/blob/main/programs/bubblegum/README.md
+fn build_update_metadata_payload(
+    keys: &[plerkle_serialization::Pubkey],
+    ix_data: &[u8],
+) -> Result<Payload, BlockbusterError> {
+    let args = UpdateMetadataInstructionArgs::try_from_slice(ix_data)?;
+
+    let tree_id = keys
+        .get(8)
+        .ok_or(BlockbusterError::InstructionParsingError)?
+        .0;
+
+    Ok(Payload::UpdateMetadata {
+        current_metadata: args.current_metadata,
+        update_args: args.update_args,
+        tree_id,
+    })
+}
diff --git a/blockbuster/tests/instructions_test.rs b/blockbuster/tests/instructions_test.rs
index d2c777d..560822f 100644
--- a/blockbuster/tests/instructions_test.rs
+++ b/blockbuster/tests/instructions_test.rs
@@ -107,7 +107,15 @@ fn helium_nested() {
             _ => panic!("Wrong type"),
         };
 
-        if let (Some(_le), Some(_cl), Some(Payload::MintV1 { args: _ })) = (
+        if let (
+            Some(_le),
+            Some(_cl),
+            Some(Payload::MintV1 {
+                args: _,
+                authority: _,
+                tree_id: _,
+            }),
+        ) = (
             &parse_result.leaf_update,
             &parse_result.tree_update,
             &parse_result.payload,