Added Email support