Updated email class