Modified email class