Updated email triggers