Improved the protobuf message