Add support for handshake ACK