Add ability to pass options parameter for handshake header