Adds emailService exchange/queue as part of redesign