Add email address support