Changed the email class