Add email address implementation & unit tests