Update to use new protobuf definitions