diff --git a/codex/proof/datasampler.nim b/codex/proof/datasampler.nim
index 95562f72..15ea6f6d 100644
--- a/codex/proof/datasampler.nim
+++ b/codex/proof/datasampler.nim
@@ -34,7 +34,7 @@ type
     blockStore: BlockStore
     slotBlocks: SlotBlocks
     # The following data is invariant over time for a given slot:
-    slotRootHash: FieldElement
+    datasetRoot: FieldElement
     slotPoseidonTree: MerkleTree
     datasetToSlotProof: MerkleProof
     blockSize: uint64
@@ -48,7 +48,7 @@ proc new*(
     T: type DataSampler,
     slot: Slot,
     blockStore: BlockStore,
-    slotRootHash: FieldElement,
+    datasetRoot: FieldElement,
     slotPoseidonTree: MerkleTree,
     datasetToSlotProof: MerkleProof
 ): Future[?!DataSampler] {.async.} =
@@ -66,7 +66,7 @@ proc new*(
     slot: slot,
     blockStore: blockStore,
     slotBlocks: slotBlocks,
-    slotRootHash: slotRootHash,
+    datasetRoot: datasetRoot,
     slotPoseidonTree: slotPoseidonTree,
     datasetToSlotProof: datasetToSlotProof,
     blockSize: blockSize,
diff --git a/codex/proof/types.nim b/codex/proof/types.nim
index 076bac59..dc6dc160 100644
--- a/codex/proof/types.nim
+++ b/codex/proof/types.nim
@@ -9,8 +9,15 @@ const
 type
   FieldElement* = F
   Cell* = seq[byte]
+  ProofSample* = ref object
+    cellData*: Cell
+    merkleProof*: MerkleProof
   ProofInput* = ref object
+    datasetRoot*: FieldElement
+    entropy*: FieldElement
+    numberOfCellsInSlot*: uint64
+    numberOfSlots*: uint64
+    datasetSlotIndex*: uint64
+    slotRoot*: FieldElement
     datasetToSlotProof*: MerkleProof
-    slotToBlockProofs*: seq[MerkleProof]
-    blockToCellProofs*: seq[MerkleProof]
-    sampleData*: seq[byte]
+    proofSamples*: seq[ProofSample]