* adding email address support