change protobuf message and resolve some errors