Updated for email_data