Expanded class hierarchy of SMTP