Added arbitrage support