Added SMTP Collector and its client