Added date option to Exchange function