added email address polymorphism support