Re-generate WKTs & small fixes to them

12 files changed, 206 insertions, 1603 deletions

diff --git a/nimpb/compiler/generator.nim b/nimpb/compiler/generator.nim
index baf9d6a..83ef893 100644
--- a/nimpb/compiler/generator.nim
+++ b/nimpb/compiler/generator.nim
@@ -767,6 +767,8 @@ iterator genWriteMapKVProc(msg: Message): string =
 proc hasFieldCheck(msg: string, field: Field): string =
     if isRepeated(field) or isMapEntry(field):
         return &"len({msg}.{field.accessor}) > 0"
+    elif field.message.file.syntax == Syntax.Proto2:
+        return &"has{field.name}({msg})"
     elif field.oneof != nil:
         # Oneof fields only check the kind of the oneof field. If we anded this
         # check with a check from below, we couldn't convey to the deserializing
diff --git a/nimpb/wkt/any_pb.nim b/nimpb/wkt/any_pb.nim
index 4ba8423..440d2b3 100644
--- a/nimpb/wkt/any_pb.nim
+++ b/nimpb/wkt/any_pb.nim
@@ -29,14 +29,9 @@ proc newgoogle_protobuf_Any*(): google_protobuf_Any =
 
 proc cleartypeUrl*(message: google_protobuf_Any) =
     message.typeUrl = ""
-    clearFields(message, [1])
-
-proc hastypeUrl*(message: google_protobuf_Any): bool =
-    result = hasField(message, 1)
 
 proc settypeUrl*(message: google_protobuf_Any, value: string) =
     message.typeUrl = value
-    setField(message, 1)
 
 proc typeUrl*(message: google_protobuf_Any): string {.inline.} =
     message.typeUrl
@@ -46,14 +41,9 @@ proc `typeUrl=`*(message: google_protobuf_Any, value: string) {.inline.} =
 
 proc clearvalue*(message: google_protobuf_Any) =
     message.value = @[]
-    clearFields(message, [2])
-
-proc hasvalue*(message: google_protobuf_Any): bool =
-    result = hasField(message, 2)
 
 proc setvalue*(message: google_protobuf_Any, value: seq[byte]) =
     message.value = value
-    setField(message, 2)
 
 proc value*(message: google_protobuf_Any): seq[byte] {.inline.} =
     message.value
@@ -62,18 +52,18 @@ proc `value=`*(message: google_protobuf_Any, value: seq[byte]) {.inline.} =
     setvalue(message, value)
 
 proc sizeOfgoogle_protobuf_Any*(message: google_protobuf_Any): uint64 =
-    if hastypeUrl(message):
+    if len(message.typeUrl) > 0:
         result = result + sizeOfTag(1, WireType.LengthDelimited)
         result = result + sizeOfString(message.typeUrl)
-    if hasvalue(message):
+    if len(message.value) > 0:
         result = result + sizeOfTag(2, WireType.LengthDelimited)
         result = result + sizeOfBytes(message.value)
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_Any*(stream: Stream, message: google_protobuf_Any) =
-    if hastypeUrl(message):
+    if len(message.typeUrl) > 0:
         protoWriteString(stream, message.typeUrl, 1)
-    if hasvalue(message):
+    if len(message.value) > 0:
         protoWriteBytes(stream, message.value, 2)
     writeUnknownFields(stream, message)
 
diff --git a/nimpb/wkt/api_pb.nim b/nimpb/wkt/api_pb.nim
index dc6ef1c..1aff6f2 100644
--- a/nimpb/wkt/api_pb.nim
+++ b/nimpb/wkt/api_pb.nim
@@ -75,14 +75,9 @@ proc newgoogle_protobuf_Method*(): google_protobuf_Method =
 
 proc clearname*(message: google_protobuf_Method) =
     message.name = ""
-    clearFields(message, [1])
-
-proc hasname*(message: google_protobuf_Method): bool =
-    result = hasField(message, 1)
 
 proc setname*(message: google_protobuf_Method, value: string) =
     message.name = value
-    setField(message, 1)
 
 proc name*(message: google_protobuf_Method): string {.inline.} =
     message.name
@@ -92,14 +87,9 @@ proc `name=`*(message: google_protobuf_Method, value: string) {.inline.} =
 
 proc clearrequestTypeUrl*(message: google_protobuf_Method) =
     message.requestTypeUrl = ""
-    clearFields(message, [2])
-
-proc hasrequestTypeUrl*(message: google_protobuf_Method): bool =
-    result = hasField(message, 2)
 
 proc setrequestTypeUrl*(message: google_protobuf_Method, value: string) =
     message.requestTypeUrl = value
-    setField(message, 2)
 
 proc requestTypeUrl*(message: google_protobuf_Method): string {.inline.} =
     message.requestTypeUrl
@@ -109,14 +99,9 @@ proc `requestTypeUrl=`*(message: google_protobuf_Method, value: string) {.inline
 
 proc clearrequestStreaming*(message: google_protobuf_Method) =
     message.requestStreaming = false
-    clearFields(message, [3])
-
-proc hasrequestStreaming*(message: google_protobuf_Method): bool =
-    result = hasField(message, 3)
 
 proc setrequestStreaming*(message: google_protobuf_Method, value: bool) =
     message.requestStreaming = value
-    setField(message, 3)
 
 proc requestStreaming*(message: google_protobuf_Method): bool {.inline.} =
     message.requestStreaming
@@ -126,14 +111,9 @@ proc `requestStreaming=`*(message: google_protobuf_Method, value: bool) {.inline
 
 proc clearresponseTypeUrl*(message: google_protobuf_Method) =
     message.responseTypeUrl = ""
-    clearFields(message, [4])
-
-proc hasresponseTypeUrl*(message: google_protobuf_Method): bool =
-    result = hasField(message, 4)
 
 proc setresponseTypeUrl*(message: google_protobuf_Method, value: string) =
     message.responseTypeUrl = value
-    setField(message, 4)
 
 proc responseTypeUrl*(message: google_protobuf_Method): string {.inline.} =
     message.responseTypeUrl
@@ -143,14 +123,9 @@ proc `responseTypeUrl=`*(message: google_protobuf_Method, value: string) {.inlin
 
 proc clearresponseStreaming*(message: google_protobuf_Method) =
     message.responseStreaming = false
-    clearFields(message, [5])
-
-proc hasresponseStreaming*(message: google_protobuf_Method): bool =
-    result = hasField(message, 5)
 
 proc setresponseStreaming*(message: google_protobuf_Method, value: bool) =
     message.responseStreaming = value
-    setField(message, 5)
 
 proc responseStreaming*(message: google_protobuf_Method): bool {.inline.} =
     message.responseStreaming
@@ -171,7 +146,6 @@ proc setoptions*(message: google_protobuf_Method, value: seq[google_protobuf_Opt
 
 proc addoptions*(message: google_protobuf_Method, value: google_protobuf_Option) =
     add(message.options, value)
-    setField(message, 6)
 
 proc options*(message: google_protobuf_Method): seq[google_protobuf_Option] {.inline.} =
     message.options
@@ -181,14 +155,9 @@ proc `options=`*(message: google_protobuf_Method, value: seq[google_protobuf_Opt
 
 proc clearsyntax*(message: google_protobuf_Method) =
     message.syntax = google_protobuf_Syntax.SYNTAX_PROTO2
-    clearFields(message, [7])
-
-proc hassyntax*(message: google_protobuf_Method): bool =
-    result = hasField(message, 7)
 
 proc setsyntax*(message: google_protobuf_Method, value: google_protobuf_Syntax) =
     message.syntax = value
-    setField(message, 7)
 
 proc syntax*(message: google_protobuf_Method): google_protobuf_Syntax {.inline.} =
     message.syntax
@@ -197,43 +166,43 @@ proc `syntax=`*(message: google_protobuf_Method, value: google_protobuf_Syntax)
     setsyntax(message, value)
 
 proc sizeOfgoogle_protobuf_Method*(message: google_protobuf_Method): uint64 =
-    if hasname(message):
+    if len(message.name) > 0:
         result = result + sizeOfTag(1, WireType.LengthDelimited)
         result = result + sizeOfString(message.name)
-    if hasrequestTypeUrl(message):
+    if len(message.requestTypeUrl) > 0:
         result = result + sizeOfTag(2, WireType.LengthDelimited)
         result = result + sizeOfString(message.requestTypeUrl)
-    if hasrequestStreaming(message):
+    if message.requestStreaming != false:
         result = result + sizeOfTag(3, WireType.Varint)
         result = result + sizeOfBool(message.requestStreaming)
-    if hasresponseTypeUrl(message):
+    if len(message.responseTypeUrl) > 0:
         result = result + sizeOfTag(4, WireType.LengthDelimited)
         result = result + sizeOfString(message.responseTypeUrl)
-    if hasresponseStreaming(message):
+    if message.responseStreaming != false:
         result = result + sizeOfTag(5, WireType.Varint)
         result = result + sizeOfBool(message.responseStreaming)
     for value in message.options:
         result = result + sizeOfTag(6, WireType.LengthDelimited)
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_Option(value))
-    if hassyntax(message):
+    if message.syntax != google_protobuf_Syntax.SYNTAX_PROTO2:
         result = result + sizeOfTag(7, WireType.Varint)
         result = result + sizeOfEnum[google_protobuf_Syntax](message.syntax)
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_Method*(stream: Stream, message: google_protobuf_Method) =
-    if hasname(message):
+    if len(message.name) > 0:
         protoWriteString(stream, message.name, 1)
-    if hasrequestTypeUrl(message):
+    if len(message.requestTypeUrl) > 0:
         protoWriteString(stream, message.requestTypeUrl, 2)
-    if hasrequestStreaming(message):
+    if message.requestStreaming != false:
         protoWriteBool(stream, message.requestStreaming, 3)
-    if hasresponseTypeUrl(message):
+    if len(message.responseTypeUrl) > 0:
         protoWriteString(stream, message.responseTypeUrl, 4)
-    if hasresponseStreaming(message):
+    if message.responseStreaming != false:
         protoWriteBool(stream, message.responseStreaming, 5)
     for value in message.options:
         writeMessage(stream, value, 6)
-    if hassyntax(message):
+    if message.syntax != google_protobuf_Syntax.SYNTAX_PROTO2:
         protoWriteEnum(stream, message.syntax, 7)
     writeUnknownFields(stream, message)
 
@@ -272,22 +241,22 @@ proc readgoogle_protobuf_Method*(stream: Stream): google_protobuf_Method =
 
 proc toJson*(message: google_protobuf_Method): JsonNode =
     result = newJObject()
-    if hasname(message):
+    if len(message.name) > 0:
         result["name"] = %message.name
-    if hasrequestTypeUrl(message):
+    if len(message.requestTypeUrl) > 0:
         result["requestTypeUrl"] = %message.requestTypeUrl
-    if hasrequestStreaming(message):
+    if message.requestStreaming != false:
         result["requestStreaming"] = %message.requestStreaming
-    if hasresponseTypeUrl(message):
+    if len(message.responseTypeUrl) > 0:
         result["responseTypeUrl"] = %message.responseTypeUrl
-    if hasresponseStreaming(message):
+    if message.responseStreaming != false:
         result["responseStreaming"] = %message.responseStreaming
-    if hasoptions(message):
+    if len(message.options) > 0:
         let arr = newJArray()
         for value in message.options:
             add(arr, toJson(value))
         result["options"] = arr
-    if hassyntax(message):
+    if message.syntax != google_protobuf_Syntax.SYNTAX_PROTO2:
         result["syntax"] = toJson(message.syntax)
 
 proc parsegoogle_protobuf_Method*(obj: JsonNode): google_protobuf_Method =
@@ -345,14 +314,9 @@ proc newgoogle_protobuf_Mixin*(): google_protobuf_Mixin =
 
 proc clearname*(message: google_protobuf_Mixin) =
     message.name = ""
-    clearFields(message, [1])
-
-proc hasname*(message: google_protobuf_Mixin): bool =
-    result = hasField(message, 1)
 
 proc setname*(message: google_protobuf_Mixin, value: string) =
     message.name = value
-    setField(message, 1)
 
 proc name*(message: google_protobuf_Mixin): string {.inline.} =
     message.name
@@ -362,14 +326,9 @@ proc `name=`*(message: google_protobuf_Mixin, value: string) {.inline.} =
 
 proc clearroot*(message: google_protobuf_Mixin) =
     message.root = ""
-    clearFields(message, [2])
-
-proc hasroot*(message: google_protobuf_Mixin): bool =
-    result = hasField(message, 2)
 
 proc setroot*(message: google_protobuf_Mixin, value: string) =
     message.root = value
-    setField(message, 2)
 
 proc root*(message: google_protobuf_Mixin): string {.inline.} =
     message.root
@@ -378,18 +337,18 @@ proc `root=`*(message: google_protobuf_Mixin, value: string) {.inline.} =
     setroot(message, value)
 
 proc sizeOfgoogle_protobuf_Mixin*(message: google_protobuf_Mixin): uint64 =
-    if hasname(message):
+    if len(message.name) > 0:
         result = result + sizeOfTag(1, WireType.LengthDelimited)
         result = result + sizeOfString(message.name)
-    if hasroot(message):
+    if len(message.root) > 0:
         result = result + sizeOfTag(2, WireType.LengthDelimited)
         result = result + sizeOfString(message.root)
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_Mixin*(stream: Stream, message: google_protobuf_Mixin) =
-    if hasname(message):
+    if len(message.name) > 0:
         protoWriteString(stream, message.name, 1)
-    if hasroot(message):
+    if len(message.root) > 0:
         protoWriteString(stream, message.root, 2)
     writeUnknownFields(stream, message)
 
@@ -412,9 +371,9 @@ proc readgoogle_protobuf_Mixin*(stream: Stream): google_protobuf_Mixin =
 
 proc toJson*(message: google_protobuf_Mixin): JsonNode =
     result = newJObject()
-    if hasname(message):
+    if len(message.name) > 0:
         result["name"] = %message.name
-    if hasroot(message):
+    if len(message.root) > 0:
         result["root"] = %message.root
 
 proc parsegoogle_protobuf_Mixin*(obj: JsonNode): google_protobuf_Mixin =
@@ -459,14 +418,9 @@ proc newgoogle_protobuf_Api*(): google_protobuf_Api =
 
 proc clearname*(message: google_protobuf_Api) =
     message.name = ""
-    clearFields(message, [1])
-
-proc hasname*(message: google_protobuf_Api): bool =
-    result = hasField(message, 1)
 
 proc setname*(message: google_protobuf_Api, value: string) =
     message.name = value
-    setField(message, 1)
 
 proc name*(message: google_protobuf_Api): string {.inline.} =
     message.name
@@ -487,7 +441,6 @@ proc setmethods*(message: google_protobuf_Api, value: seq[google_protobuf_Method
 
 proc addmethods*(message: google_protobuf_Api, value: google_protobuf_Method) =
     add(message.methods, value)
-    setField(message, 2)
 
 proc methods*(message: google_protobuf_Api): seq[google_protobuf_Method] {.inline.} =
     message.methods
@@ -508,7 +461,6 @@ proc setoptions*(message: google_protobuf_Api, value: seq[google_protobuf_Option
 
 proc addoptions*(message: google_protobuf_Api, value: google_protobuf_Option) =
     add(message.options, value)
-    setField(message, 3)
 
 proc options*(message: google_protobuf_Api): seq[google_protobuf_Option] {.inline.} =
     message.options
@@ -518,14 +470,9 @@ proc `options=`*(message: google_protobuf_Api, value: seq[google_protobuf_Option
 
 proc clearversion*(message: google_protobuf_Api) =
     message.version = ""
-    clearFields(message, [4])
-
-proc hasversion*(message: google_protobuf_Api): bool =
-    result = hasField(message, 4)
 
 proc setversion*(message: google_protobuf_Api, value: string) =
     message.version = value
-    setField(message, 4)
 
 proc version*(message: google_protobuf_Api): string {.inline.} =
     message.version
@@ -563,7 +510,6 @@ proc setmixins*(message: google_protobuf_Api, value: seq[google_protobuf_Mixin])
 
 proc addmixins*(message: google_protobuf_Api, value: google_protobuf_Mixin) =
     add(message.mixins, value)
-    setField(message, 6)
 
 proc mixins*(message: google_protobuf_Api): seq[google_protobuf_Mixin] {.inline.} =
     message.mixins
@@ -573,14 +519,9 @@ proc `mixins=`*(message: google_protobuf_Api, value: seq[google_protobuf_Mixin])
 
 proc clearsyntax*(message: google_protobuf_Api) =
     message.syntax = google_protobuf_Syntax.SYNTAX_PROTO2
-    clearFields(message, [7])
-
-proc hassyntax*(message: google_protobuf_Api): bool =
-    result = hasField(message, 7)
 
 proc setsyntax*(message: google_protobuf_Api, value: google_protobuf_Syntax) =
     message.syntax = value
-    setField(message, 7)
 
 proc syntax*(message: google_protobuf_Api): google_protobuf_Syntax {.inline.} =
     message.syntax
@@ -589,7 +530,7 @@ proc `syntax=`*(message: google_protobuf_Api, value: google_protobuf_Syntax) {.i
     setsyntax(message, value)
 
 proc sizeOfgoogle_protobuf_Api*(message: google_protobuf_Api): uint64 =
-    if hasname(message):
+    if len(message.name) > 0:
         result = result + sizeOfTag(1, WireType.LengthDelimited)
         result = result + sizeOfString(message.name)
     for value in message.methods:
@@ -598,7 +539,7 @@ proc sizeOfgoogle_protobuf_Api*(message: google_protobuf_Api): uint64 =
     for value in message.options:
         result = result + sizeOfTag(3, WireType.LengthDelimited)
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_Option(value))
-    if hasversion(message):
+    if len(message.version) > 0:
         result = result + sizeOfTag(4, WireType.LengthDelimited)
         result = result + sizeOfString(message.version)
     if hassourceContext(message):
@@ -607,25 +548,25 @@ proc sizeOfgoogle_protobuf_Api*(message: google_protobuf_Api): uint64 =
     for value in message.mixins:
         result = result + sizeOfTag(6, WireType.LengthDelimited)
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_Mixin(value))
-    if hassyntax(message):
+    if message.syntax != google_protobuf_Syntax.SYNTAX_PROTO2:
         result = result + sizeOfTag(7, WireType.Varint)
         result = result + sizeOfEnum[google_protobuf_Syntax](message.syntax)
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_Api*(stream: Stream, message: google_protobuf_Api) =
-    if hasname(message):
+    if len(message.name) > 0:
         protoWriteString(stream, message.name, 1)
     for value in message.methods:
         writeMessage(stream, value, 2)
     for value in message.options:
         writeMessage(stream, value, 3)
-    if hasversion(message):
+    if len(message.version) > 0:
         protoWriteString(stream, message.version, 4)
     if hassourceContext(message):
         writeMessage(stream, message.sourceContext, 5)
     for value in message.mixins:
         writeMessage(stream, value, 6)
-    if hassyntax(message):
+    if message.syntax != google_protobuf_Syntax.SYNTAX_PROTO2:
         protoWriteEnum(stream, message.syntax, 7)
     writeUnknownFields(stream, message)
 
@@ -667,28 +608,28 @@ proc readgoogle_protobuf_Api*(stream: Stream): google_protobuf_Api =
 
 proc toJson*(message: google_protobuf_Api): JsonNode =
     result = newJObject()
-    if hasname(message):
+    if len(message.name) > 0:
         result["name"] = %message.name
-    if hasmethods(message):
+    if len(message.methods) > 0:
         let arr = newJArray()
         for value in message.methods:
             add(arr, toJson(value))
         result["methods"] = arr
-    if hasoptions(message):
+    if len(message.options) > 0:
         let arr = newJArray()
         for value in message.options:
             add(arr, toJson(value))
         result["options"] = arr
-    if hasversion(message):
+    if len(message.version) > 0:
         result["version"] = %message.version
     if hassourceContext(message):
         result["sourceContext"] = toJson(message.sourceContext)
-    if hasmixins(message):
+    if len(message.mixins) > 0:
         let arr = newJArray()
         for value in message.mixins:
             add(arr, toJson(value))
         result["mixins"] = arr
-    if hassyntax(message):
+    if message.syntax != google_protobuf_Syntax.SYNTAX_PROTO2:
         result["syntax"] = toJson(message.syntax)
 
 proc parsegoogle_protobuf_Api*(obj: JsonNode): google_protobuf_Api =
diff --git a/nimpb/wkt/descriptor_pb.nim b/nimpb/wkt/descriptor_pb.nim
index 401b5b1..1627079 100644
--- a/nimpb/wkt/descriptor_pb.nim
+++ b/nimpb/wkt/descriptor_pb.nim
@@ -231,8 +231,6 @@ proc newgoogle_protobuf_UninterpretedOption_NamePart*(data: seq[byte]): google_p
 proc writegoogle_protobuf_UninterpretedOption_NamePart*(stream: Stream, message: google_protobuf_UninterpretedOption_NamePart)
 proc readgoogle_protobuf_UninterpretedOption_NamePart*(stream: Stream): google_protobuf_UninterpretedOption_NamePart
 proc sizeOfgoogle_protobuf_UninterpretedOption_NamePart*(message: google_protobuf_UninterpretedOption_NamePart): uint64
-proc toJson*(message: google_protobuf_UninterpretedOption_NamePart): JsonNode
-proc parsegoogle_protobuf_UninterpretedOption_NamePart*(obj: JsonNode): google_protobuf_UninterpretedOption_NamePart
 
 proc newgoogle_protobuf_UninterpretedOption*(): google_protobuf_UninterpretedOption
 proc newgoogle_protobuf_UninterpretedOption*(data: string): google_protobuf_UninterpretedOption
@@ -240,8 +238,6 @@ proc newgoogle_protobuf_UninterpretedOption*(data: seq[byte]): google_protobuf_U
 proc writegoogle_protobuf_UninterpretedOption*(stream: Stream, message: google_protobuf_UninterpretedOption)
 proc readgoogle_protobuf_UninterpretedOption*(stream: Stream): google_protobuf_UninterpretedOption
 proc sizeOfgoogle_protobuf_UninterpretedOption*(message: google_protobuf_UninterpretedOption): uint64
-proc toJson*(message: google_protobuf_UninterpretedOption): JsonNode
-proc parsegoogle_protobuf_UninterpretedOption*(obj: JsonNode): google_protobuf_UninterpretedOption
 
 proc newgoogle_protobuf_EnumValueOptions*(): google_protobuf_EnumValueOptions
 proc newgoogle_protobuf_EnumValueOptions*(data: string): google_protobuf_EnumValueOptions
@@ -249,8 +245,6 @@ proc newgoogle_protobuf_EnumValueOptions*(data: seq[byte]): google_protobuf_Enum
 proc writegoogle_protobuf_EnumValueOptions*(stream: Stream, message: google_protobuf_EnumValueOptions)
 proc readgoogle_protobuf_EnumValueOptions*(stream: Stream): google_protobuf_EnumValueOptions
 proc sizeOfgoogle_protobuf_EnumValueOptions*(message: google_protobuf_EnumValueOptions): uint64
-proc toJson*(message: google_protobuf_EnumValueOptions): JsonNode
-proc parsegoogle_protobuf_EnumValueOptions*(obj: JsonNode): google_protobuf_EnumValueOptions
 
 proc newgoogle_protobuf_EnumValueDescriptorProto*(): google_protobuf_EnumValueDescriptorProto
 proc newgoogle_protobuf_EnumValueDescriptorProto*(data: string): google_protobuf_EnumValueDescriptorProto
@@ -258,8 +252,6 @@ proc newgoogle_protobuf_EnumValueDescriptorProto*(data: seq[byte]): google_proto
 proc writegoogle_protobuf_EnumValueDescriptorProto*(stream: Stream, message: google_protobuf_EnumValueDescriptorProto)
 proc readgoogle_protobuf_EnumValueDescriptorProto*(stream: Stream): google_protobuf_EnumValueDescriptorProto
 proc sizeOfgoogle_protobuf_EnumValueDescriptorProto*(message: google_protobuf_EnumValueDescriptorProto): uint64
-proc toJson*(message: google_protobuf_EnumValueDescriptorProto): JsonNode
-proc parsegoogle_protobuf_EnumValueDescriptorProto*(obj: JsonNode): google_protobuf_EnumValueDescriptorProto
 
 proc newgoogle_protobuf_EnumDescriptorProto_EnumReservedRange*(): google_protobuf_EnumDescriptorProto_EnumReservedRange
 proc newgoogle_protobuf_EnumDescriptorProto_EnumReservedRange*(data: string): google_protobuf_EnumDescriptorProto_EnumReservedRange
@@ -267,8 +259,6 @@ proc newgoogle_protobuf_EnumDescriptorProto_EnumReservedRange*(data: seq[byte]):
 proc writegoogle_protobuf_EnumDescriptorProto_EnumReservedRange*(stream: Stream, message: google_protobuf_EnumDescriptorProto_EnumReservedRange)
 proc readgoogle_protobuf_EnumDescriptorProto_EnumReservedRange*(stream: Stream): google_protobuf_EnumDescriptorProto_EnumReservedRange
 proc sizeOfgoogle_protobuf_EnumDescriptorProto_EnumReservedRange*(message: google_protobuf_EnumDescriptorProto_EnumReservedRange): uint64
-proc toJson*(message: google_protobuf_EnumDescriptorProto_EnumReservedRange): JsonNode
-proc parsegoogle_protobuf_EnumDescriptorProto_EnumReservedRange*(obj: JsonNode): google_protobuf_EnumDescriptorProto_EnumReservedRange
 
 proc newgoogle_protobuf_EnumOptions*(): google_protobuf_EnumOptions
 proc newgoogle_protobuf_EnumOptions*(data: string): google_protobuf_EnumOptions
@@ -276,8 +266,6 @@ proc newgoogle_protobuf_EnumOptions*(data: seq[byte]): google_protobuf_EnumOptio
 proc writegoogle_protobuf_EnumOptions*(stream: Stream, message: google_protobuf_EnumOptions)
 proc readgoogle_protobuf_EnumOptions*(stream: Stream): google_protobuf_EnumOptions
 proc sizeOfgoogle_protobuf_EnumOptions*(message: google_protobuf_EnumOptions): uint64
-proc toJson*(message: google_protobuf_EnumOptions): JsonNode
-proc parsegoogle_protobuf_EnumOptions*(obj: JsonNode): google_protobuf_EnumOptions
 
 proc newgoogle_protobuf_EnumDescriptorProto*(): google_protobuf_EnumDescriptorProto
 proc newgoogle_protobuf_EnumDescriptorProto*(data: string): google_protobuf_EnumDescriptorProto
@@ -285,8 +273,6 @@ proc newgoogle_protobuf_EnumDescriptorProto*(data: seq[byte]): google_protobuf_E
 proc writegoogle_protobuf_EnumDescriptorProto*(stream: Stream, message: google_protobuf_EnumDescriptorProto)
 proc readgoogle_protobuf_EnumDescriptorProto*(stream: Stream): google_protobuf_EnumDescriptorProto
 proc sizeOfgoogle_protobuf_EnumDescriptorProto*(message: google_protobuf_EnumDescriptorProto): uint64
-proc toJson*(message: google_protobuf_EnumDescriptorProto): JsonNode
-proc parsegoogle_protobuf_EnumDescriptorProto*(obj: JsonNode): google_protobuf_EnumDescriptorProto
 
 proc newgoogle_protobuf_ExtensionRangeOptions*(): google_protobuf_ExtensionRangeOptions
 proc newgoogle_protobuf_ExtensionRangeOptions*(data: string): google_protobuf_ExtensionRangeOptions
@@ -294,8 +280,6 @@ proc newgoogle_protobuf_ExtensionRangeOptions*(data: seq[byte]): google_protobuf
 proc writegoogle_protobuf_ExtensionRangeOptions*(stream: Stream, message: google_protobuf_ExtensionRangeOptions)
 proc readgoogle_protobuf_ExtensionRangeOptions*(stream: Stream): google_protobuf_ExtensionRangeOptions
 proc sizeOfgoogle_protobuf_ExtensionRangeOptions*(message: google_protobuf_ExtensionRangeOptions): uint64
-proc toJson*(message: google_protobuf_ExtensionRangeOptions): JsonNode
-proc parsegoogle_protobuf_ExtensionRangeOptions*(obj: JsonNode): google_protobuf_ExtensionRangeOptions
 
 proc newgoogle_protobuf_SourceCodeInfo_Location*(): google_protobuf_SourceCodeInfo_Location
 proc newgoogle_protobuf_SourceCodeInfo_Location*(data: string): google_protobuf_SourceCodeInfo_Location
@@ -303,8 +287,6 @@ proc newgoogle_protobuf_SourceCodeInfo_Location*(data: seq[byte]): google_protob
 proc writegoogle_protobuf_SourceCodeInfo_Location*(stream: Stream, message: google_protobuf_SourceCodeInfo_Location)
 proc readgoogle_protobuf_SourceCodeInfo_Location*(stream: Stream): google_protobuf_SourceCodeInfo_Location
 proc sizeOfgoogle_protobuf_SourceCodeInfo_Location*(message: google_protobuf_SourceCodeInfo_Location): uint64
-proc toJson*(message: google_protobuf_SourceCodeInfo_Location): JsonNode
-proc parsegoogle_protobuf_SourceCodeInfo_Location*(obj: JsonNode): google_protobuf_SourceCodeInfo_Location
 
 proc newgoogle_protobuf_SourceCodeInfo*(): google_protobuf_SourceCodeInfo
 proc newgoogle_protobuf_SourceCodeInfo*(data: string): google_protobuf_SourceCodeInfo
@@ -312,8 +294,6 @@ proc newgoogle_protobuf_SourceCodeInfo*(data: seq[byte]): google_protobuf_Source
 proc writegoogle_protobuf_SourceCodeInfo*(stream: Stream, message: google_protobuf_SourceCodeInfo)
 proc readgoogle_protobuf_SourceCodeInfo*(stream: Stream): google_protobuf_SourceCodeInfo
 proc sizeOfgoogle_protobuf_SourceCodeInfo*(message: google_protobuf_SourceCodeInfo): uint64
-proc toJson*(message: google_protobuf_SourceCodeInfo): JsonNode
-proc parsegoogle_protobuf_SourceCodeInfo*(obj: JsonNode): google_protobuf_SourceCodeInfo
 
 proc newgoogle_protobuf_FieldOptions*(): google_protobuf_FieldOptions
 proc newgoogle_protobuf_FieldOptions*(data: string): google_protobuf_FieldOptions
@@ -321,8 +301,6 @@ proc newgoogle_protobuf_FieldOptions*(data: seq[byte]): google_protobuf_FieldOpt
 proc writegoogle_protobuf_FieldOptions*(stream: Stream, message: google_protobuf_FieldOptions)
 proc readgoogle_protobuf_FieldOptions*(stream: Stream): google_protobuf_FieldOptions
 proc sizeOfgoogle_protobuf_FieldOptions*(message: google_protobuf_FieldOptions): uint64
-proc toJson*(message: google_protobuf_FieldOptions): JsonNode
-proc parsegoogle_protobuf_FieldOptions*(obj: JsonNode): google_protobuf_FieldOptions
 
 proc newgoogle_protobuf_FieldDescriptorProto*(): google_protobuf_FieldDescriptorProto
 proc newgoogle_protobuf_FieldDescriptorProto*(data: string): google_protobuf_FieldDescriptorProto
@@ -330,8 +308,6 @@ proc newgoogle_protobuf_FieldDescriptorProto*(data: seq[byte]): google_protobuf_
 proc writegoogle_protobuf_FieldDescriptorProto*(stream: Stream, message: google_protobuf_FieldDescriptorProto)
 proc readgoogle_protobuf_FieldDescriptorProto*(stream: Stream): google_protobuf_FieldDescriptorProto
 proc sizeOfgoogle_protobuf_FieldDescriptorProto*(message: google_protobuf_FieldDescriptorProto): uint64
-proc toJson*(message: google_protobuf_FieldDescriptorProto): JsonNode
-proc parsegoogle_protobuf_FieldDescriptorProto*(obj: JsonNode): google_protobuf_FieldDescriptorProto
 
 proc newgoogle_protobuf_DescriptorProto_ExtensionRange*(): google_protobuf_DescriptorProto_ExtensionRange
 proc newgoogle_protobuf_DescriptorProto_ExtensionRange*(data: string): google_protobuf_DescriptorProto_ExtensionRange
@@ -339,8 +315,6 @@ proc newgoogle_protobuf_DescriptorProto_ExtensionRange*(data: seq[byte]): google
 proc writegoogle_protobuf_DescriptorProto_ExtensionRange*(stream: Stream, message: google_protobuf_DescriptorProto_ExtensionRange)
 proc readgoogle_protobuf_DescriptorProto_ExtensionRange*(stream: Stream): google_protobuf_DescriptorProto_ExtensionRange
 proc sizeOfgoogle_protobuf_DescriptorProto_ExtensionRange*(message: google_protobuf_DescriptorProto_ExtensionRange): uint64
-proc toJson*(message: google_protobuf_DescriptorProto_ExtensionRange): JsonNode
-proc parsegoogle_protobuf_DescriptorProto_ExtensionRange*(obj: JsonNode): google_protobuf_DescriptorProto_ExtensionRange
 
 proc newgoogle_protobuf_MessageOptions*(): google_protobuf_MessageOptions
 proc newgoogle_protobuf_MessageOptions*(data: string): google_protobuf_MessageOptions
@@ -348,8 +322,6 @@ proc newgoogle_protobuf_MessageOptions*(data: seq[byte]): google_protobuf_Messag
 proc writegoogle_protobuf_MessageOptions*(stream: Stream, message: google_protobuf_MessageOptions)
 proc readgoogle_protobuf_MessageOptions*(stream: Stream): google_protobuf_MessageOptions
 proc sizeOfgoogle_protobuf_MessageOptions*(message: google_protobuf_MessageOptions): uint64
-proc toJson*(message: google_protobuf_MessageOptions): JsonNode
-proc parsegoogle_protobuf_MessageOptions*(obj: JsonNode): google_protobuf_MessageOptions
 
 proc newgoogle_protobuf_OneofOptions*(): google_protobuf_OneofOptions
 proc newgoogle_protobuf_OneofOptions*(data: string): google_protobuf_OneofOptions
@@ -357,8 +329,6 @@ proc newgoogle_protobuf_OneofOptions*(data: seq[byte]): google_protobuf_OneofOpt
 proc writegoogle_protobuf_OneofOptions*(stream: Stream, message: google_protobuf_OneofOptions)
 proc readgoogle_protobuf_OneofOptions*(stream: Stream): google_protobuf_OneofOptions
 proc sizeOfgoogle_protobuf_OneofOptions*(message: google_protobuf_OneofOptions): uint64
-proc toJson*(message: google_protobuf_OneofOptions): JsonNode
-proc parsegoogle_protobuf_OneofOptions*(obj: JsonNode): google_protobuf_OneofOptions
 
 proc newgoogle_protobuf_OneofDescriptorProto*(): google_protobuf_OneofDescriptorProto
 proc newgoogle_protobuf_OneofDescriptorProto*(data: string): google_protobuf_OneofDescriptorProto
@@ -366,8 +336,6 @@ proc newgoogle_protobuf_OneofDescriptorProto*(data: seq[byte]): google_protobuf_
 proc writegoogle_protobuf_OneofDescriptorProto*(stream: Stream, message: google_protobuf_OneofDescriptorProto)
 proc readgoogle_protobuf_OneofDescriptorProto*(stream: Stream): google_protobuf_OneofDescriptorProto
 proc sizeOfgoogle_protobuf_OneofDescriptorProto*(message: google_protobuf_OneofDescriptorProto): uint64
-proc toJson*(message: google_protobuf_OneofDescriptorProto): JsonNode
-proc parsegoogle_protobuf_OneofDescriptorProto*(obj: JsonNode): google_protobuf_OneofDescriptorProto
 
 proc newgoogle_protobuf_DescriptorProto_ReservedRange*(): google_protobuf_DescriptorProto_ReservedRange
 proc newgoogle_protobuf_DescriptorProto_ReservedRange*(data: string): google_protobuf_DescriptorProto_ReservedRange
@@ -375,8 +343,6 @@ proc newgoogle_protobuf_DescriptorProto_ReservedRange*(data: seq[byte]): google_
 proc writegoogle_protobuf_DescriptorProto_ReservedRange*(stream: Stream, message: google_protobuf_DescriptorProto_ReservedRange)
 proc readgoogle_protobuf_DescriptorProto_ReservedRange*(stream: Stream): google_protobuf_DescriptorProto_ReservedRange
 proc sizeOfgoogle_protobuf_DescriptorProto_ReservedRange*(message: google_protobuf_DescriptorProto_ReservedRange): uint64
-proc toJson*(message: google_protobuf_DescriptorProto_ReservedRange): JsonNode
-proc parsegoogle_protobuf_DescriptorProto_ReservedRange*(obj: JsonNode): google_protobuf_DescriptorProto_ReservedRange
 
 proc newgoogle_protobuf_DescriptorProto*(): google_protobuf_DescriptorProto
 proc newgoogle_protobuf_DescriptorProto*(data: string): google_protobuf_DescriptorProto
@@ -384,8 +350,6 @@ proc newgoogle_protobuf_DescriptorProto*(data: seq[byte]): google_protobuf_Descr
 proc writegoogle_protobuf_DescriptorProto*(stream: Stream, message: google_protobuf_DescriptorProto)
 proc readgoogle_protobuf_DescriptorProto*(stream: Stream): google_protobuf_DescriptorProto
 proc sizeOfgoogle_protobuf_DescriptorProto*(message: google_protobuf_DescriptorProto): uint64
-proc toJson*(message: google_protobuf_DescriptorProto): JsonNode
-proc parsegoogle_protobuf_DescriptorProto*(obj: JsonNode): google_protobuf_DescriptorProto
 
 proc newgoogle_protobuf_FileOptions*(): google_protobuf_FileOptions
 proc newgoogle_protobuf_FileOptions*(data: string): google_protobuf_FileOptions
@@ -393,8 +357,6 @@ proc newgoogle_protobuf_FileOptions*(data: seq[byte]): google_protobuf_FileOptio
 proc writegoogle_protobuf_FileOptions*(stream: Stream, message: google_protobuf_FileOptions)
 proc readgoogle_protobuf_FileOptions*(stream: Stream): google_protobuf_FileOptions
 proc sizeOfgoogle_protobuf_FileOptions*(message: google_protobuf_FileOptions): uint64
-proc toJson*(message: google_protobuf_FileOptions): JsonNode
-proc parsegoogle_protobuf_FileOptions*(obj: JsonNode): google_protobuf_FileOptions
 
 proc newgoogle_protobuf_ServiceOptions*(): google_protobuf_ServiceOptions
 proc newgoogle_protobuf_ServiceOptions*(data: string): google_protobuf_ServiceOptions
@@ -402,8 +364,6 @@ proc newgoogle_protobuf_ServiceOptions*(data: seq[byte]): google_protobuf_Servic
 proc writegoogle_protobuf_ServiceOptions*(stream: Stream, message: google_protobuf_ServiceOptions)
 proc readgoogle_protobuf_ServiceOptions*(stream: Stream): google_protobuf_ServiceOptions
 proc sizeOfgoogle_protobuf_ServiceOptions*(message: google_protobuf_ServiceOptions): uint64
-proc toJson*(message: google_protobuf_ServiceOptions): JsonNode
-proc parsegoogle_protobuf_ServiceOptions*(obj: JsonNode): google_protobuf_ServiceOptions
 
 proc newgoogle_protobuf_MethodOptions*(): google_protobuf_MethodOptions
 proc newgoogle_protobuf_MethodOptions*(data: string): google_protobuf_MethodOptions
@@ -411,8 +371,6 @@ proc newgoogle_protobuf_MethodOptions*(data: seq[byte]): google_protobuf_MethodO
 proc writegoogle_protobuf_MethodOptions*(stream: Stream, message: google_protobuf_MethodOptions)
 proc readgoogle_protobuf_MethodOptions*(stream: Stream): google_protobuf_MethodOptions
 proc sizeOfgoogle_protobuf_MethodOptions*(message: google_protobuf_MethodOptions): uint64
-proc toJson*(message: google_protobuf_MethodOptions): JsonNode
-proc parsegoogle_protobuf_MethodOptions*(obj: JsonNode): google_protobuf_MethodOptions
 
 proc newgoogle_protobuf_MethodDescriptorProto*(): google_protobuf_MethodDescriptorProto
 proc newgoogle_protobuf_MethodDescriptorProto*(data: string): google_protobuf_MethodDescriptorProto
@@ -420,8 +378,6 @@ proc newgoogle_protobuf_MethodDescriptorProto*(data: seq[byte]): google_protobuf
 proc writegoogle_protobuf_MethodDescriptorProto*(stream: Stream, message: google_protobuf_MethodDescriptorProto)
 proc readgoogle_protobuf_MethodDescriptorProto*(stream: Stream): google_protobuf_MethodDescriptorProto
 proc sizeOfgoogle_protobuf_MethodDescriptorProto*(message: google_protobuf_MethodDescriptorProto): uint64
-proc toJson*(message: google_protobuf_MethodDescriptorProto): JsonNode
-proc parsegoogle_protobuf_MethodDescriptorProto*(obj: JsonNode): google_protobuf_MethodDescriptorProto
 
 proc newgoogle_protobuf_ServiceDescriptorProto*(): google_protobuf_ServiceDescriptorProto
 proc newgoogle_protobuf_ServiceDescriptorProto*(data: string): google_protobuf_ServiceDescriptorProto
@@ -429,8 +385,6 @@ proc newgoogle_protobuf_ServiceDescriptorProto*(data: seq[byte]): google_protobu
 proc writegoogle_protobuf_ServiceDescriptorProto*(stream: Stream, message: google_protobuf_ServiceDescriptorProto)
 proc readgoogle_protobuf_ServiceDescriptorProto*(stream: Stream): google_protobuf_ServiceDescriptorProto
 proc sizeOfgoogle_protobuf_ServiceDescriptorProto*(message: google_protobuf_ServiceDescriptorProto): uint64
-proc toJson*(message: google_protobuf_ServiceDescriptorProto): JsonNode
-proc parsegoogle_protobuf_ServiceDescriptorProto*(obj: JsonNode): google_protobuf_ServiceDescriptorProto
 
 proc newgoogle_protobuf_FileDescriptorProto*(): google_protobuf_FileDescriptorProto
 proc newgoogle_protobuf_FileDescriptorProto*(data: string): google_protobuf_FileDescriptorProto
@@ -438,8 +392,6 @@ proc newgoogle_protobuf_FileDescriptorProto*(data: seq[byte]): google_protobuf_F
 proc writegoogle_protobuf_FileDescriptorProto*(stream: Stream, message: google_protobuf_FileDescriptorProto)
 proc readgoogle_protobuf_FileDescriptorProto*(stream: Stream): google_protobuf_FileDescriptorProto
 proc sizeOfgoogle_protobuf_FileDescriptorProto*(message: google_protobuf_FileDescriptorProto): uint64
-proc toJson*(message: google_protobuf_FileDescriptorProto): JsonNode
-proc parsegoogle_protobuf_FileDescriptorProto*(obj: JsonNode): google_protobuf_FileDescriptorProto
 
 proc newgoogle_protobuf_FileDescriptorSet*(): google_protobuf_FileDescriptorSet
 proc newgoogle_protobuf_FileDescriptorSet*(data: string): google_protobuf_FileDescriptorSet
@@ -447,8 +399,6 @@ proc newgoogle_protobuf_FileDescriptorSet*(data: seq[byte]): google_protobuf_Fil
 proc writegoogle_protobuf_FileDescriptorSet*(stream: Stream, message: google_protobuf_FileDescriptorSet)
 proc readgoogle_protobuf_FileDescriptorSet*(stream: Stream): google_protobuf_FileDescriptorSet
 proc sizeOfgoogle_protobuf_FileDescriptorSet*(message: google_protobuf_FileDescriptorSet): uint64
-proc toJson*(message: google_protobuf_FileDescriptorSet): JsonNode
-proc parsegoogle_protobuf_FileDescriptorSet*(obj: JsonNode): google_protobuf_FileDescriptorSet
 
 proc newgoogle_protobuf_GeneratedCodeInfo_Annotation*(): google_protobuf_GeneratedCodeInfo_Annotation
 proc newgoogle_protobuf_GeneratedCodeInfo_Annotation*(data: string): google_protobuf_GeneratedCodeInfo_Annotation
@@ -456,8 +406,6 @@ proc newgoogle_protobuf_GeneratedCodeInfo_Annotation*(data: seq[byte]): google_p
 proc writegoogle_protobuf_GeneratedCodeInfo_Annotation*(stream: Stream, message: google_protobuf_GeneratedCodeInfo_Annotation)
 proc readgoogle_protobuf_GeneratedCodeInfo_Annotation*(stream: Stream): google_protobuf_GeneratedCodeInfo_Annotation
 proc sizeOfgoogle_protobuf_GeneratedCodeInfo_Annotation*(message: google_protobuf_GeneratedCodeInfo_Annotation): uint64
-proc toJson*(message: google_protobuf_GeneratedCodeInfo_Annotation): JsonNode
-proc parsegoogle_protobuf_GeneratedCodeInfo_Annotation*(obj: JsonNode): google_protobuf_GeneratedCodeInfo_Annotation
 
 proc newgoogle_protobuf_GeneratedCodeInfo*(): google_protobuf_GeneratedCodeInfo
 proc newgoogle_protobuf_GeneratedCodeInfo*(data: string): google_protobuf_GeneratedCodeInfo
@@ -465,8 +413,6 @@ proc newgoogle_protobuf_GeneratedCodeInfo*(data: seq[byte]): google_protobuf_Gen
 proc writegoogle_protobuf_GeneratedCodeInfo*(stream: Stream, message: google_protobuf_GeneratedCodeInfo)
 proc readgoogle_protobuf_GeneratedCodeInfo*(stream: Stream): google_protobuf_GeneratedCodeInfo
 proc sizeOfgoogle_protobuf_GeneratedCodeInfo*(message: google_protobuf_GeneratedCodeInfo): uint64
-proc toJson*(message: google_protobuf_GeneratedCodeInfo): JsonNode
-proc parsegoogle_protobuf_GeneratedCodeInfo*(obj: JsonNode): google_protobuf_GeneratedCodeInfo
 
 proc newgoogle_protobuf_UninterpretedOption_NamePart*(): google_protobuf_UninterpretedOption_NamePart =
     new(result)
@@ -541,25 +487,6 @@ proc readgoogle_protobuf_UninterpretedOption_NamePart*(stream: Stream): google_p
             setisExtension(result, protoReadBool(stream))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_UninterpretedOption_NamePart): JsonNode =
-    result = newJObject()
-    if hasnamePart(message):
-        result["namePart"] = %message.namePart
-    if hasisExtension(message):
-        result["isExtension"] = %message.isExtension
-
-proc parsegoogle_protobuf_UninterpretedOption_NamePart*(obj: JsonNode): google_protobuf_UninterpretedOption_NamePart =
-    result = newgoogle_protobuf_UninterpretedOption_NamePart()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "name_part", "namePart")
-    if node != nil and node.kind != JNull:
-        setnamePart(result, parseString(node))
-    node = getJsonField(obj, "is_extension", "isExtension")
-    if node != nil and node.kind != JNull:
-        setisExtension(result, parseBool(node))
-
 proc serialize*(message: google_protobuf_UninterpretedOption_NamePart): string =
     let
         ss = newStringStream()
@@ -601,7 +528,6 @@ proc setname*(message: google_protobuf_UninterpretedOption, value: seq[google_pr
 
 proc addname*(message: google_protobuf_UninterpretedOption, value: google_protobuf_UninterpretedOption_NamePart) =
     add(message.name, value)
-    setField(message, 2)
 
 proc name*(message: google_protobuf_UninterpretedOption): seq[google_protobuf_UninterpretedOption_NamePart] {.inline.} =
     message.name
@@ -785,56 +711,6 @@ proc readgoogle_protobuf_UninterpretedOption*(stream: Stream): google_protobuf_U
             setaggregateValue(result, protoReadString(stream))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_UninterpretedOption): JsonNode =
-    result = newJObject()
-    if hasname(message):
-        let arr = newJArray()
-        for value in message.name:
-            add(arr, toJson(value))
-        result["name"] = arr
-    if hasidentifierValue(message):
-        result["identifierValue"] = %message.identifierValue
-    if haspositiveIntValue(message):
-        result["positiveIntValue"] = toJson(message.positiveIntValue)
-    if hasnegativeIntValue(message):
-        result["negativeIntValue"] = toJson(message.negativeIntValue)
-    if hasdoubleValue(message):
-        result["doubleValue"] = toJson(message.doubleValue)
-    if hasstringValue(message):
-        result["stringValue"] = %message.stringValue
-    if hasaggregateValue(message):
-        result["aggregateValue"] = %message.aggregateValue
-
-proc parsegoogle_protobuf_UninterpretedOption*(obj: JsonNode): google_protobuf_UninterpretedOption =
-    result = newgoogle_protobuf_UninterpretedOption()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "name", "name")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addname(result, parsegoogle_protobuf_UninterpretedOption_NamePart(value))
-    node = getJsonField(obj, "identifier_value", "identifierValue")
-    if node != nil and node.kind != JNull:
-        setidentifierValue(result, parseString(node))
-    node = getJsonField(obj, "positive_int_value", "positiveIntValue")
-    if node != nil and node.kind != JNull:
-        setpositiveIntValue(result, parseInt[uint64](node))
-    node = getJsonField(obj, "negative_int_value", "negativeIntValue")
-    if node != nil and node.kind != JNull:
-        setnegativeIntValue(result, parseInt[int64](node))
-    node = getJsonField(obj, "double_value", "doubleValue")
-    if node != nil and node.kind != JNull:
-        setdoubleValue(result, parseFloat[float64](node))
-    node = getJsonField(obj, "string_value", "stringValue")
-    if node != nil and node.kind != JNull:
-        setstringValue(result, parseBytes(node))
-    node = getJsonField(obj, "aggregate_value", "aggregateValue")
-    if node != nil and node.kind != JNull:
-        setaggregateValue(result, parseString(node))
-
 proc serialize*(message: google_protobuf_UninterpretedOption): string =
     let
         ss = newStringStream()
@@ -888,7 +764,6 @@ proc setuninterpretedOption*(message: google_protobuf_EnumValueOptions, value: s
 
 proc adduninterpretedOption*(message: google_protobuf_EnumValueOptions, value: google_protobuf_UninterpretedOption) =
     add(message.uninterpretedOption, value)
-    setField(message, 999)
 
 proc uninterpretedOption*(message: google_protobuf_EnumValueOptions): seq[google_protobuf_UninterpretedOption] {.inline.} =
     message.uninterpretedOption
@@ -930,31 +805,6 @@ proc readgoogle_protobuf_EnumValueOptions*(stream: Stream): google_protobuf_Enum
             adduninterpretedOption(result, newgoogle_protobuf_UninterpretedOption(data))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_EnumValueOptions): JsonNode =
-    result = newJObject()
-    if hasdeprecated(message):
-        result["deprecated"] = %message.deprecated
-    if hasuninterpretedOption(message):
-        let arr = newJArray()
-        for value in message.uninterpretedOption:
-            add(arr, toJson(value))
-        result["uninterpretedOption"] = arr
-
-proc parsegoogle_protobuf_EnumValueOptions*(obj: JsonNode): google_protobuf_EnumValueOptions =
-    result = newgoogle_protobuf_EnumValueOptions()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "deprecated", "deprecated")
-    if node != nil and node.kind != JNull:
-        setdeprecated(result, parseBool(node))
-    node = getJsonField(obj, "uninterpreted_option", "uninterpretedOption")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            adduninterpretedOption(result, parsegoogle_protobuf_UninterpretedOption(value))
-
 proc serialize*(message: google_protobuf_EnumValueOptions): string =
     let
         ss = newStringStream()
@@ -1072,30 +922,6 @@ proc readgoogle_protobuf_EnumValueDescriptorProto*(stream: Stream): google_proto
             setoptions(result, newgoogle_protobuf_EnumValueOptions(data))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_EnumValueDescriptorProto): JsonNode =
-    result = newJObject()
-    if hasname(message):
-        result["name"] = %message.name
-    if hasnumber(message):
-        result["number"] = %message.number
-    if hasoptions(message):
-        result["options"] = toJson(message.options)
-
-proc parsegoogle_protobuf_EnumValueDescriptorProto*(obj: JsonNode): google_protobuf_EnumValueDescriptorProto =
-    result = newgoogle_protobuf_EnumValueDescriptorProto()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "name", "name")
-    if node != nil and node.kind != JNull:
-        setname(result, parseString(node))
-    node = getJsonField(obj, "number", "number")
-    if node != nil and node.kind != JNull:
-        setnumber(result, parseInt[int32](node))
-    node = getJsonField(obj, "options", "options")
-    if node != nil and node.kind != JNull:
-        setoptions(result, parsegoogle_protobuf_EnumValueOptions(node))
-
 proc serialize*(message: google_protobuf_EnumValueDescriptorProto): string =
     let
         ss = newStringStream()
@@ -1186,25 +1012,6 @@ proc readgoogle_protobuf_EnumDescriptorProto_EnumReservedRange*(stream: Stream):
             setfend(result, protoReadInt32(stream))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_EnumDescriptorProto_EnumReservedRange): JsonNode =
-    result = newJObject()
-    if hasstart(message):
-        result["start"] = %message.start
-    if hasfend(message):
-        result["end"] = %message.fend
-
-proc parsegoogle_protobuf_EnumDescriptorProto_EnumReservedRange*(obj: JsonNode): google_protobuf_EnumDescriptorProto_EnumReservedRange =
-    result = newgoogle_protobuf_EnumDescriptorProto_EnumReservedRange()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "start", "start")
-    if node != nil and node.kind != JNull:
-        setstart(result, parseInt[int32](node))
-    node = getJsonField(obj, "end", "end")
-    if node != nil and node.kind != JNull:
-        setfend(result, parseInt[int32](node))
-
 proc serialize*(message: google_protobuf_EnumDescriptorProto_EnumReservedRange): string =
     let
         ss = newStringStream()
@@ -1276,7 +1083,6 @@ proc setuninterpretedOption*(message: google_protobuf_EnumOptions, value: seq[go
 
 proc adduninterpretedOption*(message: google_protobuf_EnumOptions, value: google_protobuf_UninterpretedOption) =
     add(message.uninterpretedOption, value)
-    setField(message, 999)
 
 proc uninterpretedOption*(message: google_protobuf_EnumOptions): seq[google_protobuf_UninterpretedOption] {.inline.} =
     message.uninterpretedOption
@@ -1326,36 +1132,6 @@ proc readgoogle_protobuf_EnumOptions*(stream: Stream): google_protobuf_EnumOptio
             adduninterpretedOption(result, newgoogle_protobuf_UninterpretedOption(data))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_EnumOptions): JsonNode =
-    result = newJObject()
-    if hasallowAlias(message):
-        result["allowAlias"] = %message.allowAlias
-    if hasdeprecated(message):
-        result["deprecated"] = %message.deprecated
-    if hasuninterpretedOption(message):
-        let arr = newJArray()
-        for value in message.uninterpretedOption:
-            add(arr, toJson(value))
-        result["uninterpretedOption"] = arr
-
-proc parsegoogle_protobuf_EnumOptions*(obj: JsonNode): google_protobuf_EnumOptions =
-    result = newgoogle_protobuf_EnumOptions()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "allow_alias", "allowAlias")
-    if node != nil and node.kind != JNull:
-        setallowAlias(result, parseBool(node))
-    node = getJsonField(obj, "deprecated", "deprecated")
-    if node != nil and node.kind != JNull:
-        setdeprecated(result, parseBool(node))
-    node = getJsonField(obj, "uninterpreted_option", "uninterpretedOption")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            adduninterpretedOption(result, parsegoogle_protobuf_UninterpretedOption(value))
-
 proc serialize*(message: google_protobuf_EnumOptions): string =
     let
         ss = newStringStream()
@@ -1412,7 +1188,6 @@ proc setvalue*(message: google_protobuf_EnumDescriptorProto, value: seq[google_p
 
 proc addvalue*(message: google_protobuf_EnumDescriptorProto, value: google_protobuf_EnumValueDescriptorProto) =
     add(message.value, value)
-    setField(message, 2)
 
 proc value*(message: google_protobuf_EnumDescriptorProto): seq[google_protobuf_EnumValueDescriptorProto] {.inline.} =
     message.value
@@ -1450,7 +1225,6 @@ proc setreservedRange*(message: google_protobuf_EnumDescriptorProto, value: seq[
 
 proc addreservedRange*(message: google_protobuf_EnumDescriptorProto, value: google_protobuf_EnumDescriptorProto_EnumReservedRange) =
     add(message.reservedRange, value)
-    setField(message, 4)
 
 proc reservedRange*(message: google_protobuf_EnumDescriptorProto): seq[google_protobuf_EnumDescriptorProto_EnumReservedRange] {.inline.} =
     message.reservedRange
@@ -1471,7 +1245,6 @@ proc setreservedName*(message: google_protobuf_EnumDescriptorProto, value: seq[s
 
 proc addreservedName*(message: google_protobuf_EnumDescriptorProto, value: string) =
     add(message.reservedName, value)
-    setField(message, 5)
 
 proc reservedName*(message: google_protobuf_EnumDescriptorProto): seq[string] {.inline.} =
     message.reservedName
@@ -1539,58 +1312,6 @@ proc readgoogle_protobuf_EnumDescriptorProto*(stream: Stream): google_protobuf_E
             addreservedName(result, protoReadString(stream))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_EnumDescriptorProto): JsonNode =
-    result = newJObject()
-    if hasname(message):
-        result["name"] = %message.name
-    if hasvalue(message):
-        let arr = newJArray()
-        for value in message.value:
-            add(arr, toJson(value))
-        result["value"] = arr
-    if hasoptions(message):
-        result["options"] = toJson(message.options)
-    if hasreservedRange(message):
-        let arr = newJArray()
-        for value in message.reservedRange:
-            add(arr, toJson(value))
-        result["reservedRange"] = arr
-    if hasreservedName(message):
-        let arr = newJArray()
-        for value in message.reservedName:
-            add(arr, %value)
-        result["reservedName"] = arr
-
-proc parsegoogle_protobuf_EnumDescriptorProto*(obj: JsonNode): google_protobuf_EnumDescriptorProto =
-    result = newgoogle_protobuf_EnumDescriptorProto()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "name", "name")
-    if node != nil and node.kind != JNull:
-        setname(result, parseString(node))
-    node = getJsonField(obj, "value", "value")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addvalue(result, parsegoogle_protobuf_EnumValueDescriptorProto(value))
-    node = getJsonField(obj, "options", "options")
-    if node != nil and node.kind != JNull:
-        setoptions(result, parsegoogle_protobuf_EnumOptions(node))
-    node = getJsonField(obj, "reserved_range", "reservedRange")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addreservedRange(result, parsegoogle_protobuf_EnumDescriptorProto_EnumReservedRange(value))
-    node = getJsonField(obj, "reserved_name", "reservedName")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addreservedName(result, parseString(value))
-
 proc serialize*(message: google_protobuf_EnumDescriptorProto): string =
     let
         ss = newStringStream()
@@ -1626,7 +1347,6 @@ proc setuninterpretedOption*(message: google_protobuf_ExtensionRangeOptions, val
 
 proc adduninterpretedOption*(message: google_protobuf_ExtensionRangeOptions, value: google_protobuf_UninterpretedOption) =
     add(message.uninterpretedOption, value)
-    setField(message, 999)
 
 proc uninterpretedOption*(message: google_protobuf_ExtensionRangeOptions): seq[google_protobuf_UninterpretedOption] {.inline.} =
     message.uninterpretedOption
@@ -1660,26 +1380,6 @@ proc readgoogle_protobuf_ExtensionRangeOptions*(stream: Stream): google_protobuf
             adduninterpretedOption(result, newgoogle_protobuf_UninterpretedOption(data))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_ExtensionRangeOptions): JsonNode =
-    result = newJObject()
-    if hasuninterpretedOption(message):
-        let arr = newJArray()
-        for value in message.uninterpretedOption:
-            add(arr, toJson(value))
-        result["uninterpretedOption"] = arr
-
-proc parsegoogle_protobuf_ExtensionRangeOptions*(obj: JsonNode): google_protobuf_ExtensionRangeOptions =
-    result = newgoogle_protobuf_ExtensionRangeOptions()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "uninterpreted_option", "uninterpretedOption")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            adduninterpretedOption(result, parsegoogle_protobuf_UninterpretedOption(value))
-
 proc serialize*(message: google_protobuf_ExtensionRangeOptions): string =
     let
         ss = newStringStream()
@@ -1719,7 +1419,6 @@ proc setpath*(message: google_protobuf_SourceCodeInfo_Location, value: seq[int32
 
 proc addpath*(message: google_protobuf_SourceCodeInfo_Location, value: int32) =
     add(message.path, value)
-    setField(message, 1)
 
 proc path*(message: google_protobuf_SourceCodeInfo_Location): seq[int32] {.inline.} =
     message.path
@@ -1740,7 +1439,6 @@ proc setspan*(message: google_protobuf_SourceCodeInfo_Location, value: seq[int32
 
 proc addspan*(message: google_protobuf_SourceCodeInfo_Location, value: int32) =
     add(message.span, value)
-    setField(message, 2)
 
 proc span*(message: google_protobuf_SourceCodeInfo_Location): seq[int32] {.inline.} =
     message.span
@@ -1795,7 +1493,6 @@ proc setleadingDetachedComments*(message: google_protobuf_SourceCodeInfo_Locatio
 
 proc addleadingDetachedComments*(message: google_protobuf_SourceCodeInfo_Location, value: string) =
     add(message.leadingDetachedComments, value)
-    setField(message, 6)
 
 proc leadingDetachedComments*(message: google_protobuf_SourceCodeInfo_Location): seq[string] {.inline.} =
     message.leadingDetachedComments
@@ -1804,10 +1501,10 @@ proc `leadingDetachedComments=`*(message: google_protobuf_SourceCodeInfo_Locatio
     setleadingDetachedComments(message, value)
 
 proc sizeOfgoogle_protobuf_SourceCodeInfo_Location*(message: google_protobuf_SourceCodeInfo_Location): uint64 =
-    if haspath(message):
+    if len(message.path) > 0:
         result = result + sizeOfTag(1, WireType.LengthDelimited)
         result = result + sizeOfLengthDelimited(packedFieldSize(message.path, FieldType.Int32))
-    if hasspan(message):
+    if len(message.span) > 0:
         result = result + sizeOfTag(2, WireType.LengthDelimited)
         result = result + sizeOfLengthDelimited(packedFieldSize(message.span, FieldType.Int32))
     if hasleadingComments(message):
@@ -1822,12 +1519,12 @@ proc sizeOfgoogle_protobuf_SourceCodeInfo_Location*(message: google_protobuf_Sou
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_SourceCodeInfo_Location*(stream: Stream, message: google_protobuf_SourceCodeInfo_Location) =
-    if haspath(message):
+    if len(message.path) > 0:
         writeTag(stream, 1, WireType.LengthDelimited)
         writeVarint(stream, packedFieldSize(message.path, FieldType.Int32))
         for value in message.path:
             protoWriteInt32(stream, value)
-    if hasspan(message):
+    if len(message.span) > 0:
         writeTag(stream, 2, WireType.LengthDelimited)
         writeVarint(stream, packedFieldSize(message.span, FieldType.Int32))
         for value in message.span:
@@ -1888,58 +1585,6 @@ proc readgoogle_protobuf_SourceCodeInfo_Location*(stream: Stream): google_protob
             addleadingDetachedComments(result, protoReadString(stream))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_SourceCodeInfo_Location): JsonNode =
-    result = newJObject()
-    if haspath(message):
-        let arr = newJArray()
-        for value in message.path:
-            add(arr, %value)
-        result["path"] = arr
-    if hasspan(message):
-        let arr = newJArray()
-        for value in message.span:
-            add(arr, %value)
-        result["span"] = arr
-    if hasleadingComments(message):
-        result["leadingComments"] = %message.leadingComments
-    if hastrailingComments(message):
-        result["trailingComments"] = %message.trailingComments
-    if hasleadingDetachedComments(message):
-        let arr = newJArray()
-        for value in message.leadingDetachedComments:
-            add(arr, %value)
-        result["leadingDetachedComments"] = arr
-
-proc parsegoogle_protobuf_SourceCodeInfo_Location*(obj: JsonNode): google_protobuf_SourceCodeInfo_Location =
-    result = newgoogle_protobuf_SourceCodeInfo_Location()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "path", "path")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addpath(result, parseInt[int32](value))
-    node = getJsonField(obj, "span", "span")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addspan(result, parseInt[int32](value))
-    node = getJsonField(obj, "leading_comments", "leadingComments")
-    if node != nil and node.kind != JNull:
-        setleadingComments(result, parseString(node))
-    node = getJsonField(obj, "trailing_comments", "trailingComments")
-    if node != nil and node.kind != JNull:
-        settrailingComments(result, parseString(node))
-    node = getJsonField(obj, "leading_detached_comments", "leadingDetachedComments")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addleadingDetachedComments(result, parseString(value))
-
 proc serialize*(message: google_protobuf_SourceCodeInfo_Location): string =
     let
         ss = newStringStream()
@@ -1975,7 +1620,6 @@ proc setlocation*(message: google_protobuf_SourceCodeInfo, value: seq[google_pro
 
 proc addlocation*(message: google_protobuf_SourceCodeInfo, value: google_protobuf_SourceCodeInfo_Location) =
     add(message.location, value)
-    setField(message, 1)
 
 proc location*(message: google_protobuf_SourceCodeInfo): seq[google_protobuf_SourceCodeInfo_Location] {.inline.} =
     message.location
@@ -2009,26 +1653,6 @@ proc readgoogle_protobuf_SourceCodeInfo*(stream: Stream): google_protobuf_Source
             addlocation(result, newgoogle_protobuf_SourceCodeInfo_Location(data))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_SourceCodeInfo): JsonNode =
-    result = newJObject()
-    if haslocation(message):
-        let arr = newJArray()
-        for value in message.location:
-            add(arr, toJson(value))
-        result["location"] = arr
-
-proc parsegoogle_protobuf_SourceCodeInfo*(obj: JsonNode): google_protobuf_SourceCodeInfo =
-    result = newgoogle_protobuf_SourceCodeInfo()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "location", "location")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addlocation(result, parsegoogle_protobuf_SourceCodeInfo_Location(value))
-
 proc serialize*(message: google_protobuf_SourceCodeInfo): string =
     let
         ss = newStringStream()
@@ -2172,7 +1796,6 @@ proc setuninterpretedOption*(message: google_protobuf_FieldOptions, value: seq[g
 
 proc adduninterpretedOption*(message: google_protobuf_FieldOptions, value: google_protobuf_UninterpretedOption) =
     add(message.uninterpretedOption, value)
-    setField(message, 999)
 
 proc uninterpretedOption*(message: google_protobuf_FieldOptions): seq[google_protobuf_UninterpretedOption] {.inline.} =
     message.uninterpretedOption
@@ -2254,56 +1877,6 @@ proc readgoogle_protobuf_FieldOptions*(stream: Stream): google_protobuf_FieldOpt
             adduninterpretedOption(result, newgoogle_protobuf_UninterpretedOption(data))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_FieldOptions): JsonNode =
-    result = newJObject()
-    if hasctype(message):
-        result["ctype"] = toJson(message.ctype)
-    if haspacked(message):
-        result["packed"] = %message.packed
-    if hasjstype(message):
-        result["jstype"] = toJson(message.jstype)
-    if haslazy(message):
-        result["lazy"] = %message.lazy
-    if hasdeprecated(message):
-        result["deprecated"] = %message.deprecated
-    if hasweak(message):
-        result["weak"] = %message.weak
-    if hasuninterpretedOption(message):
-        let arr = newJArray()
-        for value in message.uninterpretedOption:
-            add(arr, toJson(value))
-        result["uninterpretedOption"] = arr
-
-proc parsegoogle_protobuf_FieldOptions*(obj: JsonNode): google_protobuf_FieldOptions =
-    result = newgoogle_protobuf_FieldOptions()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "ctype", "ctype")
-    if node != nil and node.kind != JNull:
-        setctype(result, parseEnum[google_protobuf_FieldOptions_CType](node))
-    node = getJsonField(obj, "packed", "packed")
-    if node != nil and node.kind != JNull:
-        setpacked(result, parseBool(node))
-    node = getJsonField(obj, "jstype", "jstype")
-    if node != nil and node.kind != JNull:
-        setjstype(result, parseEnum[google_protobuf_FieldOptions_JSType](node))
-    node = getJsonField(obj, "lazy", "lazy")
-    if node != nil and node.kind != JNull:
-        setlazy(result, parseBool(node))
-    node = getJsonField(obj, "deprecated", "deprecated")
-    if node != nil and node.kind != JNull:
-        setdeprecated(result, parseBool(node))
-    node = getJsonField(obj, "weak", "weak")
-    if node != nil and node.kind != JNull:
-        setweak(result, parseBool(node))
-    node = getJsonField(obj, "uninterpreted_option", "uninterpretedOption")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            adduninterpretedOption(result, parsegoogle_protobuf_UninterpretedOption(value))
-
 proc serialize*(message: google_protobuf_FieldOptions): string =
     let
         ss = newStringStream()
@@ -2603,65 +2176,6 @@ proc readgoogle_protobuf_FieldDescriptorProto*(stream: Stream): google_protobuf_
             setoptions(result, newgoogle_protobuf_FieldOptions(data))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_FieldDescriptorProto): JsonNode =
-    result = newJObject()
-    if hasname(message):
-        result["name"] = %message.name
-    if hasnumber(message):
-        result["number"] = %message.number
-    if haslabel(message):
-        result["label"] = toJson(message.label)
-    if hasftype(message):
-        result["type"] = toJson(message.ftype)
-    if hastypeName(message):
-        result["typeName"] = %message.typeName
-    if hasextendee(message):
-        result["extendee"] = %message.extendee
-    if hasdefaultValue(message):
-        result["defaultValue"] = %message.defaultValue
-    if hasoneofIndex(message):
-        result["oneofIndex"] = %message.oneofIndex
-    if hasjsonName(message):
-        result["jsonName"] = %message.jsonName
-    if hasoptions(message):
-        result["options"] = toJson(message.options)
-
-proc parsegoogle_protobuf_FieldDescriptorProto*(obj: JsonNode): google_protobuf_FieldDescriptorProto =
-    result = newgoogle_protobuf_FieldDescriptorProto()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "name", "name")
-    if node != nil and node.kind != JNull:
-        setname(result, parseString(node))
-    node = getJsonField(obj, "number", "number")
-    if node != nil and node.kind != JNull:
-        setnumber(result, parseInt[int32](node))
-    node = getJsonField(obj, "label", "label")
-    if node != nil and node.kind != JNull:
-        setlabel(result, parseEnum[google_protobuf_FieldDescriptorProto_Label](node))
-    node = getJsonField(obj, "type", "type")
-    if node != nil and node.kind != JNull:
-        setftype(result, parseEnum[google_protobuf_FieldDescriptorProto_Type](node))
-    node = getJsonField(obj, "type_name", "typeName")
-    if node != nil and node.kind != JNull:
-        settypeName(result, parseString(node))
-    node = getJsonField(obj, "extendee", "extendee")
-    if node != nil and node.kind != JNull:
-        setextendee(result, parseString(node))
-    node = getJsonField(obj, "default_value", "defaultValue")
-    if node != nil and node.kind != JNull:
-        setdefaultValue(result, parseString(node))
-    node = getJsonField(obj, "oneof_index", "oneofIndex")
-    if node != nil and node.kind != JNull:
-        setoneofIndex(result, parseInt[int32](node))
-    node = getJsonField(obj, "json_name", "jsonName")
-    if node != nil and node.kind != JNull:
-        setjsonName(result, parseString(node))
-    node = getJsonField(obj, "options", "options")
-    if node != nil and node.kind != JNull:
-        setoptions(result, parsegoogle_protobuf_FieldOptions(node))
-
 proc serialize*(message: google_protobuf_FieldDescriptorProto): string =
     let
         ss = newStringStream()
@@ -2779,30 +2293,6 @@ proc readgoogle_protobuf_DescriptorProto_ExtensionRange*(stream: Stream): google
             setoptions(result, newgoogle_protobuf_ExtensionRangeOptions(data))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_DescriptorProto_ExtensionRange): JsonNode =
-    result = newJObject()
-    if hasstart(message):
-        result["start"] = %message.start
-    if hasfend(message):
-        result["end"] = %message.fend
-    if hasoptions(message):
-        result["options"] = toJson(message.options)
-
-proc parsegoogle_protobuf_DescriptorProto_ExtensionRange*(obj: JsonNode): google_protobuf_DescriptorProto_ExtensionRange =
-    result = newgoogle_protobuf_DescriptorProto_ExtensionRange()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "start", "start")
-    if node != nil and node.kind != JNull:
-        setstart(result, parseInt[int32](node))
-    node = getJsonField(obj, "end", "end")
-    if node != nil and node.kind != JNull:
-        setfend(result, parseInt[int32](node))
-    node = getJsonField(obj, "options", "options")
-    if node != nil and node.kind != JNull:
-        setoptions(result, parsegoogle_protobuf_ExtensionRangeOptions(node))
-
 proc serialize*(message: google_protobuf_DescriptorProto_ExtensionRange): string =
     let
         ss = newStringStream()
@@ -2910,7 +2400,6 @@ proc setuninterpretedOption*(message: google_protobuf_MessageOptions, value: seq
 
 proc adduninterpretedOption*(message: google_protobuf_MessageOptions, value: google_protobuf_UninterpretedOption) =
     add(message.uninterpretedOption, value)
-    setField(message, 999)
 
 proc uninterpretedOption*(message: google_protobuf_MessageOptions): seq[google_protobuf_UninterpretedOption] {.inline.} =
     message.uninterpretedOption
@@ -2976,46 +2465,6 @@ proc readgoogle_protobuf_MessageOptions*(stream: Stream): google_protobuf_Messag
             adduninterpretedOption(result, newgoogle_protobuf_UninterpretedOption(data))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_MessageOptions): JsonNode =
-    result = newJObject()
-    if hasmessageSetWireFormat(message):
-        result["messageSetWireFormat"] = %message.messageSetWireFormat
-    if hasnoStandardDescriptorAccessor(message):
-        result["noStandardDescriptorAccessor"] = %message.noStandardDescriptorAccessor
-    if hasdeprecated(message):
-        result["deprecated"] = %message.deprecated
-    if hasmapEntry(message):
-        result["mapEntry"] = %message.mapEntry
-    if hasuninterpretedOption(message):
-        let arr = newJArray()
-        for value in message.uninterpretedOption:
-            add(arr, toJson(value))
-        result["uninterpretedOption"] = arr
-
-proc parsegoogle_protobuf_MessageOptions*(obj: JsonNode): google_protobuf_MessageOptions =
-    result = newgoogle_protobuf_MessageOptions()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "message_set_wire_format", "messageSetWireFormat")
-    if node != nil and node.kind != JNull:
-        setmessageSetWireFormat(result, parseBool(node))
-    node = getJsonField(obj, "no_standard_descriptor_accessor", "noStandardDescriptorAccessor")
-    if node != nil and node.kind != JNull:
-        setnoStandardDescriptorAccessor(result, parseBool(node))
-    node = getJsonField(obj, "deprecated", "deprecated")
-    if node != nil and node.kind != JNull:
-        setdeprecated(result, parseBool(node))
-    node = getJsonField(obj, "map_entry", "mapEntry")
-    if node != nil and node.kind != JNull:
-        setmapEntry(result, parseBool(node))
-    node = getJsonField(obj, "uninterpreted_option", "uninterpretedOption")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            adduninterpretedOption(result, parsegoogle_protobuf_UninterpretedOption(value))
-
 proc serialize*(message: google_protobuf_MessageOptions): string =
     let
         ss = newStringStream()
@@ -3051,7 +2500,6 @@ proc setuninterpretedOption*(message: google_protobuf_OneofOptions, value: seq[g
 
 proc adduninterpretedOption*(message: google_protobuf_OneofOptions, value: google_protobuf_UninterpretedOption) =
     add(message.uninterpretedOption, value)
-    setField(message, 999)
 
 proc uninterpretedOption*(message: google_protobuf_OneofOptions): seq[google_protobuf_UninterpretedOption] {.inline.} =
     message.uninterpretedOption
@@ -3085,26 +2533,6 @@ proc readgoogle_protobuf_OneofOptions*(stream: Stream): google_protobuf_OneofOpt
             adduninterpretedOption(result, newgoogle_protobuf_UninterpretedOption(data))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_OneofOptions): JsonNode =
-    result = newJObject()
-    if hasuninterpretedOption(message):
-        let arr = newJArray()
-        for value in message.uninterpretedOption:
-            add(arr, toJson(value))
-        result["uninterpretedOption"] = arr
-
-proc parsegoogle_protobuf_OneofOptions*(obj: JsonNode): google_protobuf_OneofOptions =
-    result = newgoogle_protobuf_OneofOptions()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "uninterpreted_option", "uninterpretedOption")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            adduninterpretedOption(result, parsegoogle_protobuf_UninterpretedOption(value))
-
 proc serialize*(message: google_protobuf_OneofOptions): string =
     let
         ss = newStringStream()
@@ -3196,25 +2624,6 @@ proc readgoogle_protobuf_OneofDescriptorProto*(stream: Stream): google_protobuf_
             setoptions(result, newgoogle_protobuf_OneofOptions(data))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_OneofDescriptorProto): JsonNode =
-    result = newJObject()
-    if hasname(message):
-        result["name"] = %message.name
-    if hasoptions(message):
-        result["options"] = toJson(message.options)
-
-proc parsegoogle_protobuf_OneofDescriptorProto*(obj: JsonNode): google_protobuf_OneofDescriptorProto =
-    result = newgoogle_protobuf_OneofDescriptorProto()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "name", "name")
-    if node != nil and node.kind != JNull:
-        setname(result, parseString(node))
-    node = getJsonField(obj, "options", "options")
-    if node != nil and node.kind != JNull:
-        setoptions(result, parsegoogle_protobuf_OneofOptions(node))
-
 proc serialize*(message: google_protobuf_OneofDescriptorProto): string =
     let
         ss = newStringStream()
@@ -3305,25 +2714,6 @@ proc readgoogle_protobuf_DescriptorProto_ReservedRange*(stream: Stream): google_
             setfend(result, protoReadInt32(stream))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_DescriptorProto_ReservedRange): JsonNode =
-    result = newJObject()
-    if hasstart(message):
-        result["start"] = %message.start
-    if hasfend(message):
-        result["end"] = %message.fend
-
-proc parsegoogle_protobuf_DescriptorProto_ReservedRange*(obj: JsonNode): google_protobuf_DescriptorProto_ReservedRange =
-    result = newgoogle_protobuf_DescriptorProto_ReservedRange()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "start", "start")
-    if node != nil and node.kind != JNull:
-        setstart(result, parseInt[int32](node))
-    node = getJsonField(obj, "end", "end")
-    if node != nil and node.kind != JNull:
-        setfend(result, parseInt[int32](node))
-
 proc serialize*(message: google_protobuf_DescriptorProto_ReservedRange): string =
     let
         ss = newStringStream()
@@ -3385,7 +2775,6 @@ proc setfield*(message: google_protobuf_DescriptorProto, value: seq[google_proto
 
 proc addfield*(message: google_protobuf_DescriptorProto, value: google_protobuf_FieldDescriptorProto) =
     add(message.field, value)
-    setField(message, 2)
 
 proc field*(message: google_protobuf_DescriptorProto): seq[google_protobuf_FieldDescriptorProto] {.inline.} =
     message.field
@@ -3406,7 +2795,6 @@ proc setextension*(message: google_protobuf_DescriptorProto, value: seq[google_p
 
 proc addextension*(message: google_protobuf_DescriptorProto, value: google_protobuf_FieldDescriptorProto) =
     add(message.extension, value)
-    setField(message, 6)
 
 proc extension*(message: google_protobuf_DescriptorProto): seq[google_protobuf_FieldDescriptorProto] {.inline.} =
     message.extension
@@ -3427,7 +2815,6 @@ proc setnestedType*(message: google_protobuf_DescriptorProto, value: seq[google_
 
 proc addnestedType*(message: google_protobuf_DescriptorProto, value: google_protobuf_DescriptorProto) =
     add(message.nestedType, value)
-    setField(message, 3)
 
 proc nestedType*(message: google_protobuf_DescriptorProto): seq[google_protobuf_DescriptorProto] {.inline.} =
     message.nestedType
@@ -3448,7 +2835,6 @@ proc setenumType*(message: google_protobuf_DescriptorProto, value: seq[google_pr
 
 proc addenumType*(message: google_protobuf_DescriptorProto, value: google_protobuf_EnumDescriptorProto) =
     add(message.enumType, value)
-    setField(message, 4)
 
 proc enumType*(message: google_protobuf_DescriptorProto): seq[google_protobuf_EnumDescriptorProto] {.inline.} =
     message.enumType
@@ -3469,7 +2855,6 @@ proc setextensionRange*(message: google_protobuf_DescriptorProto, value: seq[goo
 
 proc addextensionRange*(message: google_protobuf_DescriptorProto, value: google_protobuf_DescriptorProto_ExtensionRange) =
     add(message.extensionRange, value)
-    setField(message, 5)
 
 proc extensionRange*(message: google_protobuf_DescriptorProto): seq[google_protobuf_DescriptorProto_ExtensionRange] {.inline.} =
     message.extensionRange
@@ -3490,7 +2875,6 @@ proc setoneofDecl*(message: google_protobuf_DescriptorProto, value: seq[google_p
 
 proc addoneofDecl*(message: google_protobuf_DescriptorProto, value: google_protobuf_OneofDescriptorProto) =
     add(message.oneofDecl, value)
-    setField(message, 8)
 
 proc oneofDecl*(message: google_protobuf_DescriptorProto): seq[google_protobuf_OneofDescriptorProto] {.inline.} =
     message.oneofDecl
@@ -3528,7 +2912,6 @@ proc setreservedRange*(message: google_protobuf_DescriptorProto, value: seq[goog
 
 proc addreservedRange*(message: google_protobuf_DescriptorProto, value: google_protobuf_DescriptorProto_ReservedRange) =
     add(message.reservedRange, value)
-    setField(message, 9)
 
 proc reservedRange*(message: google_protobuf_DescriptorProto): seq[google_protobuf_DescriptorProto_ReservedRange] {.inline.} =
     message.reservedRange
@@ -3549,7 +2932,6 @@ proc setreservedName*(message: google_protobuf_DescriptorProto, value: seq[strin
 
 proc addreservedName*(message: google_protobuf_DescriptorProto, value: string) =
     add(message.reservedName, value)
-    setField(message, 10)
 
 proc reservedName*(message: google_protobuf_DescriptorProto): seq[string] {.inline.} =
     message.reservedName
@@ -3662,113 +3044,6 @@ proc readgoogle_protobuf_DescriptorProto*(stream: Stream): google_protobuf_Descr
             addreservedName(result, protoReadString(stream))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_DescriptorProto): JsonNode =
-    result = newJObject()
-    if hasname(message):
-        result["name"] = %message.name
-    if hasfield(message):
-        let arr = newJArray()
-        for value in message.field:
-            add(arr, toJson(value))
-        result["field"] = arr
-    if hasextension(message):
-        let arr = newJArray()
-        for value in message.extension:
-            add(arr, toJson(value))
-        result["extension"] = arr
-    if hasnestedType(message):
-        let arr = newJArray()
-        for value in message.nestedType:
-            add(arr, toJson(value))
-        result["nestedType"] = arr
-    if hasenumType(message):
-        let arr = newJArray()
-        for value in message.enumType:
-            add(arr, toJson(value))
-        result["enumType"] = arr
-    if hasextensionRange(message):
-        let arr = newJArray()
-        for value in message.extensionRange:
-            add(arr, toJson(value))
-        result["extensionRange"] = arr
-    if hasoneofDecl(message):
-        let arr = newJArray()
-        for value in message.oneofDecl:
-            add(arr, toJson(value))
-        result["oneofDecl"] = arr
-    if hasoptions(message):
-        result["options"] = toJson(message.options)
-    if hasreservedRange(message):
-        let arr = newJArray()
-        for value in message.reservedRange:
-            add(arr, toJson(value))
-        result["reservedRange"] = arr
-    if hasreservedName(message):
-        let arr = newJArray()
-        for value in message.reservedName:
-            add(arr, %value)
-        result["reservedName"] = arr
-
-proc parsegoogle_protobuf_DescriptorProto*(obj: JsonNode): google_protobuf_DescriptorProto =
-    result = newgoogle_protobuf_DescriptorProto()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "name", "name")
-    if node != nil and node.kind != JNull:
-        setname(result, parseString(node))
-    node = getJsonField(obj, "field", "field")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addfield(result, parsegoogle_protobuf_FieldDescriptorProto(value))
-    node = getJsonField(obj, "extension", "extension")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addextension(result, parsegoogle_protobuf_FieldDescriptorProto(value))
-    node = getJsonField(obj, "nested_type", "nestedType")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addnestedType(result, parsegoogle_protobuf_DescriptorProto(value))
-    node = getJsonField(obj, "enum_type", "enumType")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addenumType(result, parsegoogle_protobuf_EnumDescriptorProto(value))
-    node = getJsonField(obj, "extension_range", "extensionRange")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addextensionRange(result, parsegoogle_protobuf_DescriptorProto_ExtensionRange(value))
-    node = getJsonField(obj, "oneof_decl", "oneofDecl")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addoneofDecl(result, parsegoogle_protobuf_OneofDescriptorProto(value))
-    node = getJsonField(obj, "options", "options")
-    if node != nil and node.kind != JNull:
-        setoptions(result, parsegoogle_protobuf_MessageOptions(node))
-    node = getJsonField(obj, "reserved_range", "reservedRange")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addreservedRange(result, parsegoogle_protobuf_DescriptorProto_ReservedRange(value))
-    node = getJsonField(obj, "reserved_name", "reservedName")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addreservedName(result, parseString(value))
-
 proc serialize*(message: google_protobuf_DescriptorProto): string =
     let
         ss = newStringStream()
@@ -4128,7 +3403,6 @@ proc setuninterpretedOption*(message: google_protobuf_FileOptions, value: seq[go
 
 proc adduninterpretedOption*(message: google_protobuf_FileOptions, value: google_protobuf_UninterpretedOption) =
     add(message.uninterpretedOption, value)
-    setField(message, 999)
 
 proc uninterpretedOption*(message: google_protobuf_FileOptions): seq[google_protobuf_UninterpretedOption] {.inline.} =
     message.uninterpretedOption
@@ -4306,116 +3580,6 @@ proc readgoogle_protobuf_FileOptions*(stream: Stream): google_protobuf_FileOptio
             adduninterpretedOption(result, newgoogle_protobuf_UninterpretedOption(data))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_FileOptions): JsonNode =
-    result = newJObject()
-    if hasjavaPackage(message):
-        result["javaPackage"] = %message.javaPackage
-    if hasjavaOuterClassname(message):
-        result["javaOuterClassname"] = %message.javaOuterClassname
-    if hasjavaMultipleFiles(message):
-        result["javaMultipleFiles"] = %message.javaMultipleFiles
-    if hasjavaGenerateEqualsAndHash(message):
-        result["javaGenerateEqualsAndHash"] = %message.javaGenerateEqualsAndHash
-    if hasjavaStringCheckUtf8(message):
-        result["javaStringCheckUtf8"] = %message.javaStringCheckUtf8
-    if hasoptimizeFor(message):
-        result["optimizeFor"] = toJson(message.optimizeFor)
-    if hasgoPackage(message):
-        result["goPackage"] = %message.goPackage
-    if hasccGenericServices(message):
-        result["ccGenericServices"] = %message.ccGenericServices
-    if hasjavaGenericServices(message):
-        result["javaGenericServices"] = %message.javaGenericServices
-    if haspyGenericServices(message):
-        result["pyGenericServices"] = %message.pyGenericServices
-    if hasphpGenericServices(message):
-        result["phpGenericServices"] = %message.phpGenericServices
-    if hasdeprecated(message):
-        result["deprecated"] = %message.deprecated
-    if hasccEnableArenas(message):
-        result["ccEnableArenas"] = %message.ccEnableArenas
-    if hasobjcClassPrefix(message):
-        result["objcClassPrefix"] = %message.objcClassPrefix
-    if hascsharpNamespace(message):
-        result["csharpNamespace"] = %message.csharpNamespace
-    if hasswiftPrefix(message):
-        result["swiftPrefix"] = %message.swiftPrefix
-    if hasphpClassPrefix(message):
-        result["phpClassPrefix"] = %message.phpClassPrefix
-    if hasphpNamespace(message):
-        result["phpNamespace"] = %message.phpNamespace
-    if hasuninterpretedOption(message):
-        let arr = newJArray()
-        for value in message.uninterpretedOption:
-            add(arr, toJson(value))
-        result["uninterpretedOption"] = arr
-
-proc parsegoogle_protobuf_FileOptions*(obj: JsonNode): google_protobuf_FileOptions =
-    result = newgoogle_protobuf_FileOptions()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "java_package", "javaPackage")
-    if node != nil and node.kind != JNull:
-        setjavaPackage(result, parseString(node))
-    node = getJsonField(obj, "java_outer_classname", "javaOuterClassname")
-    if node != nil and node.kind != JNull:
-        setjavaOuterClassname(result, parseString(node))
-    node = getJsonField(obj, "java_multiple_files", "javaMultipleFiles")
-    if node != nil and node.kind != JNull:
-        setjavaMultipleFiles(result, parseBool(node))
-    node = getJsonField(obj, "java_generate_equals_and_hash", "javaGenerateEqualsAndHash")
-    if node != nil and node.kind != JNull:
-        setjavaGenerateEqualsAndHash(result, parseBool(node))
-    node = getJsonField(obj, "java_string_check_utf8", "javaStringCheckUtf8")
-    if node != nil and node.kind != JNull:
-        setjavaStringCheckUtf8(result, parseBool(node))
-    node = getJsonField(obj, "optimize_for", "optimizeFor")
-    if node != nil and node.kind != JNull:
-        setoptimizeFor(result, parseEnum[google_protobuf_FileOptions_OptimizeMode](node))
-    node = getJsonField(obj, "go_package", "goPackage")
-    if node != nil and node.kind != JNull:
-        setgoPackage(result, parseString(node))
-    node = getJsonField(obj, "cc_generic_services", "ccGenericServices")
-    if node != nil and node.kind != JNull:
-        setccGenericServices(result, parseBool(node))
-    node = getJsonField(obj, "java_generic_services", "javaGenericServices")
-    if node != nil and node.kind != JNull:
-        setjavaGenericServices(result, parseBool(node))
-    node = getJsonField(obj, "py_generic_services", "pyGenericServices")
-    if node != nil and node.kind != JNull:
-        setpyGenericServices(result, parseBool(node))
-    node = getJsonField(obj, "php_generic_services", "phpGenericServices")
-    if node != nil and node.kind != JNull:
-        setphpGenericServices(result, parseBool(node))
-    node = getJsonField(obj, "deprecated", "deprecated")
-    if node != nil and node.kind != JNull:
-        setdeprecated(result, parseBool(node))
-    node = getJsonField(obj, "cc_enable_arenas", "ccEnableArenas")
-    if node != nil and node.kind != JNull:
-        setccEnableArenas(result, parseBool(node))
-    node = getJsonField(obj, "objc_class_prefix", "objcClassPrefix")
-    if node != nil and node.kind != JNull:
-        setobjcClassPrefix(result, parseString(node))
-    node = getJsonField(obj, "csharp_namespace", "csharpNamespace")
-    if node != nil and node.kind != JNull:
-        setcsharpNamespace(result, parseString(node))
-    node = getJsonField(obj, "swift_prefix", "swiftPrefix")
-    if node != nil and node.kind != JNull:
-        setswiftPrefix(result, parseString(node))
-    node = getJsonField(obj, "php_class_prefix", "phpClassPrefix")
-    if node != nil and node.kind != JNull:
-        setphpClassPrefix(result, parseString(node))
-    node = getJsonField(obj, "php_namespace", "phpNamespace")
-    if node != nil and node.kind != JNull:
-        setphpNamespace(result, parseString(node))
-    node = getJsonField(obj, "uninterpreted_option", "uninterpretedOption")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            adduninterpretedOption(result, parsegoogle_protobuf_UninterpretedOption(value))
-
 proc serialize*(message: google_protobuf_FileOptions): string =
     let
         ss = newStringStream()
@@ -4469,7 +3633,6 @@ proc setuninterpretedOption*(message: google_protobuf_ServiceOptions, value: seq
 
 proc adduninterpretedOption*(message: google_protobuf_ServiceOptions, value: google_protobuf_UninterpretedOption) =
     add(message.uninterpretedOption, value)
-    setField(message, 999)
 
 proc uninterpretedOption*(message: google_protobuf_ServiceOptions): seq[google_protobuf_UninterpretedOption] {.inline.} =
     message.uninterpretedOption
@@ -4511,31 +3674,6 @@ proc readgoogle_protobuf_ServiceOptions*(stream: Stream): google_protobuf_Servic
             adduninterpretedOption(result, newgoogle_protobuf_UninterpretedOption(data))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_ServiceOptions): JsonNode =
-    result = newJObject()
-    if hasdeprecated(message):
-        result["deprecated"] = %message.deprecated
-    if hasuninterpretedOption(message):
-        let arr = newJArray()
-        for value in message.uninterpretedOption:
-            add(arr, toJson(value))
-        result["uninterpretedOption"] = arr
-
-proc parsegoogle_protobuf_ServiceOptions*(obj: JsonNode): google_protobuf_ServiceOptions =
-    result = newgoogle_protobuf_ServiceOptions()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "deprecated", "deprecated")
-    if node != nil and node.kind != JNull:
-        setdeprecated(result, parseBool(node))
-    node = getJsonField(obj, "uninterpreted_option", "uninterpretedOption")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            adduninterpretedOption(result, parsegoogle_protobuf_UninterpretedOption(value))
-
 proc serialize*(message: google_protobuf_ServiceOptions): string =
     let
         ss = newStringStream()
@@ -4607,7 +3745,6 @@ proc setuninterpretedOption*(message: google_protobuf_MethodOptions, value: seq[
 
 proc adduninterpretedOption*(message: google_protobuf_MethodOptions, value: google_protobuf_UninterpretedOption) =
     add(message.uninterpretedOption, value)
-    setField(message, 999)
 
 proc uninterpretedOption*(message: google_protobuf_MethodOptions): seq[google_protobuf_UninterpretedOption] {.inline.} =
     message.uninterpretedOption
@@ -4657,36 +3794,6 @@ proc readgoogle_protobuf_MethodOptions*(stream: Stream): google_protobuf_MethodO
             adduninterpretedOption(result, newgoogle_protobuf_UninterpretedOption(data))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_MethodOptions): JsonNode =
-    result = newJObject()
-    if hasdeprecated(message):
-        result["deprecated"] = %message.deprecated
-    if hasidempotencyLevel(message):
-        result["idempotencyLevel"] = toJson(message.idempotencyLevel)
-    if hasuninterpretedOption(message):
-        let arr = newJArray()
-        for value in message.uninterpretedOption:
-            add(arr, toJson(value))
-        result["uninterpretedOption"] = arr
-
-proc parsegoogle_protobuf_MethodOptions*(obj: JsonNode): google_protobuf_MethodOptions =
-    result = newgoogle_protobuf_MethodOptions()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "deprecated", "deprecated")
-    if node != nil and node.kind != JNull:
-        setdeprecated(result, parseBool(node))
-    node = getJsonField(obj, "idempotency_level", "idempotencyLevel")
-    if node != nil and node.kind != JNull:
-        setidempotencyLevel(result, parseEnum[google_protobuf_MethodOptions_IdempotencyLevel](node))
-    node = getJsonField(obj, "uninterpreted_option", "uninterpretedOption")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            adduninterpretedOption(result, parsegoogle_protobuf_UninterpretedOption(value))
-
 proc serialize*(message: google_protobuf_MethodOptions): string =
     let
         ss = newStringStream()
@@ -4882,45 +3989,6 @@ proc readgoogle_protobuf_MethodDescriptorProto*(stream: Stream): google_protobuf
             setserverStreaming(result, protoReadBool(stream))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_MethodDescriptorProto): JsonNode =
-    result = newJObject()
-    if hasname(message):
-        result["name"] = %message.name
-    if hasinputType(message):
-        result["inputType"] = %message.inputType
-    if hasoutputType(message):
-        result["outputType"] = %message.outputType
-    if hasoptions(message):
-        result["options"] = toJson(message.options)
-    if hasclientStreaming(message):
-        result["clientStreaming"] = %message.clientStreaming
-    if hasserverStreaming(message):
-        result["serverStreaming"] = %message.serverStreaming
-
-proc parsegoogle_protobuf_MethodDescriptorProto*(obj: JsonNode): google_protobuf_MethodDescriptorProto =
-    result = newgoogle_protobuf_MethodDescriptorProto()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "name", "name")
-    if node != nil and node.kind != JNull:
-        setname(result, parseString(node))
-    node = getJsonField(obj, "input_type", "inputType")
-    if node != nil and node.kind != JNull:
-        setinputType(result, parseString(node))
-    node = getJsonField(obj, "output_type", "outputType")
-    if node != nil and node.kind != JNull:
-        setoutputType(result, parseString(node))
-    node = getJsonField(obj, "options", "options")
-    if node != nil and node.kind != JNull:
-        setoptions(result, parsegoogle_protobuf_MethodOptions(node))
-    node = getJsonField(obj, "client_streaming", "clientStreaming")
-    if node != nil and node.kind != JNull:
-        setclientStreaming(result, parseBool(node))
-    node = getJsonField(obj, "server_streaming", "serverStreaming")
-    if node != nil and node.kind != JNull:
-        setserverStreaming(result, parseBool(node))
-
 proc serialize*(message: google_protobuf_MethodDescriptorProto): string =
     let
         ss = newStringStream()
@@ -4975,7 +4043,6 @@ proc setfmethod*(message: google_protobuf_ServiceDescriptorProto, value: seq[goo
 
 proc addfmethod*(message: google_protobuf_ServiceDescriptorProto, value: google_protobuf_MethodDescriptorProto) =
     add(message.fmethod, value)
-    setField(message, 2)
 
 proc fmethod*(message: google_protobuf_ServiceDescriptorProto): seq[google_protobuf_MethodDescriptorProto] {.inline.} =
     message.fmethod
@@ -5043,36 +4110,6 @@ proc readgoogle_protobuf_ServiceDescriptorProto*(stream: Stream): google_protobu
             setoptions(result, newgoogle_protobuf_ServiceOptions(data))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_ServiceDescriptorProto): JsonNode =
-    result = newJObject()
-    if hasname(message):
-        result["name"] = %message.name
-    if hasfmethod(message):
-        let arr = newJArray()
-        for value in message.fmethod:
-            add(arr, toJson(value))
-        result["method"] = arr
-    if hasoptions(message):
-        result["options"] = toJson(message.options)
-
-proc parsegoogle_protobuf_ServiceDescriptorProto*(obj: JsonNode): google_protobuf_ServiceDescriptorProto =
-    result = newgoogle_protobuf_ServiceDescriptorProto()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "name", "name")
-    if node != nil and node.kind != JNull:
-        setname(result, parseString(node))
-    node = getJsonField(obj, "method", "method")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addfmethod(result, parsegoogle_protobuf_MethodDescriptorProto(value))
-    node = getJsonField(obj, "options", "options")
-    if node != nil and node.kind != JNull:
-        setoptions(result, parsegoogle_protobuf_ServiceOptions(node))
-
 proc serialize*(message: google_protobuf_ServiceDescriptorProto): string =
     let
         ss = newStringStream()
@@ -5153,7 +4190,6 @@ proc setdependency*(message: google_protobuf_FileDescriptorProto, value: seq[str
 
 proc adddependency*(message: google_protobuf_FileDescriptorProto, value: string) =
     add(message.dependency, value)
-    setField(message, 3)
 
 proc dependency*(message: google_protobuf_FileDescriptorProto): seq[string] {.inline.} =
     message.dependency
@@ -5174,7 +4210,6 @@ proc setpublicDependency*(message: google_protobuf_FileDescriptorProto, value: s
 
 proc addpublicDependency*(message: google_protobuf_FileDescriptorProto, value: int32) =
     add(message.publicDependency, value)
-    setField(message, 10)
 
 proc publicDependency*(message: google_protobuf_FileDescriptorProto): seq[int32] {.inline.} =
     message.publicDependency
@@ -5195,7 +4230,6 @@ proc setweakDependency*(message: google_protobuf_FileDescriptorProto, value: seq
 
 proc addweakDependency*(message: google_protobuf_FileDescriptorProto, value: int32) =
     add(message.weakDependency, value)
-    setField(message, 11)
 
 proc weakDependency*(message: google_protobuf_FileDescriptorProto): seq[int32] {.inline.} =
     message.weakDependency
@@ -5216,7 +4250,6 @@ proc setmessageType*(message: google_protobuf_FileDescriptorProto, value: seq[go
 
 proc addmessageType*(message: google_protobuf_FileDescriptorProto, value: google_protobuf_DescriptorProto) =
     add(message.messageType, value)
-    setField(message, 4)
 
 proc messageType*(message: google_protobuf_FileDescriptorProto): seq[google_protobuf_DescriptorProto] {.inline.} =
     message.messageType
@@ -5237,7 +4270,6 @@ proc setenumType*(message: google_protobuf_FileDescriptorProto, value: seq[googl
 
 proc addenumType*(message: google_protobuf_FileDescriptorProto, value: google_protobuf_EnumDescriptorProto) =
     add(message.enumType, value)
-    setField(message, 5)
 
 proc enumType*(message: google_protobuf_FileDescriptorProto): seq[google_protobuf_EnumDescriptorProto] {.inline.} =
     message.enumType
@@ -5258,7 +4290,6 @@ proc setservice*(message: google_protobuf_FileDescriptorProto, value: seq[google
 
 proc addservice*(message: google_protobuf_FileDescriptorProto, value: google_protobuf_ServiceDescriptorProto) =
     add(message.service, value)
-    setField(message, 6)
 
 proc service*(message: google_protobuf_FileDescriptorProto): seq[google_protobuf_ServiceDescriptorProto] {.inline.} =
     message.service
@@ -5279,7 +4310,6 @@ proc setextension*(message: google_protobuf_FileDescriptorProto, value: seq[goog
 
 proc addextension*(message: google_protobuf_FileDescriptorProto, value: google_protobuf_FieldDescriptorProto) =
     add(message.extension, value)
-    setField(message, 7)
 
 proc extension*(message: google_protobuf_FileDescriptorProto): seq[google_protobuf_FieldDescriptorProto] {.inline.} =
     message.extension
@@ -5348,10 +4378,10 @@ proc sizeOfgoogle_protobuf_FileDescriptorProto*(message: google_protobuf_FileDes
     for value in message.dependency:
         result = result + sizeOfTag(3, WireType.LengthDelimited)
         result = result + sizeOfString(value)
-    if haspublicDependency(message):
+    if len(message.publicDependency) > 0:
         result = result + sizeOfTag(10, WireType.LengthDelimited)
         result = result + sizeOfLengthDelimited(packedFieldSize(message.publicDependency, FieldType.Int32))
-    if hasweakDependency(message):
+    if len(message.weakDependency) > 0:
         result = result + sizeOfTag(11, WireType.LengthDelimited)
         result = result + sizeOfLengthDelimited(packedFieldSize(message.weakDependency, FieldType.Int32))
     for value in message.messageType:
@@ -5479,117 +4509,6 @@ proc readgoogle_protobuf_FileDescriptorProto*(stream: Stream): google_protobuf_F
             setsyntax(result, protoReadString(stream))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_FileDescriptorProto): JsonNode =
-    result = newJObject()
-    if hasname(message):
-        result["name"] = %message.name
-    if haspackage(message):
-        result["package"] = %message.package
-    if hasdependency(message):
-        let arr = newJArray()
-        for value in message.dependency:
-            add(arr, %value)
-        result["dependency"] = arr
-    if haspublicDependency(message):
-        let arr = newJArray()
-        for value in message.publicDependency:
-            add(arr, %value)
-        result["publicDependency"] = arr
-    if hasweakDependency(message):
-        let arr = newJArray()
-        for value in message.weakDependency:
-            add(arr, %value)
-        result["weakDependency"] = arr
-    if hasmessageType(message):
-        let arr = newJArray()
-        for value in message.messageType:
-            add(arr, toJson(value))
-        result["messageType"] = arr
-    if hasenumType(message):
-        let arr = newJArray()
-        for value in message.enumType:
-            add(arr, toJson(value))
-        result["enumType"] = arr
-    if hasservice(message):
-        let arr = newJArray()
-        for value in message.service:
-            add(arr, toJson(value))
-        result["service"] = arr
-    if hasextension(message):
-        let arr = newJArray()
-        for value in message.extension:
-            add(arr, toJson(value))
-        result["extension"] = arr
-    if hasoptions(message):
-        result["options"] = toJson(message.options)
-    if hassourceCodeInfo(message):
-        result["sourceCodeInfo"] = toJson(message.sourceCodeInfo)
-    if hassyntax(message):
-        result["syntax"] = %message.syntax
-
-proc parsegoogle_protobuf_FileDescriptorProto*(obj: JsonNode): google_protobuf_FileDescriptorProto =
-    result = newgoogle_protobuf_FileDescriptorProto()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "name", "name")
-    if node != nil and node.kind != JNull:
-        setname(result, parseString(node))
-    node = getJsonField(obj, "package", "package")
-    if node != nil and node.kind != JNull:
-        setpackage(result, parseString(node))
-    node = getJsonField(obj, "dependency", "dependency")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            adddependency(result, parseString(value))
-    node = getJsonField(obj, "public_dependency", "publicDependency")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addpublicDependency(result, parseInt[int32](value))
-    node = getJsonField(obj, "weak_dependency", "weakDependency")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addweakDependency(result, parseInt[int32](value))
-    node = getJsonField(obj, "message_type", "messageType")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addmessageType(result, parsegoogle_protobuf_DescriptorProto(value))
-    node = getJsonField(obj, "enum_type", "enumType")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addenumType(result, parsegoogle_protobuf_EnumDescriptorProto(value))
-    node = getJsonField(obj, "service", "service")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addservice(result, parsegoogle_protobuf_ServiceDescriptorProto(value))
-    node = getJsonField(obj, "extension", "extension")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addextension(result, parsegoogle_protobuf_FieldDescriptorProto(value))
-    node = getJsonField(obj, "options", "options")
-    if node != nil and node.kind != JNull:
-        setoptions(result, parsegoogle_protobuf_FileOptions(node))
-    node = getJsonField(obj, "source_code_info", "sourceCodeInfo")
-    if node != nil and node.kind != JNull:
-        setsourceCodeInfo(result, parsegoogle_protobuf_SourceCodeInfo(node))
-    node = getJsonField(obj, "syntax", "syntax")
-    if node != nil and node.kind != JNull:
-        setsyntax(result, parseString(node))
-
 proc serialize*(message: google_protobuf_FileDescriptorProto): string =
     let
         ss = newStringStream()
@@ -5625,7 +4544,6 @@ proc setfile*(message: google_protobuf_FileDescriptorSet, value: seq[google_prot
 
 proc addfile*(message: google_protobuf_FileDescriptorSet, value: google_protobuf_FileDescriptorProto) =
     add(message.file, value)
-    setField(message, 1)
 
 proc file*(message: google_protobuf_FileDescriptorSet): seq[google_protobuf_FileDescriptorProto] {.inline.} =
     message.file
@@ -5659,26 +4577,6 @@ proc readgoogle_protobuf_FileDescriptorSet*(stream: Stream): google_protobuf_Fil
             addfile(result, newgoogle_protobuf_FileDescriptorProto(data))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_FileDescriptorSet): JsonNode =
-    result = newJObject()
-    if hasfile(message):
-        let arr = newJArray()
-        for value in message.file:
-            add(arr, toJson(value))
-        result["file"] = arr
-
-proc parsegoogle_protobuf_FileDescriptorSet*(obj: JsonNode): google_protobuf_FileDescriptorSet =
-    result = newgoogle_protobuf_FileDescriptorSet()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "file", "file")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addfile(result, parsegoogle_protobuf_FileDescriptorProto(value))
-
 proc serialize*(message: google_protobuf_FileDescriptorSet): string =
     let
         ss = newStringStream()
@@ -5717,7 +4615,6 @@ proc setpath*(message: google_protobuf_GeneratedCodeInfo_Annotation, value: seq[
 
 proc addpath*(message: google_protobuf_GeneratedCodeInfo_Annotation, value: int32) =
     add(message.path, value)
-    setField(message, 1)
 
 proc path*(message: google_protobuf_GeneratedCodeInfo_Annotation): seq[int32] {.inline.} =
     message.path
@@ -5777,7 +4674,7 @@ proc `fend=`*(message: google_protobuf_GeneratedCodeInfo_Annotation, value: int3
     setfend(message, value)
 
 proc sizeOfgoogle_protobuf_GeneratedCodeInfo_Annotation*(message: google_protobuf_GeneratedCodeInfo_Annotation): uint64 =
-    if haspath(message):
+    if len(message.path) > 0:
         result = result + sizeOfTag(1, WireType.LengthDelimited)
         result = result + sizeOfLengthDelimited(packedFieldSize(message.path, FieldType.Int32))
     if hassourceFile(message):
@@ -5792,7 +4689,7 @@ proc sizeOfgoogle_protobuf_GeneratedCodeInfo_Annotation*(message: google_protobu
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_GeneratedCodeInfo_Annotation*(stream: Stream, message: google_protobuf_GeneratedCodeInfo_Annotation) =
-    if haspath(message):
+    if len(message.path) > 0:
         writeTag(stream, 1, WireType.LengthDelimited)
         writeVarint(stream, packedFieldSize(message.path, FieldType.Int32))
         for value in message.path:
@@ -5839,41 +4736,6 @@ proc readgoogle_protobuf_GeneratedCodeInfo_Annotation*(stream: Stream): google_p
             setfend(result, protoReadInt32(stream))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_GeneratedCodeInfo_Annotation): JsonNode =
-    result = newJObject()
-    if haspath(message):
-        let arr = newJArray()
-        for value in message.path:
-            add(arr, %value)
-        result["path"] = arr
-    if hassourceFile(message):
-        result["sourceFile"] = %message.sourceFile
-    if hasbegin(message):
-        result["begin"] = %message.begin
-    if hasfend(message):
-        result["end"] = %message.fend
-
-proc parsegoogle_protobuf_GeneratedCodeInfo_Annotation*(obj: JsonNode): google_protobuf_GeneratedCodeInfo_Annotation =
-    result = newgoogle_protobuf_GeneratedCodeInfo_Annotation()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "path", "path")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addpath(result, parseInt[int32](value))
-    node = getJsonField(obj, "source_file", "sourceFile")
-    if node != nil and node.kind != JNull:
-        setsourceFile(result, parseString(node))
-    node = getJsonField(obj, "begin", "begin")
-    if node != nil and node.kind != JNull:
-        setbegin(result, parseInt[int32](node))
-    node = getJsonField(obj, "end", "end")
-    if node != nil and node.kind != JNull:
-        setfend(result, parseInt[int32](node))
-
 proc serialize*(message: google_protobuf_GeneratedCodeInfo_Annotation): string =
     let
         ss = newStringStream()
@@ -5909,7 +4771,6 @@ proc setannotation*(message: google_protobuf_GeneratedCodeInfo, value: seq[googl
 
 proc addannotation*(message: google_protobuf_GeneratedCodeInfo, value: google_protobuf_GeneratedCodeInfo_Annotation) =
     add(message.annotation, value)
-    setField(message, 1)
 
 proc annotation*(message: google_protobuf_GeneratedCodeInfo): seq[google_protobuf_GeneratedCodeInfo_Annotation] {.inline.} =
     message.annotation
@@ -5943,26 +4804,6 @@ proc readgoogle_protobuf_GeneratedCodeInfo*(stream: Stream): google_protobuf_Gen
             addannotation(result, newgoogle_protobuf_GeneratedCodeInfo_Annotation(data))
         else: readUnknownField(stream, result, tag)
 
-proc toJson*(message: google_protobuf_GeneratedCodeInfo): JsonNode =
-    result = newJObject()
-    if hasannotation(message):
-        let arr = newJArray()
-        for value in message.annotation:
-            add(arr, toJson(value))
-        result["annotation"] = arr
-
-proc parsegoogle_protobuf_GeneratedCodeInfo*(obj: JsonNode): google_protobuf_GeneratedCodeInfo =
-    result = newgoogle_protobuf_GeneratedCodeInfo()
-    var node: JsonNode
-    if obj.kind != JObject:
-        raise newException(nimpb_json.ParseError, "object expected")
-    node = getJsonField(obj, "annotation", "annotation")
-    if node != nil and node.kind != JNull:
-        if node.kind != JArray:
-            raise newException(ValueError, "not an array")
-        for value in node:
-            addannotation(result, parsegoogle_protobuf_GeneratedCodeInfo_Annotation(value))
-
 proc serialize*(message: google_protobuf_GeneratedCodeInfo): string =
     let
         ss = newStringStream()
diff --git a/nimpb/wkt/duration_pb.nim b/nimpb/wkt/duration_pb.nim
index f052d3a..6359c20 100644
--- a/nimpb/wkt/duration_pb.nim
+++ b/nimpb/wkt/duration_pb.nim
@@ -29,14 +29,9 @@ proc newgoogle_protobuf_Duration*(): google_protobuf_Duration =
 
 proc clearseconds*(message: google_protobuf_Duration) =
     message.seconds = 0
-    clearFields(message, [1])
-
-proc hasseconds*(message: google_protobuf_Duration): bool =
-    result = hasField(message, 1)
 
 proc setseconds*(message: google_protobuf_Duration, value: int64) =
     message.seconds = value
-    setField(message, 1)
 
 proc seconds*(message: google_protobuf_Duration): int64 {.inline.} =
     message.seconds
@@ -46,14 +41,9 @@ proc `seconds=`*(message: google_protobuf_Duration, value: int64) {.inline.} =
 
 proc clearnanos*(message: google_protobuf_Duration) =
     message.nanos = 0
-    clearFields(message, [2])
-
-proc hasnanos*(message: google_protobuf_Duration): bool =
-    result = hasField(message, 2)
 
 proc setnanos*(message: google_protobuf_Duration, value: int32) =
     message.nanos = value
-    setField(message, 2)
 
 proc nanos*(message: google_protobuf_Duration): int32 {.inline.} =
     message.nanos
@@ -62,18 +52,18 @@ proc `nanos=`*(message: google_protobuf_Duration, value: int32) {.inline.} =
     setnanos(message, value)
 
 proc sizeOfgoogle_protobuf_Duration*(message: google_protobuf_Duration): uint64 =
-    if hasseconds(message):
+    if message.seconds != 0:
         result = result + sizeOfTag(1, WireType.Varint)
         result = result + sizeOfInt64(message.seconds)
-    if hasnanos(message):
+    if message.nanos != 0:
         result = result + sizeOfTag(2, WireType.Varint)
         result = result + sizeOfInt32(message.nanos)
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_Duration*(stream: Stream, message: google_protobuf_Duration) =
-    if hasseconds(message):
+    if message.seconds != 0:
         protoWriteInt64(stream, message.seconds, 1)
-    if hasnanos(message):
+    if message.nanos != 0:
         protoWriteInt32(stream, message.nanos, 2)
     writeUnknownFields(stream, message)
 
diff --git a/nimpb/wkt/field_mask_pb.nim b/nimpb/wkt/field_mask_pb.nim
index bed3296..91b58bb 100644
--- a/nimpb/wkt/field_mask_pb.nim
+++ b/nimpb/wkt/field_mask_pb.nim
@@ -27,18 +27,12 @@ proc newgoogle_protobuf_FieldMask*(): google_protobuf_FieldMask =
 
 proc clearpaths*(message: google_protobuf_FieldMask) =
     message.paths = @[]
-    clearFields(message, [1])
-
-proc haspaths*(message: google_protobuf_FieldMask): bool =
-    result = hasField(message, 1) or (len(message.paths) > 0)
 
 proc setpaths*(message: google_protobuf_FieldMask, value: seq[string]) =
     message.paths = value
-    setField(message, 1)
 
 proc addpaths*(message: google_protobuf_FieldMask, value: string) =
     add(message.paths, value)
-    setField(message, 1)
 
 proc paths*(message: google_protobuf_FieldMask): seq[string] {.inline.} =
     message.paths
diff --git a/nimpb/wkt/source_context_pb.nim b/nimpb/wkt/source_context_pb.nim
index 943cfd1..1df97c9 100644
--- a/nimpb/wkt/source_context_pb.nim
+++ b/nimpb/wkt/source_context_pb.nim
@@ -29,14 +29,9 @@ proc newgoogle_protobuf_SourceContext*(): google_protobuf_SourceContext =
 
 proc clearfileName*(message: google_protobuf_SourceContext) =
     message.fileName = ""
-    clearFields(message, [1])
-
-proc hasfileName*(message: google_protobuf_SourceContext): bool =
-    result = hasField(message, 1)
 
 proc setfileName*(message: google_protobuf_SourceContext, value: string) =
     message.fileName = value
-    setField(message, 1)
 
 proc fileName*(message: google_protobuf_SourceContext): string {.inline.} =
     message.fileName
@@ -45,13 +40,13 @@ proc `fileName=`*(message: google_protobuf_SourceContext, value: string) {.inlin
     setfileName(message, value)
 
 proc sizeOfgoogle_protobuf_SourceContext*(message: google_protobuf_SourceContext): uint64 =
-    if hasfileName(message):
+    if len(message.fileName) > 0:
         result = result + sizeOfTag(1, WireType.LengthDelimited)
         result = result + sizeOfString(message.fileName)
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_SourceContext*(stream: Stream, message: google_protobuf_SourceContext) =
-    if hasfileName(message):
+    if len(message.fileName) > 0:
         protoWriteString(stream, message.fileName, 1)
     writeUnknownFields(stream, message)
 
@@ -71,7 +66,7 @@ proc readgoogle_protobuf_SourceContext*(stream: Stream): google_protobuf_SourceC
 
 proc toJson*(message: google_protobuf_SourceContext): JsonNode =
     result = newJObject()
-    if hasfileName(message):
+    if len(message.fileName) > 0:
         result["fileName"] = %message.fileName
 
 proc parsegoogle_protobuf_SourceContext*(obj: JsonNode): google_protobuf_SourceContext =
diff --git a/nimpb/wkt/struct_pb.nim b/nimpb/wkt/struct_pb.nim
index a1e04e1..0944989 100644
--- a/nimpb/wkt/struct_pb.nim
+++ b/nimpb/wkt/struct_pb.nim
@@ -20,13 +20,24 @@ type
     google_protobuf_ValueObj* = object of Message
         kind: google_protobuf_Value_kind_OneOf
 
-    google_protobuf_Value_kind_OneOf* {.union.} = object
-        nullValue: google_protobuf_NullValue
-        numberValue: float64
-        stringValue: string
-        boolValue: bool
-        structValue: google_protobuf_Struct
-        listValue: google_protobuf_ListValue
+    google_protobuf_Value_kind_Kind* {.pure.} = enum
+        NullValue
+        NumberValue
+        StringValue
+        BoolValue
+        StructValue
+        ListValue
+        NotSet
+
+    google_protobuf_Value_kind_OneOf* = object
+        case kind*: google_protobuf_Value_kind_Kind
+        of google_protobuf_Value_kind_Kind.NullValue: nullValue*: google_protobuf_NullValue
+        of google_protobuf_Value_kind_Kind.NumberValue: numberValue*: float64
+        of google_protobuf_Value_kind_Kind.StringValue: stringValue*: string
+        of google_protobuf_Value_kind_Kind.BoolValue: boolValue*: bool
+        of google_protobuf_Value_kind_Kind.StructValue: structValue*: google_protobuf_Struct
+        of google_protobuf_Value_kind_Kind.ListValue: listValue*: google_protobuf_ListValue
+        of google_protobuf_Value_kind_Kind.NotSet: nil
     google_protobuf_ListValue* = ref google_protobuf_ListValueObj
     google_protobuf_ListValueObj* = object of Message
         values: seq[google_protobuf_Value]
@@ -102,14 +113,9 @@ proc newgoogle_protobuf_Struct*(): google_protobuf_Struct =
 
 proc clearfields*(message: google_protobuf_Struct) =
     message.fields = newTable[string, google_protobuf_Value]()
-    clearFields(message, [1])
-
-proc hasfields*(message: google_protobuf_Struct): bool =
-    result = hasField(message, 1) or (len(message.fields) > 0)
 
 proc setfields*(message: google_protobuf_Struct, value: TableRef[string, google_protobuf_Value]) =
     message.fields = value
-    setField(message, 1)
 
 proc fields*(message: google_protobuf_Struct): TableRef[string, google_protobuf_Value] {.inline.} =
     message.fields
@@ -118,7 +124,7 @@ proc `fields=`*(message: google_protobuf_Struct, value: TableRef[string, google_
     setfields(message, value)
 
 proc sizeOfgoogle_protobuf_Struct*(message: google_protobuf_Struct): uint64 =
-    if hasfields(message):
+    if len(message.fields) > 0:
         var sizeOfKV = 0'u64
         for key, value in message.fields:
             sizeOfKV = sizeOfKV + sizeOfgoogle_protobuf_Struct_FieldsEntryKV(key, value)
@@ -186,7 +192,6 @@ proc setvalues*(message: google_protobuf_ListValue, value: seq[google_protobuf_V
 
 proc addvalues*(message: google_protobuf_ListValue, value: google_protobuf_Value) =
     add(message.values, value)
-    setField(message, 1)
 
 proc values*(message: google_protobuf_ListValue): seq[google_protobuf_Value] {.inline.} =
     message.values
@@ -240,21 +245,20 @@ proc newgoogle_protobuf_ListValue*(data: seq[byte]): google_protobuf_ListValue =
 proc newgoogle_protobuf_Value*(): google_protobuf_Value =
     new(result)
     initMessage(result[])
-    result.kind.nullValue = google_protobuf_NullValue.NULL_VALUE
-    result.kind.numberValue = 0
-    result.kind.stringValue = ""
-    result.kind.boolValue = false
-    result.kind.structValue = nil
-    result.kind.listValue = nil
+    result.kind.kind = google_protobuf_Value_kind_Kind.NotSet
 
 proc clearnullValue*(message: google_protobuf_Value) =
-    message.kind.nullValue = google_protobuf_NullValue.NULL_VALUE
+    reset(message.kind)
+    message.kind.kind = google_protobuf_Value_kind_Kind.NotSet
     clearFields(message, [1, 2, 3, 4, 5, 6])
 
 proc hasnullValue*(message: google_protobuf_Value): bool =
     result = hasField(message, 1)
 
 proc setnullValue*(message: google_protobuf_Value, value: google_protobuf_NullValue) =
+    if message.kind.kind != google_protobuf_Value_kind_Kind.NullValue:
+        reset(message.kind)
+        message.kind.kind = google_protobuf_Value_kind_Kind.NullValue
     message.kind.nullValue = value
     setField(message, 1)
     clearFields(message, [2, 3, 4, 5, 6])
@@ -266,13 +270,17 @@ proc `nullValue=`*(message: google_protobuf_Value, value: google_protobuf_NullVa
     setnullValue(message, value)
 
 proc clearnumberValue*(message: google_protobuf_Value) =
-    message.kind.numberValue = 0
+    reset(message.kind)
+    message.kind.kind = google_protobuf_Value_kind_Kind.NotSet
     clearFields(message, [2, 1, 3, 4, 5, 6])
 
 proc hasnumberValue*(message: google_protobuf_Value): bool =
     result = hasField(message, 2)
 
 proc setnumberValue*(message: google_protobuf_Value, value: float64) =
+    if message.kind.kind != google_protobuf_Value_kind_Kind.NumberValue:
+        reset(message.kind)
+        message.kind.kind = google_protobuf_Value_kind_Kind.NumberValue
     message.kind.numberValue = value
     setField(message, 2)
     clearFields(message, [1, 3, 4, 5, 6])
@@ -284,13 +292,17 @@ proc `numberValue=`*(message: google_protobuf_Value, value: float64) {.inline.}
     setnumberValue(message, value)
 
 proc clearstringValue*(message: google_protobuf_Value) =
-    message.kind.stringValue = ""
+    reset(message.kind)
+    message.kind.kind = google_protobuf_Value_kind_Kind.NotSet
     clearFields(message, [3, 1, 2, 4, 5, 6])
 
 proc hasstringValue*(message: google_protobuf_Value): bool =
     result = hasField(message, 3)
 
 proc setstringValue*(message: google_protobuf_Value, value: string) =
+    if message.kind.kind != google_protobuf_Value_kind_Kind.StringValue:
+        reset(message.kind)
+        message.kind.kind = google_protobuf_Value_kind_Kind.StringValue
     message.kind.stringValue = value
     setField(message, 3)
     clearFields(message, [1, 2, 4, 5, 6])
@@ -302,13 +314,17 @@ proc `stringValue=`*(message: google_protobuf_Value, value: string) {.inline.} =
     setstringValue(message, value)
 
 proc clearboolValue*(message: google_protobuf_Value) =
-    message.kind.boolValue = false
+    reset(message.kind)
+    message.kind.kind = google_protobuf_Value_kind_Kind.NotSet
     clearFields(message, [4, 1, 2, 3, 5, 6])
 
 proc hasboolValue*(message: google_protobuf_Value): bool =
     result = hasField(message, 4)
 
 proc setboolValue*(message: google_protobuf_Value, value: bool) =
+    if message.kind.kind != google_protobuf_Value_kind_Kind.BoolValue:
+        reset(message.kind)
+        message.kind.kind = google_protobuf_Value_kind_Kind.BoolValue
     message.kind.boolValue = value
     setField(message, 4)
     clearFields(message, [1, 2, 3, 5, 6])
@@ -320,13 +336,17 @@ proc `boolValue=`*(message: google_protobuf_Value, value: bool) {.inline.} =
     setboolValue(message, value)
 
 proc clearstructValue*(message: google_protobuf_Value) =
-    message.kind.structValue = nil
+    reset(message.kind)
+    message.kind.kind = google_protobuf_Value_kind_Kind.NotSet
     clearFields(message, [5, 1, 2, 3, 4, 6])
 
 proc hasstructValue*(message: google_protobuf_Value): bool =
     result = hasField(message, 5)
 
 proc setstructValue*(message: google_protobuf_Value, value: google_protobuf_Struct) =
+    if message.kind.kind != google_protobuf_Value_kind_Kind.StructValue:
+        reset(message.kind)
+        message.kind.kind = google_protobuf_Value_kind_Kind.StructValue
     message.kind.structValue = value
     setField(message, 5)
     clearFields(message, [1, 2, 3, 4, 6])
@@ -338,13 +358,17 @@ proc `structValue=`*(message: google_protobuf_Value, value: google_protobuf_Stru
     setstructValue(message, value)
 
 proc clearlistValue*(message: google_protobuf_Value) =
-    message.kind.listValue = nil
+    reset(message.kind)
+    message.kind.kind = google_protobuf_Value_kind_Kind.NotSet
     clearFields(message, [6, 1, 2, 3, 4, 5])
 
 proc haslistValue*(message: google_protobuf_Value): bool =
     result = hasField(message, 6)
 
 proc setlistValue*(message: google_protobuf_Value, value: google_protobuf_ListValue) =
+    if message.kind.kind != google_protobuf_Value_kind_Kind.ListValue:
+        reset(message.kind)
+        message.kind.kind = google_protobuf_Value_kind_Kind.ListValue
     message.kind.listValue = value
     setField(message, 6)
     clearFields(message, [1, 2, 3, 4, 5])
@@ -356,38 +380,38 @@ proc `listValue=`*(message: google_protobuf_Value, value: google_protobuf_ListVa
     setlistValue(message, value)
 
 proc sizeOfgoogle_protobuf_Value*(message: google_protobuf_Value): uint64 =
-    if hasnullValue(message):
+    if message.kind.kind == google_protobuf_Value_kind_Kind.NullValue:
         result = result + sizeOfTag(1, WireType.Varint)
         result = result + sizeOfEnum[google_protobuf_NullValue](message.kind.nullValue)
-    if hasnumberValue(message):
+    if message.kind.kind == google_protobuf_Value_kind_Kind.NumberValue:
         result = result + sizeOfTag(2, WireType.Fixed64)
         result = result + sizeOfDouble(message.kind.numberValue)
-    if hasstringValue(message):
+    if message.kind.kind == google_protobuf_Value_kind_Kind.StringValue:
         result = result + sizeOfTag(3, WireType.LengthDelimited)
         result = result + sizeOfString(message.kind.stringValue)
-    if hasboolValue(message):
+    if message.kind.kind == google_protobuf_Value_kind_Kind.BoolValue:
         result = result + sizeOfTag(4, WireType.Varint)
         result = result + sizeOfBool(message.kind.boolValue)
-    if hasstructValue(message):
+    if message.kind.kind == google_protobuf_Value_kind_Kind.StructValue:
         result = result + sizeOfTag(5, WireType.LengthDelimited)
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_Struct(message.kind.structValue))
-    if haslistValue(message):
+    if message.kind.kind == google_protobuf_Value_kind_Kind.ListValue:
         result = result + sizeOfTag(6, WireType.LengthDelimited)
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_ListValue(message.kind.listValue))
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_Value*(stream: Stream, message: google_protobuf_Value) =
-    if hasnullValue(message):
+    if message.kind.kind == google_protobuf_Value_kind_Kind.NullValue:
         protoWriteEnum(stream, message.kind.nullValue, 1)
-    if hasnumberValue(message):
+    if message.kind.kind == google_protobuf_Value_kind_Kind.NumberValue:
         protoWriteDouble(stream, message.kind.numberValue, 2)
-    if hasstringValue(message):
+    if message.kind.kind == google_protobuf_Value_kind_Kind.StringValue:
         protoWriteString(stream, message.kind.stringValue, 3)
-    if hasboolValue(message):
+    if message.kind.kind == google_protobuf_Value_kind_Kind.BoolValue:
         protoWriteBool(stream, message.kind.boolValue, 4)
-    if hasstructValue(message):
+    if message.kind.kind == google_protobuf_Value_kind_Kind.StructValue:
         writeMessage(stream, message.kind.structValue, 5)
-    if haslistValue(message):
+    if message.kind.kind == google_protobuf_Value_kind_Kind.ListValue:
         writeMessage(stream, message.kind.listValue, 6)
     writeUnknownFields(stream, message)
 
diff --git a/nimpb/wkt/timestamp_pb.nim b/nimpb/wkt/timestamp_pb.nim
index 7403e2e..b0a7420 100644
--- a/nimpb/wkt/timestamp_pb.nim
+++ b/nimpb/wkt/timestamp_pb.nim
@@ -29,14 +29,9 @@ proc newgoogle_protobuf_Timestamp*(): google_protobuf_Timestamp =
 
 proc clearseconds*(message: google_protobuf_Timestamp) =
     message.seconds = 0
-    clearFields(message, [1])
-
-proc hasseconds*(message: google_protobuf_Timestamp): bool =
-    result = hasField(message, 1)
 
 proc setseconds*(message: google_protobuf_Timestamp, value: int64) =
     message.seconds = value
-    setField(message, 1)
 
 proc seconds*(message: google_protobuf_Timestamp): int64 {.inline.} =
     message.seconds
@@ -46,14 +41,9 @@ proc `seconds=`*(message: google_protobuf_Timestamp, value: int64) {.inline.} =
 
 proc clearnanos*(message: google_protobuf_Timestamp) =
     message.nanos = 0
-    clearFields(message, [2])
-
-proc hasnanos*(message: google_protobuf_Timestamp): bool =
-    result = hasField(message, 2)
 
 proc setnanos*(message: google_protobuf_Timestamp, value: int32) =
     message.nanos = value
-    setField(message, 2)
 
 proc nanos*(message: google_protobuf_Timestamp): int32 {.inline.} =
     message.nanos
@@ -62,18 +52,18 @@ proc `nanos=`*(message: google_protobuf_Timestamp, value: int32) {.inline.} =
     setnanos(message, value)
 
 proc sizeOfgoogle_protobuf_Timestamp*(message: google_protobuf_Timestamp): uint64 =
-    if hasseconds(message):
+    if message.seconds != 0:
         result = result + sizeOfTag(1, WireType.Varint)
         result = result + sizeOfInt64(message.seconds)
-    if hasnanos(message):
+    if message.nanos != 0:
         result = result + sizeOfTag(2, WireType.Varint)
         result = result + sizeOfInt32(message.nanos)
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_Timestamp*(stream: Stream, message: google_protobuf_Timestamp) =
-    if hasseconds(message):
+    if message.seconds != 0:
         protoWriteInt64(stream, message.seconds, 1)
-    if hasnanos(message):
+    if message.nanos != 0:
         protoWriteInt32(stream, message.nanos, 2)
     writeUnknownFields(stream, message)
 
diff --git a/nimpb/wkt/type_pb.nim b/nimpb/wkt/type_pb.nim
index a4e6838..4c87659 100644
--- a/nimpb/wkt/type_pb.nim
+++ b/nimpb/wkt/type_pb.nim
@@ -130,14 +130,9 @@ proc newgoogle_protobuf_Option*(): google_protobuf_Option =
 
 proc clearname*(message: google_protobuf_Option) =
     message.name = ""
-    clearFields(message, [1])
-
-proc hasname*(message: google_protobuf_Option): bool =
-    result = hasField(message, 1)
 
 proc setname*(message: google_protobuf_Option, value: string) =
     message.name = value
-    setField(message, 1)
 
 proc name*(message: google_protobuf_Option): string {.inline.} =
     message.name
@@ -163,7 +158,7 @@ proc `value=`*(message: google_protobuf_Option, value: google_protobuf_Any) {.in
     setvalue(message, value)
 
 proc sizeOfgoogle_protobuf_Option*(message: google_protobuf_Option): uint64 =
-    if hasname(message):
+    if len(message.name) > 0:
         result = result + sizeOfTag(1, WireType.LengthDelimited)
         result = result + sizeOfString(message.name)
     if hasvalue(message):
@@ -172,7 +167,7 @@ proc sizeOfgoogle_protobuf_Option*(message: google_protobuf_Option): uint64 =
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_Option*(stream: Stream, message: google_protobuf_Option) =
-    if hasname(message):
+    if len(message.name) > 0:
         protoWriteString(stream, message.name, 1)
     if hasvalue(message):
         writeMessage(stream, message.value, 2)
@@ -198,7 +193,7 @@ proc readgoogle_protobuf_Option*(stream: Stream): google_protobuf_Option =
 
 proc toJson*(message: google_protobuf_Option): JsonNode =
     result = newJObject()
-    if hasname(message):
+    if len(message.name) > 0:
         result["name"] = %message.name
     if hasvalue(message):
         result["value"] = toJson(message.value)
@@ -248,14 +243,9 @@ proc newgoogle_protobuf_Field*(): google_protobuf_Field =
 
 proc clearkind*(message: google_protobuf_Field) =
     message.kind = google_protobuf_Field_Kind.TYPE_UNKNOWN
-    clearFields(message, [1])
-
-proc haskind*(message: google_protobuf_Field): bool =
-    result = hasField(message, 1)
 
 proc setkind*(message: google_protobuf_Field, value: google_protobuf_Field_Kind) =
     message.kind = value
-    setField(message, 1)
 
 proc kind*(message: google_protobuf_Field): google_protobuf_Field_Kind {.inline.} =
     message.kind
@@ -265,14 +255,9 @@ proc `kind=`*(message: google_protobuf_Field, value: google_protobuf_Field_Kind)
 
 proc clearcardinality*(message: google_protobuf_Field) =
     message.cardinality = google_protobuf_Field_Cardinality.CARDINALITY_UNKNOWN
-    clearFields(message, [2])
-
-proc hascardinality*(message: google_protobuf_Field): bool =
-    result = hasField(message, 2)
 
 proc setcardinality*(message: google_protobuf_Field, value: google_protobuf_Field_Cardinality) =
     message.cardinality = value
-    setField(message, 2)
 
 proc cardinality*(message: google_protobuf_Field): google_protobuf_Field_Cardinality {.inline.} =
     message.cardinality
@@ -282,14 +267,9 @@ proc `cardinality=`*(message: google_protobuf_Field, value: google_protobuf_Fiel
 
 proc clearnumber*(message: google_protobuf_Field) =
     message.number = 0
-    clearFields(message, [3])
-
-proc hasnumber*(message: google_protobuf_Field): bool =
-    result = hasField(message, 3)
 
 proc setnumber*(message: google_protobuf_Field, value: int32) =
     message.number = value
-    setField(message, 3)
 
 proc number*(message: google_protobuf_Field): int32 {.inline.} =
     message.number
@@ -299,14 +279,9 @@ proc `number=`*(message: google_protobuf_Field, value: int32) {.inline.} =
 
 proc clearname*(message: google_protobuf_Field) =
     message.name = ""
-    clearFields(message, [4])
-
-proc hasname*(message: google_protobuf_Field): bool =
-    result = hasField(message, 4)
 
 proc setname*(message: google_protobuf_Field, value: string) =
     message.name = value
-    setField(message, 4)
 
 proc name*(message: google_protobuf_Field): string {.inline.} =
     message.name
@@ -316,14 +291,9 @@ proc `name=`*(message: google_protobuf_Field, value: string) {.inline.} =
 
 proc cleartypeUrl*(message: google_protobuf_Field) =
     message.typeUrl = ""
-    clearFields(message, [6])
-
-proc hastypeUrl*(message: google_protobuf_Field): bool =
-    result = hasField(message, 6)
 
 proc settypeUrl*(message: google_protobuf_Field, value: string) =
     message.typeUrl = value
-    setField(message, 6)
 
 proc typeUrl*(message: google_protobuf_Field): string {.inline.} =
     message.typeUrl
@@ -333,14 +303,9 @@ proc `typeUrl=`*(message: google_protobuf_Field, value: string) {.inline.} =
 
 proc clearoneofIndex*(message: google_protobuf_Field) =
     message.oneofIndex = 0
-    clearFields(message, [7])
-
-proc hasoneofIndex*(message: google_protobuf_Field): bool =
-    result = hasField(message, 7)
 
 proc setoneofIndex*(message: google_protobuf_Field, value: int32) =
     message.oneofIndex = value
-    setField(message, 7)
 
 proc oneofIndex*(message: google_protobuf_Field): int32 {.inline.} =
     message.oneofIndex
@@ -350,14 +315,9 @@ proc `oneofIndex=`*(message: google_protobuf_Field, value: int32) {.inline.} =
 
 proc clearpacked*(message: google_protobuf_Field) =
     message.packed = false
-    clearFields(message, [8])
-
-proc haspacked*(message: google_protobuf_Field): bool =
-    result = hasField(message, 8)
 
 proc setpacked*(message: google_protobuf_Field, value: bool) =
     message.packed = value
-    setField(message, 8)
 
 proc packed*(message: google_protobuf_Field): bool {.inline.} =
     message.packed
@@ -378,7 +338,6 @@ proc setoptions*(message: google_protobuf_Field, value: seq[google_protobuf_Opti
 
 proc addoptions*(message: google_protobuf_Field, value: google_protobuf_Option) =
     add(message.options, value)
-    setField(message, 9)
 
 proc options*(message: google_protobuf_Field): seq[google_protobuf_Option] {.inline.} =
     message.options
@@ -388,14 +347,9 @@ proc `options=`*(message: google_protobuf_Field, value: seq[google_protobuf_Opti
 
 proc clearjsonName*(message: google_protobuf_Field) =
     message.jsonName = ""
-    clearFields(message, [10])
-
-proc hasjsonName*(message: google_protobuf_Field): bool =
-    result = hasField(message, 10)
 
 proc setjsonName*(message: google_protobuf_Field, value: string) =
     message.jsonName = value
-    setField(message, 10)
 
 proc jsonName*(message: google_protobuf_Field): string {.inline.} =
     message.jsonName
@@ -405,14 +359,9 @@ proc `jsonName=`*(message: google_protobuf_Field, value: string) {.inline.} =
 
 proc cleardefaultValue*(message: google_protobuf_Field) =
     message.defaultValue = ""
-    clearFields(message, [11])
-
-proc hasdefaultValue*(message: google_protobuf_Field): bool =
-    result = hasField(message, 11)
 
 proc setdefaultValue*(message: google_protobuf_Field, value: string) =
     message.defaultValue = value
-    setField(message, 11)
 
 proc defaultValue*(message: google_protobuf_Field): string {.inline.} =
     message.defaultValue
@@ -421,58 +370,58 @@ proc `defaultValue=`*(message: google_protobuf_Field, value: string) {.inline.}
     setdefaultValue(message, value)
 
 proc sizeOfgoogle_protobuf_Field*(message: google_protobuf_Field): uint64 =
-    if haskind(message):
+    if message.kind != google_protobuf_Field_Kind.TYPE_UNKNOWN:
         result = result + sizeOfTag(1, WireType.Varint)
         result = result + sizeOfEnum[google_protobuf_Field_Kind](message.kind)
-    if hascardinality(message):
+    if message.cardinality != google_protobuf_Field_Cardinality.CARDINALITY_UNKNOWN:
         result = result + sizeOfTag(2, WireType.Varint)
         result = result + sizeOfEnum[google_protobuf_Field_Cardinality](message.cardinality)
-    if hasnumber(message):
+    if message.number != 0:
         result = result + sizeOfTag(3, WireType.Varint)
         result = result + sizeOfInt32(message.number)
-    if hasname(message):
+    if len(message.name) > 0:
         result = result + sizeOfTag(4, WireType.LengthDelimited)
         result = result + sizeOfString(message.name)
-    if hastypeUrl(message):
+    if len(message.typeUrl) > 0:
         result = result + sizeOfTag(6, WireType.LengthDelimited)
         result = result + sizeOfString(message.typeUrl)
-    if hasoneofIndex(message):
+    if message.oneofIndex != 0:
         result = result + sizeOfTag(7, WireType.Varint)
         result = result + sizeOfInt32(message.oneofIndex)
-    if haspacked(message):
+    if message.packed != false:
         result = result + sizeOfTag(8, WireType.Varint)
         result = result + sizeOfBool(message.packed)
     for value in message.options:
         result = result + sizeOfTag(9, WireType.LengthDelimited)
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_Option(value))
-    if hasjsonName(message):
+    if len(message.jsonName) > 0:
         result = result + sizeOfTag(10, WireType.LengthDelimited)
         result = result + sizeOfString(message.jsonName)
-    if hasdefaultValue(message):
+    if len(message.defaultValue) > 0:
         result = result + sizeOfTag(11, WireType.LengthDelimited)
         result = result + sizeOfString(message.defaultValue)
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_Field*(stream: Stream, message: google_protobuf_Field) =
-    if haskind(message):
+    if message.kind != google_protobuf_Field_Kind.TYPE_UNKNOWN:
         protoWriteEnum(stream, message.kind, 1)
-    if hascardinality(message):
+    if message.cardinality != google_protobuf_Field_Cardinality.CARDINALITY_UNKNOWN:
         protoWriteEnum(stream, message.cardinality, 2)
-    if hasnumber(message):
+    if message.number != 0:
         protoWriteInt32(stream, message.number, 3)
-    if hasname(message):
+    if len(message.name) > 0:
         protoWriteString(stream, message.name, 4)
-    if hastypeUrl(message):
+    if len(message.typeUrl) > 0:
         protoWriteString(stream, message.typeUrl, 6)
-    if hasoneofIndex(message):
+    if message.oneofIndex != 0:
         protoWriteInt32(stream, message.oneofIndex, 7)
-    if haspacked(message):
+    if message.packed != false:
         protoWriteBool(stream, message.packed, 8)
     for value in message.options:
         writeMessage(stream, value, 9)
-    if hasjsonName(message):
+    if len(message.jsonName) > 0:
         protoWriteString(stream, message.jsonName, 10)
-    if hasdefaultValue(message):
+    if len(message.defaultValue) > 0:
         protoWriteString(stream, message.defaultValue, 11)
     writeUnknownFields(stream, message)
 
@@ -520,28 +469,28 @@ proc readgoogle_protobuf_Field*(stream: Stream): google_protobuf_Field =
 
 proc toJson*(message: google_protobuf_Field): JsonNode =
     result = newJObject()
-    if haskind(message):
+    if message.kind != google_protobuf_Field_Kind.TYPE_UNKNOWN:
         result["kind"] = toJson(message.kind)
-    if hascardinality(message):
+    if message.cardinality != google_protobuf_Field_Cardinality.CARDINALITY_UNKNOWN:
         result["cardinality"] = toJson(message.cardinality)
-    if hasnumber(message):
+    if message.number != 0:
         result["number"] = %message.number
-    if hasname(message):
+    if len(message.name) > 0:
         result["name"] = %message.name
-    if hastypeUrl(message):
+    if len(message.typeUrl) > 0:
         result["typeUrl"] = %message.typeUrl
-    if hasoneofIndex(message):
+    if message.oneofIndex != 0:
         result["oneofIndex"] = %message.oneofIndex
-    if haspacked(message):
+    if message.packed != false:
         result["packed"] = %message.packed
-    if hasoptions(message):
+    if len(message.options) > 0:
         let arr = newJArray()
         for value in message.options:
             add(arr, toJson(value))
         result["options"] = arr
-    if hasjsonName(message):
+    if len(message.jsonName) > 0:
         result["jsonName"] = %message.jsonName
-    if hasdefaultValue(message):
+    if len(message.defaultValue) > 0:
         result["defaultValue"] = %message.defaultValue
 
 proc parsegoogle_protobuf_Field*(obj: JsonNode): google_protobuf_Field =
@@ -612,14 +561,9 @@ proc newgoogle_protobuf_Type*(): google_protobuf_Type =
 
 proc clearname*(message: google_protobuf_Type) =
     message.name = ""
-    clearFields(message, [1])
-
-proc hasname*(message: google_protobuf_Type): bool =
-    result = hasField(message, 1)
 
 proc setname*(message: google_protobuf_Type, value: string) =
     message.name = value
-    setField(message, 1)
 
 proc name*(message: google_protobuf_Type): string {.inline.} =
     message.name
@@ -640,7 +584,6 @@ proc setfields*(message: google_protobuf_Type, value: seq[google_protobuf_Field]
 
 proc addfields*(message: google_protobuf_Type, value: google_protobuf_Field) =
     add(message.fields, value)
-    setField(message, 2)
 
 proc fields*(message: google_protobuf_Type): seq[google_protobuf_Field] {.inline.} =
     message.fields
@@ -650,18 +593,12 @@ proc `fields=`*(message: google_protobuf_Type, value: seq[google_protobuf_Field]
 
 proc clearoneofs*(message: google_protobuf_Type) =
     message.oneofs = @[]
-    clearFields(message, [3])
-
-proc hasoneofs*(message: google_protobuf_Type): bool =
-    result = hasField(message, 3) or (len(message.oneofs) > 0)
 
 proc setoneofs*(message: google_protobuf_Type, value: seq[string]) =
     message.oneofs = value
-    setField(message, 3)
 
 proc addoneofs*(message: google_protobuf_Type, value: string) =
     add(message.oneofs, value)
-    setField(message, 3)
 
 proc oneofs*(message: google_protobuf_Type): seq[string] {.inline.} =
     message.oneofs
@@ -682,7 +619,6 @@ proc setoptions*(message: google_protobuf_Type, value: seq[google_protobuf_Optio
 
 proc addoptions*(message: google_protobuf_Type, value: google_protobuf_Option) =
     add(message.options, value)
-    setField(message, 4)
 
 proc options*(message: google_protobuf_Type): seq[google_protobuf_Option] {.inline.} =
     message.options
@@ -709,14 +645,9 @@ proc `sourceContext=`*(message: google_protobuf_Type, value: google_protobuf_Sou
 
 proc clearsyntax*(message: google_protobuf_Type) =
     message.syntax = google_protobuf_Syntax.SYNTAX_PROTO2
-    clearFields(message, [6])
-
-proc hassyntax*(message: google_protobuf_Type): bool =
-    result = hasField(message, 6)
 
 proc setsyntax*(message: google_protobuf_Type, value: google_protobuf_Syntax) =
     message.syntax = value
-    setField(message, 6)
 
 proc syntax*(message: google_protobuf_Type): google_protobuf_Syntax {.inline.} =
     message.syntax
@@ -725,7 +656,7 @@ proc `syntax=`*(message: google_protobuf_Type, value: google_protobuf_Syntax) {.
     setsyntax(message, value)
 
 proc sizeOfgoogle_protobuf_Type*(message: google_protobuf_Type): uint64 =
-    if hasname(message):
+    if len(message.name) > 0:
         result = result + sizeOfTag(1, WireType.LengthDelimited)
         result = result + sizeOfString(message.name)
     for value in message.fields:
@@ -740,13 +671,13 @@ proc sizeOfgoogle_protobuf_Type*(message: google_protobuf_Type): uint64 =
     if hassourceContext(message):
         result = result + sizeOfTag(5, WireType.LengthDelimited)
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_SourceContext(message.sourceContext))
-    if hassyntax(message):
+    if message.syntax != google_protobuf_Syntax.SYNTAX_PROTO2:
         result = result + sizeOfTag(6, WireType.Varint)
         result = result + sizeOfEnum[google_protobuf_Syntax](message.syntax)
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_Type*(stream: Stream, message: google_protobuf_Type) =
-    if hasname(message):
+    if len(message.name) > 0:
         protoWriteString(stream, message.name, 1)
     for value in message.fields:
         writeMessage(stream, value, 2)
@@ -756,7 +687,7 @@ proc writegoogle_protobuf_Type*(stream: Stream, message: google_protobuf_Type) =
         writeMessage(stream, value, 4)
     if hassourceContext(message):
         writeMessage(stream, message.sourceContext, 5)
-    if hassyntax(message):
+    if message.syntax != google_protobuf_Syntax.SYNTAX_PROTO2:
         protoWriteEnum(stream, message.syntax, 6)
     writeUnknownFields(stream, message)
 
@@ -794,26 +725,26 @@ proc readgoogle_protobuf_Type*(stream: Stream): google_protobuf_Type =
 
 proc toJson*(message: google_protobuf_Type): JsonNode =
     result = newJObject()
-    if hasname(message):
+    if len(message.name) > 0:
         result["name"] = %message.name
-    if hasfields(message):
+    if len(message.fields) > 0:
         let arr = newJArray()
         for value in message.fields:
             add(arr, toJson(value))
         result["fields"] = arr
-    if hasoneofs(message):
+    if len(message.oneofs) > 0:
         let arr = newJArray()
         for value in message.oneofs:
             add(arr, %value)
         result["oneofs"] = arr
-    if hasoptions(message):
+    if len(message.options) > 0:
         let arr = newJArray()
         for value in message.options:
             add(arr, toJson(value))
         result["options"] = arr
     if hassourceContext(message):
         result["sourceContext"] = toJson(message.sourceContext)
-    if hassyntax(message):
+    if message.syntax != google_protobuf_Syntax.SYNTAX_PROTO2:
         result["syntax"] = toJson(message.syntax)
 
 proc parsegoogle_protobuf_Type*(obj: JsonNode): google_protobuf_Type =
@@ -875,14 +806,9 @@ proc newgoogle_protobuf_EnumValue*(): google_protobuf_EnumValue =
 
 proc clearname*(message: google_protobuf_EnumValue) =
     message.name = ""
-    clearFields(message, [1])
-
-proc hasname*(message: google_protobuf_EnumValue): bool =
-    result = hasField(message, 1)
 
 proc setname*(message: google_protobuf_EnumValue, value: string) =
     message.name = value
-    setField(message, 1)
 
 proc name*(message: google_protobuf_EnumValue): string {.inline.} =
     message.name
@@ -892,14 +818,9 @@ proc `name=`*(message: google_protobuf_EnumValue, value: string) {.inline.} =
 
 proc clearnumber*(message: google_protobuf_EnumValue) =
     message.number = 0
-    clearFields(message, [2])
-
-proc hasnumber*(message: google_protobuf_EnumValue): bool =
-    result = hasField(message, 2)
 
 proc setnumber*(message: google_protobuf_EnumValue, value: int32) =
     message.number = value
-    setField(message, 2)
 
 proc number*(message: google_protobuf_EnumValue): int32 {.inline.} =
     message.number
@@ -920,7 +841,6 @@ proc setoptions*(message: google_protobuf_EnumValue, value: seq[google_protobuf_
 
 proc addoptions*(message: google_protobuf_EnumValue, value: google_protobuf_Option) =
     add(message.options, value)
-    setField(message, 3)
 
 proc options*(message: google_protobuf_EnumValue): seq[google_protobuf_Option] {.inline.} =
     message.options
@@ -929,10 +849,10 @@ proc `options=`*(message: google_protobuf_EnumValue, value: seq[google_protobuf_
     setoptions(message, value)
 
 proc sizeOfgoogle_protobuf_EnumValue*(message: google_protobuf_EnumValue): uint64 =
-    if hasname(message):
+    if len(message.name) > 0:
         result = result + sizeOfTag(1, WireType.LengthDelimited)
         result = result + sizeOfString(message.name)
-    if hasnumber(message):
+    if message.number != 0:
         result = result + sizeOfTag(2, WireType.Varint)
         result = result + sizeOfInt32(message.number)
     for value in message.options:
@@ -941,9 +861,9 @@ proc sizeOfgoogle_protobuf_EnumValue*(message: google_protobuf_EnumValue): uint6
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_EnumValue*(stream: Stream, message: google_protobuf_EnumValue) =
-    if hasname(message):
+    if len(message.name) > 0:
         protoWriteString(stream, message.name, 1)
-    if hasnumber(message):
+    if message.number != 0:
         protoWriteInt32(stream, message.number, 2)
     for value in message.options:
         writeMessage(stream, value, 3)
@@ -972,11 +892,11 @@ proc readgoogle_protobuf_EnumValue*(stream: Stream): google_protobuf_EnumValue =
 
 proc toJson*(message: google_protobuf_EnumValue): JsonNode =
     result = newJObject()
-    if hasname(message):
+    if len(message.name) > 0:
         result["name"] = %message.name
-    if hasnumber(message):
+    if message.number != 0:
         result["number"] = %message.number
-    if hasoptions(message):
+    if len(message.options) > 0:
         let arr = newJArray()
         for value in message.options:
             add(arr, toJson(value))
@@ -1028,14 +948,9 @@ proc newgoogle_protobuf_Enum*(): google_protobuf_Enum =
 
 proc clearname*(message: google_protobuf_Enum) =
     message.name = ""
-    clearFields(message, [1])
-
-proc hasname*(message: google_protobuf_Enum): bool =
-    result = hasField(message, 1)
 
 proc setname*(message: google_protobuf_Enum, value: string) =
     message.name = value
-    setField(message, 1)
 
 proc name*(message: google_protobuf_Enum): string {.inline.} =
     message.name
@@ -1056,7 +971,6 @@ proc setenumvalue*(message: google_protobuf_Enum, value: seq[google_protobuf_Enu
 
 proc addenumvalue*(message: google_protobuf_Enum, value: google_protobuf_EnumValue) =
     add(message.enumvalue, value)
-    setField(message, 2)
 
 proc enumvalue*(message: google_protobuf_Enum): seq[google_protobuf_EnumValue] {.inline.} =
     message.enumvalue
@@ -1077,7 +991,6 @@ proc setoptions*(message: google_protobuf_Enum, value: seq[google_protobuf_Optio
 
 proc addoptions*(message: google_protobuf_Enum, value: google_protobuf_Option) =
     add(message.options, value)
-    setField(message, 3)
 
 proc options*(message: google_protobuf_Enum): seq[google_protobuf_Option] {.inline.} =
     message.options
@@ -1104,14 +1017,9 @@ proc `sourceContext=`*(message: google_protobuf_Enum, value: google_protobuf_Sou
 
 proc clearsyntax*(message: google_protobuf_Enum) =
     message.syntax = google_protobuf_Syntax.SYNTAX_PROTO2
-    clearFields(message, [5])
-
-proc hassyntax*(message: google_protobuf_Enum): bool =
-    result = hasField(message, 5)
 
 proc setsyntax*(message: google_protobuf_Enum, value: google_protobuf_Syntax) =
     message.syntax = value
-    setField(message, 5)
 
 proc syntax*(message: google_protobuf_Enum): google_protobuf_Syntax {.inline.} =
     message.syntax
@@ -1120,7 +1028,7 @@ proc `syntax=`*(message: google_protobuf_Enum, value: google_protobuf_Syntax) {.
     setsyntax(message, value)
 
 proc sizeOfgoogle_protobuf_Enum*(message: google_protobuf_Enum): uint64 =
-    if hasname(message):
+    if len(message.name) > 0:
         result = result + sizeOfTag(1, WireType.LengthDelimited)
         result = result + sizeOfString(message.name)
     for value in message.enumvalue:
@@ -1132,13 +1040,13 @@ proc sizeOfgoogle_protobuf_Enum*(message: google_protobuf_Enum): uint64 =
     if hassourceContext(message):
         result = result + sizeOfTag(4, WireType.LengthDelimited)
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_SourceContext(message.sourceContext))
-    if hassyntax(message):
+    if message.syntax != google_protobuf_Syntax.SYNTAX_PROTO2:
         result = result + sizeOfTag(5, WireType.Varint)
         result = result + sizeOfEnum[google_protobuf_Syntax](message.syntax)
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_Enum*(stream: Stream, message: google_protobuf_Enum) =
-    if hasname(message):
+    if len(message.name) > 0:
         protoWriteString(stream, message.name, 1)
     for value in message.enumvalue:
         writeMessage(stream, value, 2)
@@ -1146,7 +1054,7 @@ proc writegoogle_protobuf_Enum*(stream: Stream, message: google_protobuf_Enum) =
         writeMessage(stream, value, 3)
     if hassourceContext(message):
         writeMessage(stream, message.sourceContext, 4)
-    if hassyntax(message):
+    if message.syntax != google_protobuf_Syntax.SYNTAX_PROTO2:
         protoWriteEnum(stream, message.syntax, 5)
     writeUnknownFields(stream, message)
 
@@ -1181,21 +1089,21 @@ proc readgoogle_protobuf_Enum*(stream: Stream): google_protobuf_Enum =
 
 proc toJson*(message: google_protobuf_Enum): JsonNode =
     result = newJObject()
-    if hasname(message):
+    if len(message.name) > 0:
         result["name"] = %message.name
-    if hasenumvalue(message):
+    if len(message.enumvalue) > 0:
         let arr = newJArray()
         for value in message.enumvalue:
             add(arr, toJson(value))
         result["enumvalue"] = arr
-    if hasoptions(message):
+    if len(message.options) > 0:
         let arr = newJArray()
         for value in message.options:
             add(arr, toJson(value))
         result["options"] = arr
     if hassourceContext(message):
         result["sourceContext"] = toJson(message.sourceContext)
-    if hassyntax(message):
+    if message.syntax != google_protobuf_Syntax.SYNTAX_PROTO2:
         result["syntax"] = toJson(message.syntax)
 
 proc parsegoogle_protobuf_Enum*(obj: JsonNode): google_protobuf_Enum =
diff --git a/nimpb/wkt/wrappers.nim b/nimpb/wkt/wrappers.nim
index 848745c..f4c42fa 100644
--- a/nimpb/wkt/wrappers.nim
+++ b/nimpb/wkt/wrappers.nim
@@ -5,58 +5,31 @@ import base64
 include wrappers_pb
 
 proc toJson*(message: google_protobuf_DoubleValue): JsonNode =
-    if hasValue(message):
-        result = toJson(message.value)
-    else:
-        result = newJNull()
+    toJson(message.value)
 
 proc toJson*(message: google_protobuf_FloatValue): JsonNode =
-    if hasValue(message):
-        result = toJson(message.value)
-    else:
-        result = newJNull()
+    toJson(message.value)
 
 proc toJson*(message: google_protobuf_Int64Value): JsonNode =
-    if hasValue(message):
-        result = toJson(message.value)
-    else:
-        result = newJNull()
+    toJson(message.value)
 
 proc toJson*(message: google_protobuf_UInt64Value): JsonNode =
-    if hasValue(message):
-        result = toJson(message.value)
-    else:
-        result = newJNull()
+    toJson(message.value)
 
 proc toJson*(message: google_protobuf_Int32Value): JsonNode =
-    if hasValue(message):
-        result = %message.value
-    else:
-        result = newJNull()
+    %message.value
 
 proc toJson*(message: google_protobuf_UInt32Value): JsonNode =
-    if hasValue(message):
-        result = %message.value
-    else:
-        result = newJNull()
+    %message.value
 
 proc toJson*(message: google_protobuf_BoolValue): JsonNode =
-    if hasValue(message):
-        result = %message.value
-    else:
-        result = newJNull()
+    %message.value
 
 proc toJson*(message: google_protobuf_StringValue): JsonNode =
-    if hasValue(message):
-        result = %message.value
-    else:
-        result = newJNull()
+    %message.value
 
 proc toJson*(message: google_protobuf_BytesValue): JsonNode =
-    if hasValue(message):
-        result = %message.value
-    else:
-        result = newJNull()
+    %message.value
 
 proc parsegoogle_protobuf_DoubleValue*(node: JsonNode): google_protobuf_DoubleValue =
     result = newgoogle_protobuf_DoubleValue()
diff --git a/nimpb/wkt/wrappers_pb.nim b/nimpb/wkt/wrappers_pb.nim
index e19afa6..a0b3432 100644
--- a/nimpb/wkt/wrappers_pb.nim
+++ b/nimpb/wkt/wrappers_pb.nim
@@ -107,14 +107,9 @@ proc newgoogle_protobuf_Int32Value*(): google_protobuf_Int32Value =
 
 proc clearvalue*(message: google_protobuf_Int32Value) =
     message.value = 0
-    clearFields(message, [1])
-
-proc hasvalue*(message: google_protobuf_Int32Value): bool =
-    result = hasField(message, 1)
 
 proc setvalue*(message: google_protobuf_Int32Value, value: int32) =
     message.value = value
-    setField(message, 1)
 
 proc value*(message: google_protobuf_Int32Value): int32 {.inline.} =
     message.value
@@ -123,13 +118,13 @@ proc `value=`*(message: google_protobuf_Int32Value, value: int32) {.inline.} =
     setvalue(message, value)
 
 proc sizeOfgoogle_protobuf_Int32Value*(message: google_protobuf_Int32Value): uint64 =
-    if hasvalue(message):
+    if message.value != 0:
         result = result + sizeOfTag(1, WireType.Varint)
         result = result + sizeOfInt32(message.value)
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_Int32Value*(stream: Stream, message: google_protobuf_Int32Value) =
-    if hasvalue(message):
+    if message.value != 0:
         protoWriteInt32(stream, message.value, 1)
     writeUnknownFields(stream, message)
 
@@ -171,14 +166,9 @@ proc newgoogle_protobuf_Int64Value*(): google_protobuf_Int64Value =
 
 proc clearvalue*(message: google_protobuf_Int64Value) =
     message.value = 0
-    clearFields(message, [1])
-
-proc hasvalue*(message: google_protobuf_Int64Value): bool =
-    result = hasField(message, 1)
 
 proc setvalue*(message: google_protobuf_Int64Value, value: int64) =
     message.value = value
-    setField(message, 1)
 
 proc value*(message: google_protobuf_Int64Value): int64 {.inline.} =
     message.value
@@ -187,13 +177,13 @@ proc `value=`*(message: google_protobuf_Int64Value, value: int64) {.inline.} =
     setvalue(message, value)
 
 proc sizeOfgoogle_protobuf_Int64Value*(message: google_protobuf_Int64Value): uint64 =
-    if hasvalue(message):
+    if message.value != 0:
         result = result + sizeOfTag(1, WireType.Varint)
         result = result + sizeOfInt64(message.value)
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_Int64Value*(stream: Stream, message: google_protobuf_Int64Value) =
-    if hasvalue(message):
+    if message.value != 0:
         protoWriteInt64(stream, message.value, 1)
     writeUnknownFields(stream, message)
 
@@ -235,14 +225,9 @@ proc newgoogle_protobuf_DoubleValue*(): google_protobuf_DoubleValue =
 
 proc clearvalue*(message: google_protobuf_DoubleValue) =
     message.value = 0
-    clearFields(message, [1])
-
-proc hasvalue*(message: google_protobuf_DoubleValue): bool =
-    result = hasField(message, 1)
 
 proc setvalue*(message: google_protobuf_DoubleValue, value: float64) =
     message.value = value
-    setField(message, 1)
 
 proc value*(message: google_protobuf_DoubleValue): float64 {.inline.} =
     message.value
@@ -251,13 +236,13 @@ proc `value=`*(message: google_protobuf_DoubleValue, value: float64) {.inline.}
     setvalue(message, value)
 
 proc sizeOfgoogle_protobuf_DoubleValue*(message: google_protobuf_DoubleValue): uint64 =
-    if hasvalue(message):
+    if message.value != 0:
         result = result + sizeOfTag(1, WireType.Fixed64)
         result = result + sizeOfDouble(message.value)
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_DoubleValue*(stream: Stream, message: google_protobuf_DoubleValue) =
-    if hasvalue(message):
+    if message.value != 0:
         protoWriteDouble(stream, message.value, 1)
     writeUnknownFields(stream, message)
 
@@ -299,14 +284,9 @@ proc newgoogle_protobuf_StringValue*(): google_protobuf_StringValue =
 
 proc clearvalue*(message: google_protobuf_StringValue) =
     message.value = ""
-    clearFields(message, [1])
-
-proc hasvalue*(message: google_protobuf_StringValue): bool =
-    result = hasField(message, 1)
 
 proc setvalue*(message: google_protobuf_StringValue, value: string) =
     message.value = value
-    setField(message, 1)
 
 proc value*(message: google_protobuf_StringValue): string {.inline.} =
     message.value
@@ -315,13 +295,13 @@ proc `value=`*(message: google_protobuf_StringValue, value: string) {.inline.} =
     setvalue(message, value)
 
 proc sizeOfgoogle_protobuf_StringValue*(message: google_protobuf_StringValue): uint64 =
-    if hasvalue(message):
+    if len(message.value) > 0:
         result = result + sizeOfTag(1, WireType.LengthDelimited)
         result = result + sizeOfString(message.value)
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_StringValue*(stream: Stream, message: google_protobuf_StringValue) =
-    if hasvalue(message):
+    if len(message.value) > 0:
         protoWriteString(stream, message.value, 1)
     writeUnknownFields(stream, message)
 
@@ -363,14 +343,9 @@ proc newgoogle_protobuf_BoolValue*(): google_protobuf_BoolValue =
 
 proc clearvalue*(message: google_protobuf_BoolValue) =
     message.value = false
-    clearFields(message, [1])
-
-proc hasvalue*(message: google_protobuf_BoolValue): bool =
-    result = hasField(message, 1)
 
 proc setvalue*(message: google_protobuf_BoolValue, value: bool) =
     message.value = value
-    setField(message, 1)
 
 proc value*(message: google_protobuf_BoolValue): bool {.inline.} =
     message.value
@@ -379,13 +354,13 @@ proc `value=`*(message: google_protobuf_BoolValue, value: bool) {.inline.} =
     setvalue(message, value)
 
 proc sizeOfgoogle_protobuf_BoolValue*(message: google_protobuf_BoolValue): uint64 =
-    if hasvalue(message):
+    if message.value != false:
         result = result + sizeOfTag(1, WireType.Varint)
         result = result + sizeOfBool(message.value)
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_BoolValue*(stream: Stream, message: google_protobuf_BoolValue) =
-    if hasvalue(message):
+    if message.value != false:
         protoWriteBool(stream, message.value, 1)
     writeUnknownFields(stream, message)
 
@@ -427,14 +402,9 @@ proc newgoogle_protobuf_BytesValue*(): google_protobuf_BytesValue =
 
 proc clearvalue*(message: google_protobuf_BytesValue) =
     message.value = @[]
-    clearFields(message, [1])
-
-proc hasvalue*(message: google_protobuf_BytesValue): bool =
-    result = hasField(message, 1)
 
 proc setvalue*(message: google_protobuf_BytesValue, value: seq[byte]) =
     message.value = value
-    setField(message, 1)
 
 proc value*(message: google_protobuf_BytesValue): seq[byte] {.inline.} =
     message.value
@@ -443,13 +413,13 @@ proc `value=`*(message: google_protobuf_BytesValue, value: seq[byte]) {.inline.}
     setvalue(message, value)
 
 proc sizeOfgoogle_protobuf_BytesValue*(message: google_protobuf_BytesValue): uint64 =
-    if hasvalue(message):
+    if len(message.value) > 0:
         result = result + sizeOfTag(1, WireType.LengthDelimited)
         result = result + sizeOfBytes(message.value)
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_BytesValue*(stream: Stream, message: google_protobuf_BytesValue) =
-    if hasvalue(message):
+    if len(message.value) > 0:
         protoWriteBytes(stream, message.value, 1)
     writeUnknownFields(stream, message)
 
@@ -491,14 +461,9 @@ proc newgoogle_protobuf_FloatValue*(): google_protobuf_FloatValue =
 
 proc clearvalue*(message: google_protobuf_FloatValue) =
     message.value = 0
-    clearFields(message, [1])
-
-proc hasvalue*(message: google_protobuf_FloatValue): bool =
-    result = hasField(message, 1)
 
 proc setvalue*(message: google_protobuf_FloatValue, value: float32) =
     message.value = value
-    setField(message, 1)
 
 proc value*(message: google_protobuf_FloatValue): float32 {.inline.} =
     message.value
@@ -507,13 +472,13 @@ proc `value=`*(message: google_protobuf_FloatValue, value: float32) {.inline.} =
     setvalue(message, value)
 
 proc sizeOfgoogle_protobuf_FloatValue*(message: google_protobuf_FloatValue): uint64 =
-    if hasvalue(message):
+    if message.value != 0:
         result = result + sizeOfTag(1, WireType.Fixed32)
         result = result + sizeOfFloat(message.value)
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_FloatValue*(stream: Stream, message: google_protobuf_FloatValue) =
-    if hasvalue(message):
+    if message.value != 0:
         protoWriteFloat(stream, message.value, 1)
     writeUnknownFields(stream, message)
 
@@ -555,14 +520,9 @@ proc newgoogle_protobuf_UInt64Value*(): google_protobuf_UInt64Value =
 
 proc clearvalue*(message: google_protobuf_UInt64Value) =
     message.value = 0
-    clearFields(message, [1])
-
-proc hasvalue*(message: google_protobuf_UInt64Value): bool =
-    result = hasField(message, 1)
 
 proc setvalue*(message: google_protobuf_UInt64Value, value: uint64) =
     message.value = value
-    setField(message, 1)
 
 proc value*(message: google_protobuf_UInt64Value): uint64 {.inline.} =
     message.value
@@ -571,13 +531,13 @@ proc `value=`*(message: google_protobuf_UInt64Value, value: uint64) {.inline.} =
     setvalue(message, value)
 
 proc sizeOfgoogle_protobuf_UInt64Value*(message: google_protobuf_UInt64Value): uint64 =
-    if hasvalue(message):
+    if message.value != 0:
         result = result + sizeOfTag(1, WireType.Varint)
         result = result + sizeOfUInt64(message.value)
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_UInt64Value*(stream: Stream, message: google_protobuf_UInt64Value) =
-    if hasvalue(message):
+    if message.value != 0:
         protoWriteUInt64(stream, message.value, 1)
     writeUnknownFields(stream, message)
 
@@ -619,14 +579,9 @@ proc newgoogle_protobuf_UInt32Value*(): google_protobuf_UInt32Value =
 
 proc clearvalue*(message: google_protobuf_UInt32Value) =
     message.value = 0
-    clearFields(message, [1])
-
-proc hasvalue*(message: google_protobuf_UInt32Value): bool =
-    result = hasField(message, 1)
 
 proc setvalue*(message: google_protobuf_UInt32Value, value: uint32) =
     message.value = value
-    setField(message, 1)
 
 proc value*(message: google_protobuf_UInt32Value): uint32 {.inline.} =
     message.value
@@ -635,13 +590,13 @@ proc `value=`*(message: google_protobuf_UInt32Value, value: uint32) {.inline.} =
     setvalue(message, value)
 
 proc sizeOfgoogle_protobuf_UInt32Value*(message: google_protobuf_UInt32Value): uint64 =
-    if hasvalue(message):
+    if message.value != 0:
         result = result + sizeOfTag(1, WireType.Varint)
         result = result + sizeOfUInt32(message.value)
     result = result + sizeOfUnknownFields(message)
 
 proc writegoogle_protobuf_UInt32Value*(stream: Stream, message: google_protobuf_UInt32Value) =
-    if hasvalue(message):
+    if message.value != 0:
         protoWriteUInt32(stream, message.value, 1)
     writeUnknownFields(stream, message)