added exchange support