Begin switch to protobuf