Added support for email_cids