Updated with email template