Added additional SMTP stuff