diff --git a/statediff/builder/builder.go b/statediff/builder/builder.go
index bea07fd73..0745444ff 100644
--- a/statediff/builder/builder.go
+++ b/statediff/builder/builder.go
@@ -204,7 +204,7 @@ func (sdb *builder) buildDiffIncremental(creations map[common.Address]*state.Acc
 	return updatedAccounts, nil
 }
 
-func (sdb *builder) buildStorageDiffsEventual(sr common.Hash) (map[string]DiffString, error) {
+func (sdb *builder) buildStorageDiffsEventual(sr common.Hash) (map[string]DiffStorage, error) {
 	log.Debug("Storage Root For Eventual Diff", "root", sr.Hex())
 	sTrie, err := trie.New(sr, sdb.trieDB)
 	if err != nil {
@@ -212,14 +212,14 @@ func (sdb *builder) buildStorageDiffsEventual(sr common.Hash) (map[string]DiffSt
 		return nil, err
 	}
 	it := sTrie.NodeIterator(make([]byte, 0))
-	storageDiffs := make(map[string]DiffString)
+	storageDiffs := make(map[string]DiffStorage)
 	for {
 		log.Debug("Iterating over state at path ", "path", pathToStr(it))
 		if it.Leaf() {
 			log.Debug("Found leaf in storage", "path", pathToStr(it))
 			path := pathToStr(it)
 			value := hexutil.Encode(it.LeafBlob())
-			storageDiffs[path] = DiffString{Value: &value}
+			storageDiffs[path] = DiffStorage{Value: &value}
 		}
 		cont := it.Next(true)
 		if !cont {
@@ -229,7 +229,7 @@ func (sdb *builder) buildStorageDiffsEventual(sr common.Hash) (map[string]DiffSt
 	return storageDiffs, nil
 }
 
-func (sdb *builder) buildStorageDiffsIncremental(oldSR common.Hash, newSR common.Hash) (map[string]DiffString, error) {
+func (sdb *builder) buildStorageDiffsIncremental(oldSR common.Hash, newSR common.Hash) (map[string]DiffStorage, error) {
 	log.Debug("Storage Roots for Incremental Diff", "old", oldSR.Hex(), "new", newSR.Hex())
 	oldTrie, err := trie.New(oldSR, sdb.trieDB)
 	if err != nil {
@@ -243,13 +243,15 @@ func (sdb *builder) buildStorageDiffsIncremental(oldSR common.Hash, newSR common
 	oldIt := oldTrie.NodeIterator(make([]byte, 0))
 	newIt := newTrie.NodeIterator(make([]byte, 0))
 	it, _ := trie.NewDifferenceIterator(oldIt, newIt)
-	storageDiffs := make(map[string]DiffString)
+	storageDiffs := make(map[string]DiffStorage)
 	for {
 		if it.Leaf() {
 			log.Debug("Found leaf in storage", "path", pathToStr(it))
 			path := pathToStr(it)
-			value := hexutil.Encode(it.LeafBlob())
-			storageDiffs[path] = DiffString{Value: &value}
+			storageValue := hexutil.Encode(it.LeafBlob())
+			storageDiffs[path] = DiffStorage{
+				Value: &storageValue,
+			}
 		}
 
 		cont := it.Next(true)
diff --git a/statediff/builder/builder_test.go b/statediff/builder/builder_test.go
index 925cba512..e9cb8caf2 100644
--- a/statediff/builder/builder_test.go
+++ b/statediff/builder/builder_test.go
@@ -115,14 +115,14 @@ func TestBuilder(t *testing.T) {
 						Balance:      b.DiffBigInt{Value: big.NewInt(balanceChange10000)},
 						CodeHash:     "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
 						ContractRoot: b.DiffString{Value: &originalContractRoot},
-						Storage:      map[string]b.DiffString{},
+						Storage:      map[string]b.DiffStorage{},
 					},
 					burnAddress: {
 						Nonce:        b.DiffUint64{Value: &nonce0},
 						Balance:      b.DiffBigInt{Value: big.NewInt(miningReward)},
 						CodeHash:     "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
 						ContractRoot: b.DiffString{Value: &originalContractRoot},
-						Storage:      map[string]b.DiffString{},
+						Storage:      map[string]b.DiffStorage{},
 					},
 				},
 				DeletedAccounts: emptyAccountDiffEventualMap,
@@ -132,7 +132,7 @@ func TestBuilder(t *testing.T) {
 						Balance:      b.DiffBigInt{Value: big.NewInt(testBankFunds.Int64() - balanceChange10000)},
 						CodeHash:     "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
 						ContractRoot: b.DiffString{Value: &originalContractRoot},
-						Storage:      map[string]b.DiffString{},
+						Storage:      map[string]b.DiffStorage{},
 					},
 				},
 			},
@@ -156,14 +156,14 @@ func TestBuilder(t *testing.T) {
 						Balance:      b.DiffBigInt{Value: big.NewInt(balanceChange1000)},
 						CodeHash:     "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
 						ContractRoot: b.DiffString{Value: &originalContractRoot},
-						Storage:      map[string]b.DiffString{},
+						Storage:      map[string]b.DiffStorage{},
 					},
 					contractAddr: {
 						Nonce:        b.DiffUint64{Value: &nonce1},
 						Balance:      b.DiffBigInt{Value: big.NewInt(0)},
 						CodeHash:     "0x1c671ee4ae8abbacab7da59d6f8785cce8295eb086551ce7ac266a2e93666c0f",
 						ContractRoot: b.DiffString{Value: &originalContractRoot},
-						Storage:      map[string]b.DiffString{},
+						Storage:      map[string]b.DiffStorage{},
 					},
 				},
 				DeletedAccounts: emptyAccountDiffEventualMap,
@@ -173,21 +173,21 @@ func TestBuilder(t *testing.T) {
 						Balance:      b.DiffBigInt{Value: big.NewInt(block1BankBalance - balanceChange1000)},
 						CodeHash:     "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
 						ContractRoot: b.DiffString{Value: &originalContractRoot},
-						Storage:      map[string]b.DiffString{},
+						Storage:      map[string]b.DiffStorage{},
 					},
 					account1Addr: {
 						Nonce:        b.DiffUint64{Value: &nonce2},
 						Balance:      b.DiffBigInt{Value: big.NewInt(block1Account1Balance - balanceChange1000 + balanceChange1000)},
 						CodeHash:     "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
 						ContractRoot: b.DiffString{Value: &originalContractRoot},
-						Storage:      map[string]b.DiffString{},
+						Storage:      map[string]b.DiffStorage{},
 					},
 					burnAddress: {
 						Nonce:        b.DiffUint64{Value: &nonce0},
 						Balance:      b.DiffBigInt{Value: big.NewInt(miningReward + miningReward)},
 						CodeHash:     "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
 						ContractRoot: b.DiffString{Value: &originalContractRoot},
-						Storage:      map[string]b.DiffString{},
+						Storage:      map[string]b.DiffStorage{},
 					},
 				},
 			},
@@ -213,14 +213,14 @@ func TestBuilder(t *testing.T) {
 						Balance:      b.DiffBigInt{Value: big.NewInt(block2Account2Balance + miningReward)},
 						CodeHash:     "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
 						ContractRoot: b.DiffString{Value: &originalContractRoot},
-						Storage:      map[string]b.DiffString{},
+						Storage:      map[string]b.DiffStorage{},
 					},
 					contractAddr: {
 						Nonce:        b.DiffUint64{Value: &nonce1},
 						Balance:      b.DiffBigInt{Value: big.NewInt(0)},
 						CodeHash:     "0x1c671ee4ae8abbacab7da59d6f8785cce8295eb086551ce7ac266a2e93666c0f",
 						ContractRoot: b.DiffString{Value: &newContractRoot},
-						Storage: map[string]b.DiffString{
+						Storage: map[string]b.DiffStorage{
 							"0x405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace": {
 								Value: &newStorageValue},
 						},
@@ -230,7 +230,7 @@ func TestBuilder(t *testing.T) {
 						Balance:      b.DiffBigInt{Value: big.NewInt(99989000)},
 						CodeHash:     "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
 						ContractRoot: b.DiffString{Value: &originalContractRoot},
-						Storage:      map[string]b.DiffString{},
+						Storage:      map[string]b.DiffStorage{},
 					},
 				},
 			},
diff --git a/statediff/builder/struct.go b/statediff/builder/struct.go
index a7fc79815..44f7f4f84 100644
--- a/statediff/builder/struct.go
+++ b/statediff/builder/struct.go
@@ -56,13 +56,16 @@ func (sd *StateDiff) Encode() ([]byte, error) {
 }
 
 type AccountDiff struct {
-	Nonce        DiffUint64            `json:"nonce"         gencodec:"required"`
-	Balance      DiffBigInt            `json:"balance"       gencodec:"required"`
-	CodeHash     string                `json:"codeHash"      gencodec:"required"`
-	ContractRoot DiffString            `json:"contractRoot"  gencodec:"required"`
-	Storage      map[string]DiffString `json:"storage"       gencodec:"required"`
+	Nonce        DiffUint64             `json:"nonce"         gencodec:"required"`
+	Balance      DiffBigInt             `json:"balance"       gencodec:"required"`
+	CodeHash     string                 `json:"codeHash"      gencodec:"required"`
+	ContractRoot DiffString             `json:"contractRoot"  gencodec:"required"`
+	Storage      map[string]DiffStorage `json:"storage"       gencodec:"required"`
 }
 
+type DiffStorage struct {
+	Value *string `json:"value"  gencodec:"optional"`
+}
 type DiffString struct {
 	Value *string `json:"value"  gencodec:"optional"`
 }
diff --git a/statediff/testhelpers/test_data.go b/statediff/testhelpers/test_data.go
index cdbbb54c3..2dff3c323 100644
--- a/statediff/testhelpers/test_data.go
+++ b/statediff/testhelpers/test_data.go
@@ -16,7 +16,7 @@ var (
 	ContractRoot        = "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"
 	StoragePath         = "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
 	StorageValue        = "0x03"
-	storage             = map[string]builder.DiffString{StoragePath: {Value: &StorageValue}}
+	storage             = map[string]builder.DiffStorage{StoragePath: {Value: &StorageValue}}
 	address             = common.HexToAddress("0xaE9BEa628c4Ce503DcFD7E305CaB4e29E7476592")
 	ContractAddress     = address.String()
 	CreatedAccountDiffs = map[common.Address]builder.AccountDiff{address: {