Adapt to latest protocol version