Updated the MailServiceInterface with a few more params