Added the ability to declare the exchange automatically when necessary