diff --git a/packages/jellyfish-transaction-builder/__tests__/provider.mock.ts b/packages/jellyfish-transaction-builder/__tests__/provider.mock.ts
index 4a90806fa..0ac15c5a8 100644
--- a/packages/jellyfish-transaction-builder/__tests__/provider.mock.ts
+++ b/packages/jellyfish-transaction-builder/__tests__/provider.mock.ts
@@ -1,10 +1,9 @@
 import BigNumber from 'bignumber.js'
 import { Bech32, EllipticPair, Eth, HASH160, WIF } from '@defichain/jellyfish-crypto'
-import { EllipticPairProvider, FeeRateProvider, Prevout, PrevoutProvider } from '../src'
+import { EllipticPairProvider, FeeRateProvider, ListUnspentQueryOptions, Prevout, PrevoutProvider } from '../src'
 import { MasterNodeRegTestContainer } from '@defichain/testcontainers'
 import { OP_CODES, Script } from '@defichain/jellyfish-transaction'
 import { randomEllipticPair } from './test.utils'
-import { ListUnspentQueryOptions } from '@defichain/jellyfish-api-core/src/category/wallet'
 
 export class MockFeeRateProvider implements FeeRateProvider {
   constructor (
diff --git a/packages/jellyfish-transaction-builder/src/provider.ts b/packages/jellyfish-transaction-builder/src/provider.ts
index e1d24636b..71459d0a3 100644
--- a/packages/jellyfish-transaction-builder/src/provider.ts
+++ b/packages/jellyfish-transaction-builder/src/provider.ts
@@ -1,7 +1,6 @@
 import BigNumber from 'bignumber.js'
 import { EllipticPair } from '@defichain/jellyfish-crypto'
 import { Vout } from '@defichain/jellyfish-transaction'
-import { ListUnspentQueryOptions } from '@defichain/jellyfish-api-core/src/category/wallet'
 
 export interface FeeRateProvider {
   /**
@@ -10,6 +9,14 @@ export interface FeeRateProvider {
   estimate: () => Promise<BigNumber>
 }
 
+export interface ListUnspentQueryOptions {
+  minimumAmount?: number
+  maximumAmount?: number
+  maximumCount?: number
+  minimumSumAmount?: number
+  tokenId?: string
+}
+
 export interface PrevoutProvider {
   /**
    * @return {Prevout[]} all outputs to create transaction, aka to send all.
diff --git a/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts b/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts
index 17acfabd8..5a8991544 100644
--- a/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts
+++ b/packages/jellyfish-transaction-builder/src/txn/txn_builder.ts
@@ -10,12 +10,11 @@ import {
 } from '@defichain/jellyfish-transaction'
 import { SignInputOption, TransactionSigner } from '@defichain/jellyfish-transaction-signature'
 import BigNumber from 'bignumber.js'
-import { EllipticPairProvider, FeeRateProvider, Prevout, PrevoutProvider } from '../provider'
+import { EllipticPairProvider, FeeRateProvider, ListUnspentQueryOptions, Prevout, PrevoutProvider } from '../provider'
 import { calculateFeeP2WPKH } from './txn_fee'
 import { TxnBuilderError, TxnBuilderErrorType } from './txn_builder_error'
 import { EllipticPair } from '@defichain/jellyfish-crypto'
 import { Network } from '@defichain/jellyfish-network'
-import { ListUnspentQueryOptions } from '@defichain/jellyfish-api-core/src/category/wallet'
 
 const MAX_FEE_RATE = new BigNumber('0.00100000')
 
diff --git a/packages/jellyfish-transaction-builder/src/txn/txn_builder_account.ts b/packages/jellyfish-transaction-builder/src/txn/txn_builder_account.ts
index 705096094..99f93e744 100644
--- a/packages/jellyfish-transaction-builder/src/txn/txn_builder_account.ts
+++ b/packages/jellyfish-transaction-builder/src/txn/txn_builder_account.ts
@@ -5,7 +5,7 @@ import {
 } from '@defichain/jellyfish-transaction'
 import { P2WPKHTxnBuilder } from './txn_builder'
 import { TxnBuilderError, TxnBuilderErrorType } from './txn_builder_error'
-import { ListUnspentQueryOptions } from '@defichain/jellyfish-api-core/src/category/wallet'
+import { ListUnspentQueryOptions } from '../provider'
 
 export class TxnBuilderAccount extends P2WPKHTxnBuilder {
   /**