Make more complete, should be everything needed for SMTP