diff --git a/src/state.cairo b/src/state.cairo
index eb9c1950..8928a518 100644
--- a/src/state.cairo
+++ b/src/state.cairo
@@ -1,3 +1,9 @@
+//! Bitcoin data type objects extended with validation context.
+//!
+//! The data is expected to be prepared in advance and passed as program arguments.
+//! The extended set of fields allows to recursively validate entities in a stateless manner,
+//! and to avoid repetitive computations.
+
 /// Represents the state of the blockchain.
 #[derive(Drop, Copy)]
 pub struct ChainState {
@@ -13,23 +19,21 @@ pub struct ChainState {
     pub epoch_start_time: u32,
     /// Previous timestamps.
     pub prev_timestamps: Span<u32>,
-    // TODO: utreexo_roots?
+    // Utreexo roots (for checking [TxIn] inclusion proofs)
+    pub utreexo_roots: Span<felt252>
 }
 
 /// Represents a block in the blockchain.
-///
 #[derive(Drop, Copy)]
 pub struct Block {
     /// block header
     pub header: Header,
-    // TODO: how to handle coinbase transactions?
-
     /// Transactions
     pub txs: Span<Transaction>,
 }
 
 /// Block header
-/// https://developer.bitcoin.org/reference/block_chain.html#block-headers
+/// https://learnmeabitcoin.com/technical/block/
 #[derive(Drop, Copy)]
 pub struct Header {
     /// The version of the block.
@@ -46,22 +50,34 @@ pub struct Header {
     pub nonce: u32,
 }
 
-/// Transaction
-/// https://developer.bitcoin.org/reference/transactions.html#raw-transaction-format
+/// Extended transaction.
+/// https://learnmeabitcoin.com/technical/transaction/
+///
+/// Contains additional "meta" fields required for validation.
 #[derive(Drop, Copy)]
 pub struct Transaction {
     /// The version of the transaction.
     pub version: i32,
+    /// Flag which indicates the presence of witness data.
+    /// Segwit marker and flag do not contribute to TXID (transaction hash),
+    /// but do contribute to wTXID.
+    pub is_segwit: bool,
     /// The inputs of the transaction.
     pub inputs: Span<TxIn>,
     /// The outputs of the transaction.
     pub outputs: Span<TxOut>,
+    /// The list of witnesses, one for each input.
+    /// Each witness is a list of elements that are to be pushed onto stack.
+    /// Witnesses do not contribute to TXID but do contribute to wTXID.
+    pub witnesses: Span<Span<ByteArray>>,
     /// The lock time of the transaction.
     pub lock_time: u32,
+    /// Transaction fee which is diff between total input and output amounts (meta field)
+    pub fee: i64,
 }
 
 /// Output of a transaction.
-/// https://developer.bitcoin.org/reference/transactions.html#txout-a-transaction-output
+/// https://learnmeabitcoin.com/technical/transaction/output/
 #[derive(Drop, Copy)]
 pub struct TxOut {
     /// The value of the output.
@@ -70,17 +86,23 @@ pub struct TxOut {
     pub pk_script: @ByteArray,
 }
 
-/// Input of a transaction.
-/// https://developer.bitcoin.org/reference/transactions.html#txin-a-transaction-input-non-coinbase
+/// Extended input of a transaction.
+/// https://learnmeabitcoin.com/technical/transaction/input/
+///
+/// Contains additional "meta" fields required for validation.
 #[derive(Drop, Copy)]
 pub struct TxIn {
-    /// The transaction ID of the input.
+    /// The previous TXID this input spends.
     pub txid: u256,
-    /// The index of the input.
-    pub index: u32,
-    /// The script of the input.
+    /// The previous transaction output index this input spends.
+    pub vout: u32,
+    /// The signature script which satisfies the conditions placed in the txo pubkey script
+    /// or coinbase script that contains block height (since 227,836) and miner nonce (optional).
     pub script: @ByteArray,
-    /// The sequence of the input.
+    /// The sequence number of the input ().
     pub sequence: u32,
+    /// The previous transaction output this input spends (meta field)
+    pub txo: @TxOut,
+    /// Utreexo inclusion proof of the spent output (meta field)
+    pub txo_proof: Span<felt252>,
 }
-
diff --git a/src/validation.cairo b/src/validation.cairo
index 68bf7eb8..427f387d 100644
--- a/src/validation.cairo
+++ b/src/validation.cairo
@@ -85,6 +85,7 @@ mod tests {
             current_target: 1,
             epoch_start_time: 1,
             prev_timestamps: array![1, 2, 3, 4, 5].span(),
+            utreexo_roots: array![].span(),
         };
         let mut block = Block {
             header: Header {
@@ -116,6 +117,7 @@ mod tests {
             current_target: 1,
             epoch_start_time: 1,
             prev_timestamps: array![1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].span(),
+            utreexo_roots: array![].span(),
         };
         let mut block = Block {
             header: Header {