Added e-mail support because I can