diff --git a/internal/handlers/server/accountservice.go b/internal/handlers/server/accountservice.go
index d53db57..9f6ce03 100644
--- a/internal/handlers/server/accountservice.go
+++ b/internal/handlers/server/accountservice.go
@@ -139,42 +139,6 @@ func (as *AccountService) FetchVouchers(publicKey string) (*models.VoucherHoldin
 					"tokenSymbol": "MILO",
 					"tokenDecimals": "6",
 					"balance": "75"
-				},
-				{
-					"contractAddress": "0xd4c288865Ce0985a481Eef3be02443dF5E2e4Ea9",
-					"tokenSymbol": "SOHAIL",
-					"tokenDecimals": "6",
-					"balance": "27874115"
-				},
-				{
-					"contractAddress": "0x45d747172e77d55575c197CbA9451bC2CD8F4958",
-					"tokenSymbol": "SRQIF",
-					"tokenDecimals": "6",
-					"balance": "2745987"
-				},
-				{
-					"contractAddress": "0x45d747172e77d55575c197CbA9451bC2CD8F4958",
-					"tokenSymbol": "SRFI",
-					"tokenDecimals": "6",
-					"balance": "2745987"
-				},
-				{
-					"contractAddress": "0x45d747172e77d55575c197CbA9451bC2CD8F4958",
-					"tokenSymbol": "SRFU",
-					"tokenDecimals": "6",
-					"balance": "2745987"
-				},
-				{
-					"contractAddress": "0x45d747172e77d55575c197CbA9451bC2CD8F4958",
-					"tokenSymbol": "SRQF",
-					"tokenDecimals": "6",
-					"balance": "2745987"
-				},
-				{
-					"contractAddress": "0x45d747172e77d55575c197CbA9451bC2CD8F4958",
-					"tokenSymbol": "SREF",
-					"tokenDecimals": "6",
-					"balance": "2745987"
 				}
 			]
 		}
diff --git a/internal/handlers/ussd/menuhandler.go b/internal/handlers/ussd/menuhandler.go
index 4c09acb..0ff1017 100644
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@@ -21,6 +21,8 @@ import (
 	"git.grassecon.net/urdt/ussd/internal/handlers/server"
 	"git.grassecon.net/urdt/ussd/internal/utils"
 	"gopkg.in/leonelquinteros/gotext.v1"
+
+	"git.grassecon.net/urdt/ussd/internal/storage"
 )
 
 var (
@@ -235,19 +237,17 @@ func (h *Handlers) SaveTemporaryPin(ctx context.Context, sym string, input []byt
 // checks whether they are stored internally before calling the API
 func (h *Handlers) GetVoucherList(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return res, fmt.Errorf("missing session")
-	}
 
 	// check if the vouchers exist internally and if not
 	// fetch from the API
 
 	// Read vouchers from the store
 	store := h.userdataStore
-	voucherData, err := store.ReadEntry(ctx, sessionId, utils.DATA_VOUCHER_LIST)
+	prefixdb := storage.NewSubPrefixDb(store, []byte("token_holdings"))
+
+	voucherData, err := prefixdb.Get(ctx, []byte("tokens"))
 	if err != nil {
-		return res, err
+		return res, nil
 	}
 
 	res.Content = string(voucherData)
@@ -1030,14 +1030,23 @@ func (h *Handlers) CheckVouchers(ctx context.Context, sym string, input []byte)
 		return res, nil
 	}
 
-	var numberedVouchers []string
+	var numberedSymbols []string
+	var numberedBalances []string
 	for i, voucher := range vouchersResp.Result.Holdings {
-		numberedVouchers = append(numberedVouchers, fmt.Sprintf("%d:%s", i+1, voucher.TokenSymbol))
+		numberedSymbols = append(numberedSymbols, fmt.Sprintf("%d:%s", i+1, voucher.TokenSymbol))
+		numberedBalances = append(numberedBalances, fmt.Sprintf("%d:%s", i+1, voucher.Balance))
 	}
 
-	voucherList := strings.Join(numberedVouchers, "\n")
+	voucherSymbolList := strings.Join(numberedSymbols, "\n")
+	voucherBalanceList := strings.Join(numberedBalances, "\n")
 
-	err = store.WriteEntry(ctx, sessionId, utils.DATA_VOUCHER_LIST, []byte(voucherList))
+	prefixdb := storage.NewSubPrefixDb(store, []byte("token_holdings"))
+	err = prefixdb.Put(ctx, []byte("tokens"), []byte(voucherSymbolList))
+	if err != nil {
+		return res, nil
+	}
+
+	err = prefixdb.Put(ctx, []byte(voucherSymbolList), []byte(voucherBalanceList))
 	if err != nil {
 		return res, nil
 	}