diff --git a/dev/api.go b/dev/api.go
index 00e14d8..13ffc4f 100644
--- a/dev/api.go
+++ b/dev/api.go
@@ -852,18 +852,17 @@ func (das *DevAccountService) GetPoolSwappableFromVouchers(ctx context.Context,
 	return swapFromList, nil
 }
 
-func (das *DevAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
-	var swapToList []dataserviceapi.TokenHoldings
+func (das *DevAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, error) {
+	var swapToList []dataserviceapi.TokenDetails
 	_, ok := das.pools[poolAddress]
 	if !ok {
 		return nil, fmt.Errorf("Invalid pool address: %v", poolAddress)
 	}
 	for _, voucher := range das.vouchers {
-		swapToList = append(swapToList, dataserviceapi.TokenHoldings{
-			ContractAddress: voucher.Address,
-			TokenSymbol:     voucher.Symbol,
-			TokenDecimals:   string(defaultDecimals),
-			Balance:         fmt.Sprintf("%f", defaultVoucherBalance),
+		swapToList = append(swapToList, dataserviceapi.TokenDetails{
+			TokenAddress:  voucher.Address,
+			TokenSymbol:   voucher.Symbol,
+			TokenDecimals: defaultDecimals,
 		})
 	}
 	return swapToList, nil
diff --git a/remote/account_service.go b/remote/account_service.go
index 4050295..bafa665 100644
--- a/remote/account_service.go
+++ b/remote/account_service.go
@@ -23,7 +23,7 @@ type AccountService interface {
 	PoolDeposit(ctx context.Context, amount, from, poolAddress, tokenAddress string) (*models.PoolDepositResult, error)
 	FetchTopPools(ctx context.Context) ([]dataserviceapi.PoolDetails, error)
 	GetPoolSwappableFromVouchers(ctx context.Context, poolAddress, publicKey string) ([]dataserviceapi.TokenHoldings, error)
-	GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error)
+	GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, error)
 	GetPoolSwapQuote(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapQuoteResult, error)
 	PoolSwap(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapResult, error)
 	GetSwapFromTokenMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.MaxLimitResult, error)
diff --git a/remote/http/service.go b/remote/http/service.go
index 00c055a..4d124de 100644
--- a/remote/http/service.go
+++ b/remote/http/service.go
@@ -389,7 +389,7 @@ func (as *HTTPAccountService) getPoolSwappableFromVouchers(ctx context.Context,
 	return r.PoolSwappableVouchers, nil
 }
 
-func (as *HTTPAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
+func (as *HTTPAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, error) {
 	svc := dev.NewDevAccountService(ctx, as.SS)
 	if as.UseApi {
 		return as.getPoolSwappableVouchers(ctx, poolAddress)
@@ -398,9 +398,9 @@ func (as *HTTPAccountService) GetPoolSwappableVouchers(ctx context.Context, pool
 	}
 }
 
-func (as HTTPAccountService) getPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
+func (as HTTPAccountService) getPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, error) {
 	var r struct {
-		PoolSwappableVouchers []dataserviceapi.TokenHoldings `json:"filtered"`
+		PoolSwappableVouchers []dataserviceapi.TokenDetails `json:"filtered"`
 	}
 
 	basePath, err := url.JoinPath(config.PoolSwappableVouchersURL, poolAddress, "to")
diff --git a/testutil/mocks/service_mock.go b/testutil/mocks/service_mock.go
index 1c0ee97..4ea9cd8 100644
--- a/testutil/mocks/service_mock.go
+++ b/testutil/mocks/service_mock.go
@@ -86,9 +86,9 @@ func (m MockAccountService) GetPoolSwappableFromVouchers(ctx context.Context, po
 	return args.Get(0).([]dataserviceapi.TokenHoldings), args.Error(1)
 }
 
-func (m MockAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
+func (m MockAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, error) {
 	args := m.Called(poolAddress)
-	return args.Get(0).([]dataserviceapi.TokenHoldings), args.Error(1)
+	return args.Get(0).([]dataserviceapi.TokenDetails), args.Error(1)
 }
 
 func (m MockAccountService) GetPoolSwapQuote(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapQuoteResult, error) {
diff --git a/testutil/testservice/account_service.go b/testutil/testservice/account_service.go
index f9c69ef..a9e1d0d 100644
--- a/testutil/testservice/account_service.go
+++ b/testutil/testservice/account_service.go
@@ -89,8 +89,8 @@ func (m TestAccountService) GetPoolSwappableFromVouchers(ctx context.Context, po
 	return []dataserviceapi.TokenHoldings{}, nil
 }
 
-func (m TestAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
-	return []dataserviceapi.TokenHoldings{}, nil
+func (m TestAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, error) {
+	return []dataserviceapi.TokenDetails{}, nil
 }
 
 func (m TestAccountService) GetPoolSwapQuote(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapQuoteResult, error) {