Added more email notifications