Changed handshake message reading