diff --git a/pom.xml b/pom.xml
index 68a8fb959..3ccb7ee7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,7 +75,7 @@
 		<!-- Core -->
 		<spring.version>3.3.5</spring.version>
 		<reactor.version>Dysprosium-SR25</reactor.version>
-		<xchange.version>5.0.13</xchange.version>
+		<xchange.version>5.2.2</xchange.version>
 		<bucket4j.version>8.0.1</bucket4j.version>
 		<liquibase.version>4.29.1</liquibase.version>
 		<opencsv.version>5.9</opencsv.version>
diff --git a/spring-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/batch/TickerStreamFlux.java b/spring-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/batch/TickerStreamFlux.java
index 22e8b0b90..b2afcd935 100644
--- a/spring-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/batch/TickerStreamFlux.java
+++ b/spring-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/batch/TickerStreamFlux.java
@@ -1,7 +1,7 @@
 package tech.cassandre.trading.bot.batch;
 
 import info.bitrich.xchangestream.core.StreamingExchange;
-import io.reactivex.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.knowm.xchange.currency.CurrencyPair;
 import org.knowm.xchange.dto.marketdata.Ticker;
 import org.springframework.context.ApplicationContext;
diff --git a/spring-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/dto/util/CurrencyPairDTO.java b/spring-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/dto/util/CurrencyPairDTO.java
index c35bd6150..712821e3c 100644
--- a/spring-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/dto/util/CurrencyPairDTO.java
+++ b/spring-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/dto/util/CurrencyPairDTO.java
@@ -51,7 +51,7 @@ public CurrencyPairDTO(final String currencyPair) {
      * @param currencyPair currency pair
      */
     public CurrencyPairDTO(final CurrencyPair currencyPair) {
-        this(currencyPair.base.toString(), currencyPair.counter.toString());
+        this(currencyPair.getBase().toString(), currencyPair.getCounter().toString());
     }
 
     /**
@@ -108,8 +108,8 @@ public CurrencyPairDTO(final CurrencyDTO newBaseCurrency, final CurrencyDTO newQ
      */
     public CurrencyPairDTO(final Instrument instrument) {
         final CurrencyPair cp = (CurrencyPair) instrument;
-        this.baseCurrency = new CurrencyDTO(cp.base.getCurrencyCode());
-        this.quoteCurrency = new CurrencyDTO(cp.counter.getCurrencyCode());
+        this.baseCurrency = new CurrencyDTO(cp.getBase().getCurrencyCode());
+        this.quoteCurrency = new CurrencyDTO(cp.getCounter().getCurrencyCode());
         this.baseCurrencyPrecision = DEFAULT_CURRENCY_PRECISION;
         this.quoteCurrencyPrecision = DEFAULT_CURRENCY_PRECISION;
     }
@@ -122,8 +122,8 @@ public CurrencyPairDTO(final Instrument instrument) {
      */
     public CurrencyPairDTO(final Instrument instrument, final int newBaseCurrencyPrecision, final int newQuoteCurrencyPrecision) {
         final CurrencyPair cp = (CurrencyPair) instrument;
-        this.baseCurrency = new CurrencyDTO(cp.base.getCurrencyCode());
-        this.quoteCurrency = new CurrencyDTO(cp.counter.getCurrencyCode());
+        this.baseCurrency = new CurrencyDTO(cp.getBase().getCurrencyCode());
+        this.quoteCurrency = new CurrencyDTO(cp.getCounter().getCurrencyCode());
         this.baseCurrencyPrecision = newBaseCurrencyPrecision;
         this.quoteCurrencyPrecision = newQuoteCurrencyPrecision;
     }
diff --git a/spring-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/service/ExchangeServiceXChangeImplementation.java b/spring-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/service/ExchangeServiceXChangeImplementation.java
index 6f6c94fb8..4a5c38c9e 100644
--- a/spring-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/service/ExchangeServiceXChangeImplementation.java
+++ b/spring-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/service/ExchangeServiceXChangeImplementation.java
@@ -23,7 +23,7 @@ public class ExchangeServiceXChangeImplementation extends BaseService implements
     public Set<CurrencyPairDTO> getAvailableCurrencyPairs() {
         logger.debug("Retrieving available currency pairs");
         return exchange.getExchangeMetaData()
-                .getCurrencyPairs()
+                .getInstruments()
                 .keySet()
                 .stream()
                 .peek(cp -> logger.debug(" - {} available", cp))
diff --git a/spring-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/util/mapper/AccountMapper.java b/spring-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/util/mapper/AccountMapper.java
index cce5fd141..87dce7673 100644
--- a/spring-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/util/mapper/AccountMapper.java
+++ b/spring-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/util/mapper/AccountMapper.java
@@ -28,7 +28,7 @@ public interface AccountMapper {
     UserDTO mapToUserDTO(AccountInfo source);
 
     @Mapping(source = "id", target = "accountId")
-    @Mapping(target = "feature", ignore = true)
+    @Mapping(target = "features", ignore = true)
     @Mapping(target = "balances", source = "balances")
     @Mapping(target = "balance", ignore = true)
     AccountDTO mapToWalletDTO(Wallet source);
diff --git a/spring-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/util/mapper/CurrencyMapper.java b/spring-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/util/mapper/CurrencyMapper.java
index f33db31e5..5f8fcad77 100644
--- a/spring-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/util/mapper/CurrencyMapper.java
+++ b/spring-boot-starter/autoconfigure/src/main/java/tech/cassandre/trading/bot/util/mapper/CurrencyMapper.java
@@ -40,8 +40,8 @@ default String mapToCurrencyPairString(CurrencyPairDTO source) {
 
     default CurrencyPairDTO mapToCurrencyPairDTO(Instrument source) {
         final CurrencyPair cp = (CurrencyPair) source;
-        CurrencyDTO base = new CurrencyDTO(cp.base.getCurrencyCode());
-        CurrencyDTO quote = new CurrencyDTO(cp.counter.getCurrencyCode());
+        CurrencyDTO base = new CurrencyDTO(cp.getBase().getCurrencyCode());
+        CurrencyDTO quote = new CurrencyDTO(cp.getCounter().getCurrencyCode());
         return new CurrencyPairDTO(base, quote);
     }