Added e-mail notification support