diff --git a/ledger/alonzo/alonzo.go b/ledger/alonzo/alonzo.go
index f9b22646..0354b1a5 100644
--- a/ledger/alonzo/alonzo.go
+++ b/ledger/alonzo/alonzo.go
@@ -311,9 +311,9 @@ type AlonzoRedeemer struct {
 
 type AlonzoTransactionWitnessSet struct {
 	shelley.ShelleyTransactionWitnessSet
-	PlutusScripts []cbor.RawMessage `cbor:"3,keyasint,omitempty"`
-	PlutusData    []cbor.RawMessage `cbor:"4,keyasint,omitempty"`
-	Redeemers     []AlonzoRedeemer  `cbor:"5,keyasint,omitempty"`
+	PlutusV1Scripts [][]byte         `cbor:"3,keyasint,omitempty"`
+	PlutusData      []cbor.Value     `cbor:"4,keyasint,omitempty"`
+	Redeemers       []AlonzoRedeemer `cbor:"5,keyasint,omitempty"`
 }
 
 func (t *AlonzoTransactionWitnessSet) UnmarshalCBOR(cborData []byte) error {
diff --git a/ledger/babbage/babbage.go b/ledger/babbage/babbage.go
index b54f14ce..76a4c464 100644
--- a/ledger/babbage/babbage.go
+++ b/ledger/babbage/babbage.go
@@ -491,7 +491,7 @@ func (o BabbageTransactionOutput) Utxorpc() *utxorpc.TxOutput {
 
 type BabbageTransactionWitnessSet struct {
 	alonzo.AlonzoTransactionWitnessSet
-	PlutusV2Scripts []cbor.RawMessage `cbor:"6,keyasint,omitempty"`
+	PlutusV2Scripts [][]byte `cbor:"6,keyasint,omitempty"`
 }
 
 func (t *BabbageTransactionWitnessSet) UnmarshalCBOR(cborData []byte) error {
diff --git a/ledger/babbage/babbage_test.go b/ledger/babbage/babbage_test.go
index 249b5487..75d7f3b1 100644
--- a/ledger/babbage/babbage_test.go
+++ b/ledger/babbage/babbage_test.go
@@ -48,8 +48,11 @@ func TestBabbageBlockTransactions(t *testing.T) {
 		b.TransactionWitnessSets[i] = BabbageTransactionWitnessSet{
 			AlonzoTransactionWitnessSet: alonzo.AlonzoTransactionWitnessSet{
 				ShelleyTransactionWitnessSet: shelley.ShelleyTransactionWitnessSet{
-					VkeyWitnesses: []interface{}{
-						append(make([]byte, 95), 1<<i),
+					VkeyWitnesses: []common.VkeyWitness{
+						{
+							Vkey:      append(make([]byte, 31), 1<<i)[:],
+							Signature: append(make([]byte, 63), 1<<i)[:],
+						},
 					},
 				},
 			},
diff --git a/ledger/common/native_script.go b/ledger/common/native_script.go
new file mode 100644
index 00000000..db547e37
--- /dev/null
+++ b/ledger/common/native_script.go
@@ -0,0 +1,94 @@
+// Copyright 2025 Blink Labs Software
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package common
+
+import (
+	"fmt"
+
+	"github.com/blinklabs-io/gouroboros/cbor"
+)
+
+type NativeScript struct {
+	item any
+}
+
+func (n *NativeScript) Item() any {
+	return n.item
+}
+
+func (n *NativeScript) UnmarshalCBOR(data []byte) error {
+	id, err := cbor.DecodeIdFromList(data)
+	if err != nil {
+		return err
+	}
+	var tmpData any
+	switch id {
+	case 0:
+		tmpData = &NativeScriptPubkey{}
+	case 1:
+		tmpData = &NativeScriptAll{}
+	case 2:
+		tmpData = &NativeScriptAny{}
+	case 3:
+		tmpData = &NativeScriptNofK{}
+	case 4:
+		tmpData = &NativeScriptInvalidBefore{}
+	case 5:
+		tmpData = &NativeScriptInvalidHereafter{}
+	default:
+		return fmt.Errorf("unknown native script type %d", id)
+	}
+	if _, err := cbor.Decode(data, tmpData); err != nil {
+		return err
+	}
+	return nil
+}
+
+type NativeScriptPubkey struct {
+	cbor.StructAsArray
+	Type uint
+	Hash []byte
+}
+
+type NativeScriptAll struct {
+	cbor.StructAsArray
+	Type    uint
+	Scripts []NativeScript
+}
+
+type NativeScriptAny struct {
+	cbor.StructAsArray
+	Type    uint
+	Scripts []NativeScript
+}
+
+type NativeScriptNofK struct {
+	cbor.StructAsArray
+	Type    uint
+	N       uint
+	Scripts []NativeScript
+}
+
+type NativeScriptInvalidBefore struct {
+	cbor.StructAsArray
+	Type uint
+	Slot uint64
+}
+
+type NativeScriptInvalidHereafter struct {
+	cbor.StructAsArray
+	Type uint
+	Slot uint64
+}
diff --git a/ledger/common/witness.go b/ledger/common/witness.go
new file mode 100644
index 00000000..4ca664ce
--- /dev/null
+++ b/ledger/common/witness.go
@@ -0,0 +1,33 @@
+// Copyright 2025 Blink Labs Software
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package common
+
+import (
+	"github.com/blinklabs-io/gouroboros/cbor"
+)
+
+type VkeyWitness struct {
+	cbor.StructAsArray
+	Vkey      []byte
+	Signature []byte
+}
+
+type BootstrapWitness struct {
+	cbor.StructAsArray
+	PublicKey  []byte
+	Signature  []byte
+	ChainCode  []byte
+	Attributes []byte
+}
diff --git a/ledger/conway/conway.go b/ledger/conway/conway.go
index 4653de17..ce6eb233 100644
--- a/ledger/conway/conway.go
+++ b/ledger/conway/conway.go
@@ -191,8 +191,8 @@ func (r *ConwayRedeemers) UnmarshalCBOR(cborData []byte) error {
 
 type ConwayTransactionWitnessSet struct {
 	babbage.BabbageTransactionWitnessSet
-	Redeemers       ConwayRedeemers   `cbor:"5,keyasint,omitempty"`
-	PlutusV3Scripts []cbor.RawMessage `cbor:"7,keyasint,omitempty"`
+	Redeemers       ConwayRedeemers `cbor:"5,keyasint,omitempty"`
+	PlutusV3Scripts [][]byte        `cbor:"7,keyasint,omitempty"`
 }
 
 func (t *ConwayTransactionWitnessSet) UnmarshalCBOR(cborData []byte) error {
diff --git a/ledger/mary.go b/ledger/mary.go
index bed9476a..58c5b216 100644
--- a/ledger/mary.go
+++ b/ledger/mary.go
@@ -26,7 +26,6 @@ type MaryTransaction = mary.MaryTransaction
 type MaryTransactionBody = mary.MaryTransactionBody
 type MaryTransactionOutput = mary.MaryTransactionOutput
 type MaryTransactionOutputValue = mary.MaryTransactionOutputValue
-type MaryTransactionWitnessSet = mary.MaryTransactionWitnessSet
 type MaryProtocolParameters = mary.MaryProtocolParameters
 type MaryProtocolParameterUpdate = mary.MaryProtocolParameterUpdate
 
diff --git a/ledger/mary/mary.go b/ledger/mary/mary.go
index 00c99c1f..fa0153af 100644
--- a/ledger/mary/mary.go
+++ b/ledger/mary/mary.go
@@ -54,7 +54,7 @@ type MaryBlock struct {
 	cbor.DecodeStoreCbor
 	BlockHeader            *MaryBlockHeader
 	TransactionBodies      []MaryTransactionBody
-	TransactionWitnessSets []MaryTransactionWitnessSet
+	TransactionWitnessSets []shelley.ShelleyTransactionWitnessSet
 	TransactionMetadataSet map[uint]*cbor.LazyValue
 }
 
@@ -180,7 +180,7 @@ type MaryTransaction struct {
 	cbor.StructAsArray
 	cbor.DecodeStoreCbor
 	Body       MaryTransactionBody
-	WitnessSet MaryTransactionWitnessSet
+	WitnessSet shelley.ShelleyTransactionWitnessSet
 	TxMetadata *cbor.LazyValue
 }
 
@@ -188,12 +188,6 @@ func (MaryTransaction) Type() int {
 	return TxTypeMary
 }
 
-type MaryTransactionWitnessSet struct {
-	shelley.ShelleyTransactionWitnessSet
-	Script        []interface{} `cbor:"4,keyasint,omitempty"`
-	PlutusScripts []interface{} `cbor:"5,keyasint,omitempty"`
-}
-
 func (t MaryTransaction) Hash() string {
 	return t.Body.Hash()
 }
diff --git a/ledger/shelley/shelley.go b/ledger/shelley/shelley.go
index 8b251940..a469d07a 100644
--- a/ledger/shelley/shelley.go
+++ b/ledger/shelley/shelley.go
@@ -468,9 +468,9 @@ func (o ShelleyTransactionOutput) Utxorpc() *utxorpc.TxOutput {
 
 type ShelleyTransactionWitnessSet struct {
 	cbor.DecodeStoreCbor
-	VkeyWitnesses      []interface{} `cbor:"0,keyasint,omitempty"`
-	MultisigScripts    []interface{} `cbor:"1,keyasint,omitempty"`
-	BootstrapWitnesses []interface{} `cbor:"2,keyasint,omitempty"`
+	VkeyWitnesses      []common.VkeyWitness      `cbor:"0,keyasint,omitempty"`
+	NativeScripts      []common.NativeScript     `cbor:"1,keyasint,omitempty"`
+	BootstrapWitnesses []common.BootstrapWitness `cbor:"2,keyasint,omitempty"`
 }
 
 func (t *ShelleyTransactionWitnessSet) UnmarshalCBOR(cborData []byte) error {