Yet another Protobuf refactor