Updated schemas for Handshake and Message