Updated with additional items needed for handling emails