Updated mapping for emails.