Added new fields for notification email