Added one more handshake item and added mailer