Added AssemblyHelper and MailService