Add email and number clauses
Sync with reality