Upgrade EmailValidator to 2.x