Implement changes to conform to protocol version 0.8