enhance for exchange config