Added more exchnage support