Switch to using EmailAddresses with additional information