Added email notification support