Changes for sending email notification