Use new ExchangeType class