Improved ExchangeManager functionality