Added new parameter exchange and exchange_type plus some fixed