Updated ExchangeFactory