Add regexp matching for email address and text attributes