Changes to EmailHelper class