Updated with refactored Email class