Get rid of ProtobufStream

13 files changed, 1085 insertions, 1338 deletions

diff --git a/nimpb/compiler/descriptor_pb.nim b/nimpb/compiler/descriptor_pb.nim
index b5460e4..5273add 100644
--- a/nimpb/compiler/descriptor_pb.nim
+++ b/nimpb/compiler/descriptor_pb.nim
@@ -226,190 +226,190 @@ type
 
 proc newgoogle_protobuf_UninterpretedOption_NamePart*(): google_protobuf_UninterpretedOption_NamePart
 proc newgoogle_protobuf_UninterpretedOption_NamePart*(data: string): google_protobuf_UninterpretedOption_NamePart
-proc writegoogle_protobuf_UninterpretedOption_NamePart*(stream: ProtobufStream, message: google_protobuf_UninterpretedOption_NamePart)
-proc readgoogle_protobuf_UninterpretedOption_NamePart*(stream: ProtobufStream): google_protobuf_UninterpretedOption_NamePart
+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 newgoogle_protobuf_UninterpretedOption*(): google_protobuf_UninterpretedOption
 proc newgoogle_protobuf_UninterpretedOption*(data: string): google_protobuf_UninterpretedOption
-proc writegoogle_protobuf_UninterpretedOption*(stream: ProtobufStream, message: google_protobuf_UninterpretedOption)
-proc readgoogle_protobuf_UninterpretedOption*(stream: ProtobufStream): google_protobuf_UninterpretedOption
+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 newgoogle_protobuf_EnumValueOptions*(): google_protobuf_EnumValueOptions
 proc newgoogle_protobuf_EnumValueOptions*(data: string): google_protobuf_EnumValueOptions
-proc writegoogle_protobuf_EnumValueOptions*(stream: ProtobufStream, message: google_protobuf_EnumValueOptions)
-proc readgoogle_protobuf_EnumValueOptions*(stream: ProtobufStream): google_protobuf_EnumValueOptions
+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 newgoogle_protobuf_EnumValueDescriptorProto*(): google_protobuf_EnumValueDescriptorProto
 proc newgoogle_protobuf_EnumValueDescriptorProto*(data: string): google_protobuf_EnumValueDescriptorProto
-proc writegoogle_protobuf_EnumValueDescriptorProto*(stream: ProtobufStream, message: google_protobuf_EnumValueDescriptorProto)
-proc readgoogle_protobuf_EnumValueDescriptorProto*(stream: ProtobufStream): google_protobuf_EnumValueDescriptorProto
+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 newgoogle_protobuf_EnumDescriptorProto_EnumReservedRange*(): google_protobuf_EnumDescriptorProto_EnumReservedRange
 proc newgoogle_protobuf_EnumDescriptorProto_EnumReservedRange*(data: string): google_protobuf_EnumDescriptorProto_EnumReservedRange
-proc writegoogle_protobuf_EnumDescriptorProto_EnumReservedRange*(stream: ProtobufStream, message: google_protobuf_EnumDescriptorProto_EnumReservedRange)
-proc readgoogle_protobuf_EnumDescriptorProto_EnumReservedRange*(stream: ProtobufStream): google_protobuf_EnumDescriptorProto_EnumReservedRange
+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 newgoogle_protobuf_EnumOptions*(): google_protobuf_EnumOptions
 proc newgoogle_protobuf_EnumOptions*(data: string): google_protobuf_EnumOptions
-proc writegoogle_protobuf_EnumOptions*(stream: ProtobufStream, message: google_protobuf_EnumOptions)
-proc readgoogle_protobuf_EnumOptions*(stream: ProtobufStream): google_protobuf_EnumOptions
+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 newgoogle_protobuf_EnumDescriptorProto*(): google_protobuf_EnumDescriptorProto
 proc newgoogle_protobuf_EnumDescriptorProto*(data: string): google_protobuf_EnumDescriptorProto
-proc writegoogle_protobuf_EnumDescriptorProto*(stream: ProtobufStream, message: google_protobuf_EnumDescriptorProto)
-proc readgoogle_protobuf_EnumDescriptorProto*(stream: ProtobufStream): google_protobuf_EnumDescriptorProto
+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 newgoogle_protobuf_ExtensionRangeOptions*(): google_protobuf_ExtensionRangeOptions
 proc newgoogle_protobuf_ExtensionRangeOptions*(data: string): google_protobuf_ExtensionRangeOptions
-proc writegoogle_protobuf_ExtensionRangeOptions*(stream: ProtobufStream, message: google_protobuf_ExtensionRangeOptions)
-proc readgoogle_protobuf_ExtensionRangeOptions*(stream: ProtobufStream): google_protobuf_ExtensionRangeOptions
+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 newgoogle_protobuf_SourceCodeInfo_Location*(): google_protobuf_SourceCodeInfo_Location
 proc newgoogle_protobuf_SourceCodeInfo_Location*(data: string): google_protobuf_SourceCodeInfo_Location
-proc writegoogle_protobuf_SourceCodeInfo_Location*(stream: ProtobufStream, message: google_protobuf_SourceCodeInfo_Location)
-proc readgoogle_protobuf_SourceCodeInfo_Location*(stream: ProtobufStream): google_protobuf_SourceCodeInfo_Location
+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 newgoogle_protobuf_SourceCodeInfo*(): google_protobuf_SourceCodeInfo
 proc newgoogle_protobuf_SourceCodeInfo*(data: string): google_protobuf_SourceCodeInfo
-proc writegoogle_protobuf_SourceCodeInfo*(stream: ProtobufStream, message: google_protobuf_SourceCodeInfo)
-proc readgoogle_protobuf_SourceCodeInfo*(stream: ProtobufStream): google_protobuf_SourceCodeInfo
+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 newgoogle_protobuf_FieldOptions*(): google_protobuf_FieldOptions
 proc newgoogle_protobuf_FieldOptions*(data: string): google_protobuf_FieldOptions
-proc writegoogle_protobuf_FieldOptions*(stream: ProtobufStream, message: google_protobuf_FieldOptions)
-proc readgoogle_protobuf_FieldOptions*(stream: ProtobufStream): google_protobuf_FieldOptions
+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 newgoogle_protobuf_FieldDescriptorProto*(): google_protobuf_FieldDescriptorProto
 proc newgoogle_protobuf_FieldDescriptorProto*(data: string): google_protobuf_FieldDescriptorProto
-proc writegoogle_protobuf_FieldDescriptorProto*(stream: ProtobufStream, message: google_protobuf_FieldDescriptorProto)
-proc readgoogle_protobuf_FieldDescriptorProto*(stream: ProtobufStream): google_protobuf_FieldDescriptorProto
+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 newgoogle_protobuf_DescriptorProto_ExtensionRange*(): google_protobuf_DescriptorProto_ExtensionRange
 proc newgoogle_protobuf_DescriptorProto_ExtensionRange*(data: string): google_protobuf_DescriptorProto_ExtensionRange
-proc writegoogle_protobuf_DescriptorProto_ExtensionRange*(stream: ProtobufStream, message: google_protobuf_DescriptorProto_ExtensionRange)
-proc readgoogle_protobuf_DescriptorProto_ExtensionRange*(stream: ProtobufStream): google_protobuf_DescriptorProto_ExtensionRange
+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 newgoogle_protobuf_MessageOptions*(): google_protobuf_MessageOptions
 proc newgoogle_protobuf_MessageOptions*(data: string): google_protobuf_MessageOptions
-proc writegoogle_protobuf_MessageOptions*(stream: ProtobufStream, message: google_protobuf_MessageOptions)
-proc readgoogle_protobuf_MessageOptions*(stream: ProtobufStream): google_protobuf_MessageOptions
+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 newgoogle_protobuf_OneofOptions*(): google_protobuf_OneofOptions
 proc newgoogle_protobuf_OneofOptions*(data: string): google_protobuf_OneofOptions
-proc writegoogle_protobuf_OneofOptions*(stream: ProtobufStream, message: google_protobuf_OneofOptions)
-proc readgoogle_protobuf_OneofOptions*(stream: ProtobufStream): google_protobuf_OneofOptions
+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 newgoogle_protobuf_OneofDescriptorProto*(): google_protobuf_OneofDescriptorProto
 proc newgoogle_protobuf_OneofDescriptorProto*(data: string): google_protobuf_OneofDescriptorProto
-proc writegoogle_protobuf_OneofDescriptorProto*(stream: ProtobufStream, message: google_protobuf_OneofDescriptorProto)
-proc readgoogle_protobuf_OneofDescriptorProto*(stream: ProtobufStream): google_protobuf_OneofDescriptorProto
+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 newgoogle_protobuf_DescriptorProto_ReservedRange*(): google_protobuf_DescriptorProto_ReservedRange
 proc newgoogle_protobuf_DescriptorProto_ReservedRange*(data: string): google_protobuf_DescriptorProto_ReservedRange
-proc writegoogle_protobuf_DescriptorProto_ReservedRange*(stream: ProtobufStream, message: google_protobuf_DescriptorProto_ReservedRange)
-proc readgoogle_protobuf_DescriptorProto_ReservedRange*(stream: ProtobufStream): google_protobuf_DescriptorProto_ReservedRange
+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 newgoogle_protobuf_DescriptorProto*(): google_protobuf_DescriptorProto
 proc newgoogle_protobuf_DescriptorProto*(data: string): google_protobuf_DescriptorProto
-proc writegoogle_protobuf_DescriptorProto*(stream: ProtobufStream, message: google_protobuf_DescriptorProto)
-proc readgoogle_protobuf_DescriptorProto*(stream: ProtobufStream): google_protobuf_DescriptorProto
+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 newgoogle_protobuf_FileOptions*(): google_protobuf_FileOptions
 proc newgoogle_protobuf_FileOptions*(data: string): google_protobuf_FileOptions
-proc writegoogle_protobuf_FileOptions*(stream: ProtobufStream, message: google_protobuf_FileOptions)
-proc readgoogle_protobuf_FileOptions*(stream: ProtobufStream): google_protobuf_FileOptions
+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 newgoogle_protobuf_ServiceOptions*(): google_protobuf_ServiceOptions
 proc newgoogle_protobuf_ServiceOptions*(data: string): google_protobuf_ServiceOptions
-proc writegoogle_protobuf_ServiceOptions*(stream: ProtobufStream, message: google_protobuf_ServiceOptions)
-proc readgoogle_protobuf_ServiceOptions*(stream: ProtobufStream): google_protobuf_ServiceOptions
+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 newgoogle_protobuf_MethodOptions*(): google_protobuf_MethodOptions
 proc newgoogle_protobuf_MethodOptions*(data: string): google_protobuf_MethodOptions
-proc writegoogle_protobuf_MethodOptions*(stream: ProtobufStream, message: google_protobuf_MethodOptions)
-proc readgoogle_protobuf_MethodOptions*(stream: ProtobufStream): google_protobuf_MethodOptions
+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 newgoogle_protobuf_MethodDescriptorProto*(): google_protobuf_MethodDescriptorProto
 proc newgoogle_protobuf_MethodDescriptorProto*(data: string): google_protobuf_MethodDescriptorProto
-proc writegoogle_protobuf_MethodDescriptorProto*(stream: ProtobufStream, message: google_protobuf_MethodDescriptorProto)
-proc readgoogle_protobuf_MethodDescriptorProto*(stream: ProtobufStream): google_protobuf_MethodDescriptorProto
+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 newgoogle_protobuf_ServiceDescriptorProto*(): google_protobuf_ServiceDescriptorProto
 proc newgoogle_protobuf_ServiceDescriptorProto*(data: string): google_protobuf_ServiceDescriptorProto
-proc writegoogle_protobuf_ServiceDescriptorProto*(stream: ProtobufStream, message: google_protobuf_ServiceDescriptorProto)
-proc readgoogle_protobuf_ServiceDescriptorProto*(stream: ProtobufStream): google_protobuf_ServiceDescriptorProto
+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 newgoogle_protobuf_FileDescriptorProto*(): google_protobuf_FileDescriptorProto
 proc newgoogle_protobuf_FileDescriptorProto*(data: string): google_protobuf_FileDescriptorProto
-proc writegoogle_protobuf_FileDescriptorProto*(stream: ProtobufStream, message: google_protobuf_FileDescriptorProto)
-proc readgoogle_protobuf_FileDescriptorProto*(stream: ProtobufStream): google_protobuf_FileDescriptorProto
+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 newgoogle_protobuf_FileDescriptorSet*(): google_protobuf_FileDescriptorSet
 proc newgoogle_protobuf_FileDescriptorSet*(data: string): google_protobuf_FileDescriptorSet
-proc writegoogle_protobuf_FileDescriptorSet*(stream: ProtobufStream, message: google_protobuf_FileDescriptorSet)
-proc readgoogle_protobuf_FileDescriptorSet*(stream: ProtobufStream): google_protobuf_FileDescriptorSet
+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 newgoogle_protobuf_GeneratedCodeInfo_Annotation*(): google_protobuf_GeneratedCodeInfo_Annotation
 proc newgoogle_protobuf_GeneratedCodeInfo_Annotation*(data: string): google_protobuf_GeneratedCodeInfo_Annotation
-proc writegoogle_protobuf_GeneratedCodeInfo_Annotation*(stream: ProtobufStream, message: google_protobuf_GeneratedCodeInfo_Annotation)
-proc readgoogle_protobuf_GeneratedCodeInfo_Annotation*(stream: ProtobufStream): google_protobuf_GeneratedCodeInfo_Annotation
+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 newgoogle_protobuf_GeneratedCodeInfo*(): google_protobuf_GeneratedCodeInfo
 proc newgoogle_protobuf_GeneratedCodeInfo*(data: string): google_protobuf_GeneratedCodeInfo
-proc writegoogle_protobuf_GeneratedCodeInfo*(stream: ProtobufStream, message: google_protobuf_GeneratedCodeInfo)
-proc readgoogle_protobuf_GeneratedCodeInfo*(stream: ProtobufStream): google_protobuf_GeneratedCodeInfo
+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
 
@@ -462,14 +462,14 @@ proc sizeOfgoogle_protobuf_UninterpretedOption_NamePart*(message: google_protobu
         result = result + sizeOfBool(message.is_extension)
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_UninterpretedOption_NamePart*(stream: ProtobufStream, message: google_protobuf_UninterpretedOption_NamePart) =
+proc writegoogle_protobuf_UninterpretedOption_NamePart*(stream: Stream, message: google_protobuf_UninterpretedOption_NamePart) =
     if hasname_part(message):
-        writeString(stream, message.name_part, 1)
+        protoWriteString(stream, message.name_part, 1)
     if hasis_extension(message):
-        writeBool(stream, message.is_extension, 2)
+        protoWriteBool(stream, message.is_extension, 2)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_UninterpretedOption_NamePart*(stream: ProtobufStream): google_protobuf_UninterpretedOption_NamePart =
+proc readgoogle_protobuf_UninterpretedOption_NamePart*(stream: Stream): google_protobuf_UninterpretedOption_NamePart =
     result = newgoogle_protobuf_UninterpretedOption_NamePart()
     while not atEnd(stream):
         let
@@ -480,10 +480,10 @@ proc readgoogle_protobuf_UninterpretedOption_NamePart*(stream: ProtobufStream):
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.LengthDelimited)
-            setname_part(result, readString(stream))
+            setname_part(result, protoReadString(stream))
         of 2:
             expectWireType(wireType, WireType.Varint)
-            setis_extension(result, readBool(stream))
+            setis_extension(result, protoReadBool(stream))
         else: readUnknownField(stream, result, tag)
 
 proc toJson*(message: google_protobuf_UninterpretedOption_NamePart): JsonNode =
@@ -496,15 +496,13 @@ proc toJson*(message: google_protobuf_UninterpretedOption_NamePart): JsonNode =
 proc serialize*(message: google_protobuf_UninterpretedOption_NamePart): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_UninterpretedOption_NamePart(pbs, message)
+    writegoogle_protobuf_UninterpretedOption_NamePart(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_UninterpretedOption_NamePart*(data: string): google_protobuf_UninterpretedOption_NamePart =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_UninterpretedOption_NamePart(pbs)
+    result = readgoogle_protobuf_UninterpretedOption_NamePart(ss)
 
 
 proc newgoogle_protobuf_UninterpretedOption*(): google_protobuf_UninterpretedOption =
@@ -665,24 +663,24 @@ proc sizeOfgoogle_protobuf_UninterpretedOption*(message: google_protobuf_Uninter
         result = result + sizeOfString(message.aggregate_value)
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_UninterpretedOption*(stream: ProtobufStream, message: google_protobuf_UninterpretedOption) =
+proc writegoogle_protobuf_UninterpretedOption*(stream: Stream, message: google_protobuf_UninterpretedOption) =
     for value in message.name:
         writeMessage(stream, value, 2)
     if hasidentifier_value(message):
-        writeString(stream, message.identifier_value, 3)
+        protoWriteString(stream, message.identifier_value, 3)
     if haspositive_int_value(message):
-        writeUInt64(stream, message.positive_int_value, 4)
+        protoWriteUInt64(stream, message.positive_int_value, 4)
     if hasnegative_int_value(message):
-        writeInt64(stream, message.negative_int_value, 5)
+        protoWriteInt64(stream, message.negative_int_value, 5)
     if hasdouble_value(message):
-        writeDouble(stream, message.double_value, 6)
+        protoWriteDouble(stream, message.double_value, 6)
     if hasstring_value(message):
-        writeBytes(stream, message.string_value, 7)
+        protoWriteBytes(stream, message.string_value, 7)
     if hasaggregate_value(message):
-        writeString(stream, message.aggregate_value, 8)
+        protoWriteString(stream, message.aggregate_value, 8)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_UninterpretedOption*(stream: ProtobufStream): google_protobuf_UninterpretedOption =
+proc readgoogle_protobuf_UninterpretedOption*(stream: Stream): google_protobuf_UninterpretedOption =
     result = newgoogle_protobuf_UninterpretedOption()
     while not atEnd(stream):
         let
@@ -697,22 +695,22 @@ proc readgoogle_protobuf_UninterpretedOption*(stream: ProtobufStream): google_pr
             addname(result, newgoogle_protobuf_UninterpretedOption_NamePart(data))
         of 3:
             expectWireType(wireType, WireType.LengthDelimited)
-            setidentifier_value(result, readString(stream))
+            setidentifier_value(result, protoReadString(stream))
         of 4:
             expectWireType(wireType, WireType.Varint)
-            setpositive_int_value(result, readUInt64(stream))
+            setpositive_int_value(result, protoReadUInt64(stream))
         of 5:
             expectWireType(wireType, WireType.Varint)
-            setnegative_int_value(result, readInt64(stream))
+            setnegative_int_value(result, protoReadInt64(stream))
         of 6:
             expectWireType(wireType, WireType.Fixed64)
-            setdouble_value(result, readDouble(stream))
+            setdouble_value(result, protoReadDouble(stream))
         of 7:
             expectWireType(wireType, WireType.LengthDelimited)
-            setstring_value(result, readBytes(stream))
+            setstring_value(result, protoReadBytes(stream))
         of 8:
             expectWireType(wireType, WireType.LengthDelimited)
-            setaggregate_value(result, readString(stream))
+            setaggregate_value(result, protoReadString(stream))
         else: readUnknownField(stream, result, tag)
 
 proc toJson*(message: google_protobuf_UninterpretedOption): JsonNode =
@@ -738,15 +736,13 @@ proc toJson*(message: google_protobuf_UninterpretedOption): JsonNode =
 proc serialize*(message: google_protobuf_UninterpretedOption): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_UninterpretedOption(pbs, message)
+    writegoogle_protobuf_UninterpretedOption(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_UninterpretedOption*(data: string): google_protobuf_UninterpretedOption =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_UninterpretedOption(pbs)
+    result = readgoogle_protobuf_UninterpretedOption(ss)
 
 
 proc newgoogle_protobuf_EnumValueOptions*(): google_protobuf_EnumValueOptions =
@@ -802,14 +798,14 @@ proc sizeOfgoogle_protobuf_EnumValueOptions*(message: google_protobuf_EnumValueO
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_UninterpretedOption(value))
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_EnumValueOptions*(stream: ProtobufStream, message: google_protobuf_EnumValueOptions) =
+proc writegoogle_protobuf_EnumValueOptions*(stream: Stream, message: google_protobuf_EnumValueOptions) =
     if hasdeprecated(message):
-        writeBool(stream, message.deprecated, 1)
+        protoWriteBool(stream, message.deprecated, 1)
     for value in message.uninterpreted_option:
         writeMessage(stream, value, 999)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_EnumValueOptions*(stream: ProtobufStream): google_protobuf_EnumValueOptions =
+proc readgoogle_protobuf_EnumValueOptions*(stream: Stream): google_protobuf_EnumValueOptions =
     result = newgoogle_protobuf_EnumValueOptions()
     while not atEnd(stream):
         let
@@ -820,7 +816,7 @@ proc readgoogle_protobuf_EnumValueOptions*(stream: ProtobufStream): google_proto
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.Varint)
-            setdeprecated(result, readBool(stream))
+            setdeprecated(result, protoReadBool(stream))
         of 999:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
@@ -840,15 +836,13 @@ proc toJson*(message: google_protobuf_EnumValueOptions): JsonNode =
 proc serialize*(message: google_protobuf_EnumValueOptions): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_EnumValueOptions(pbs, message)
+    writegoogle_protobuf_EnumValueOptions(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_EnumValueOptions*(data: string): google_protobuf_EnumValueOptions =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_EnumValueOptions(pbs)
+    result = readgoogle_protobuf_EnumValueOptions(ss)
 
 
 proc newgoogle_protobuf_EnumValueDescriptorProto*(): google_protobuf_EnumValueDescriptorProto =
@@ -921,16 +915,16 @@ proc sizeOfgoogle_protobuf_EnumValueDescriptorProto*(message: google_protobuf_En
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_EnumValueOptions(message.options))
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_EnumValueDescriptorProto*(stream: ProtobufStream, message: google_protobuf_EnumValueDescriptorProto) =
+proc writegoogle_protobuf_EnumValueDescriptorProto*(stream: Stream, message: google_protobuf_EnumValueDescriptorProto) =
     if hasname(message):
-        writeString(stream, message.name, 1)
+        protoWriteString(stream, message.name, 1)
     if hasnumber(message):
-        writeInt32(stream, message.number, 2)
+        protoWriteInt32(stream, message.number, 2)
     if hasoptions(message):
         writeMessage(stream, message.options, 3)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_EnumValueDescriptorProto*(stream: ProtobufStream): google_protobuf_EnumValueDescriptorProto =
+proc readgoogle_protobuf_EnumValueDescriptorProto*(stream: Stream): google_protobuf_EnumValueDescriptorProto =
     result = newgoogle_protobuf_EnumValueDescriptorProto()
     while not atEnd(stream):
         let
@@ -941,10 +935,10 @@ proc readgoogle_protobuf_EnumValueDescriptorProto*(stream: ProtobufStream): goog
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.LengthDelimited)
-            setname(result, readString(stream))
+            setname(result, protoReadString(stream))
         of 2:
             expectWireType(wireType, WireType.Varint)
-            setnumber(result, readInt32(stream))
+            setnumber(result, protoReadInt32(stream))
         of 3:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
@@ -963,15 +957,13 @@ proc toJson*(message: google_protobuf_EnumValueDescriptorProto): JsonNode =
 proc serialize*(message: google_protobuf_EnumValueDescriptorProto): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_EnumValueDescriptorProto(pbs, message)
+    writegoogle_protobuf_EnumValueDescriptorProto(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_EnumValueDescriptorProto*(data: string): google_protobuf_EnumValueDescriptorProto =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_EnumValueDescriptorProto(pbs)
+    result = readgoogle_protobuf_EnumValueDescriptorProto(ss)
 
 
 proc newgoogle_protobuf_EnumDescriptorProto_EnumReservedRange*(): google_protobuf_EnumDescriptorProto_EnumReservedRange =
@@ -1023,14 +1015,14 @@ proc sizeOfgoogle_protobuf_EnumDescriptorProto_EnumReservedRange*(message: googl
         result = result + sizeOfInt32(message.fend)
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_EnumDescriptorProto_EnumReservedRange*(stream: ProtobufStream, message: google_protobuf_EnumDescriptorProto_EnumReservedRange) =
+proc writegoogle_protobuf_EnumDescriptorProto_EnumReservedRange*(stream: Stream, message: google_protobuf_EnumDescriptorProto_EnumReservedRange) =
     if hasstart(message):
-        writeInt32(stream, message.start, 1)
+        protoWriteInt32(stream, message.start, 1)
     if hasfend(message):
-        writeInt32(stream, message.fend, 2)
+        protoWriteInt32(stream, message.fend, 2)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_EnumDescriptorProto_EnumReservedRange*(stream: ProtobufStream): google_protobuf_EnumDescriptorProto_EnumReservedRange =
+proc readgoogle_protobuf_EnumDescriptorProto_EnumReservedRange*(stream: Stream): google_protobuf_EnumDescriptorProto_EnumReservedRange =
     result = newgoogle_protobuf_EnumDescriptorProto_EnumReservedRange()
     while not atEnd(stream):
         let
@@ -1041,10 +1033,10 @@ proc readgoogle_protobuf_EnumDescriptorProto_EnumReservedRange*(stream: Protobuf
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.Varint)
-            setstart(result, readInt32(stream))
+            setstart(result, protoReadInt32(stream))
         of 2:
             expectWireType(wireType, WireType.Varint)
-            setfend(result, readInt32(stream))
+            setfend(result, protoReadInt32(stream))
         else: readUnknownField(stream, result, tag)
 
 proc toJson*(message: google_protobuf_EnumDescriptorProto_EnumReservedRange): JsonNode =
@@ -1057,15 +1049,13 @@ proc toJson*(message: google_protobuf_EnumDescriptorProto_EnumReservedRange): Js
 proc serialize*(message: google_protobuf_EnumDescriptorProto_EnumReservedRange): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_EnumDescriptorProto_EnumReservedRange(pbs, message)
+    writegoogle_protobuf_EnumDescriptorProto_EnumReservedRange(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_EnumDescriptorProto_EnumReservedRange*(data: string): google_protobuf_EnumDescriptorProto_EnumReservedRange =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_EnumDescriptorProto_EnumReservedRange(pbs)
+    result = readgoogle_protobuf_EnumDescriptorProto_EnumReservedRange(ss)
 
 
 proc newgoogle_protobuf_EnumOptions*(): google_protobuf_EnumOptions =
@@ -1142,16 +1132,16 @@ proc sizeOfgoogle_protobuf_EnumOptions*(message: google_protobuf_EnumOptions): u
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_UninterpretedOption(value))
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_EnumOptions*(stream: ProtobufStream, message: google_protobuf_EnumOptions) =
+proc writegoogle_protobuf_EnumOptions*(stream: Stream, message: google_protobuf_EnumOptions) =
     if hasallow_alias(message):
-        writeBool(stream, message.allow_alias, 2)
+        protoWriteBool(stream, message.allow_alias, 2)
     if hasdeprecated(message):
-        writeBool(stream, message.deprecated, 3)
+        protoWriteBool(stream, message.deprecated, 3)
     for value in message.uninterpreted_option:
         writeMessage(stream, value, 999)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_EnumOptions*(stream: ProtobufStream): google_protobuf_EnumOptions =
+proc readgoogle_protobuf_EnumOptions*(stream: Stream): google_protobuf_EnumOptions =
     result = newgoogle_protobuf_EnumOptions()
     while not atEnd(stream):
         let
@@ -1162,10 +1152,10 @@ proc readgoogle_protobuf_EnumOptions*(stream: ProtobufStream): google_protobuf_E
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 2:
             expectWireType(wireType, WireType.Varint)
-            setallow_alias(result, readBool(stream))
+            setallow_alias(result, protoReadBool(stream))
         of 3:
             expectWireType(wireType, WireType.Varint)
-            setdeprecated(result, readBool(stream))
+            setdeprecated(result, protoReadBool(stream))
         of 999:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
@@ -1187,15 +1177,13 @@ proc toJson*(message: google_protobuf_EnumOptions): JsonNode =
 proc serialize*(message: google_protobuf_EnumOptions): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_EnumOptions(pbs, message)
+    writegoogle_protobuf_EnumOptions(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_EnumOptions*(data: string): google_protobuf_EnumOptions =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_EnumOptions(pbs)
+    result = readgoogle_protobuf_EnumOptions(ss)
 
 
 proc newgoogle_protobuf_EnumDescriptorProto*(): google_protobuf_EnumDescriptorProto =
@@ -1322,9 +1310,9 @@ proc sizeOfgoogle_protobuf_EnumDescriptorProto*(message: google_protobuf_EnumDes
         result = result + sizeOfString(value)
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_EnumDescriptorProto*(stream: ProtobufStream, message: google_protobuf_EnumDescriptorProto) =
+proc writegoogle_protobuf_EnumDescriptorProto*(stream: Stream, message: google_protobuf_EnumDescriptorProto) =
     if hasname(message):
-        writeString(stream, message.name, 1)
+        protoWriteString(stream, message.name, 1)
     for value in message.value:
         writeMessage(stream, value, 2)
     if hasoptions(message):
@@ -1332,10 +1320,10 @@ proc writegoogle_protobuf_EnumDescriptorProto*(stream: ProtobufStream, message:
     for value in message.reserved_range:
         writeMessage(stream, value, 4)
     for value in message.reserved_name:
-        writeString(stream, value, 5)
+        protoWriteString(stream, value, 5)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_EnumDescriptorProto*(stream: ProtobufStream): google_protobuf_EnumDescriptorProto =
+proc readgoogle_protobuf_EnumDescriptorProto*(stream: Stream): google_protobuf_EnumDescriptorProto =
     result = newgoogle_protobuf_EnumDescriptorProto()
     while not atEnd(stream):
         let
@@ -1346,7 +1334,7 @@ proc readgoogle_protobuf_EnumDescriptorProto*(stream: ProtobufStream): google_pr
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.LengthDelimited)
-            setname(result, readString(stream))
+            setname(result, protoReadString(stream))
         of 2:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
@@ -1361,7 +1349,7 @@ proc readgoogle_protobuf_EnumDescriptorProto*(stream: ProtobufStream): google_pr
             addreserved_range(result, newgoogle_protobuf_EnumDescriptorProto_EnumReservedRange(data))
         of 5:
             expectWireType(wireType, WireType.LengthDelimited)
-            addreserved_name(result, readString(stream))
+            addreserved_name(result, protoReadString(stream))
         else: readUnknownField(stream, result, tag)
 
 proc toJson*(message: google_protobuf_EnumDescriptorProto): JsonNode =
@@ -1389,15 +1377,13 @@ proc toJson*(message: google_protobuf_EnumDescriptorProto): JsonNode =
 proc serialize*(message: google_protobuf_EnumDescriptorProto): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_EnumDescriptorProto(pbs, message)
+    writegoogle_protobuf_EnumDescriptorProto(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_EnumDescriptorProto*(data: string): google_protobuf_EnumDescriptorProto =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_EnumDescriptorProto(pbs)
+    result = readgoogle_protobuf_EnumDescriptorProto(ss)
 
 
 proc newgoogle_protobuf_ExtensionRangeOptions*(): google_protobuf_ExtensionRangeOptions =
@@ -1432,12 +1418,12 @@ proc sizeOfgoogle_protobuf_ExtensionRangeOptions*(message: google_protobuf_Exten
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_UninterpretedOption(value))
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_ExtensionRangeOptions*(stream: ProtobufStream, message: google_protobuf_ExtensionRangeOptions) =
+proc writegoogle_protobuf_ExtensionRangeOptions*(stream: Stream, message: google_protobuf_ExtensionRangeOptions) =
     for value in message.uninterpreted_option:
         writeMessage(stream, value, 999)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_ExtensionRangeOptions*(stream: ProtobufStream): google_protobuf_ExtensionRangeOptions =
+proc readgoogle_protobuf_ExtensionRangeOptions*(stream: Stream): google_protobuf_ExtensionRangeOptions =
     result = newgoogle_protobuf_ExtensionRangeOptions()
     while not atEnd(stream):
         let
@@ -1463,15 +1449,13 @@ proc toJson*(message: google_protobuf_ExtensionRangeOptions): JsonNode =
 proc serialize*(message: google_protobuf_ExtensionRangeOptions): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_ExtensionRangeOptions(pbs, message)
+    writegoogle_protobuf_ExtensionRangeOptions(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_ExtensionRangeOptions*(data: string): google_protobuf_ExtensionRangeOptions =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_ExtensionRangeOptions(pbs)
+    result = readgoogle_protobuf_ExtensionRangeOptions(ss)
 
 
 proc newgoogle_protobuf_SourceCodeInfo_Location*(): google_protobuf_SourceCodeInfo_Location =
@@ -1598,26 +1582,26 @@ proc sizeOfgoogle_protobuf_SourceCodeInfo_Location*(message: google_protobuf_Sou
         result = result + sizeOfString(value)
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_SourceCodeInfo_Location*(stream: ProtobufStream, message: google_protobuf_SourceCodeInfo_Location) =
+proc writegoogle_protobuf_SourceCodeInfo_Location*(stream: Stream, message: google_protobuf_SourceCodeInfo_Location) =
     if haspath(message):
         writeTag(stream, 1, WireType.LengthDelimited)
         writeVarint(stream, packedFieldSize(message.path, FieldType.Int32))
         for value in message.path:
-            writeInt32(stream, value)
+            protoWriteInt32(stream, value)
     if hasspan(message):
         writeTag(stream, 2, WireType.LengthDelimited)
         writeVarint(stream, packedFieldSize(message.span, FieldType.Int32))
         for value in message.span:
-            writeInt32(stream, value)
+            protoWriteInt32(stream, value)
     if hasleading_comments(message):
-        writeString(stream, message.leading_comments, 3)
+        protoWriteString(stream, message.leading_comments, 3)
     if hastrailing_comments(message):
-        writeString(stream, message.trailing_comments, 4)
+        protoWriteString(stream, message.trailing_comments, 4)
     for value in message.leading_detached_comments:
-        writeString(stream, value, 6)
+        protoWriteString(stream, value, 6)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_SourceCodeInfo_Location*(stream: ProtobufStream): google_protobuf_SourceCodeInfo_Location =
+proc readgoogle_protobuf_SourceCodeInfo_Location*(stream: Stream): google_protobuf_SourceCodeInfo_Location =
     result = newgoogle_protobuf_SourceCodeInfo_Location()
     while not atEnd(stream):
         let
@@ -1634,12 +1618,12 @@ proc readgoogle_protobuf_SourceCodeInfo_Location*(stream: ProtobufStream): googl
                     start = uint64(getPosition(stream))
                 var consumed = 0'u64
                 while consumed < size:
-                    addpath(result, readInt32(stream))
+                    addpath(result, protoReadInt32(stream))
                     consumed = uint64(getPosition(stream)) - start
                 if consumed != size:
                     raise newException(Exception, "packed field size mismatch")
             else:
-                addpath(result, readInt32(stream))
+                addpath(result, protoReadInt32(stream))
         of 2:
             expectWireType(wireType, WireType.Varint, WireType.LengthDelimited)
             if wireType == WireType.LengthDelimited:
@@ -1648,21 +1632,21 @@ proc readgoogle_protobuf_SourceCodeInfo_Location*(stream: ProtobufStream): googl
                     start = uint64(getPosition(stream))
                 var consumed = 0'u64
                 while consumed < size:
-                    addspan(result, readInt32(stream))
+                    addspan(result, protoReadInt32(stream))
                     consumed = uint64(getPosition(stream)) - start
                 if consumed != size:
                     raise newException(Exception, "packed field size mismatch")
             else:
-                addspan(result, readInt32(stream))
+                addspan(result, protoReadInt32(stream))
         of 3:
             expectWireType(wireType, WireType.LengthDelimited)
-            setleading_comments(result, readString(stream))
+            setleading_comments(result, protoReadString(stream))
         of 4:
             expectWireType(wireType, WireType.LengthDelimited)
-            settrailing_comments(result, readString(stream))
+            settrailing_comments(result, protoReadString(stream))
         of 6:
             expectWireType(wireType, WireType.LengthDelimited)
-            addleading_detached_comments(result, readString(stream))
+            addleading_detached_comments(result, protoReadString(stream))
         else: readUnknownField(stream, result, tag)
 
 proc toJson*(message: google_protobuf_SourceCodeInfo_Location): JsonNode =
@@ -1690,15 +1674,13 @@ proc toJson*(message: google_protobuf_SourceCodeInfo_Location): JsonNode =
 proc serialize*(message: google_protobuf_SourceCodeInfo_Location): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_SourceCodeInfo_Location(pbs, message)
+    writegoogle_protobuf_SourceCodeInfo_Location(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_SourceCodeInfo_Location*(data: string): google_protobuf_SourceCodeInfo_Location =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_SourceCodeInfo_Location(pbs)
+    result = readgoogle_protobuf_SourceCodeInfo_Location(ss)
 
 
 proc newgoogle_protobuf_SourceCodeInfo*(): google_protobuf_SourceCodeInfo =
@@ -1733,12 +1715,12 @@ proc sizeOfgoogle_protobuf_SourceCodeInfo*(message: google_protobuf_SourceCodeIn
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_SourceCodeInfo_Location(value))
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_SourceCodeInfo*(stream: ProtobufStream, message: google_protobuf_SourceCodeInfo) =
+proc writegoogle_protobuf_SourceCodeInfo*(stream: Stream, message: google_protobuf_SourceCodeInfo) =
     for value in message.location:
         writeMessage(stream, value, 1)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_SourceCodeInfo*(stream: ProtobufStream): google_protobuf_SourceCodeInfo =
+proc readgoogle_protobuf_SourceCodeInfo*(stream: Stream): google_protobuf_SourceCodeInfo =
     result = newgoogle_protobuf_SourceCodeInfo()
     while not atEnd(stream):
         let
@@ -1764,15 +1746,13 @@ proc toJson*(message: google_protobuf_SourceCodeInfo): JsonNode =
 proc serialize*(message: google_protobuf_SourceCodeInfo): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_SourceCodeInfo(pbs, message)
+    writegoogle_protobuf_SourceCodeInfo(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_SourceCodeInfo*(data: string): google_protobuf_SourceCodeInfo =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_SourceCodeInfo(pbs)
+    result = readgoogle_protobuf_SourceCodeInfo(ss)
 
 
 proc newgoogle_protobuf_FieldOptions*(): google_protobuf_FieldOptions =
@@ -1933,24 +1913,24 @@ proc sizeOfgoogle_protobuf_FieldOptions*(message: google_protobuf_FieldOptions):
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_UninterpretedOption(value))
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_FieldOptions*(stream: ProtobufStream, message: google_protobuf_FieldOptions) =
+proc writegoogle_protobuf_FieldOptions*(stream: Stream, message: google_protobuf_FieldOptions) =
     if hasctype(message):
-        writeEnum(stream, message.ctype, 1)
+        protoWriteEnum(stream, message.ctype, 1)
     if haspacked(message):
-        writeBool(stream, message.packed, 2)
+        protoWriteBool(stream, message.packed, 2)
     if hasjstype(message):
-        writeEnum(stream, message.jstype, 6)
+        protoWriteEnum(stream, message.jstype, 6)
     if haslazy(message):
-        writeBool(stream, message.lazy, 5)
+        protoWriteBool(stream, message.lazy, 5)
     if hasdeprecated(message):
-        writeBool(stream, message.deprecated, 3)
+        protoWriteBool(stream, message.deprecated, 3)
     if hasweak(message):
-        writeBool(stream, message.weak, 10)
+        protoWriteBool(stream, message.weak, 10)
     for value in message.uninterpreted_option:
         writeMessage(stream, value, 999)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_FieldOptions*(stream: ProtobufStream): google_protobuf_FieldOptions =
+proc readgoogle_protobuf_FieldOptions*(stream: Stream): google_protobuf_FieldOptions =
     result = newgoogle_protobuf_FieldOptions()
     while not atEnd(stream):
         let
@@ -1961,22 +1941,22 @@ proc readgoogle_protobuf_FieldOptions*(stream: ProtobufStream): google_protobuf_
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.Varint)
-            setctype(result, readEnum[google_protobuf_FieldOptions_CType](stream))
+            setctype(result, protoReadEnum[google_protobuf_FieldOptions_CType](stream))
         of 2:
             expectWireType(wireType, WireType.Varint)
-            setpacked(result, readBool(stream))
+            setpacked(result, protoReadBool(stream))
         of 6:
             expectWireType(wireType, WireType.Varint)
-            setjstype(result, readEnum[google_protobuf_FieldOptions_JSType](stream))
+            setjstype(result, protoReadEnum[google_protobuf_FieldOptions_JSType](stream))
         of 5:
             expectWireType(wireType, WireType.Varint)
-            setlazy(result, readBool(stream))
+            setlazy(result, protoReadBool(stream))
         of 3:
             expectWireType(wireType, WireType.Varint)
-            setdeprecated(result, readBool(stream))
+            setdeprecated(result, protoReadBool(stream))
         of 10:
             expectWireType(wireType, WireType.Varint)
-            setweak(result, readBool(stream))
+            setweak(result, protoReadBool(stream))
         of 999:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
@@ -2006,15 +1986,13 @@ proc toJson*(message: google_protobuf_FieldOptions): JsonNode =
 proc serialize*(message: google_protobuf_FieldOptions): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_FieldOptions(pbs, message)
+    writegoogle_protobuf_FieldOptions(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_FieldOptions*(data: string): google_protobuf_FieldOptions =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_FieldOptions(pbs)
+    result = readgoogle_protobuf_FieldOptions(ss)
 
 
 proc newgoogle_protobuf_FieldDescriptorProto*(): google_protobuf_FieldDescriptorProto =
@@ -2234,30 +2212,30 @@ proc sizeOfgoogle_protobuf_FieldDescriptorProto*(message: google_protobuf_FieldD
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_FieldOptions(message.options))
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_FieldDescriptorProto*(stream: ProtobufStream, message: google_protobuf_FieldDescriptorProto) =
+proc writegoogle_protobuf_FieldDescriptorProto*(stream: Stream, message: google_protobuf_FieldDescriptorProto) =
     if hasname(message):
-        writeString(stream, message.name, 1)
+        protoWriteString(stream, message.name, 1)
     if hasnumber(message):
-        writeInt32(stream, message.number, 3)
+        protoWriteInt32(stream, message.number, 3)
     if haslabel(message):
-        writeEnum(stream, message.label, 4)
+        protoWriteEnum(stream, message.label, 4)
     if hasftype(message):
-        writeEnum(stream, message.ftype, 5)
+        protoWriteEnum(stream, message.ftype, 5)
     if hastype_name(message):
-        writeString(stream, message.type_name, 6)
+        protoWriteString(stream, message.type_name, 6)
     if hasextendee(message):
-        writeString(stream, message.extendee, 2)
+        protoWriteString(stream, message.extendee, 2)
     if hasdefault_value(message):
-        writeString(stream, message.default_value, 7)
+        protoWriteString(stream, message.default_value, 7)
     if hasoneof_index(message):
-        writeInt32(stream, message.oneof_index, 9)
+        protoWriteInt32(stream, message.oneof_index, 9)
     if hasjson_name(message):
-        writeString(stream, message.json_name, 10)
+        protoWriteString(stream, message.json_name, 10)
     if hasoptions(message):
         writeMessage(stream, message.options, 8)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_FieldDescriptorProto*(stream: ProtobufStream): google_protobuf_FieldDescriptorProto =
+proc readgoogle_protobuf_FieldDescriptorProto*(stream: Stream): google_protobuf_FieldDescriptorProto =
     result = newgoogle_protobuf_FieldDescriptorProto()
     while not atEnd(stream):
         let
@@ -2268,31 +2246,31 @@ proc readgoogle_protobuf_FieldDescriptorProto*(stream: ProtobufStream): google_p
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.LengthDelimited)
-            setname(result, readString(stream))
+            setname(result, protoReadString(stream))
         of 3:
             expectWireType(wireType, WireType.Varint)
-            setnumber(result, readInt32(stream))
+            setnumber(result, protoReadInt32(stream))
         of 4:
             expectWireType(wireType, WireType.Varint)
-            setlabel(result, readEnum[google_protobuf_FieldDescriptorProto_Label](stream))
+            setlabel(result, protoReadEnum[google_protobuf_FieldDescriptorProto_Label](stream))
         of 5:
             expectWireType(wireType, WireType.Varint)
-            setftype(result, readEnum[google_protobuf_FieldDescriptorProto_Type](stream))
+            setftype(result, protoReadEnum[google_protobuf_FieldDescriptorProto_Type](stream))
         of 6:
             expectWireType(wireType, WireType.LengthDelimited)
-            settype_name(result, readString(stream))
+            settype_name(result, protoReadString(stream))
         of 2:
             expectWireType(wireType, WireType.LengthDelimited)
-            setextendee(result, readString(stream))
+            setextendee(result, protoReadString(stream))
         of 7:
             expectWireType(wireType, WireType.LengthDelimited)
-            setdefault_value(result, readString(stream))
+            setdefault_value(result, protoReadString(stream))
         of 9:
             expectWireType(wireType, WireType.Varint)
-            setoneof_index(result, readInt32(stream))
+            setoneof_index(result, protoReadInt32(stream))
         of 10:
             expectWireType(wireType, WireType.LengthDelimited)
-            setjson_name(result, readString(stream))
+            setjson_name(result, protoReadString(stream))
         of 8:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
@@ -2325,15 +2303,13 @@ proc toJson*(message: google_protobuf_FieldDescriptorProto): JsonNode =
 proc serialize*(message: google_protobuf_FieldDescriptorProto): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_FieldDescriptorProto(pbs, message)
+    writegoogle_protobuf_FieldDescriptorProto(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_FieldDescriptorProto*(data: string): google_protobuf_FieldDescriptorProto =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_FieldDescriptorProto(pbs)
+    result = readgoogle_protobuf_FieldDescriptorProto(ss)
 
 
 proc newgoogle_protobuf_DescriptorProto_ExtensionRange*(): google_protobuf_DescriptorProto_ExtensionRange =
@@ -2406,16 +2382,16 @@ proc sizeOfgoogle_protobuf_DescriptorProto_ExtensionRange*(message: google_proto
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_ExtensionRangeOptions(message.options))
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_DescriptorProto_ExtensionRange*(stream: ProtobufStream, message: google_protobuf_DescriptorProto_ExtensionRange) =
+proc writegoogle_protobuf_DescriptorProto_ExtensionRange*(stream: Stream, message: google_protobuf_DescriptorProto_ExtensionRange) =
     if hasstart(message):
-        writeInt32(stream, message.start, 1)
+        protoWriteInt32(stream, message.start, 1)
     if hasfend(message):
-        writeInt32(stream, message.fend, 2)
+        protoWriteInt32(stream, message.fend, 2)
     if hasoptions(message):
         writeMessage(stream, message.options, 3)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_DescriptorProto_ExtensionRange*(stream: ProtobufStream): google_protobuf_DescriptorProto_ExtensionRange =
+proc readgoogle_protobuf_DescriptorProto_ExtensionRange*(stream: Stream): google_protobuf_DescriptorProto_ExtensionRange =
     result = newgoogle_protobuf_DescriptorProto_ExtensionRange()
     while not atEnd(stream):
         let
@@ -2426,10 +2402,10 @@ proc readgoogle_protobuf_DescriptorProto_ExtensionRange*(stream: ProtobufStream)
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.Varint)
-            setstart(result, readInt32(stream))
+            setstart(result, protoReadInt32(stream))
         of 2:
             expectWireType(wireType, WireType.Varint)
-            setfend(result, readInt32(stream))
+            setfend(result, protoReadInt32(stream))
         of 3:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
@@ -2448,15 +2424,13 @@ proc toJson*(message: google_protobuf_DescriptorProto_ExtensionRange): JsonNode
 proc serialize*(message: google_protobuf_DescriptorProto_ExtensionRange): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_DescriptorProto_ExtensionRange(pbs, message)
+    writegoogle_protobuf_DescriptorProto_ExtensionRange(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_DescriptorProto_ExtensionRange*(data: string): google_protobuf_DescriptorProto_ExtensionRange =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_DescriptorProto_ExtensionRange(pbs)
+    result = readgoogle_protobuf_DescriptorProto_ExtensionRange(ss)
 
 
 proc newgoogle_protobuf_MessageOptions*(): google_protobuf_MessageOptions =
@@ -2575,20 +2549,20 @@ proc sizeOfgoogle_protobuf_MessageOptions*(message: google_protobuf_MessageOptio
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_UninterpretedOption(value))
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_MessageOptions*(stream: ProtobufStream, message: google_protobuf_MessageOptions) =
+proc writegoogle_protobuf_MessageOptions*(stream: Stream, message: google_protobuf_MessageOptions) =
     if hasmessage_set_wire_format(message):
-        writeBool(stream, message.message_set_wire_format, 1)
+        protoWriteBool(stream, message.message_set_wire_format, 1)
     if hasno_standard_descriptor_accessor(message):
-        writeBool(stream, message.no_standard_descriptor_accessor, 2)
+        protoWriteBool(stream, message.no_standard_descriptor_accessor, 2)
     if hasdeprecated(message):
-        writeBool(stream, message.deprecated, 3)
+        protoWriteBool(stream, message.deprecated, 3)
     if hasmap_entry(message):
-        writeBool(stream, message.map_entry, 7)
+        protoWriteBool(stream, message.map_entry, 7)
     for value in message.uninterpreted_option:
         writeMessage(stream, value, 999)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_MessageOptions*(stream: ProtobufStream): google_protobuf_MessageOptions =
+proc readgoogle_protobuf_MessageOptions*(stream: Stream): google_protobuf_MessageOptions =
     result = newgoogle_protobuf_MessageOptions()
     while not atEnd(stream):
         let
@@ -2599,16 +2573,16 @@ proc readgoogle_protobuf_MessageOptions*(stream: ProtobufStream): google_protobu
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.Varint)
-            setmessage_set_wire_format(result, readBool(stream))
+            setmessage_set_wire_format(result, protoReadBool(stream))
         of 2:
             expectWireType(wireType, WireType.Varint)
-            setno_standard_descriptor_accessor(result, readBool(stream))
+            setno_standard_descriptor_accessor(result, protoReadBool(stream))
         of 3:
             expectWireType(wireType, WireType.Varint)
-            setdeprecated(result, readBool(stream))
+            setdeprecated(result, protoReadBool(stream))
         of 7:
             expectWireType(wireType, WireType.Varint)
-            setmap_entry(result, readBool(stream))
+            setmap_entry(result, protoReadBool(stream))
         of 999:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
@@ -2634,15 +2608,13 @@ proc toJson*(message: google_protobuf_MessageOptions): JsonNode =
 proc serialize*(message: google_protobuf_MessageOptions): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_MessageOptions(pbs, message)
+    writegoogle_protobuf_MessageOptions(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_MessageOptions*(data: string): google_protobuf_MessageOptions =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_MessageOptions(pbs)
+    result = readgoogle_protobuf_MessageOptions(ss)
 
 
 proc newgoogle_protobuf_OneofOptions*(): google_protobuf_OneofOptions =
@@ -2677,12 +2649,12 @@ proc sizeOfgoogle_protobuf_OneofOptions*(message: google_protobuf_OneofOptions):
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_UninterpretedOption(value))
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_OneofOptions*(stream: ProtobufStream, message: google_protobuf_OneofOptions) =
+proc writegoogle_protobuf_OneofOptions*(stream: Stream, message: google_protobuf_OneofOptions) =
     for value in message.uninterpreted_option:
         writeMessage(stream, value, 999)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_OneofOptions*(stream: ProtobufStream): google_protobuf_OneofOptions =
+proc readgoogle_protobuf_OneofOptions*(stream: Stream): google_protobuf_OneofOptions =
     result = newgoogle_protobuf_OneofOptions()
     while not atEnd(stream):
         let
@@ -2708,15 +2680,13 @@ proc toJson*(message: google_protobuf_OneofOptions): JsonNode =
 proc serialize*(message: google_protobuf_OneofOptions): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_OneofOptions(pbs, message)
+    writegoogle_protobuf_OneofOptions(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_OneofOptions*(data: string): google_protobuf_OneofOptions =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_OneofOptions(pbs)
+    result = readgoogle_protobuf_OneofOptions(ss)
 
 
 proc newgoogle_protobuf_OneofDescriptorProto*(): google_protobuf_OneofDescriptorProto =
@@ -2768,14 +2738,14 @@ proc sizeOfgoogle_protobuf_OneofDescriptorProto*(message: google_protobuf_OneofD
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_OneofOptions(message.options))
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_OneofDescriptorProto*(stream: ProtobufStream, message: google_protobuf_OneofDescriptorProto) =
+proc writegoogle_protobuf_OneofDescriptorProto*(stream: Stream, message: google_protobuf_OneofDescriptorProto) =
     if hasname(message):
-        writeString(stream, message.name, 1)
+        protoWriteString(stream, message.name, 1)
     if hasoptions(message):
         writeMessage(stream, message.options, 2)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_OneofDescriptorProto*(stream: ProtobufStream): google_protobuf_OneofDescriptorProto =
+proc readgoogle_protobuf_OneofDescriptorProto*(stream: Stream): google_protobuf_OneofDescriptorProto =
     result = newgoogle_protobuf_OneofDescriptorProto()
     while not atEnd(stream):
         let
@@ -2786,7 +2756,7 @@ proc readgoogle_protobuf_OneofDescriptorProto*(stream: ProtobufStream): google_p
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.LengthDelimited)
-            setname(result, readString(stream))
+            setname(result, protoReadString(stream))
         of 2:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
@@ -2803,15 +2773,13 @@ proc toJson*(message: google_protobuf_OneofDescriptorProto): JsonNode =
 proc serialize*(message: google_protobuf_OneofDescriptorProto): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_OneofDescriptorProto(pbs, message)
+    writegoogle_protobuf_OneofDescriptorProto(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_OneofDescriptorProto*(data: string): google_protobuf_OneofDescriptorProto =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_OneofDescriptorProto(pbs)
+    result = readgoogle_protobuf_OneofDescriptorProto(ss)
 
 
 proc newgoogle_protobuf_DescriptorProto_ReservedRange*(): google_protobuf_DescriptorProto_ReservedRange =
@@ -2863,14 +2831,14 @@ proc sizeOfgoogle_protobuf_DescriptorProto_ReservedRange*(message: google_protob
         result = result + sizeOfInt32(message.fend)
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_DescriptorProto_ReservedRange*(stream: ProtobufStream, message: google_protobuf_DescriptorProto_ReservedRange) =
+proc writegoogle_protobuf_DescriptorProto_ReservedRange*(stream: Stream, message: google_protobuf_DescriptorProto_ReservedRange) =
     if hasstart(message):
-        writeInt32(stream, message.start, 1)
+        protoWriteInt32(stream, message.start, 1)
     if hasfend(message):
-        writeInt32(stream, message.fend, 2)
+        protoWriteInt32(stream, message.fend, 2)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_DescriptorProto_ReservedRange*(stream: ProtobufStream): google_protobuf_DescriptorProto_ReservedRange =
+proc readgoogle_protobuf_DescriptorProto_ReservedRange*(stream: Stream): google_protobuf_DescriptorProto_ReservedRange =
     result = newgoogle_protobuf_DescriptorProto_ReservedRange()
     while not atEnd(stream):
         let
@@ -2881,10 +2849,10 @@ proc readgoogle_protobuf_DescriptorProto_ReservedRange*(stream: ProtobufStream):
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.Varint)
-            setstart(result, readInt32(stream))
+            setstart(result, protoReadInt32(stream))
         of 2:
             expectWireType(wireType, WireType.Varint)
-            setfend(result, readInt32(stream))
+            setfend(result, protoReadInt32(stream))
         else: readUnknownField(stream, result, tag)
 
 proc toJson*(message: google_protobuf_DescriptorProto_ReservedRange): JsonNode =
@@ -2897,15 +2865,13 @@ proc toJson*(message: google_protobuf_DescriptorProto_ReservedRange): JsonNode =
 proc serialize*(message: google_protobuf_DescriptorProto_ReservedRange): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_DescriptorProto_ReservedRange(pbs, message)
+    writegoogle_protobuf_DescriptorProto_ReservedRange(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_DescriptorProto_ReservedRange*(data: string): google_protobuf_DescriptorProto_ReservedRange =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_DescriptorProto_ReservedRange(pbs)
+    result = readgoogle_protobuf_DescriptorProto_ReservedRange(ss)
 
 
 proc newgoogle_protobuf_DescriptorProto*(): google_protobuf_DescriptorProto =
@@ -3157,9 +3123,9 @@ proc sizeOfgoogle_protobuf_DescriptorProto*(message: google_protobuf_DescriptorP
         result = result + sizeOfString(value)
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_DescriptorProto*(stream: ProtobufStream, message: google_protobuf_DescriptorProto) =
+proc writegoogle_protobuf_DescriptorProto*(stream: Stream, message: google_protobuf_DescriptorProto) =
     if hasname(message):
-        writeString(stream, message.name, 1)
+        protoWriteString(stream, message.name, 1)
     for value in message.field:
         writeMessage(stream, value, 2)
     for value in message.extension:
@@ -3177,10 +3143,10 @@ proc writegoogle_protobuf_DescriptorProto*(stream: ProtobufStream, message: goog
     for value in message.reserved_range:
         writeMessage(stream, value, 9)
     for value in message.reserved_name:
-        writeString(stream, value, 10)
+        protoWriteString(stream, value, 10)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_DescriptorProto*(stream: ProtobufStream): google_protobuf_DescriptorProto =
+proc readgoogle_protobuf_DescriptorProto*(stream: Stream): google_protobuf_DescriptorProto =
     result = newgoogle_protobuf_DescriptorProto()
     while not atEnd(stream):
         let
@@ -3191,7 +3157,7 @@ proc readgoogle_protobuf_DescriptorProto*(stream: ProtobufStream): google_protob
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.LengthDelimited)
-            setname(result, readString(stream))
+            setname(result, protoReadString(stream))
         of 2:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
@@ -3226,7 +3192,7 @@ proc readgoogle_protobuf_DescriptorProto*(stream: ProtobufStream): google_protob
             addreserved_range(result, newgoogle_protobuf_DescriptorProto_ReservedRange(data))
         of 10:
             expectWireType(wireType, WireType.LengthDelimited)
-            addreserved_name(result, readString(stream))
+            addreserved_name(result, protoReadString(stream))
         else: readUnknownField(stream, result, tag)
 
 proc toJson*(message: google_protobuf_DescriptorProto): JsonNode =
@@ -3279,15 +3245,13 @@ proc toJson*(message: google_protobuf_DescriptorProto): JsonNode =
 proc serialize*(message: google_protobuf_DescriptorProto): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_DescriptorProto(pbs, message)
+    writegoogle_protobuf_DescriptorProto(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_DescriptorProto*(data: string): google_protobuf_DescriptorProto =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_DescriptorProto(pbs)
+    result = readgoogle_protobuf_DescriptorProto(ss)
 
 
 proc newgoogle_protobuf_FileOptions*(): google_protobuf_FileOptions =
@@ -3700,48 +3664,48 @@ proc sizeOfgoogle_protobuf_FileOptions*(message: google_protobuf_FileOptions): u
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_UninterpretedOption(value))
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_FileOptions*(stream: ProtobufStream, message: google_protobuf_FileOptions) =
+proc writegoogle_protobuf_FileOptions*(stream: Stream, message: google_protobuf_FileOptions) =
     if hasjava_package(message):
-        writeString(stream, message.java_package, 1)
+        protoWriteString(stream, message.java_package, 1)
     if hasjava_outer_classname(message):
-        writeString(stream, message.java_outer_classname, 8)
+        protoWriteString(stream, message.java_outer_classname, 8)
     if hasjava_multiple_files(message):
-        writeBool(stream, message.java_multiple_files, 10)
+        protoWriteBool(stream, message.java_multiple_files, 10)
     if hasjava_generate_equals_and_hash(message):
-        writeBool(stream, message.java_generate_equals_and_hash, 20)
+        protoWriteBool(stream, message.java_generate_equals_and_hash, 20)
     if hasjava_string_check_utf8(message):
-        writeBool(stream, message.java_string_check_utf8, 27)
+        protoWriteBool(stream, message.java_string_check_utf8, 27)
     if hasoptimize_for(message):
-        writeEnum(stream, message.optimize_for, 9)
+        protoWriteEnum(stream, message.optimize_for, 9)
     if hasgo_package(message):
-        writeString(stream, message.go_package, 11)
+        protoWriteString(stream, message.go_package, 11)
     if hascc_generic_services(message):
-        writeBool(stream, message.cc_generic_services, 16)
+        protoWriteBool(stream, message.cc_generic_services, 16)
     if hasjava_generic_services(message):
-        writeBool(stream, message.java_generic_services, 17)
+        protoWriteBool(stream, message.java_generic_services, 17)
     if haspy_generic_services(message):
-        writeBool(stream, message.py_generic_services, 18)
+        protoWriteBool(stream, message.py_generic_services, 18)
     if hasphp_generic_services(message):
-        writeBool(stream, message.php_generic_services, 42)
+        protoWriteBool(stream, message.php_generic_services, 42)
     if hasdeprecated(message):
-        writeBool(stream, message.deprecated, 23)
+        protoWriteBool(stream, message.deprecated, 23)
     if hascc_enable_arenas(message):
-        writeBool(stream, message.cc_enable_arenas, 31)
+        protoWriteBool(stream, message.cc_enable_arenas, 31)
     if hasobjc_class_prefix(message):
-        writeString(stream, message.objc_class_prefix, 36)
+        protoWriteString(stream, message.objc_class_prefix, 36)
     if hascsharp_namespace(message):
-        writeString(stream, message.csharp_namespace, 37)
+        protoWriteString(stream, message.csharp_namespace, 37)
     if hasswift_prefix(message):
-        writeString(stream, message.swift_prefix, 39)
+        protoWriteString(stream, message.swift_prefix, 39)
     if hasphp_class_prefix(message):
-        writeString(stream, message.php_class_prefix, 40)
+        protoWriteString(stream, message.php_class_prefix, 40)
     if hasphp_namespace(message):
-        writeString(stream, message.php_namespace, 41)
+        protoWriteString(stream, message.php_namespace, 41)
     for value in message.uninterpreted_option:
         writeMessage(stream, value, 999)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_FileOptions*(stream: ProtobufStream): google_protobuf_FileOptions =
+proc readgoogle_protobuf_FileOptions*(stream: Stream): google_protobuf_FileOptions =
     result = newgoogle_protobuf_FileOptions()
     while not atEnd(stream):
         let
@@ -3752,58 +3716,58 @@ proc readgoogle_protobuf_FileOptions*(stream: ProtobufStream): google_protobuf_F
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.LengthDelimited)
-            setjava_package(result, readString(stream))
+            setjava_package(result, protoReadString(stream))
         of 8:
             expectWireType(wireType, WireType.LengthDelimited)
-            setjava_outer_classname(result, readString(stream))
+            setjava_outer_classname(result, protoReadString(stream))
         of 10:
             expectWireType(wireType, WireType.Varint)
-            setjava_multiple_files(result, readBool(stream))
+            setjava_multiple_files(result, protoReadBool(stream))
         of 20:
             expectWireType(wireType, WireType.Varint)
-            setjava_generate_equals_and_hash(result, readBool(stream))
+            setjava_generate_equals_and_hash(result, protoReadBool(stream))
         of 27:
             expectWireType(wireType, WireType.Varint)
-            setjava_string_check_utf8(result, readBool(stream))
+            setjava_string_check_utf8(result, protoReadBool(stream))
         of 9:
             expectWireType(wireType, WireType.Varint)
-            setoptimize_for(result, readEnum[google_protobuf_FileOptions_OptimizeMode](stream))
+            setoptimize_for(result, protoReadEnum[google_protobuf_FileOptions_OptimizeMode](stream))
         of 11:
             expectWireType(wireType, WireType.LengthDelimited)
-            setgo_package(result, readString(stream))
+            setgo_package(result, protoReadString(stream))
         of 16:
             expectWireType(wireType, WireType.Varint)
-            setcc_generic_services(result, readBool(stream))
+            setcc_generic_services(result, protoReadBool(stream))
         of 17:
             expectWireType(wireType, WireType.Varint)
-            setjava_generic_services(result, readBool(stream))
+            setjava_generic_services(result, protoReadBool(stream))
         of 18:
             expectWireType(wireType, WireType.Varint)
-            setpy_generic_services(result, readBool(stream))
+            setpy_generic_services(result, protoReadBool(stream))
         of 42:
             expectWireType(wireType, WireType.Varint)
-            setphp_generic_services(result, readBool(stream))
+            setphp_generic_services(result, protoReadBool(stream))
         of 23:
             expectWireType(wireType, WireType.Varint)
-            setdeprecated(result, readBool(stream))
+            setdeprecated(result, protoReadBool(stream))
         of 31:
             expectWireType(wireType, WireType.Varint)
-            setcc_enable_arenas(result, readBool(stream))
+            setcc_enable_arenas(result, protoReadBool(stream))
         of 36:
             expectWireType(wireType, WireType.LengthDelimited)
-            setobjc_class_prefix(result, readString(stream))
+            setobjc_class_prefix(result, protoReadString(stream))
         of 37:
             expectWireType(wireType, WireType.LengthDelimited)
-            setcsharp_namespace(result, readString(stream))
+            setcsharp_namespace(result, protoReadString(stream))
         of 39:
             expectWireType(wireType, WireType.LengthDelimited)
-            setswift_prefix(result, readString(stream))
+            setswift_prefix(result, protoReadString(stream))
         of 40:
             expectWireType(wireType, WireType.LengthDelimited)
-            setphp_class_prefix(result, readString(stream))
+            setphp_class_prefix(result, protoReadString(stream))
         of 41:
             expectWireType(wireType, WireType.LengthDelimited)
-            setphp_namespace(result, readString(stream))
+            setphp_namespace(result, protoReadString(stream))
         of 999:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
@@ -3857,15 +3821,13 @@ proc toJson*(message: google_protobuf_FileOptions): JsonNode =
 proc serialize*(message: google_protobuf_FileOptions): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_FileOptions(pbs, message)
+    writegoogle_protobuf_FileOptions(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_FileOptions*(data: string): google_protobuf_FileOptions =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_FileOptions(pbs)
+    result = readgoogle_protobuf_FileOptions(ss)
 
 
 proc newgoogle_protobuf_ServiceOptions*(): google_protobuf_ServiceOptions =
@@ -3921,14 +3883,14 @@ proc sizeOfgoogle_protobuf_ServiceOptions*(message: google_protobuf_ServiceOptio
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_UninterpretedOption(value))
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_ServiceOptions*(stream: ProtobufStream, message: google_protobuf_ServiceOptions) =
+proc writegoogle_protobuf_ServiceOptions*(stream: Stream, message: google_protobuf_ServiceOptions) =
     if hasdeprecated(message):
-        writeBool(stream, message.deprecated, 33)
+        protoWriteBool(stream, message.deprecated, 33)
     for value in message.uninterpreted_option:
         writeMessage(stream, value, 999)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_ServiceOptions*(stream: ProtobufStream): google_protobuf_ServiceOptions =
+proc readgoogle_protobuf_ServiceOptions*(stream: Stream): google_protobuf_ServiceOptions =
     result = newgoogle_protobuf_ServiceOptions()
     while not atEnd(stream):
         let
@@ -3939,7 +3901,7 @@ proc readgoogle_protobuf_ServiceOptions*(stream: ProtobufStream): google_protobu
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 33:
             expectWireType(wireType, WireType.Varint)
-            setdeprecated(result, readBool(stream))
+            setdeprecated(result, protoReadBool(stream))
         of 999:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
@@ -3959,15 +3921,13 @@ proc toJson*(message: google_protobuf_ServiceOptions): JsonNode =
 proc serialize*(message: google_protobuf_ServiceOptions): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_ServiceOptions(pbs, message)
+    writegoogle_protobuf_ServiceOptions(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_ServiceOptions*(data: string): google_protobuf_ServiceOptions =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_ServiceOptions(pbs)
+    result = readgoogle_protobuf_ServiceOptions(ss)
 
 
 proc newgoogle_protobuf_MethodOptions*(): google_protobuf_MethodOptions =
@@ -4044,16 +4004,16 @@ proc sizeOfgoogle_protobuf_MethodOptions*(message: google_protobuf_MethodOptions
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_UninterpretedOption(value))
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_MethodOptions*(stream: ProtobufStream, message: google_protobuf_MethodOptions) =
+proc writegoogle_protobuf_MethodOptions*(stream: Stream, message: google_protobuf_MethodOptions) =
     if hasdeprecated(message):
-        writeBool(stream, message.deprecated, 33)
+        protoWriteBool(stream, message.deprecated, 33)
     if hasidempotency_level(message):
-        writeEnum(stream, message.idempotency_level, 34)
+        protoWriteEnum(stream, message.idempotency_level, 34)
     for value in message.uninterpreted_option:
         writeMessage(stream, value, 999)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_MethodOptions*(stream: ProtobufStream): google_protobuf_MethodOptions =
+proc readgoogle_protobuf_MethodOptions*(stream: Stream): google_protobuf_MethodOptions =
     result = newgoogle_protobuf_MethodOptions()
     while not atEnd(stream):
         let
@@ -4064,10 +4024,10 @@ proc readgoogle_protobuf_MethodOptions*(stream: ProtobufStream): google_protobuf
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 33:
             expectWireType(wireType, WireType.Varint)
-            setdeprecated(result, readBool(stream))
+            setdeprecated(result, protoReadBool(stream))
         of 34:
             expectWireType(wireType, WireType.Varint)
-            setidempotency_level(result, readEnum[google_protobuf_MethodOptions_IdempotencyLevel](stream))
+            setidempotency_level(result, protoReadEnum[google_protobuf_MethodOptions_IdempotencyLevel](stream))
         of 999:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
@@ -4089,15 +4049,13 @@ proc toJson*(message: google_protobuf_MethodOptions): JsonNode =
 proc serialize*(message: google_protobuf_MethodOptions): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_MethodOptions(pbs, message)
+    writegoogle_protobuf_MethodOptions(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_MethodOptions*(data: string): google_protobuf_MethodOptions =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_MethodOptions(pbs)
+    result = readgoogle_protobuf_MethodOptions(ss)
 
 
 proc newgoogle_protobuf_MethodDescriptorProto*(): google_protobuf_MethodDescriptorProto =
@@ -4233,22 +4191,22 @@ proc sizeOfgoogle_protobuf_MethodDescriptorProto*(message: google_protobuf_Metho
         result = result + sizeOfBool(message.server_streaming)
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_MethodDescriptorProto*(stream: ProtobufStream, message: google_protobuf_MethodDescriptorProto) =
+proc writegoogle_protobuf_MethodDescriptorProto*(stream: Stream, message: google_protobuf_MethodDescriptorProto) =
     if hasname(message):
-        writeString(stream, message.name, 1)
+        protoWriteString(stream, message.name, 1)
     if hasinput_type(message):
-        writeString(stream, message.input_type, 2)
+        protoWriteString(stream, message.input_type, 2)
     if hasoutput_type(message):
-        writeString(stream, message.output_type, 3)
+        protoWriteString(stream, message.output_type, 3)
     if hasoptions(message):
         writeMessage(stream, message.options, 4)
     if hasclient_streaming(message):
-        writeBool(stream, message.client_streaming, 5)
+        protoWriteBool(stream, message.client_streaming, 5)
     if hasserver_streaming(message):
-        writeBool(stream, message.server_streaming, 6)
+        protoWriteBool(stream, message.server_streaming, 6)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_MethodDescriptorProto*(stream: ProtobufStream): google_protobuf_MethodDescriptorProto =
+proc readgoogle_protobuf_MethodDescriptorProto*(stream: Stream): google_protobuf_MethodDescriptorProto =
     result = newgoogle_protobuf_MethodDescriptorProto()
     while not atEnd(stream):
         let
@@ -4259,23 +4217,23 @@ proc readgoogle_protobuf_MethodDescriptorProto*(stream: ProtobufStream): google_
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.LengthDelimited)
-            setname(result, readString(stream))
+            setname(result, protoReadString(stream))
         of 2:
             expectWireType(wireType, WireType.LengthDelimited)
-            setinput_type(result, readString(stream))
+            setinput_type(result, protoReadString(stream))
         of 3:
             expectWireType(wireType, WireType.LengthDelimited)
-            setoutput_type(result, readString(stream))
+            setoutput_type(result, protoReadString(stream))
         of 4:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
             setoptions(result, newgoogle_protobuf_MethodOptions(data))
         of 5:
             expectWireType(wireType, WireType.Varint)
-            setclient_streaming(result, readBool(stream))
+            setclient_streaming(result, protoReadBool(stream))
         of 6:
             expectWireType(wireType, WireType.Varint)
-            setserver_streaming(result, readBool(stream))
+            setserver_streaming(result, protoReadBool(stream))
         else: readUnknownField(stream, result, tag)
 
 proc toJson*(message: google_protobuf_MethodDescriptorProto): JsonNode =
@@ -4296,15 +4254,13 @@ proc toJson*(message: google_protobuf_MethodDescriptorProto): JsonNode =
 proc serialize*(message: google_protobuf_MethodDescriptorProto): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_MethodDescriptorProto(pbs, message)
+    writegoogle_protobuf_MethodDescriptorProto(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_MethodDescriptorProto*(data: string): google_protobuf_MethodDescriptorProto =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_MethodDescriptorProto(pbs)
+    result = readgoogle_protobuf_MethodDescriptorProto(ss)
 
 
 proc newgoogle_protobuf_ServiceDescriptorProto*(): google_protobuf_ServiceDescriptorProto =
@@ -4381,16 +4337,16 @@ proc sizeOfgoogle_protobuf_ServiceDescriptorProto*(message: google_protobuf_Serv
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_ServiceOptions(message.options))
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_ServiceDescriptorProto*(stream: ProtobufStream, message: google_protobuf_ServiceDescriptorProto) =
+proc writegoogle_protobuf_ServiceDescriptorProto*(stream: Stream, message: google_protobuf_ServiceDescriptorProto) =
     if hasname(message):
-        writeString(stream, message.name, 1)
+        protoWriteString(stream, message.name, 1)
     for value in message.fmethod:
         writeMessage(stream, value, 2)
     if hasoptions(message):
         writeMessage(stream, message.options, 3)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_ServiceDescriptorProto*(stream: ProtobufStream): google_protobuf_ServiceDescriptorProto =
+proc readgoogle_protobuf_ServiceDescriptorProto*(stream: Stream): google_protobuf_ServiceDescriptorProto =
     result = newgoogle_protobuf_ServiceDescriptorProto()
     while not atEnd(stream):
         let
@@ -4401,7 +4357,7 @@ proc readgoogle_protobuf_ServiceDescriptorProto*(stream: ProtobufStream): google
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.LengthDelimited)
-            setname(result, readString(stream))
+            setname(result, protoReadString(stream))
         of 2:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
@@ -4427,15 +4383,13 @@ proc toJson*(message: google_protobuf_ServiceDescriptorProto): JsonNode =
 proc serialize*(message: google_protobuf_ServiceDescriptorProto): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_ServiceDescriptorProto(pbs, message)
+    writegoogle_protobuf_ServiceDescriptorProto(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_ServiceDescriptorProto*(data: string): google_protobuf_ServiceDescriptorProto =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_ServiceDescriptorProto(pbs)
+    result = readgoogle_protobuf_ServiceDescriptorProto(ss)
 
 
 proc newgoogle_protobuf_FileDescriptorProto*(): google_protobuf_FileDescriptorProto =
@@ -4725,17 +4679,17 @@ proc sizeOfgoogle_protobuf_FileDescriptorProto*(message: google_protobuf_FileDes
         result = result + sizeOfString(message.syntax)
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_FileDescriptorProto*(stream: ProtobufStream, message: google_protobuf_FileDescriptorProto) =
+proc writegoogle_protobuf_FileDescriptorProto*(stream: Stream, message: google_protobuf_FileDescriptorProto) =
     if hasname(message):
-        writeString(stream, message.name, 1)
+        protoWriteString(stream, message.name, 1)
     if haspackage(message):
-        writeString(stream, message.package, 2)
+        protoWriteString(stream, message.package, 2)
     for value in message.dependency:
-        writeString(stream, value, 3)
+        protoWriteString(stream, value, 3)
     for value in message.public_dependency:
-        writeInt32(stream, value, 10)
+        protoWriteInt32(stream, value, 10)
     for value in message.weak_dependency:
-        writeInt32(stream, value, 11)
+        protoWriteInt32(stream, value, 11)
     for value in message.message_type:
         writeMessage(stream, value, 4)
     for value in message.enum_type:
@@ -4749,10 +4703,10 @@ proc writegoogle_protobuf_FileDescriptorProto*(stream: ProtobufStream, message:
     if hassource_code_info(message):
         writeMessage(stream, message.source_code_info, 9)
     if hassyntax(message):
-        writeString(stream, message.syntax, 12)
+        protoWriteString(stream, message.syntax, 12)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_FileDescriptorProto*(stream: ProtobufStream): google_protobuf_FileDescriptorProto =
+proc readgoogle_protobuf_FileDescriptorProto*(stream: Stream): google_protobuf_FileDescriptorProto =
     result = newgoogle_protobuf_FileDescriptorProto()
     while not atEnd(stream):
         let
@@ -4763,13 +4717,13 @@ proc readgoogle_protobuf_FileDescriptorProto*(stream: ProtobufStream): google_pr
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.LengthDelimited)
-            setname(result, readString(stream))
+            setname(result, protoReadString(stream))
         of 2:
             expectWireType(wireType, WireType.LengthDelimited)
-            setpackage(result, readString(stream))
+            setpackage(result, protoReadString(stream))
         of 3:
             expectWireType(wireType, WireType.LengthDelimited)
-            adddependency(result, readString(stream))
+            adddependency(result, protoReadString(stream))
         of 10:
             expectWireType(wireType, WireType.Varint, WireType.LengthDelimited)
             if wireType == WireType.LengthDelimited:
@@ -4778,12 +4732,12 @@ proc readgoogle_protobuf_FileDescriptorProto*(stream: ProtobufStream): google_pr
                     start = uint64(getPosition(stream))
                 var consumed = 0'u64
                 while consumed < size:
-                    addpublic_dependency(result, readInt32(stream))
+                    addpublic_dependency(result, protoReadInt32(stream))
                     consumed = uint64(getPosition(stream)) - start
                 if consumed != size:
                     raise newException(Exception, "packed field size mismatch")
             else:
-                addpublic_dependency(result, readInt32(stream))
+                addpublic_dependency(result, protoReadInt32(stream))
         of 11:
             expectWireType(wireType, WireType.Varint, WireType.LengthDelimited)
             if wireType == WireType.LengthDelimited:
@@ -4792,12 +4746,12 @@ proc readgoogle_protobuf_FileDescriptorProto*(stream: ProtobufStream): google_pr
                     start = uint64(getPosition(stream))
                 var consumed = 0'u64
                 while consumed < size:
-                    addweak_dependency(result, readInt32(stream))
+                    addweak_dependency(result, protoReadInt32(stream))
                     consumed = uint64(getPosition(stream)) - start
                 if consumed != size:
                     raise newException(Exception, "packed field size mismatch")
             else:
-                addweak_dependency(result, readInt32(stream))
+                addweak_dependency(result, protoReadInt32(stream))
         of 4:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
@@ -4824,7 +4778,7 @@ proc readgoogle_protobuf_FileDescriptorProto*(stream: ProtobufStream): google_pr
             setsource_code_info(result, newgoogle_protobuf_SourceCodeInfo(data))
         of 12:
             expectWireType(wireType, WireType.LengthDelimited)
-            setsyntax(result, readString(stream))
+            setsyntax(result, protoReadString(stream))
         else: readUnknownField(stream, result, tag)
 
 proc toJson*(message: google_protobuf_FileDescriptorProto): JsonNode =
@@ -4878,15 +4832,13 @@ proc toJson*(message: google_protobuf_FileDescriptorProto): JsonNode =
 proc serialize*(message: google_protobuf_FileDescriptorProto): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_FileDescriptorProto(pbs, message)
+    writegoogle_protobuf_FileDescriptorProto(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_FileDescriptorProto*(data: string): google_protobuf_FileDescriptorProto =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_FileDescriptorProto(pbs)
+    result = readgoogle_protobuf_FileDescriptorProto(ss)
 
 
 proc newgoogle_protobuf_FileDescriptorSet*(): google_protobuf_FileDescriptorSet =
@@ -4921,12 +4873,12 @@ proc sizeOfgoogle_protobuf_FileDescriptorSet*(message: google_protobuf_FileDescr
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_FileDescriptorProto(value))
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_FileDescriptorSet*(stream: ProtobufStream, message: google_protobuf_FileDescriptorSet) =
+proc writegoogle_protobuf_FileDescriptorSet*(stream: Stream, message: google_protobuf_FileDescriptorSet) =
     for value in message.file:
         writeMessage(stream, value, 1)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_FileDescriptorSet*(stream: ProtobufStream): google_protobuf_FileDescriptorSet =
+proc readgoogle_protobuf_FileDescriptorSet*(stream: Stream): google_protobuf_FileDescriptorSet =
     result = newgoogle_protobuf_FileDescriptorSet()
     while not atEnd(stream):
         let
@@ -4952,15 +4904,13 @@ proc toJson*(message: google_protobuf_FileDescriptorSet): JsonNode =
 proc serialize*(message: google_protobuf_FileDescriptorSet): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_FileDescriptorSet(pbs, message)
+    writegoogle_protobuf_FileDescriptorSet(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_FileDescriptorSet*(data: string): google_protobuf_FileDescriptorSet =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_FileDescriptorSet(pbs)
+    result = readgoogle_protobuf_FileDescriptorSet(ss)
 
 
 proc newgoogle_protobuf_GeneratedCodeInfo_Annotation*(): google_protobuf_GeneratedCodeInfo_Annotation =
@@ -5058,21 +5008,21 @@ proc sizeOfgoogle_protobuf_GeneratedCodeInfo_Annotation*(message: google_protobu
         result = result + sizeOfInt32(message.fend)
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_GeneratedCodeInfo_Annotation*(stream: ProtobufStream, message: google_protobuf_GeneratedCodeInfo_Annotation) =
+proc writegoogle_protobuf_GeneratedCodeInfo_Annotation*(stream: Stream, message: google_protobuf_GeneratedCodeInfo_Annotation) =
     if haspath(message):
         writeTag(stream, 1, WireType.LengthDelimited)
         writeVarint(stream, packedFieldSize(message.path, FieldType.Int32))
         for value in message.path:
-            writeInt32(stream, value)
+            protoWriteInt32(stream, value)
     if hassource_file(message):
-        writeString(stream, message.source_file, 2)
+        protoWriteString(stream, message.source_file, 2)
     if hasbegin(message):
-        writeInt32(stream, message.begin, 3)
+        protoWriteInt32(stream, message.begin, 3)
     if hasfend(message):
-        writeInt32(stream, message.fend, 4)
+        protoWriteInt32(stream, message.fend, 4)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_GeneratedCodeInfo_Annotation*(stream: ProtobufStream): google_protobuf_GeneratedCodeInfo_Annotation =
+proc readgoogle_protobuf_GeneratedCodeInfo_Annotation*(stream: Stream): google_protobuf_GeneratedCodeInfo_Annotation =
     result = newgoogle_protobuf_GeneratedCodeInfo_Annotation()
     while not atEnd(stream):
         let
@@ -5089,21 +5039,21 @@ proc readgoogle_protobuf_GeneratedCodeInfo_Annotation*(stream: ProtobufStream):
                     start = uint64(getPosition(stream))
                 var consumed = 0'u64
                 while consumed < size:
-                    addpath(result, readInt32(stream))
+                    addpath(result, protoReadInt32(stream))
                     consumed = uint64(getPosition(stream)) - start
                 if consumed != size:
                     raise newException(Exception, "packed field size mismatch")
             else:
-                addpath(result, readInt32(stream))
+                addpath(result, protoReadInt32(stream))
         of 2:
             expectWireType(wireType, WireType.LengthDelimited)
-            setsource_file(result, readString(stream))
+            setsource_file(result, protoReadString(stream))
         of 3:
             expectWireType(wireType, WireType.Varint)
-            setbegin(result, readInt32(stream))
+            setbegin(result, protoReadInt32(stream))
         of 4:
             expectWireType(wireType, WireType.Varint)
-            setfend(result, readInt32(stream))
+            setfend(result, protoReadInt32(stream))
         else: readUnknownField(stream, result, tag)
 
 proc toJson*(message: google_protobuf_GeneratedCodeInfo_Annotation): JsonNode =
@@ -5123,15 +5073,13 @@ proc toJson*(message: google_protobuf_GeneratedCodeInfo_Annotation): JsonNode =
 proc serialize*(message: google_protobuf_GeneratedCodeInfo_Annotation): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_GeneratedCodeInfo_Annotation(pbs, message)
+    writegoogle_protobuf_GeneratedCodeInfo_Annotation(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_GeneratedCodeInfo_Annotation*(data: string): google_protobuf_GeneratedCodeInfo_Annotation =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_GeneratedCodeInfo_Annotation(pbs)
+    result = readgoogle_protobuf_GeneratedCodeInfo_Annotation(ss)
 
 
 proc newgoogle_protobuf_GeneratedCodeInfo*(): google_protobuf_GeneratedCodeInfo =
@@ -5166,12 +5114,12 @@ proc sizeOfgoogle_protobuf_GeneratedCodeInfo*(message: google_protobuf_Generated
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_GeneratedCodeInfo_Annotation(value))
     result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_GeneratedCodeInfo*(stream: ProtobufStream, message: google_protobuf_GeneratedCodeInfo) =
+proc writegoogle_protobuf_GeneratedCodeInfo*(stream: Stream, message: google_protobuf_GeneratedCodeInfo) =
     for value in message.annotation:
         writeMessage(stream, value, 1)
     writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_GeneratedCodeInfo*(stream: ProtobufStream): google_protobuf_GeneratedCodeInfo =
+proc readgoogle_protobuf_GeneratedCodeInfo*(stream: Stream): google_protobuf_GeneratedCodeInfo =
     result = newgoogle_protobuf_GeneratedCodeInfo()
     while not atEnd(stream):
         let
@@ -5197,14 +5145,12 @@ proc toJson*(message: google_protobuf_GeneratedCodeInfo): JsonNode =
 proc serialize*(message: google_protobuf_GeneratedCodeInfo): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_GeneratedCodeInfo(pbs, message)
+    writegoogle_protobuf_GeneratedCodeInfo(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_GeneratedCodeInfo*(data: string): google_protobuf_GeneratedCodeInfo =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_GeneratedCodeInfo(pbs)
+    result = readgoogle_protobuf_GeneratedCodeInfo(ss)
 
 
diff --git a/nimpb/compiler/generator.nim b/nimpb/compiler/generator.nim
index 6fdeae1..235cec7 100644
--- a/nimpb/compiler/generator.nim
+++ b/nimpb/compiler/generator.nim
@@ -278,17 +278,19 @@ proc writeProc(field: Field): string =
     elif isMessage(field):
         result = "writeMessage"
     elif isEnum(field):
-        result = "writeEnum"
+        result = "protoWriteEnum"
     else:
-        result = &"write{field.typeName}"
+        result = &"protoWrite{field.typeName}"
 
 proc readProc(field: Field): string =
     if isMapEntry(field):
         result = &"read{field.typeName}KV"
     elif isEnum(field):
-        result = &"readEnum[{field.typeName}]"
-    else:
+        result = &"protoReadEnum[{field.typeName}]"
+    elif isMessage(field):
         result = &"read{field.typeName}"
+    else:
+        result = &"protoRead{field.typeName}"
 
 proc sizeOfProc(field: Field): string =
     if isMapEntry(field):
@@ -671,13 +673,13 @@ iterator genWriteMapKVProc(msg: Message): string =
         key = mapKeyField(msg)
         value = mapValueField(msg)
 
-    yield &"proc write{msg.names}KV(stream: ProtobufStream, key: {key.fullType}, value: {value.fullType}) ="
+    yield &"proc write{msg.names}KV(stream: Stream, key: {key.fullType}, value: {value.fullType}) ="
     yield indent(&"{key.writeProc}(stream, key, {key.number})", 4)
     yield indent(&"{value.writeProc}(stream, value, {value.number})", 4)
     yield ""
 
 iterator genWriteMessageProc(msg: Message): string =
-    yield &"proc write{msg.names}*(stream: ProtobufStream, message: {msg.names}) ="
+    yield &"proc write{msg.names}*(stream: Stream, message: {msg.names}) ="
 
     for field in msg.fields:
         if isMapEntry(field):
@@ -708,7 +710,7 @@ iterator genReadMapKVProc(msg: Message): string =
         key = mapKeyField(msg)
         value = mapValueField(msg)
 
-    yield &"proc read{msg.names}KV(stream: ProtobufStream, tbl: TableRef[{key.fullType}, {value.fullType}]) ="
+    yield &"proc read{msg.names}KV(stream: Stream, tbl: TableRef[{key.fullType}, {value.fullType}]) ="
 
     yield indent(&"var", 4)
     yield indent(&"key: {key.fullType}", 8)
@@ -728,7 +730,7 @@ iterator genReadMapKVProc(msg: Message): string =
         yield indent("let", 12)
         yield indent("size = readVarint(stream)", 16)
         yield indent("data = safeReadStr(stream, int(size))", 16)
-        yield indent("pbs = newProtobufStream(newStringStream(data))", 16)
+        yield indent("pbs = newStringStream(data)", 16)
         yield indent(&"value = {value.readProc}(pbs)", 12)
     else:
         yield indent(&"value = {value.readProc}(stream)", 12)
@@ -742,7 +744,7 @@ iterator genReadMapKVProc(msg: Message): string =
     yield ""
 
 iterator genReadMessageProc(msg: Message): string =
-    yield &"proc read{msg.names}*(stream: ProtobufStream): {msg.names} ="
+    yield &"proc read{msg.names}*(stream: Stream): {msg.names} ="
     yield indent(&"result = new{msg.names}()", 4)
     yield indent("while not atEnd(stream):", 4)
     yield indent("let", 8)
@@ -765,7 +767,7 @@ iterator genReadMessageProc(msg: Message): string =
                 yield indent("let", 12)
                 yield indent("size = readVarint(stream)", 16)
                 yield indent("data = safeReadStr(stream, int(size))", 16)
-                yield indent("pbs = newProtobufStream(newStringStream(data))", 16)
+                yield indent("pbs = newStringStream(data)", 16)
                 yield indent(&"{field.readProc}(pbs, result.{field.name})", 12)
             elif isNumeric(field):
                 yield indent(&"expectWireType(wireType, {field.wiretypeStr}, WireType.LengthDelimited)", 12)
@@ -921,8 +923,8 @@ iterator genMessageProcForwards(msg: Message): string =
     if not isMapEntry(msg):
         yield &"proc new{msg.names}*(): {msg.names}"
         yield &"proc new{msg.names}*(data: string): {msg.names}"
-        yield &"proc write{msg.names}*(stream: ProtobufStream, message: {msg.names})"
-        yield &"proc read{msg.names}*(stream: ProtobufStream): {msg.names}"
+        yield &"proc write{msg.names}*(stream: Stream, message: {msg.names})"
+        yield &"proc read{msg.names}*(stream: Stream): {msg.names}"
         yield &"proc sizeOf{msg.names}*(message: {msg.names}): uint64"
         if shouldGenerateJsonProcs($msg.names):
             yield &"proc toJson*(message: {msg.names}): JsonNode"
@@ -931,8 +933,8 @@ iterator genMessageProcForwards(msg: Message): string =
             key = mapKeyField(msg)
             value = mapValueField(msg)
 
-        yield &"proc write{msg.names}KV(stream: ProtobufStream, key: {key.fullType}, value: {value.fullType})"
-        yield &"proc read{msg.names}KV(stream: ProtobufStream, tbl: TableRef[{key.fullType}, {value.fullType}])"
+        yield &"proc write{msg.names}KV(stream: Stream, key: {key.fullType}, value: {value.fullType})"
+        yield &"proc read{msg.names}KV(stream: Stream, tbl: TableRef[{key.fullType}, {value.fullType}])"
         yield &"proc sizeOf{msg.names}KV(key: {key.fullType}, value: {value.fullType}): uint64"
 
 iterator genProcs(msg: Message): string =
@@ -963,16 +965,14 @@ iterator genProcs(msg: Message): string =
         yield &"proc serialize*(message: {msg.names}): string ="
         yield indent("let", 4)
         yield indent("ss = newStringStream()", 8)
-        yield indent("pbs = newProtobufStream(ss)", 8)
-        yield indent(&"write{msg.names}(pbs, message)", 4)
+        yield indent(&"write{msg.names}(ss, message)", 4)
         yield indent("result = ss.data", 4)
         yield ""
 
         yield &"proc new{msg.names}*(data: string): {msg.names} ="
         yield indent("let", 4)
         yield indent("ss = newStringStream(data)", 8)
-        yield indent("pbs = newProtobufStream(ss)", 8)
-        yield indent(&"result = read{msg.names}(pbs)", 4)
+        yield indent(&"result = read{msg.names}(ss)", 4)
         yield ""
 
 proc processFile(fdesc: google_protobuf_FileDescriptorProto,
@@ -1054,7 +1054,7 @@ proc processFileDescriptorSet*(filename: string,
                                outdir: string,
                                protos: openArray[string],
                                serviceGenerator: ServiceGenerator) =
-    let s = newProtobufStream(newFileStream(filename, fmRead))
+    let s = newFileStream(filename, fmRead)
 
     let fileSet = readgoogle_protobuf_FileDescriptorSet(s)
 
diff --git a/nimpb/nimpb.nim b/nimpb/nimpb.nim
index 2d0289c..156b3fd 100644
--- a/nimpb/nimpb.nim
+++ b/nimpb/nimpb.nim
@@ -12,11 +12,6 @@ const
     WireTypeMask = (1 shl WireTypeBits) - 1
 
 type
-    ProtobufStreamObj* = object of StreamObj
-        stream: Stream
-
-    ProtobufStream* = ref ProtobufStreamObj
-
     Tag* = distinct uint32
 
     ParseError* = object of Exception
@@ -106,54 +101,46 @@ proc isNumeric*(wiretype: WireType): bool =
 proc isNumeric*(ft: FieldType): bool =
     result = isNumeric(wiretype(ft))
 
-proc pbClose(s: Stream) =
-    close(ProtobufStream(s).stream)
-    ProtobufStream(s).stream = nil
-
-proc pbAtEnd(s: Stream): bool =
-    result = atEnd(ProtobufStream(s).stream)
-
-proc pbSetPosition(s: Stream, pos: int) =
-    setPosition(ProtobufStream(s).stream, pos)
-
-proc pbGetPosition(s: Stream): int =
-    result = getPosition(ProtobufStream(s).stream)
-
-proc pbReadData(s: Stream, buffer: pointer, bufLen: int): int =
-    result = readData(ProtobufStream(s).stream, buffer, bufLen)
+proc zigzagEncode*(n: int32): uint32 =
+    let x = cast[uint32](n)
+    let a = cast[int32](x shl 1)
+    let b = -cast[int32](x shr 31)
+    result = uint32(a xor b)
 
-proc pbPeekData(s: Stream, buffer: pointer, bufLen: int): int =
-    result = peekData(ProtobufStream(s).stream, buffer, bufLen)
+proc zigzagDecode*(n: uint32): int32 =
+    let a = int32(n shr 1)
+    let b = -int32(n and 1)
+    result = a xor b
 
-proc pbWriteData(s: Stream, buffer: pointer, bufLen: int) =
-    writeData(ProtobufStream(s).stream, buffer, bufLen)
+proc zigzagEncode*(n: int64): uint64 =
+    let x = cast[uint64](n)
+    let a = cast[int64](x shl 1)
+    let b = -cast[int64](x shr 63)
+    result = uint64(a xor b)
 
-proc pbFlush(s: Stream) =
-    flush(ProtobufStream(s).stream)
+proc zigzagDecode*(n: uint64): int64 =
+    let a = int64(n shr 1)
+    let b = -int64(n and 1)
+    result = a xor b
 
-proc newProtobufStream*(stream: Stream): ProtobufStream =
-    new(result)
+template makeTag*(fieldNumber: int, wireType: WireType): Tag =
+    ((fieldNumber shl 3).uint32 or wireType.uint32).Tag
 
-    result.closeImpl = pbClose
-    result.atEndImpl = pbAtEnd
-    result.setPositionImpl = pbSetPosition
-    result.getPositionImpl = pbGetPosition
-    result.readDataImpl = pbReadData
-    result.peekDataImpl = pbPeekData
-    result.writeDataImpl = pbWriteData
-    result.flushImpl = pbFlush
+template wireType*(tag: Tag): WireType =
+    (tag.uint32 and WireTypeMask).WireType
 
-    result.stream = stream
+template fieldNumber*(tag: Tag): int =
+    (tag.uint32 shr 3).int
 
-proc readByte(stream: ProtobufStream): byte =
+proc protoReadByte(stream: Stream): byte =
     result = readInt8(stream).byte
 
-proc writeByte(stream: ProtobufStream, b: byte) =
+proc protoWriteByte(stream: Stream, b: byte) =
     var x: byte
     shallowCopy(x, b)
     writeData(stream, addr(x), sizeof(x))
 
-proc readVarint*(stream: ProtobufStream): uint64 =
+proc readVarint*(stream: Stream): uint64 =
     var
         count = 0
 
@@ -163,7 +150,7 @@ proc readVarint*(stream: ProtobufStream): uint64 =
         if count == MaximumVarintBytes:
             raise newException(Exception, "invalid varint (<= 10 bytes)")
 
-        let b = readByte(stream)
+        let b = protoReadByte(stream)
 
         result = result or ((b.uint64 and 0x7f) shl (7 * count))
 
@@ -172,124 +159,93 @@ proc readVarint*(stream: ProtobufStream): uint64 =
         if (b and 0x80) == 0:
             break
 
-proc writeVarint*(stream: ProtobufStream, n: uint64) =
+proc writeVarint*(stream: Stream, n: uint64) =
     var value = n
     while value >= 0x80'u64:
-        writeByte(stream, (value or 0x80).byte)
+        protoWriteByte(stream, (value or 0x80).byte)
         value = value shr 7
-    writeByte(stream, value.byte)
-
-proc zigzagEncode*(n: int32): uint32 =
-    let x = cast[uint32](n)
-    let a = cast[int32](x shl 1)
-    let b = -cast[int32](x shr 31)
-    result = uint32(a xor b)
-
-proc zigzagDecode*(n: uint32): int32 =
-    let a = int32(n shr 1)
-    let b = -int32(n and 1)
-    result = a xor b
-
-proc zigzagEncode*(n: int64): uint64 =
-    let x = cast[uint64](n)
-    let a = cast[int64](x shl 1)
-    let b = -cast[int64](x shr 63)
-    result = uint64(a xor b)
-
-proc zigzagDecode*(n: uint64): int64 =
-    let a = int64(n shr 1)
-    let b = -int64(n and 1)
-    result = a xor b
-
-template makeTag*(fieldNumber: int, wireType: WireType): Tag =
-    ((fieldNumber shl 3).uint32 or wireType.uint32).Tag
-
-template wireType*(tag: Tag): WireType =
-    (tag.uint32 and WireTypeMask).WireType
-
-template fieldNumber*(tag: Tag): int =
-    (tag.uint32 shr 3).int
+    protoWriteByte(stream, value.byte)
 
-proc writeTag*(stream: ProtobufStream, tag: Tag) =
+proc writeTag*(stream: Stream, tag: Tag) =
     writeVarint(stream, tag.uint32)
 
-proc writeTag*(stream: ProtobufStream, fieldNumber: int, wireType: WireType) =
+proc writeTag*(stream: Stream, fieldNumber: int, wireType: WireType) =
     writeTag(stream, makeTag(fieldNumber, wireType))
 
-proc readTag*(stream: ProtobufStream): Tag =
+proc readTag*(stream: Stream): Tag =
     result = readVarint(stream).Tag
 
-proc writeInt32*(stream: ProtobufStream, n: int32) =
+proc protoWriteInt32*(stream: Stream, n: int32) =
     writeVarint(stream, n.uint64)
 
-proc writeInt32*(stream: ProtobufStream, n: int32, fieldNumber: int) =
+proc protoWriteInt32*(stream: Stream, n: int32, fieldNumber: int) =
     writeTag(stream, fieldNumber, WireType.Varint)
-    writeInt32(stream, n)
+    protoWriteInt32(stream, n)
 
-proc readInt32*(stream: ProtobufStream): int32 =
+proc protoReadInt32*(stream: Stream): int32 =
     result = readVarint(stream).int32
 
-proc writeSInt32*(stream: ProtobufStream, n: int32) =
+proc protoWriteSInt32*(stream: Stream, n: int32) =
     writeVarint(stream, zigzagEncode(n))
 
-proc writeSInt32*(stream: ProtobufStream, n: int32, fieldNumber: int) =
+proc protoWriteSInt32*(stream: Stream, n: int32, fieldNumber: int) =
     writeTag(stream, fieldNumber, WireType.Varint)
     writeVarint(stream, zigzagEncode(n))
 
-proc readSInt32*(stream: ProtobufStream): int32 =
+proc protoReadSInt32*(stream: Stream): int32 =
     result = zigzagDecode(readVarint(stream).uint32)
 
-proc writeUInt32*(stream: ProtobufStream, n: uint32) =
+proc protoWriteUInt32*(stream: Stream, n: uint32) =
     writeVarint(stream, n)
 
-proc writeUInt32*(stream: ProtobufStream, n: uint32, fieldNumber: int) =
+proc protoWriteUInt32*(stream: Stream, n: uint32, fieldNumber: int) =
     writeTag(stream, fieldNumber, WireType.Varint)
     writeVarint(stream, n)
 
-proc readUInt32*(stream: ProtobufStream): uint32 =
+proc protoReadUInt32*(stream: Stream): uint32 =
     result = readVarint(stream).uint32
 
-proc writeInt64*(stream: ProtobufStream, n: int64) =
+proc protoWriteInt64*(stream: Stream, n: int64) =
     writeVarint(stream, n.uint64)
 
-proc writeInt64*(stream: ProtobufStream, n: int64, fieldNumber: int) =
+proc protoWriteInt64*(stream: Stream, n: int64, fieldNumber: int) =
     writeTag(stream, fieldNumber, WireType.Varint)
     writeVarint(stream, n.uint64)
 
-proc readInt64*(stream: ProtobufStream): int64 =
+proc protoReadInt64*(stream: Stream): int64 =
     result = readVarint(stream).int64
 
-proc writeSInt64*(stream: ProtobufStream, n: int64) =
+proc protoWriteSInt64*(stream: Stream, n: int64) =
     writeVarint(stream, zigzagEncode(n))
 
-proc writeSInt64*(stream: ProtobufStream, n: int64, fieldNumber: int) =
+proc protoWriteSInt64*(stream: Stream, n: int64, fieldNumber: int) =
     writeTag(stream, fieldNumber, WireType.Varint)
     writeVarint(stream, zigzagEncode(n))
 
-proc readSInt64*(stream: ProtobufStream): int64 =
+proc protoReadSInt64*(stream: Stream): int64 =
     result = zigzagDecode(readVarint(stream))
 
-proc writeUInt64*(stream: ProtobufStream, n: uint64) =
+proc protoWriteUInt64*(stream: Stream, n: uint64) =
     writeVarint(stream, n)
 
-proc writeUInt64*(stream: ProtobufStream, n: uint64, fieldNumber: int) =
+proc protoWriteUInt64*(stream: Stream, n: uint64, fieldNumber: int) =
     writeTag(stream, fieldNumber, WireType.Varint)
     writeVarint(stream, n)
 
-proc readUInt64*(stream: ProtobufStream): uint64 =
+proc protoReadUInt64*(stream: Stream): uint64 =
     result = readVarint(stream)
 
-proc writeBool*(stream: ProtobufStream, value: bool) =
+proc protoWriteBool*(stream: Stream, value: bool) =
     writeVarint(stream, value.uint32)
 
-proc writeBool*(stream: ProtobufStream, n: bool, fieldNumber: int) =
+proc protoWriteBool*(stream: Stream, n: bool, fieldNumber: int) =
     writeTag(stream, fieldNumber, WireType.Varint)
     writeVarint(stream, n.uint32)
 
-proc readBool*(stream: ProtobufStream): bool =
+proc protoReadBool*(stream: Stream): bool =
     result = readVarint(stream).bool
 
-proc writeFixed64*(stream: ProtobufStream, value: uint64) =
+proc protoWriteFixed64*(stream: Stream, value: uint64) =
     var
         input = value
         output: uint64
@@ -298,27 +254,27 @@ proc writeFixed64*(stream: ProtobufStream, value: uint64) =
 
     write(stream, output)
 
-proc writeFixed64*(stream: ProtobufStream, n: uint64, fieldNumber: int) =
+proc protoWriteFixed64*(stream: Stream, n: uint64, fieldNumber: int) =
     writeTag(stream, fieldNumber, WireType.Fixed64)
-    writeFixed64(stream, n)
+    protoWriteFixed64(stream, n)
 
-proc readFixed64*(stream: ProtobufStream): uint64 =
+proc protoReadFixed64*(stream: Stream): uint64 =
     var tmp: uint64
     if readData(stream, addr(tmp), sizeof(tmp)) != sizeof(tmp):
         raise newException(IOError, "cannot read from stream")
     littleEndian64(addr(result), addr(tmp))
 
-proc writeSFixed64*(stream: ProtobufStream, value: int64) =
-    writeFixed64(stream, cast[uint64](value))
+proc protoWriteSFixed64*(stream: Stream, value: int64) =
+    protoWriteFixed64(stream, cast[uint64](value))
 
-proc writeSFixed64*(stream: ProtobufStream, value: int64, fieldNumber: int) =
+proc protoWriteSFixed64*(stream: Stream, value: int64, fieldNumber: int) =
     writeTag(stream, fieldNumber, WireType.Fixed64)
-    writeSFixed64(stream, value)
+    protoWriteSFixed64(stream, value)
 
-proc readSFixed64*(stream: ProtobufStream): int64 =
-    result = cast[int64](readFixed64(stream))
+proc protoReadSFixed64*(stream: Stream): int64 =
+    result = cast[int64](protoReadFixed64(stream))
 
-proc writeDouble*(stream: ProtobufStream, value: float64) =
+proc protoWriteDouble*(stream: Stream, value: float64) =
     var
         input = value
         output: float64
@@ -327,17 +283,17 @@ proc writeDouble*(stream: ProtobufStream, value: float64) =
 
     write(stream, output)
 
-proc writeDouble*(stream: ProtobufStream, value: float64, fieldNumber: int) =
+proc protoWriteDouble*(stream: Stream, value: float64, fieldNumber: int) =
     writeTag(stream, fieldNumber, WireType.Fixed64)
-    writeDouble(stream, value)
+    protoWriteDouble(stream, value)
 
-proc readDouble*(stream: ProtobufStream): float64 =
+proc protoReadDouble*(stream: Stream): float64 =
     var tmp: uint64
     if readData(stream, addr(tmp), sizeof(tmp)) != sizeof(tmp):
         raise newException(IOError, "cannot read from stream")
     littleEndian64(addr(result), addr(tmp))
 
-proc writeFixed32*(stream: ProtobufStream, value: uint32) =
+proc protoWriteFixed32*(stream: Stream, value: uint32) =
     var
         input = value
         output: uint32
@@ -346,27 +302,27 @@ proc writeFixed32*(stream: ProtobufStream, value: uint32) =
 
     write(stream, output)
 
-proc writeFixed32*(stream: ProtobufStream, value: uint32, fieldNumber: int) =
+proc protoWriteFixed32*(stream: Stream, value: uint32, fieldNumber: int) =
     writeTag(stream, fieldNumber, WireType.Fixed32)
-    writeFixed32(stream, value)
+    protoWriteFixed32(stream, value)
 
-proc readFixed32*(stream: ProtobufStream): uint32 =
+proc protoReadFixed32*(stream: Stream): uint32 =
     var tmp: uint32
     if readData(stream, addr(tmp), sizeof(tmp)) != sizeof(tmp):
         raise newException(IOError, "cannot read from stream")
     littleEndian32(addr(result), addr(tmp))
 
-proc writeSFixed32*(stream: ProtobufStream, value: int32) =
-    writeFixed32(stream, cast[uint32](value))
+proc protoWriteSFixed32*(stream: Stream, value: int32) =
+    protoWriteFixed32(stream, cast[uint32](value))
 
-proc writeSFixed32*(stream: ProtobufStream, value: int32, fieldNumber: int) =
+proc protoWriteSFixed32*(stream: Stream, value: int32, fieldNumber: int) =
     writeTag(stream, fieldNumber, WireType.Fixed32)
-    writeSFixed32(stream, value)
+    protoWriteSFixed32(stream, value)
 
-proc readSFixed32*(stream: ProtobufStream): int32 =
-    result = cast[int32](readFixed32(stream))
+proc protoReadSFixed32*(stream: Stream): int32 =
+    result = cast[int32](protoReadFixed32(stream))
 
-proc writeFloat*(stream: ProtobufStream, value: float32) =
+proc protoWriteFloat*(stream: Stream, value: float32) =
     var
         input = value
         output: float32
@@ -375,51 +331,51 @@ proc writeFloat*(stream: ProtobufStream, value: float32) =
 
     write(stream, output)
 
-proc writeFloat*(stream: ProtobufStream, value: float32, fieldNumber: int) =
+proc protoWriteFloat*(stream: Stream, value: float32, fieldNumber: int) =
     writeTag(stream, fieldNumber, WireType.Fixed32)
-    writeFloat(stream, value)
+    protoWriteFloat(stream, value)
 
-proc readFloat*(stream: ProtobufStream): float32 =
+proc protoReadFloat*(stream: Stream): float32 =
     var tmp: float32
     if readData(stream, addr(tmp), sizeof(tmp)) != sizeof(tmp):
         raise newException(IOError, "cannot read from stream")
     littleEndian32(addr(result), addr(tmp))
 
-proc writeString*(stream: ProtobufStream, s: string) =
-    writeUInt64(stream, len(s).uint64)
+proc protoWriteString*(stream: Stream, s: string) =
+    protoWriteUInt64(stream, len(s).uint64)
     write(stream, s)
 
-proc writeString*(stream: ProtobufStream, s: string, fieldNumber: int) =
+proc protoWriteString*(stream: Stream, s: string, fieldNumber: int) =
     writeTag(stream, fieldNumber, WireType.LengthDelimited)
-    writeString(stream, s)
+    protoWriteString(stream, s)
 
-proc writeBytes*(stream: ProtobufStream, s: bytes) =
-    writeString(stream, string(s))
+proc protoWriteBytes*(stream: Stream, s: bytes) =
+    protoWriteString(stream, string(s))
 
-proc writeBytes*(stream: ProtobufStream, s: bytes, fieldNumber: int) =
-    writeString(stream, string(s), fieldNumber)
+proc protoWriteBytes*(stream: Stream, s: bytes, fieldNumber: int) =
+    protoWriteString(stream, string(s), fieldNumber)
 
 proc safeReadStr*(stream: Stream, size: int): string =
     result = newString(size)
     if readData(stream, addr(result[0]), size) != size:
         raise newException(IOError, "cannot read from stream")
 
-proc readString*(stream: ProtobufStream): string =
-    let size = int(readUInt64(stream))
+proc protoReadString*(stream: Stream): string =
+    let size = int(protoReadUInt64(stream))
     result = safeReadStr(stream, size)
 
-proc readBytes*(stream: ProtobufStream): bytes =
-    bytes(readString(stream))
+proc protoReadBytes*(stream: Stream): bytes =
+    bytes(protoReadString(stream))
 
-proc readEnum*[T](stream: ProtobufStream): T =
-    result = T(readUInt32(stream))
+proc protoReadEnum*[T](stream: Stream): T =
+    result = T(protoReadUInt32(stream))
 
-proc writeEnum*[T](stream: ProtobufStream, value: T) =
-    writeUInt32(stream, uint32(value))
+proc protoWriteEnum*[T](stream: Stream, value: T) =
+    protoWriteUInt32(stream, uint32(value))
 
-proc writeEnum*[T](stream: ProtobufStream, value: T, fieldNumber: int) =
+proc protoWriteEnum*[T](stream: Stream, value: T, fieldNumber: int) =
     writeTag(stream, fieldNumber, WireType.Varint)
-    writeUInt32(stream, uint32(value))
+    protoWriteUInt32(stream, uint32(value))
 
 proc sizeOfVarint[T](value: T): uint64 =
     var tmp = uint64(value)
@@ -501,14 +457,14 @@ proc sizeOfLengthDelimited*(size: uint64): uint64 =
 proc sizeOfTag*(fieldNumber: int, wiretype: WireType): uint64 =
     result = sizeOfUInt32(uint32(makeTag(fieldNumber, wiretype)))
 
-proc skipField*(stream: ProtobufStream, wiretype: WireType) =
+proc skipField*(stream: Stream, wiretype: WireType) =
     case wiretype
     of WireType.Varint:
         discard readVarint(stream)
     of WireType.Fixed64:
-        discard readFixed64(stream)
+        discard protoReadFixed64(stream)
     of WireType.Fixed32:
-        discard readFixed32(stream)
+        discard protoReadFixed32(stream)
     of WireType.LengthDelimited:
         let size = readVarint(stream)
         discard safeReadStr(stream, int(size))
@@ -523,7 +479,7 @@ proc expectWireType*(actual: WireType, expected: varargs[WireType]) =
         join(expected, ", ")
     raise newException(UnexpectedWireTypeError, message)
 
-macro writeMessage*(stream: ProtobufStream, message: typed, fieldNumber: int): typed =
+macro writeMessage*(stream: Stream, message: typed, fieldNumber: int): typed =
     ## Write a message to a stream with tag and length.
     let t = getTypeInst(message)
     result = newStmtList(
@@ -550,11 +506,11 @@ proc excl*(s: var IntSet, values: openArray[int]) =
     for value in values:
         excl(s, value)
 
-proc readLengthDelimited*(stream: ProtobufStream): string =
+proc readLengthDelimited*(stream: Stream): string =
     let size = int(readVarint(stream))
     result = safeReadStr(stream, size)
 
-proc readUnknownField*(stream: ProtobufStream, tag: Tag,
+proc readUnknownField*(stream: Stream, tag: Tag,
                        fields: var seq[UnknownField]) =
     var field: UnknownField
 
@@ -566,9 +522,9 @@ proc readUnknownField*(stream: ProtobufStream, tag: Tag,
     of WireType.Varint:
         field.vint = readVarint(stream)
     of WireType.Fixed64:
-        field.fixed64 = readFixed64(stream)
+        field.fixed64 = protoReadFixed64(stream)
     of WireType.Fixed32:
-        field.fixed32 = readFixed32(stream)
+        field.fixed32 = protoReadFixed32(stream)
     of WireType.LengthDelimited:
         let size = readVarint(stream)
         field.data = safeReadStr(stream, int(size))
@@ -577,25 +533,25 @@ proc readUnknownField*(stream: ProtobufStream, tag: Tag,
 
     add(fields, field)
 
-proc readUnknownField*(stream: ProtobufStream, message: Message, tag: Tag) =
+proc readUnknownField*(stream: Stream, message: Message, tag: Tag) =
     readUnknownField(stream, tag, message.unknownFields)
 
-proc writeUnknownFields*(stream: ProtobufStream, fields: seq[UnknownField]) =
+proc writeUnknownFields*(stream: Stream, fields: seq[UnknownField]) =
     for field in fields:
         case field.wiretype
         of WireType.Varint:
             writeTag(stream, field.fieldNumber, field.wireType)
             writeVarint(stream, field.vint)
         of WireType.Fixed64:
-            writeFixed64(stream, field.fixed64, field.fieldNumber)
+            protoWriteFixed64(stream, field.fixed64, field.fieldNumber)
         of WireType.Fixed32:
-            writeFixed32(stream, field.fixed32, field.fieldNumber)
+            protoWriteFixed32(stream, field.fixed32, field.fieldNumber)
         of WireType.LengthDelimited:
-            writeString(stream, field.data, field.fieldNumber)
+            protoWriteString(stream, field.data, field.fieldNumber)
         else:
             raise newException(Exception, "unsupported wiretype: " & $field.wiretype)
 
-proc writeUnknownFields*(stream: ProtobufStream, message: Message) =
+proc writeUnknownFields*(stream: Stream, message: Message) =
     writeUnknownFields(stream, message.unknownFields)
 
 proc discardUnknownFields*[T](message: T) =
diff --git a/nimpb/wkt/any_pb.nim b/nimpb/wkt/any_pb.nim
index f7613e0..107ba2f 100644
--- a/nimpb/wkt/any_pb.nim
+++ b/nimpb/wkt/any_pb.nim
@@ -5,38 +5,36 @@ import intsets
 import json
 
 import nimpb/nimpb
+import nimpb/json as nimpb_json
 
 type
     google_protobuf_Any* = ref google_protobuf_AnyObj
-    google_protobuf_AnyObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_AnyObj* = object of Message
         type_url: string
         value: bytes
 
 proc newgoogle_protobuf_Any*(): google_protobuf_Any
 proc newgoogle_protobuf_Any*(data: string): google_protobuf_Any
-proc writegoogle_protobuf_Any*(stream: ProtobufStream, message: google_protobuf_Any)
-proc readgoogle_protobuf_Any*(stream: ProtobufStream): google_protobuf_Any
+proc writegoogle_protobuf_Any*(stream: Stream, message: google_protobuf_Any)
+proc readgoogle_protobuf_Any*(stream: Stream): google_protobuf_Any
 proc sizeOfgoogle_protobuf_Any*(message: google_protobuf_Any): uint64
 
 proc newgoogle_protobuf_Any*(): google_protobuf_Any =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.type_url = ""
     result.value = bytes("")
 
 proc cleartype_url*(message: google_protobuf_Any) =
     message.type_url = ""
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc hastype_url*(message: google_protobuf_Any): bool =
-    result = contains(message.hasField, 1)
+    result = hasField(message, 1)
 
 proc settype_url*(message: google_protobuf_Any, value: string) =
     message.type_url = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc type_url*(message: google_protobuf_Any): string {.inline.} =
     message.type_url
@@ -46,14 +44,14 @@ proc `type_url=`*(message: google_protobuf_Any, value: string) {.inline.} =
 
 proc clearvalue*(message: google_protobuf_Any) =
     message.value = bytes("")
-    excl(message.hasField, [2])
+    clearFields(message, [2])
 
 proc hasvalue*(message: google_protobuf_Any): bool =
-    result = contains(message.hasField, 2)
+    result = hasField(message, 2)
 
 proc setvalue*(message: google_protobuf_Any, value: bytes) =
     message.value = value
-    incl(message.hasField, 2)
+    setField(message, 2)
 
 proc value*(message: google_protobuf_Any): bytes {.inline.} =
     message.value
@@ -68,17 +66,16 @@ proc sizeOfgoogle_protobuf_Any*(message: google_protobuf_Any): uint64 =
     if hasvalue(message):
         result = result + sizeOfTag(2, WireType.LengthDelimited)
         result = result + sizeOfBytes(message.value)
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_Any*(stream: ProtobufStream, message: google_protobuf_Any) =
+proc writegoogle_protobuf_Any*(stream: Stream, message: google_protobuf_Any) =
     if hastype_url(message):
-        writeString(stream, message.type_url, 1)
+        protoWriteString(stream, message.type_url, 1)
     if hasvalue(message):
-        writeBytes(stream, message.value, 2)
-    writeUnknownFields(stream, message.unknownFields)
+        protoWriteBytes(stream, message.value, 2)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_Any*(stream: ProtobufStream): google_protobuf_Any =
+proc readgoogle_protobuf_Any*(stream: Stream): google_protobuf_Any =
     result = newgoogle_protobuf_Any()
     while not atEnd(stream):
         let
@@ -89,23 +86,21 @@ proc readgoogle_protobuf_Any*(stream: ProtobufStream): google_protobuf_Any =
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.LengthDelimited)
-            settype_url(result, readString(stream))
+            settype_url(result, protoReadString(stream))
         of 2:
             expectWireType(wireType, WireType.LengthDelimited)
-            setvalue(result, readBytes(stream))
-        else: readUnknownField(stream, tag, result.unknownFields)
+            setvalue(result, protoReadBytes(stream))
+        else: readUnknownField(stream, result, tag)
 
 proc serialize*(message: google_protobuf_Any): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_Any(pbs, message)
+    writegoogle_protobuf_Any(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_Any*(data: string): google_protobuf_Any =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_Any(pbs)
+    result = readgoogle_protobuf_Any(ss)
 
 
diff --git a/nimpb/wkt/api_pb.nim b/nimpb/wkt/api_pb.nim
index 28f5b2b..b639021 100644
--- a/nimpb/wkt/api_pb.nim
+++ b/nimpb/wkt/api_pb.nim
@@ -12,9 +12,7 @@ import nimpb/wkt/type_pb
 
 type
     google_protobuf_Api* = ref google_protobuf_ApiObj
-    google_protobuf_ApiObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_ApiObj* = object of Message
         name: string
         methods: seq[google_protobuf_Method]
         options: seq[google_protobuf_Option]
@@ -23,9 +21,7 @@ type
         mixins: seq[google_protobuf_Mixin]
         syntax: google_protobuf_Syntax
     google_protobuf_Method* = ref google_protobuf_MethodObj
-    google_protobuf_MethodObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_MethodObj* = object of Message
         name: string
         request_type_url: string
         request_streaming: bool
@@ -34,37 +30,34 @@ type
         options: seq[google_protobuf_Option]
         syntax: google_protobuf_Syntax
     google_protobuf_Mixin* = ref google_protobuf_MixinObj
-    google_protobuf_MixinObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_MixinObj* = object of Message
         name: string
         root: string
 
 proc newgoogle_protobuf_Method*(): google_protobuf_Method
 proc newgoogle_protobuf_Method*(data: string): google_protobuf_Method
-proc writegoogle_protobuf_Method*(stream: ProtobufStream, message: google_protobuf_Method)
-proc readgoogle_protobuf_Method*(stream: ProtobufStream): google_protobuf_Method
+proc writegoogle_protobuf_Method*(stream: Stream, message: google_protobuf_Method)
+proc readgoogle_protobuf_Method*(stream: Stream): google_protobuf_Method
 proc sizeOfgoogle_protobuf_Method*(message: google_protobuf_Method): uint64
 proc toJson*(message: google_protobuf_Method): JsonNode
 
 proc newgoogle_protobuf_Mixin*(): google_protobuf_Mixin
 proc newgoogle_protobuf_Mixin*(data: string): google_protobuf_Mixin
-proc writegoogle_protobuf_Mixin*(stream: ProtobufStream, message: google_protobuf_Mixin)
-proc readgoogle_protobuf_Mixin*(stream: ProtobufStream): google_protobuf_Mixin
+proc writegoogle_protobuf_Mixin*(stream: Stream, message: google_protobuf_Mixin)
+proc readgoogle_protobuf_Mixin*(stream: Stream): google_protobuf_Mixin
 proc sizeOfgoogle_protobuf_Mixin*(message: google_protobuf_Mixin): uint64
 proc toJson*(message: google_protobuf_Mixin): JsonNode
 
 proc newgoogle_protobuf_Api*(): google_protobuf_Api
 proc newgoogle_protobuf_Api*(data: string): google_protobuf_Api
-proc writegoogle_protobuf_Api*(stream: ProtobufStream, message: google_protobuf_Api)
-proc readgoogle_protobuf_Api*(stream: ProtobufStream): google_protobuf_Api
+proc writegoogle_protobuf_Api*(stream: Stream, message: google_protobuf_Api)
+proc readgoogle_protobuf_Api*(stream: Stream): google_protobuf_Api
 proc sizeOfgoogle_protobuf_Api*(message: google_protobuf_Api): uint64
 proc toJson*(message: google_protobuf_Api): JsonNode
 
 proc newgoogle_protobuf_Method*(): google_protobuf_Method =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.name = ""
     result.request_type_url = ""
     result.request_streaming = false
@@ -75,14 +68,14 @@ proc newgoogle_protobuf_Method*(): google_protobuf_Method =
 
 proc clearname*(message: google_protobuf_Method) =
     message.name = ""
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc hasname*(message: google_protobuf_Method): bool =
-    result = contains(message.hasField, 1)
+    result = hasField(message, 1)
 
 proc setname*(message: google_protobuf_Method, value: string) =
     message.name = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc name*(message: google_protobuf_Method): string {.inline.} =
     message.name
@@ -92,14 +85,14 @@ proc `name=`*(message: google_protobuf_Method, value: string) {.inline.} =
 
 proc clearrequest_type_url*(message: google_protobuf_Method) =
     message.request_type_url = ""
-    excl(message.hasField, [2])
+    clearFields(message, [2])
 
 proc hasrequest_type_url*(message: google_protobuf_Method): bool =
-    result = contains(message.hasField, 2)
+    result = hasField(message, 2)
 
 proc setrequest_type_url*(message: google_protobuf_Method, value: string) =
     message.request_type_url = value
-    incl(message.hasField, 2)
+    setField(message, 2)
 
 proc request_type_url*(message: google_protobuf_Method): string {.inline.} =
     message.request_type_url
@@ -109,14 +102,14 @@ proc `request_type_url=`*(message: google_protobuf_Method, value: string) {.inli
 
 proc clearrequest_streaming*(message: google_protobuf_Method) =
     message.request_streaming = false
-    excl(message.hasField, [3])
+    clearFields(message, [3])
 
 proc hasrequest_streaming*(message: google_protobuf_Method): bool =
-    result = contains(message.hasField, 3)
+    result = hasField(message, 3)
 
 proc setrequest_streaming*(message: google_protobuf_Method, value: bool) =
     message.request_streaming = value
-    incl(message.hasField, 3)
+    setField(message, 3)
 
 proc request_streaming*(message: google_protobuf_Method): bool {.inline.} =
     message.request_streaming
@@ -126,14 +119,14 @@ proc `request_streaming=`*(message: google_protobuf_Method, value: bool) {.inlin
 
 proc clearresponse_type_url*(message: google_protobuf_Method) =
     message.response_type_url = ""
-    excl(message.hasField, [4])
+    clearFields(message, [4])
 
 proc hasresponse_type_url*(message: google_protobuf_Method): bool =
-    result = contains(message.hasField, 4)
+    result = hasField(message, 4)
 
 proc setresponse_type_url*(message: google_protobuf_Method, value: string) =
     message.response_type_url = value
-    incl(message.hasField, 4)
+    setField(message, 4)
 
 proc response_type_url*(message: google_protobuf_Method): string {.inline.} =
     message.response_type_url
@@ -143,14 +136,14 @@ proc `response_type_url=`*(message: google_protobuf_Method, value: string) {.inl
 
 proc clearresponse_streaming*(message: google_protobuf_Method) =
     message.response_streaming = false
-    excl(message.hasField, [5])
+    clearFields(message, [5])
 
 proc hasresponse_streaming*(message: google_protobuf_Method): bool =
-    result = contains(message.hasField, 5)
+    result = hasField(message, 5)
 
 proc setresponse_streaming*(message: google_protobuf_Method, value: bool) =
     message.response_streaming = value
-    incl(message.hasField, 5)
+    setField(message, 5)
 
 proc response_streaming*(message: google_protobuf_Method): bool {.inline.} =
     message.response_streaming
@@ -160,18 +153,18 @@ proc `response_streaming=`*(message: google_protobuf_Method, value: bool) {.inli
 
 proc clearoptions*(message: google_protobuf_Method) =
     message.options = @[]
-    excl(message.hasField, [6])
+    clearFields(message, [6])
 
 proc hasoptions*(message: google_protobuf_Method): bool =
-    result = contains(message.hasField, 6) or (len(message.options) > 0)
+    result = hasField(message, 6) or (len(message.options) > 0)
 
 proc setoptions*(message: google_protobuf_Method, value: seq[google_protobuf_Option]) =
     message.options = value
-    incl(message.hasField, 6)
+    setField(message, 6)
 
 proc addoptions*(message: google_protobuf_Method, value: google_protobuf_Option) =
     add(message.options, value)
-    incl(message.hasField, 6)
+    setField(message, 6)
 
 proc options*(message: google_protobuf_Method): seq[google_protobuf_Option] {.inline.} =
     message.options
@@ -181,14 +174,14 @@ proc `options=`*(message: google_protobuf_Method, value: seq[google_protobuf_Opt
 
 proc clearsyntax*(message: google_protobuf_Method) =
     message.syntax = google_protobuf_Syntax.SYNTAX_PROTO2
-    excl(message.hasField, [7])
+    clearFields(message, [7])
 
 proc hassyntax*(message: google_protobuf_Method): bool =
-    result = contains(message.hasField, 7)
+    result = hasField(message, 7)
 
 proc setsyntax*(message: google_protobuf_Method, value: google_protobuf_Syntax) =
     message.syntax = value
-    incl(message.hasField, 7)
+    setField(message, 7)
 
 proc syntax*(message: google_protobuf_Method): google_protobuf_Syntax {.inline.} =
     message.syntax
@@ -218,27 +211,26 @@ proc sizeOfgoogle_protobuf_Method*(message: google_protobuf_Method): uint64 =
     if hassyntax(message):
         result = result + sizeOfTag(7, WireType.Varint)
         result = result + sizeOfEnum[google_protobuf_Syntax](message.syntax)
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_Method*(stream: ProtobufStream, message: google_protobuf_Method) =
+proc writegoogle_protobuf_Method*(stream: Stream, message: google_protobuf_Method) =
     if hasname(message):
-        writeString(stream, message.name, 1)
+        protoWriteString(stream, message.name, 1)
     if hasrequest_type_url(message):
-        writeString(stream, message.request_type_url, 2)
+        protoWriteString(stream, message.request_type_url, 2)
     if hasrequest_streaming(message):
-        writeBool(stream, message.request_streaming, 3)
+        protoWriteBool(stream, message.request_streaming, 3)
     if hasresponse_type_url(message):
-        writeString(stream, message.response_type_url, 4)
+        protoWriteString(stream, message.response_type_url, 4)
     if hasresponse_streaming(message):
-        writeBool(stream, message.response_streaming, 5)
+        protoWriteBool(stream, message.response_streaming, 5)
     for value in message.options:
         writeMessage(stream, value, 6)
     if hassyntax(message):
-        writeEnum(stream, message.syntax, 7)
-    writeUnknownFields(stream, message.unknownFields)
+        protoWriteEnum(stream, message.syntax, 7)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_Method*(stream: ProtobufStream): google_protobuf_Method =
+proc readgoogle_protobuf_Method*(stream: Stream): google_protobuf_Method =
     result = newgoogle_protobuf_Method()
     while not atEnd(stream):
         let
@@ -249,27 +241,27 @@ proc readgoogle_protobuf_Method*(stream: ProtobufStream): google_protobuf_Method
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.LengthDelimited)
-            setname(result, readString(stream))
+            setname(result, protoReadString(stream))
         of 2:
             expectWireType(wireType, WireType.LengthDelimited)
-            setrequest_type_url(result, readString(stream))
+            setrequest_type_url(result, protoReadString(stream))
         of 3:
             expectWireType(wireType, WireType.Varint)
-            setrequest_streaming(result, readBool(stream))
+            setrequest_streaming(result, protoReadBool(stream))
         of 4:
             expectWireType(wireType, WireType.LengthDelimited)
-            setresponse_type_url(result, readString(stream))
+            setresponse_type_url(result, protoReadString(stream))
         of 5:
             expectWireType(wireType, WireType.Varint)
-            setresponse_streaming(result, readBool(stream))
+            setresponse_streaming(result, protoReadBool(stream))
         of 6:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
             addoptions(result, newgoogle_protobuf_Option(data))
         of 7:
             expectWireType(wireType, WireType.Varint)
-            setsyntax(result, readEnum[google_protobuf_Syntax](stream))
-        else: readUnknownField(stream, tag, result.unknownFields)
+            setsyntax(result, protoReadEnum[google_protobuf_Syntax](stream))
+        else: readUnknownField(stream, result, tag)
 
 proc toJson*(message: google_protobuf_Method): JsonNode =
     result = newJObject()
@@ -294,34 +286,31 @@ proc toJson*(message: google_protobuf_Method): JsonNode =
 proc serialize*(message: google_protobuf_Method): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_Method(pbs, message)
+    writegoogle_protobuf_Method(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_Method*(data: string): google_protobuf_Method =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_Method(pbs)
+    result = readgoogle_protobuf_Method(ss)
 
 
 proc newgoogle_protobuf_Mixin*(): google_protobuf_Mixin =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.name = ""
     result.root = ""
 
 proc clearname*(message: google_protobuf_Mixin) =
     message.name = ""
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc hasname*(message: google_protobuf_Mixin): bool =
-    result = contains(message.hasField, 1)
+    result = hasField(message, 1)
 
 proc setname*(message: google_protobuf_Mixin, value: string) =
     message.name = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc name*(message: google_protobuf_Mixin): string {.inline.} =
     message.name
@@ -331,14 +320,14 @@ proc `name=`*(message: google_protobuf_Mixin, value: string) {.inline.} =
 
 proc clearroot*(message: google_protobuf_Mixin) =
     message.root = ""
-    excl(message.hasField, [2])
+    clearFields(message, [2])
 
 proc hasroot*(message: google_protobuf_Mixin): bool =
-    result = contains(message.hasField, 2)
+    result = hasField(message, 2)
 
 proc setroot*(message: google_protobuf_Mixin, value: string) =
     message.root = value
-    incl(message.hasField, 2)
+    setField(message, 2)
 
 proc root*(message: google_protobuf_Mixin): string {.inline.} =
     message.root
@@ -353,17 +342,16 @@ proc sizeOfgoogle_protobuf_Mixin*(message: google_protobuf_Mixin): uint64 =
     if hasroot(message):
         result = result + sizeOfTag(2, WireType.LengthDelimited)
         result = result + sizeOfString(message.root)
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_Mixin*(stream: ProtobufStream, message: google_protobuf_Mixin) =
+proc writegoogle_protobuf_Mixin*(stream: Stream, message: google_protobuf_Mixin) =
     if hasname(message):
-        writeString(stream, message.name, 1)
+        protoWriteString(stream, message.name, 1)
     if hasroot(message):
-        writeString(stream, message.root, 2)
-    writeUnknownFields(stream, message.unknownFields)
+        protoWriteString(stream, message.root, 2)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_Mixin*(stream: ProtobufStream): google_protobuf_Mixin =
+proc readgoogle_protobuf_Mixin*(stream: Stream): google_protobuf_Mixin =
     result = newgoogle_protobuf_Mixin()
     while not atEnd(stream):
         let
@@ -374,11 +362,11 @@ proc readgoogle_protobuf_Mixin*(stream: ProtobufStream): google_protobuf_Mixin =
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.LengthDelimited)
-            setname(result, readString(stream))
+            setname(result, protoReadString(stream))
         of 2:
             expectWireType(wireType, WireType.LengthDelimited)
-            setroot(result, readString(stream))
-        else: readUnknownField(stream, tag, result.unknownFields)
+            setroot(result, protoReadString(stream))
+        else: readUnknownField(stream, result, tag)
 
 proc toJson*(message: google_protobuf_Mixin): JsonNode =
     result = newJObject()
@@ -390,21 +378,18 @@ proc toJson*(message: google_protobuf_Mixin): JsonNode =
 proc serialize*(message: google_protobuf_Mixin): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_Mixin(pbs, message)
+    writegoogle_protobuf_Mixin(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_Mixin*(data: string): google_protobuf_Mixin =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_Mixin(pbs)
+    result = readgoogle_protobuf_Mixin(ss)
 
 
 proc newgoogle_protobuf_Api*(): google_protobuf_Api =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.name = ""
     result.methods = @[]
     result.options = @[]
@@ -415,14 +400,14 @@ proc newgoogle_protobuf_Api*(): google_protobuf_Api =
 
 proc clearname*(message: google_protobuf_Api) =
     message.name = ""
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc hasname*(message: google_protobuf_Api): bool =
-    result = contains(message.hasField, 1)
+    result = hasField(message, 1)
 
 proc setname*(message: google_protobuf_Api, value: string) =
     message.name = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc name*(message: google_protobuf_Api): string {.inline.} =
     message.name
@@ -432,18 +417,18 @@ proc `name=`*(message: google_protobuf_Api, value: string) {.inline.} =
 
 proc clearmethods*(message: google_protobuf_Api) =
     message.methods = @[]
-    excl(message.hasField, [2])
+    clearFields(message, [2])
 
 proc hasmethods*(message: google_protobuf_Api): bool =
-    result = contains(message.hasField, 2) or (len(message.methods) > 0)
+    result = hasField(message, 2) or (len(message.methods) > 0)
 
 proc setmethods*(message: google_protobuf_Api, value: seq[google_protobuf_Method]) =
     message.methods = value
-    incl(message.hasField, 2)
+    setField(message, 2)
 
 proc addmethods*(message: google_protobuf_Api, value: google_protobuf_Method) =
     add(message.methods, value)
-    incl(message.hasField, 2)
+    setField(message, 2)
 
 proc methods*(message: google_protobuf_Api): seq[google_protobuf_Method] {.inline.} =
     message.methods
@@ -453,18 +438,18 @@ proc `methods=`*(message: google_protobuf_Api, value: seq[google_protobuf_Method
 
 proc clearoptions*(message: google_protobuf_Api) =
     message.options = @[]
-    excl(message.hasField, [3])
+    clearFields(message, [3])
 
 proc hasoptions*(message: google_protobuf_Api): bool =
-    result = contains(message.hasField, 3) or (len(message.options) > 0)
+    result = hasField(message, 3) or (len(message.options) > 0)
 
 proc setoptions*(message: google_protobuf_Api, value: seq[google_protobuf_Option]) =
     message.options = value
-    incl(message.hasField, 3)
+    setField(message, 3)
 
 proc addoptions*(message: google_protobuf_Api, value: google_protobuf_Option) =
     add(message.options, value)
-    incl(message.hasField, 3)
+    setField(message, 3)
 
 proc options*(message: google_protobuf_Api): seq[google_protobuf_Option] {.inline.} =
     message.options
@@ -474,14 +459,14 @@ proc `options=`*(message: google_protobuf_Api, value: seq[google_protobuf_Option
 
 proc clearversion*(message: google_protobuf_Api) =
     message.version = ""
-    excl(message.hasField, [4])
+    clearFields(message, [4])
 
 proc hasversion*(message: google_protobuf_Api): bool =
-    result = contains(message.hasField, 4)
+    result = hasField(message, 4)
 
 proc setversion*(message: google_protobuf_Api, value: string) =
     message.version = value
-    incl(message.hasField, 4)
+    setField(message, 4)
 
 proc version*(message: google_protobuf_Api): string {.inline.} =
     message.version
@@ -491,14 +476,14 @@ proc `version=`*(message: google_protobuf_Api, value: string) {.inline.} =
 
 proc clearsource_context*(message: google_protobuf_Api) =
     message.source_context = nil
-    excl(message.hasField, [5])
+    clearFields(message, [5])
 
 proc hassource_context*(message: google_protobuf_Api): bool =
-    result = contains(message.hasField, 5)
+    result = hasField(message, 5)
 
 proc setsource_context*(message: google_protobuf_Api, value: google_protobuf_SourceContext) =
     message.source_context = value
-    incl(message.hasField, 5)
+    setField(message, 5)
 
 proc source_context*(message: google_protobuf_Api): google_protobuf_SourceContext {.inline.} =
     message.source_context
@@ -508,18 +493,18 @@ proc `source_context=`*(message: google_protobuf_Api, value: google_protobuf_Sou
 
 proc clearmixins*(message: google_protobuf_Api) =
     message.mixins = @[]
-    excl(message.hasField, [6])
+    clearFields(message, [6])
 
 proc hasmixins*(message: google_protobuf_Api): bool =
-    result = contains(message.hasField, 6) or (len(message.mixins) > 0)
+    result = hasField(message, 6) or (len(message.mixins) > 0)
 
 proc setmixins*(message: google_protobuf_Api, value: seq[google_protobuf_Mixin]) =
     message.mixins = value
-    incl(message.hasField, 6)
+    setField(message, 6)
 
 proc addmixins*(message: google_protobuf_Api, value: google_protobuf_Mixin) =
     add(message.mixins, value)
-    incl(message.hasField, 6)
+    setField(message, 6)
 
 proc mixins*(message: google_protobuf_Api): seq[google_protobuf_Mixin] {.inline.} =
     message.mixins
@@ -529,14 +514,14 @@ proc `mixins=`*(message: google_protobuf_Api, value: seq[google_protobuf_Mixin])
 
 proc clearsyntax*(message: google_protobuf_Api) =
     message.syntax = google_protobuf_Syntax.SYNTAX_PROTO2
-    excl(message.hasField, [7])
+    clearFields(message, [7])
 
 proc hassyntax*(message: google_protobuf_Api): bool =
-    result = contains(message.hasField, 7)
+    result = hasField(message, 7)
 
 proc setsyntax*(message: google_protobuf_Api, value: google_protobuf_Syntax) =
     message.syntax = value
-    incl(message.hasField, 7)
+    setField(message, 7)
 
 proc syntax*(message: google_protobuf_Api): google_protobuf_Syntax {.inline.} =
     message.syntax
@@ -566,27 +551,26 @@ proc sizeOfgoogle_protobuf_Api*(message: google_protobuf_Api): uint64 =
     if hassyntax(message):
         result = result + sizeOfTag(7, WireType.Varint)
         result = result + sizeOfEnum[google_protobuf_Syntax](message.syntax)
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_Api*(stream: ProtobufStream, message: google_protobuf_Api) =
+proc writegoogle_protobuf_Api*(stream: Stream, message: google_protobuf_Api) =
     if hasname(message):
-        writeString(stream, message.name, 1)
+        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):
-        writeString(stream, message.version, 4)
+        protoWriteString(stream, message.version, 4)
     if hassource_context(message):
         writeMessage(stream, message.source_context, 5)
     for value in message.mixins:
         writeMessage(stream, value, 6)
     if hassyntax(message):
-        writeEnum(stream, message.syntax, 7)
-    writeUnknownFields(stream, message.unknownFields)
+        protoWriteEnum(stream, message.syntax, 7)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_Api*(stream: ProtobufStream): google_protobuf_Api =
+proc readgoogle_protobuf_Api*(stream: Stream): google_protobuf_Api =
     result = newgoogle_protobuf_Api()
     while not atEnd(stream):
         let
@@ -597,7 +581,7 @@ proc readgoogle_protobuf_Api*(stream: ProtobufStream): google_protobuf_Api =
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.LengthDelimited)
-            setname(result, readString(stream))
+            setname(result, protoReadString(stream))
         of 2:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
@@ -608,7 +592,7 @@ proc readgoogle_protobuf_Api*(stream: ProtobufStream): google_protobuf_Api =
             addoptions(result, newgoogle_protobuf_Option(data))
         of 4:
             expectWireType(wireType, WireType.LengthDelimited)
-            setversion(result, readString(stream))
+            setversion(result, protoReadString(stream))
         of 5:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
@@ -619,8 +603,8 @@ proc readgoogle_protobuf_Api*(stream: ProtobufStream): google_protobuf_Api =
             addmixins(result, newgoogle_protobuf_Mixin(data))
         of 7:
             expectWireType(wireType, WireType.Varint)
-            setsyntax(result, readEnum[google_protobuf_Syntax](stream))
-        else: readUnknownField(stream, tag, result.unknownFields)
+            setsyntax(result, protoReadEnum[google_protobuf_Syntax](stream))
+        else: readUnknownField(stream, result, tag)
 
 proc toJson*(message: google_protobuf_Api): JsonNode =
     result = newJObject()
@@ -651,14 +635,12 @@ proc toJson*(message: google_protobuf_Api): JsonNode =
 proc serialize*(message: google_protobuf_Api): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_Api(pbs, message)
+    writegoogle_protobuf_Api(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_Api*(data: string): google_protobuf_Api =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_Api(pbs)
+    result = readgoogle_protobuf_Api(ss)
 
 
diff --git a/nimpb/wkt/duration_pb.nim b/nimpb/wkt/duration_pb.nim
index d15aeee..62fa334 100644
--- a/nimpb/wkt/duration_pb.nim
+++ b/nimpb/wkt/duration_pb.nim
@@ -9,35 +9,32 @@ import nimpb/json as nimpb_json
 
 type
     google_protobuf_Duration* = ref google_protobuf_DurationObj
-    google_protobuf_DurationObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_DurationObj* = object of Message
         seconds: int64
         nanos: int32
 
 proc newgoogle_protobuf_Duration*(): google_protobuf_Duration
 proc newgoogle_protobuf_Duration*(data: string): google_protobuf_Duration
-proc writegoogle_protobuf_Duration*(stream: ProtobufStream, message: google_protobuf_Duration)
-proc readgoogle_protobuf_Duration*(stream: ProtobufStream): google_protobuf_Duration
+proc writegoogle_protobuf_Duration*(stream: Stream, message: google_protobuf_Duration)
+proc readgoogle_protobuf_Duration*(stream: Stream): google_protobuf_Duration
 proc sizeOfgoogle_protobuf_Duration*(message: google_protobuf_Duration): uint64
 
 proc newgoogle_protobuf_Duration*(): google_protobuf_Duration =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.seconds = 0
     result.nanos = 0
 
 proc clearseconds*(message: google_protobuf_Duration) =
     message.seconds = 0
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc hasseconds*(message: google_protobuf_Duration): bool =
-    result = contains(message.hasField, 1)
+    result = hasField(message, 1)
 
 proc setseconds*(message: google_protobuf_Duration, value: int64) =
     message.seconds = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc seconds*(message: google_protobuf_Duration): int64 {.inline.} =
     message.seconds
@@ -47,14 +44,14 @@ proc `seconds=`*(message: google_protobuf_Duration, value: int64) {.inline.} =
 
 proc clearnanos*(message: google_protobuf_Duration) =
     message.nanos = 0
-    excl(message.hasField, [2])
+    clearFields(message, [2])
 
 proc hasnanos*(message: google_protobuf_Duration): bool =
-    result = contains(message.hasField, 2)
+    result = hasField(message, 2)
 
 proc setnanos*(message: google_protobuf_Duration, value: int32) =
     message.nanos = value
-    incl(message.hasField, 2)
+    setField(message, 2)
 
 proc nanos*(message: google_protobuf_Duration): int32 {.inline.} =
     message.nanos
@@ -69,17 +66,16 @@ proc sizeOfgoogle_protobuf_Duration*(message: google_protobuf_Duration): uint64
     if hasnanos(message):
         result = result + sizeOfTag(2, WireType.Varint)
         result = result + sizeOfInt32(message.nanos)
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_Duration*(stream: ProtobufStream, message: google_protobuf_Duration) =
+proc writegoogle_protobuf_Duration*(stream: Stream, message: google_protobuf_Duration) =
     if hasseconds(message):
-        writeInt64(stream, message.seconds, 1)
+        protoWriteInt64(stream, message.seconds, 1)
     if hasnanos(message):
-        writeInt32(stream, message.nanos, 2)
-    writeUnknownFields(stream, message.unknownFields)
+        protoWriteInt32(stream, message.nanos, 2)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_Duration*(stream: ProtobufStream): google_protobuf_Duration =
+proc readgoogle_protobuf_Duration*(stream: Stream): google_protobuf_Duration =
     result = newgoogle_protobuf_Duration()
     while not atEnd(stream):
         let
@@ -90,23 +86,21 @@ proc readgoogle_protobuf_Duration*(stream: ProtobufStream): google_protobuf_Dura
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.Varint)
-            setseconds(result, readInt64(stream))
+            setseconds(result, protoReadInt64(stream))
         of 2:
             expectWireType(wireType, WireType.Varint)
-            setnanos(result, readInt32(stream))
-        else: readUnknownField(stream, tag, result.unknownFields)
+            setnanos(result, protoReadInt32(stream))
+        else: readUnknownField(stream, result, tag)
 
 proc serialize*(message: google_protobuf_Duration): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_Duration(pbs, message)
+    writegoogle_protobuf_Duration(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_Duration*(data: string): google_protobuf_Duration =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_Duration(pbs)
+    result = readgoogle_protobuf_Duration(ss)
 
 
diff --git a/nimpb/wkt/empty_pb.nim b/nimpb/wkt/empty_pb.nim
index c53cb03..83f3cda 100644
--- a/nimpb/wkt/empty_pb.nim
+++ b/nimpb/wkt/empty_pb.nim
@@ -9,30 +9,26 @@ import nimpb/json as nimpb_json
 
 type
     google_protobuf_Empty* = ref google_protobuf_EmptyObj
-    google_protobuf_EmptyObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_EmptyObj* = object of Message
 
 proc newgoogle_protobuf_Empty*(): google_protobuf_Empty
 proc newgoogle_protobuf_Empty*(data: string): google_protobuf_Empty
-proc writegoogle_protobuf_Empty*(stream: ProtobufStream, message: google_protobuf_Empty)
-proc readgoogle_protobuf_Empty*(stream: ProtobufStream): google_protobuf_Empty
+proc writegoogle_protobuf_Empty*(stream: Stream, message: google_protobuf_Empty)
+proc readgoogle_protobuf_Empty*(stream: Stream): google_protobuf_Empty
 proc sizeOfgoogle_protobuf_Empty*(message: google_protobuf_Empty): uint64
 proc toJson*(message: google_protobuf_Empty): JsonNode
 
 proc newgoogle_protobuf_Empty*(): google_protobuf_Empty =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
 
 proc sizeOfgoogle_protobuf_Empty*(message: google_protobuf_Empty): uint64 =
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_Empty*(stream: ProtobufStream, message: google_protobuf_Empty) =
-    writeUnknownFields(stream, message.unknownFields)
+proc writegoogle_protobuf_Empty*(stream: Stream, message: google_protobuf_Empty) =
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_Empty*(stream: ProtobufStream): google_protobuf_Empty =
+proc readgoogle_protobuf_Empty*(stream: Stream): google_protobuf_Empty =
     result = newgoogle_protobuf_Empty()
     while not atEnd(stream):
         let
@@ -41,7 +37,7 @@ proc readgoogle_protobuf_Empty*(stream: ProtobufStream): google_protobuf_Empty =
         case fieldNumber(tag)
         of 0:
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
-        else: readUnknownField(stream, tag, result.unknownFields)
+        else: readUnknownField(stream, result, tag)
 
 proc toJson*(message: google_protobuf_Empty): JsonNode =
     result = newJObject()
@@ -49,14 +45,12 @@ proc toJson*(message: google_protobuf_Empty): JsonNode =
 proc serialize*(message: google_protobuf_Empty): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_Empty(pbs, message)
+    writegoogle_protobuf_Empty(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_Empty*(data: string): google_protobuf_Empty =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_Empty(pbs)
+    result = readgoogle_protobuf_Empty(ss)
 
 
diff --git a/nimpb/wkt/field_mask_pb.nim b/nimpb/wkt/field_mask_pb.nim
index e925416..689247d 100644
--- a/nimpb/wkt/field_mask_pb.nim
+++ b/nimpb/wkt/field_mask_pb.nim
@@ -9,37 +9,34 @@ import nimpb/json as nimpb_json
 
 type
     google_protobuf_FieldMask* = ref google_protobuf_FieldMaskObj
-    google_protobuf_FieldMaskObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_FieldMaskObj* = object of Message
         paths: seq[string]
 
 proc newgoogle_protobuf_FieldMask*(): google_protobuf_FieldMask
 proc newgoogle_protobuf_FieldMask*(data: string): google_protobuf_FieldMask
-proc writegoogle_protobuf_FieldMask*(stream: ProtobufStream, message: google_protobuf_FieldMask)
-proc readgoogle_protobuf_FieldMask*(stream: ProtobufStream): google_protobuf_FieldMask
+proc writegoogle_protobuf_FieldMask*(stream: Stream, message: google_protobuf_FieldMask)
+proc readgoogle_protobuf_FieldMask*(stream: Stream): google_protobuf_FieldMask
 proc sizeOfgoogle_protobuf_FieldMask*(message: google_protobuf_FieldMask): uint64
 
 proc newgoogle_protobuf_FieldMask*(): google_protobuf_FieldMask =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.paths = @[]
 
 proc clearpaths*(message: google_protobuf_FieldMask) =
     message.paths = @[]
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc haspaths*(message: google_protobuf_FieldMask): bool =
-    result = contains(message.hasField, 1) or (len(message.paths) > 0)
+    result = hasField(message, 1) or (len(message.paths) > 0)
 
 proc setpaths*(message: google_protobuf_FieldMask, value: seq[string]) =
     message.paths = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc addpaths*(message: google_protobuf_FieldMask, value: string) =
     add(message.paths, value)
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc paths*(message: google_protobuf_FieldMask): seq[string] {.inline.} =
     message.paths
@@ -51,15 +48,14 @@ proc sizeOfgoogle_protobuf_FieldMask*(message: google_protobuf_FieldMask): uint6
     for value in message.paths:
         result = result + sizeOfTag(1, WireType.LengthDelimited)
         result = result + sizeOfString(value)
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_FieldMask*(stream: ProtobufStream, message: google_protobuf_FieldMask) =
+proc writegoogle_protobuf_FieldMask*(stream: Stream, message: google_protobuf_FieldMask) =
     for value in message.paths:
-        writeString(stream, value, 1)
-    writeUnknownFields(stream, message.unknownFields)
+        protoWriteString(stream, value, 1)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_FieldMask*(stream: ProtobufStream): google_protobuf_FieldMask =
+proc readgoogle_protobuf_FieldMask*(stream: Stream): google_protobuf_FieldMask =
     result = newgoogle_protobuf_FieldMask()
     while not atEnd(stream):
         let
@@ -70,20 +66,18 @@ proc readgoogle_protobuf_FieldMask*(stream: ProtobufStream): google_protobuf_Fie
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.LengthDelimited)
-            addpaths(result, readString(stream))
-        else: readUnknownField(stream, tag, result.unknownFields)
+            addpaths(result, protoReadString(stream))
+        else: readUnknownField(stream, result, tag)
 
 proc serialize*(message: google_protobuf_FieldMask): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_FieldMask(pbs, message)
+    writegoogle_protobuf_FieldMask(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_FieldMask*(data: string): google_protobuf_FieldMask =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_FieldMask(pbs)
+    result = readgoogle_protobuf_FieldMask(ss)
 
 
diff --git a/nimpb/wkt/source_context_pb.nim b/nimpb/wkt/source_context_pb.nim
index 815da98..5db0179 100644
--- a/nimpb/wkt/source_context_pb.nim
+++ b/nimpb/wkt/source_context_pb.nim
@@ -9,34 +9,31 @@ import nimpb/json as nimpb_json
 
 type
     google_protobuf_SourceContext* = ref google_protobuf_SourceContextObj
-    google_protobuf_SourceContextObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_SourceContextObj* = object of Message
         file_name: string
 
 proc newgoogle_protobuf_SourceContext*(): google_protobuf_SourceContext
 proc newgoogle_protobuf_SourceContext*(data: string): google_protobuf_SourceContext
-proc writegoogle_protobuf_SourceContext*(stream: ProtobufStream, message: google_protobuf_SourceContext)
-proc readgoogle_protobuf_SourceContext*(stream: ProtobufStream): google_protobuf_SourceContext
+proc writegoogle_protobuf_SourceContext*(stream: Stream, message: google_protobuf_SourceContext)
+proc readgoogle_protobuf_SourceContext*(stream: Stream): google_protobuf_SourceContext
 proc sizeOfgoogle_protobuf_SourceContext*(message: google_protobuf_SourceContext): uint64
 proc toJson*(message: google_protobuf_SourceContext): JsonNode
 
 proc newgoogle_protobuf_SourceContext*(): google_protobuf_SourceContext =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.file_name = ""
 
 proc clearfile_name*(message: google_protobuf_SourceContext) =
     message.file_name = ""
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc hasfile_name*(message: google_protobuf_SourceContext): bool =
-    result = contains(message.hasField, 1)
+    result = hasField(message, 1)
 
 proc setfile_name*(message: google_protobuf_SourceContext, value: string) =
     message.file_name = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc file_name*(message: google_protobuf_SourceContext): string {.inline.} =
     message.file_name
@@ -48,15 +45,14 @@ proc sizeOfgoogle_protobuf_SourceContext*(message: google_protobuf_SourceContext
     if hasfile_name(message):
         result = result + sizeOfTag(1, WireType.LengthDelimited)
         result = result + sizeOfString(message.file_name)
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_SourceContext*(stream: ProtobufStream, message: google_protobuf_SourceContext) =
+proc writegoogle_protobuf_SourceContext*(stream: Stream, message: google_protobuf_SourceContext) =
     if hasfile_name(message):
-        writeString(stream, message.file_name, 1)
-    writeUnknownFields(stream, message.unknownFields)
+        protoWriteString(stream, message.file_name, 1)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_SourceContext*(stream: ProtobufStream): google_protobuf_SourceContext =
+proc readgoogle_protobuf_SourceContext*(stream: Stream): google_protobuf_SourceContext =
     result = newgoogle_protobuf_SourceContext()
     while not atEnd(stream):
         let
@@ -67,8 +63,8 @@ proc readgoogle_protobuf_SourceContext*(stream: ProtobufStream): google_protobuf
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.LengthDelimited)
-            setfile_name(result, readString(stream))
-        else: readUnknownField(stream, tag, result.unknownFields)
+            setfile_name(result, protoReadString(stream))
+        else: readUnknownField(stream, result, tag)
 
 proc toJson*(message: google_protobuf_SourceContext): JsonNode =
     result = newJObject()
@@ -78,14 +74,12 @@ proc toJson*(message: google_protobuf_SourceContext): JsonNode =
 proc serialize*(message: google_protobuf_SourceContext): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_SourceContext(pbs, message)
+    writegoogle_protobuf_SourceContext(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_SourceContext*(data: string): google_protobuf_SourceContext =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_SourceContext(pbs)
+    result = readgoogle_protobuf_SourceContext(ss)
 
 
diff --git a/nimpb/wkt/struct_pb.nim b/nimpb/wkt/struct_pb.nim
index 2a38f6d..bec0cab 100644
--- a/nimpb/wkt/struct_pb.nim
+++ b/nimpb/wkt/struct_pb.nim
@@ -13,14 +13,10 @@ type
     google_protobuf_NullValue* {.pure.} = enum
         NULL_VALUE = 0
     google_protobuf_Struct* = ref google_protobuf_StructObj
-    google_protobuf_StructObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_StructObj* = object of Message
         fields: TableRef[string, google_protobuf_Value]
     google_protobuf_Value* = ref google_protobuf_ValueObj
-    google_protobuf_ValueObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_ValueObj* = object of Message
         kind: google_protobuf_Value_kind_OneOf
 
     google_protobuf_Value_kind_OneOf* {.union.} = object
@@ -31,31 +27,29 @@ type
         struct_value: google_protobuf_Struct
         list_value: google_protobuf_ListValue
     google_protobuf_ListValue* = ref google_protobuf_ListValueObj
-    google_protobuf_ListValueObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_ListValueObj* = object of Message
         values: seq[google_protobuf_Value]
 
-proc writegoogle_protobuf_Struct_FieldsEntryKV(stream: ProtobufStream, key: string, value: google_protobuf_Value)
-proc readgoogle_protobuf_Struct_FieldsEntryKV(stream: ProtobufStream, tbl: TableRef[string, google_protobuf_Value])
+proc writegoogle_protobuf_Struct_FieldsEntryKV(stream: Stream, key: string, value: google_protobuf_Value)
+proc readgoogle_protobuf_Struct_FieldsEntryKV(stream: Stream, tbl: TableRef[string, google_protobuf_Value])
 proc sizeOfgoogle_protobuf_Struct_FieldsEntryKV(key: string, value: google_protobuf_Value): uint64
 
 proc newgoogle_protobuf_Struct*(): google_protobuf_Struct
 proc newgoogle_protobuf_Struct*(data: string): google_protobuf_Struct
-proc writegoogle_protobuf_Struct*(stream: ProtobufStream, message: google_protobuf_Struct)
-proc readgoogle_protobuf_Struct*(stream: ProtobufStream): google_protobuf_Struct
+proc writegoogle_protobuf_Struct*(stream: Stream, message: google_protobuf_Struct)
+proc readgoogle_protobuf_Struct*(stream: Stream): google_protobuf_Struct
 proc sizeOfgoogle_protobuf_Struct*(message: google_protobuf_Struct): uint64
 
 proc newgoogle_protobuf_ListValue*(): google_protobuf_ListValue
 proc newgoogle_protobuf_ListValue*(data: string): google_protobuf_ListValue
-proc writegoogle_protobuf_ListValue*(stream: ProtobufStream, message: google_protobuf_ListValue)
-proc readgoogle_protobuf_ListValue*(stream: ProtobufStream): google_protobuf_ListValue
+proc writegoogle_protobuf_ListValue*(stream: Stream, message: google_protobuf_ListValue)
+proc readgoogle_protobuf_ListValue*(stream: Stream): google_protobuf_ListValue
 proc sizeOfgoogle_protobuf_ListValue*(message: google_protobuf_ListValue): uint64
 
 proc newgoogle_protobuf_Value*(): google_protobuf_Value
 proc newgoogle_protobuf_Value*(data: string): google_protobuf_Value
-proc writegoogle_protobuf_Value*(stream: ProtobufStream, message: google_protobuf_Value)
-proc readgoogle_protobuf_Value*(stream: ProtobufStream): google_protobuf_Value
+proc writegoogle_protobuf_Value*(stream: Stream, message: google_protobuf_Value)
+proc readgoogle_protobuf_Value*(stream: Stream): google_protobuf_Value
 proc sizeOfgoogle_protobuf_Value*(message: google_protobuf_Value): uint64
 
 proc sizeOfgoogle_protobuf_Struct_FieldsEntryKV(key: string, value: google_protobuf_Value): uint64 =
@@ -64,11 +58,11 @@ proc sizeOfgoogle_protobuf_Struct_FieldsEntryKV(key: string, value: google_proto
     result = result + sizeOfTag(2, WireType.LengthDelimited)
     result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_Value(value))
 
-proc writegoogle_protobuf_Struct_FieldsEntryKV(stream: ProtobufStream, key: string, value: google_protobuf_Value) =
-    writeString(stream, key, 1)
+proc writegoogle_protobuf_Struct_FieldsEntryKV(stream: Stream, key: string, value: google_protobuf_Value) =
+    protoWriteString(stream, key, 1)
     writeMessage(stream, value, 2)
 
-proc readgoogle_protobuf_Struct_FieldsEntryKV(stream: ProtobufStream, tbl: TableRef[string, google_protobuf_Value]) =
+proc readgoogle_protobuf_Struct_FieldsEntryKV(stream: Stream, tbl: TableRef[string, google_protobuf_Value]) =
     var
         key: string
         gotKey = false
@@ -80,13 +74,13 @@ proc readgoogle_protobuf_Struct_FieldsEntryKV(stream: ProtobufStream, tbl: Table
             wireType = wireType(tag)
         case fieldNumber(tag)
         of 1:
-            key = readString(stream)
+            key = protoReadString(stream)
             gotKey = true
         of 2:
             let
                 size = readVarint(stream)
                 data = safeReadStr(stream, int(size))
-                pbs = newProtobufStream(newStringStream(data))
+                pbs = newStringStream(data)
             value = readgoogle_protobuf_Value(pbs)
             gotValue = true
         else: skipField(stream, wireType)
@@ -99,20 +93,19 @@ proc readgoogle_protobuf_Struct_FieldsEntryKV(stream: ProtobufStream, tbl: Table
 
 proc newgoogle_protobuf_Struct*(): google_protobuf_Struct =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.fields = newTable[string, google_protobuf_Value]()
 
 proc clearfields*(message: google_protobuf_Struct) =
     message.fields = newTable[string, google_protobuf_Value]()
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc hasfields*(message: google_protobuf_Struct): bool =
-    result = contains(message.hasField, 1) or (len(message.fields) > 0)
+    result = hasField(message, 1) or (len(message.fields) > 0)
 
 proc setfields*(message: google_protobuf_Struct, value: TableRef[string, google_protobuf_Value]) =
     message.fields = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc fields*(message: google_protobuf_Struct): TableRef[string, google_protobuf_Value] {.inline.} =
     message.fields
@@ -127,17 +120,16 @@ proc sizeOfgoogle_protobuf_Struct*(message: google_protobuf_Struct): uint64 =
             sizeOfKV = sizeOfKV + sizeOfgoogle_protobuf_Struct_FieldsEntryKV(key, value)
         result = result + sizeOfTag(1, WireType.LengthDelimited)
         result = result + sizeOfLengthDelimited(sizeOfKV)
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_Struct*(stream: ProtobufStream, message: google_protobuf_Struct) =
+proc writegoogle_protobuf_Struct*(stream: Stream, message: google_protobuf_Struct) =
     for key, value in message.fields:
         writeTag(stream, 1, WireType.LengthDelimited)
         writeVarint(stream, sizeOfgoogle_protobuf_Struct_FieldsEntryKV(key, value))
         writegoogle_protobuf_Struct_FieldsEntryKV(stream, key, value)
-    writeUnknownFields(stream, message.unknownFields)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_Struct*(stream: ProtobufStream): google_protobuf_Struct =
+proc readgoogle_protobuf_Struct*(stream: Stream): google_protobuf_Struct =
     result = newgoogle_protobuf_Struct()
     while not atEnd(stream):
         let
@@ -151,44 +143,41 @@ proc readgoogle_protobuf_Struct*(stream: ProtobufStream): google_protobuf_Struct
             let
                 size = readVarint(stream)
                 data = safeReadStr(stream, int(size))
-                pbs = newProtobufStream(newStringStream(data))
+                pbs = newStringStream(data)
             readgoogle_protobuf_Struct_FieldsEntryKV(pbs, result.fields)
-        else: readUnknownField(stream, tag, result.unknownFields)
+        else: readUnknownField(stream, result, tag)
 
 proc serialize*(message: google_protobuf_Struct): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_Struct(pbs, message)
+    writegoogle_protobuf_Struct(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_Struct*(data: string): google_protobuf_Struct =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_Struct(pbs)
+    result = readgoogle_protobuf_Struct(ss)
 
 
 proc newgoogle_protobuf_ListValue*(): google_protobuf_ListValue =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.values = @[]
 
 proc clearvalues*(message: google_protobuf_ListValue) =
     message.values = @[]
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc hasvalues*(message: google_protobuf_ListValue): bool =
-    result = contains(message.hasField, 1) or (len(message.values) > 0)
+    result = hasField(message, 1) or (len(message.values) > 0)
 
 proc setvalues*(message: google_protobuf_ListValue, value: seq[google_protobuf_Value]) =
     message.values = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc addvalues*(message: google_protobuf_ListValue, value: google_protobuf_Value) =
     add(message.values, value)
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc values*(message: google_protobuf_ListValue): seq[google_protobuf_Value] {.inline.} =
     message.values
@@ -200,15 +189,14 @@ proc sizeOfgoogle_protobuf_ListValue*(message: google_protobuf_ListValue): uint6
     for value in message.values:
         result = result + sizeOfTag(1, WireType.LengthDelimited)
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_Value(value))
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_ListValue*(stream: ProtobufStream, message: google_protobuf_ListValue) =
+proc writegoogle_protobuf_ListValue*(stream: Stream, message: google_protobuf_ListValue) =
     for value in message.values:
         writeMessage(stream, value, 1)
-    writeUnknownFields(stream, message.unknownFields)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_ListValue*(stream: ProtobufStream): google_protobuf_ListValue =
+proc readgoogle_protobuf_ListValue*(stream: Stream): google_protobuf_ListValue =
     result = newgoogle_protobuf_ListValue()
     while not atEnd(stream):
         let
@@ -221,26 +209,23 @@ proc readgoogle_protobuf_ListValue*(stream: ProtobufStream): google_protobuf_Lis
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
             addvalues(result, newgoogle_protobuf_Value(data))
-        else: readUnknownField(stream, tag, result.unknownFields)
+        else: readUnknownField(stream, result, tag)
 
 proc serialize*(message: google_protobuf_ListValue): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_ListValue(pbs, message)
+    writegoogle_protobuf_ListValue(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_ListValue*(data: string): google_protobuf_ListValue =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_ListValue(pbs)
+    result = readgoogle_protobuf_ListValue(ss)
 
 
 proc newgoogle_protobuf_Value*(): google_protobuf_Value =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.kind.null_value = google_protobuf_NullValue.NULL_VALUE
     result.kind.number_value = 0
     result.kind.string_value = ""
@@ -250,15 +235,15 @@ proc newgoogle_protobuf_Value*(): google_protobuf_Value =
 
 proc clearnull_value*(message: google_protobuf_Value) =
     message.kind.null_value = google_protobuf_NullValue.NULL_VALUE
-    excl(message.hasField, [1, 2, 3, 4, 5, 6])
+    clearFields(message, [1, 2, 3, 4, 5, 6])
 
 proc hasnull_value*(message: google_protobuf_Value): bool =
-    result = contains(message.hasField, 1)
+    result = hasField(message, 1)
 
 proc setnull_value*(message: google_protobuf_Value, value: google_protobuf_NullValue) =
     message.kind.null_value = value
-    incl(message.hasField, 1)
-    excl(message.hasField, [2, 3, 4, 5, 6])
+    setField(message, 1)
+    clearFields(message, [2, 3, 4, 5, 6])
 
 proc null_value*(message: google_protobuf_Value): google_protobuf_NullValue {.inline.} =
     message.kind.null_value
@@ -268,15 +253,15 @@ proc `null_value=`*(message: google_protobuf_Value, value: google_protobuf_NullV
 
 proc clearnumber_value*(message: google_protobuf_Value) =
     message.kind.number_value = 0
-    excl(message.hasField, [2, 1, 3, 4, 5, 6])
+    clearFields(message, [2, 1, 3, 4, 5, 6])
 
 proc hasnumber_value*(message: google_protobuf_Value): bool =
-    result = contains(message.hasField, 2)
+    result = hasField(message, 2)
 
 proc setnumber_value*(message: google_protobuf_Value, value: float64) =
     message.kind.number_value = value
-    incl(message.hasField, 2)
-    excl(message.hasField, [1, 3, 4, 5, 6])
+    setField(message, 2)
+    clearFields(message, [1, 3, 4, 5, 6])
 
 proc number_value*(message: google_protobuf_Value): float64 {.inline.} =
     message.kind.number_value
@@ -286,15 +271,15 @@ proc `number_value=`*(message: google_protobuf_Value, value: float64) {.inline.}
 
 proc clearstring_value*(message: google_protobuf_Value) =
     message.kind.string_value = ""
-    excl(message.hasField, [3, 1, 2, 4, 5, 6])
+    clearFields(message, [3, 1, 2, 4, 5, 6])
 
 proc hasstring_value*(message: google_protobuf_Value): bool =
-    result = contains(message.hasField, 3)
+    result = hasField(message, 3)
 
 proc setstring_value*(message: google_protobuf_Value, value: string) =
     message.kind.string_value = value
-    incl(message.hasField, 3)
-    excl(message.hasField, [1, 2, 4, 5, 6])
+    setField(message, 3)
+    clearFields(message, [1, 2, 4, 5, 6])
 
 proc string_value*(message: google_protobuf_Value): string {.inline.} =
     message.kind.string_value
@@ -304,15 +289,15 @@ proc `string_value=`*(message: google_protobuf_Value, value: string) {.inline.}
 
 proc clearbool_value*(message: google_protobuf_Value) =
     message.kind.bool_value = false
-    excl(message.hasField, [4, 1, 2, 3, 5, 6])
+    clearFields(message, [4, 1, 2, 3, 5, 6])
 
 proc hasbool_value*(message: google_protobuf_Value): bool =
-    result = contains(message.hasField, 4)
+    result = hasField(message, 4)
 
 proc setbool_value*(message: google_protobuf_Value, value: bool) =
     message.kind.bool_value = value
-    incl(message.hasField, 4)
-    excl(message.hasField, [1, 2, 3, 5, 6])
+    setField(message, 4)
+    clearFields(message, [1, 2, 3, 5, 6])
 
 proc bool_value*(message: google_protobuf_Value): bool {.inline.} =
     message.kind.bool_value
@@ -322,15 +307,15 @@ proc `bool_value=`*(message: google_protobuf_Value, value: bool) {.inline.} =
 
 proc clearstruct_value*(message: google_protobuf_Value) =
     message.kind.struct_value = nil
-    excl(message.hasField, [5, 1, 2, 3, 4, 6])
+    clearFields(message, [5, 1, 2, 3, 4, 6])
 
 proc hasstruct_value*(message: google_protobuf_Value): bool =
-    result = contains(message.hasField, 5)
+    result = hasField(message, 5)
 
 proc setstruct_value*(message: google_protobuf_Value, value: google_protobuf_Struct) =
     message.kind.struct_value = value
-    incl(message.hasField, 5)
-    excl(message.hasField, [1, 2, 3, 4, 6])
+    setField(message, 5)
+    clearFields(message, [1, 2, 3, 4, 6])
 
 proc struct_value*(message: google_protobuf_Value): google_protobuf_Struct {.inline.} =
     message.kind.struct_value
@@ -340,15 +325,15 @@ proc `struct_value=`*(message: google_protobuf_Value, value: google_protobuf_Str
 
 proc clearlist_value*(message: google_protobuf_Value) =
     message.kind.list_value = nil
-    excl(message.hasField, [6, 1, 2, 3, 4, 5])
+    clearFields(message, [6, 1, 2, 3, 4, 5])
 
 proc haslist_value*(message: google_protobuf_Value): bool =
-    result = contains(message.hasField, 6)
+    result = hasField(message, 6)
 
 proc setlist_value*(message: google_protobuf_Value, value: google_protobuf_ListValue) =
     message.kind.list_value = value
-    incl(message.hasField, 6)
-    excl(message.hasField, [1, 2, 3, 4, 5])
+    setField(message, 6)
+    clearFields(message, [1, 2, 3, 4, 5])
 
 proc list_value*(message: google_protobuf_Value): google_protobuf_ListValue {.inline.} =
     message.kind.list_value
@@ -375,25 +360,24 @@ proc sizeOfgoogle_protobuf_Value*(message: google_protobuf_Value): uint64 =
     if haslist_value(message):
         result = result + sizeOfTag(6, WireType.LengthDelimited)
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_ListValue(message.kind.list_value))
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_Value*(stream: ProtobufStream, message: google_protobuf_Value) =
+proc writegoogle_protobuf_Value*(stream: Stream, message: google_protobuf_Value) =
     if hasnull_value(message):
-        writeEnum(stream, message.kind.null_value, 1)
+        protoWriteEnum(stream, message.kind.null_value, 1)
     if hasnumber_value(message):
-        writeDouble(stream, message.kind.number_value, 2)
+        protoWriteDouble(stream, message.kind.number_value, 2)
     if hasstring_value(message):
-        writeString(stream, message.kind.string_value, 3)
+        protoWriteString(stream, message.kind.string_value, 3)
     if hasbool_value(message):
-        writeBool(stream, message.kind.bool_value, 4)
+        protoWriteBool(stream, message.kind.bool_value, 4)
     if hasstruct_value(message):
         writeMessage(stream, message.kind.struct_value, 5)
     if haslist_value(message):
         writeMessage(stream, message.kind.list_value, 6)
-    writeUnknownFields(stream, message.unknownFields)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_Value*(stream: ProtobufStream): google_protobuf_Value =
+proc readgoogle_protobuf_Value*(stream: Stream): google_protobuf_Value =
     result = newgoogle_protobuf_Value()
     while not atEnd(stream):
         let
@@ -404,16 +388,16 @@ proc readgoogle_protobuf_Value*(stream: ProtobufStream): google_protobuf_Value =
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.Varint)
-            setnull_value(result, readEnum[google_protobuf_NullValue](stream))
+            setnull_value(result, protoReadEnum[google_protobuf_NullValue](stream))
         of 2:
             expectWireType(wireType, WireType.Fixed64)
-            setnumber_value(result, readDouble(stream))
+            setnumber_value(result, protoReadDouble(stream))
         of 3:
             expectWireType(wireType, WireType.LengthDelimited)
-            setstring_value(result, readString(stream))
+            setstring_value(result, protoReadString(stream))
         of 4:
             expectWireType(wireType, WireType.Varint)
-            setbool_value(result, readBool(stream))
+            setbool_value(result, protoReadBool(stream))
         of 5:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
@@ -422,19 +406,17 @@ proc readgoogle_protobuf_Value*(stream: ProtobufStream): google_protobuf_Value =
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
             setlist_value(result, newgoogle_protobuf_ListValue(data))
-        else: readUnknownField(stream, tag, result.unknownFields)
+        else: readUnknownField(stream, result, tag)
 
 proc serialize*(message: google_protobuf_Value): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_Value(pbs, message)
+    writegoogle_protobuf_Value(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_Value*(data: string): google_protobuf_Value =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_Value(pbs)
+    result = readgoogle_protobuf_Value(ss)
 
 
diff --git a/nimpb/wkt/timestamp_pb.nim b/nimpb/wkt/timestamp_pb.nim
index 5f00154..a67eeeb 100644
--- a/nimpb/wkt/timestamp_pb.nim
+++ b/nimpb/wkt/timestamp_pb.nim
@@ -9,35 +9,32 @@ import nimpb/json as nimpb_json
 
 type
     google_protobuf_Timestamp* = ref google_protobuf_TimestampObj
-    google_protobuf_TimestampObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_TimestampObj* = object of Message
         seconds: int64
         nanos: int32
 
 proc newgoogle_protobuf_Timestamp*(): google_protobuf_Timestamp
 proc newgoogle_protobuf_Timestamp*(data: string): google_protobuf_Timestamp
-proc writegoogle_protobuf_Timestamp*(stream: ProtobufStream, message: google_protobuf_Timestamp)
-proc readgoogle_protobuf_Timestamp*(stream: ProtobufStream): google_protobuf_Timestamp
+proc writegoogle_protobuf_Timestamp*(stream: Stream, message: google_protobuf_Timestamp)
+proc readgoogle_protobuf_Timestamp*(stream: Stream): google_protobuf_Timestamp
 proc sizeOfgoogle_protobuf_Timestamp*(message: google_protobuf_Timestamp): uint64
 
 proc newgoogle_protobuf_Timestamp*(): google_protobuf_Timestamp =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.seconds = 0
     result.nanos = 0
 
 proc clearseconds*(message: google_protobuf_Timestamp) =
     message.seconds = 0
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc hasseconds*(message: google_protobuf_Timestamp): bool =
-    result = contains(message.hasField, 1)
+    result = hasField(message, 1)
 
 proc setseconds*(message: google_protobuf_Timestamp, value: int64) =
     message.seconds = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc seconds*(message: google_protobuf_Timestamp): int64 {.inline.} =
     message.seconds
@@ -47,14 +44,14 @@ proc `seconds=`*(message: google_protobuf_Timestamp, value: int64) {.inline.} =
 
 proc clearnanos*(message: google_protobuf_Timestamp) =
     message.nanos = 0
-    excl(message.hasField, [2])
+    clearFields(message, [2])
 
 proc hasnanos*(message: google_protobuf_Timestamp): bool =
-    result = contains(message.hasField, 2)
+    result = hasField(message, 2)
 
 proc setnanos*(message: google_protobuf_Timestamp, value: int32) =
     message.nanos = value
-    incl(message.hasField, 2)
+    setField(message, 2)
 
 proc nanos*(message: google_protobuf_Timestamp): int32 {.inline.} =
     message.nanos
@@ -69,17 +66,16 @@ proc sizeOfgoogle_protobuf_Timestamp*(message: google_protobuf_Timestamp): uint6
     if hasnanos(message):
         result = result + sizeOfTag(2, WireType.Varint)
         result = result + sizeOfInt32(message.nanos)
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_Timestamp*(stream: ProtobufStream, message: google_protobuf_Timestamp) =
+proc writegoogle_protobuf_Timestamp*(stream: Stream, message: google_protobuf_Timestamp) =
     if hasseconds(message):
-        writeInt64(stream, message.seconds, 1)
+        protoWriteInt64(stream, message.seconds, 1)
     if hasnanos(message):
-        writeInt32(stream, message.nanos, 2)
-    writeUnknownFields(stream, message.unknownFields)
+        protoWriteInt32(stream, message.nanos, 2)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_Timestamp*(stream: ProtobufStream): google_protobuf_Timestamp =
+proc readgoogle_protobuf_Timestamp*(stream: Stream): google_protobuf_Timestamp =
     result = newgoogle_protobuf_Timestamp()
     while not atEnd(stream):
         let
@@ -90,23 +86,21 @@ proc readgoogle_protobuf_Timestamp*(stream: ProtobufStream): google_protobuf_Tim
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.Varint)
-            setseconds(result, readInt64(stream))
+            setseconds(result, protoReadInt64(stream))
         of 2:
             expectWireType(wireType, WireType.Varint)
-            setnanos(result, readInt32(stream))
-        else: readUnknownField(stream, tag, result.unknownFields)
+            setnanos(result, protoReadInt32(stream))
+        else: readUnknownField(stream, result, tag)
 
 proc serialize*(message: google_protobuf_Timestamp): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_Timestamp(pbs, message)
+    writegoogle_protobuf_Timestamp(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_Timestamp*(data: string): google_protobuf_Timestamp =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_Timestamp(pbs)
+    result = readgoogle_protobuf_Timestamp(ss)
 
 
diff --git a/nimpb/wkt/type_pb.nim b/nimpb/wkt/type_pb.nim
index efb7d26..6e4675b 100644
--- a/nimpb/wkt/type_pb.nim
+++ b/nimpb/wkt/type_pb.nim
@@ -40,9 +40,7 @@ type
         CARDINALITY_REQUIRED = 2
         CARDINALITY_REPEATED = 3
     google_protobuf_Type* = ref google_protobuf_TypeObj
-    google_protobuf_TypeObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_TypeObj* = object of Message
         name: string
         fields: seq[google_protobuf_Field]
         oneofs: seq[string]
@@ -50,9 +48,7 @@ type
         source_context: google_protobuf_SourceContext
         syntax: google_protobuf_Syntax
     google_protobuf_Field* = ref google_protobuf_FieldObj
-    google_protobuf_FieldObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_FieldObj* = object of Message
         kind: google_protobuf_Field_Kind
         cardinality: google_protobuf_Field_Cardinality
         number: int32
@@ -64,80 +60,73 @@ type
         json_name: string
         default_value: string
     google_protobuf_Enum* = ref google_protobuf_EnumObj
-    google_protobuf_EnumObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_EnumObj* = object of Message
         name: string
         enumvalue: seq[google_protobuf_EnumValue]
         options: seq[google_protobuf_Option]
         source_context: google_protobuf_SourceContext
         syntax: google_protobuf_Syntax
     google_protobuf_EnumValue* = ref google_protobuf_EnumValueObj
-    google_protobuf_EnumValueObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_EnumValueObj* = object of Message
         name: string
         number: int32
         options: seq[google_protobuf_Option]
     google_protobuf_Option* = ref google_protobuf_OptionObj
-    google_protobuf_OptionObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_OptionObj* = object of Message
         name: string
         value: google_protobuf_Any
 
 proc newgoogle_protobuf_Option*(): google_protobuf_Option
 proc newgoogle_protobuf_Option*(data: string): google_protobuf_Option
-proc writegoogle_protobuf_Option*(stream: ProtobufStream, message: google_protobuf_Option)
-proc readgoogle_protobuf_Option*(stream: ProtobufStream): google_protobuf_Option
+proc writegoogle_protobuf_Option*(stream: Stream, message: google_protobuf_Option)
+proc readgoogle_protobuf_Option*(stream: Stream): google_protobuf_Option
 proc sizeOfgoogle_protobuf_Option*(message: google_protobuf_Option): uint64
 proc toJson*(message: google_protobuf_Option): JsonNode
 
 proc newgoogle_protobuf_Field*(): google_protobuf_Field
 proc newgoogle_protobuf_Field*(data: string): google_protobuf_Field
-proc writegoogle_protobuf_Field*(stream: ProtobufStream, message: google_protobuf_Field)
-proc readgoogle_protobuf_Field*(stream: ProtobufStream): google_protobuf_Field
+proc writegoogle_protobuf_Field*(stream: Stream, message: google_protobuf_Field)
+proc readgoogle_protobuf_Field*(stream: Stream): google_protobuf_Field
 proc sizeOfgoogle_protobuf_Field*(message: google_protobuf_Field): uint64
 proc toJson*(message: google_protobuf_Field): JsonNode
 
 proc newgoogle_protobuf_Type*(): google_protobuf_Type
 proc newgoogle_protobuf_Type*(data: string): google_protobuf_Type
-proc writegoogle_protobuf_Type*(stream: ProtobufStream, message: google_protobuf_Type)
-proc readgoogle_protobuf_Type*(stream: ProtobufStream): google_protobuf_Type
+proc writegoogle_protobuf_Type*(stream: Stream, message: google_protobuf_Type)
+proc readgoogle_protobuf_Type*(stream: Stream): google_protobuf_Type
 proc sizeOfgoogle_protobuf_Type*(message: google_protobuf_Type): uint64
 proc toJson*(message: google_protobuf_Type): JsonNode
 
 proc newgoogle_protobuf_EnumValue*(): google_protobuf_EnumValue
 proc newgoogle_protobuf_EnumValue*(data: string): google_protobuf_EnumValue
-proc writegoogle_protobuf_EnumValue*(stream: ProtobufStream, message: google_protobuf_EnumValue)
-proc readgoogle_protobuf_EnumValue*(stream: ProtobufStream): google_protobuf_EnumValue
+proc writegoogle_protobuf_EnumValue*(stream: Stream, message: google_protobuf_EnumValue)
+proc readgoogle_protobuf_EnumValue*(stream: Stream): google_protobuf_EnumValue
 proc sizeOfgoogle_protobuf_EnumValue*(message: google_protobuf_EnumValue): uint64
 proc toJson*(message: google_protobuf_EnumValue): JsonNode
 
 proc newgoogle_protobuf_Enum*(): google_protobuf_Enum
 proc newgoogle_protobuf_Enum*(data: string): google_protobuf_Enum
-proc writegoogle_protobuf_Enum*(stream: ProtobufStream, message: google_protobuf_Enum)
-proc readgoogle_protobuf_Enum*(stream: ProtobufStream): google_protobuf_Enum
+proc writegoogle_protobuf_Enum*(stream: Stream, message: google_protobuf_Enum)
+proc readgoogle_protobuf_Enum*(stream: Stream): google_protobuf_Enum
 proc sizeOfgoogle_protobuf_Enum*(message: google_protobuf_Enum): uint64
 proc toJson*(message: google_protobuf_Enum): JsonNode
 
 proc newgoogle_protobuf_Option*(): google_protobuf_Option =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.name = ""
     result.value = nil
 
 proc clearname*(message: google_protobuf_Option) =
     message.name = ""
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc hasname*(message: google_protobuf_Option): bool =
-    result = contains(message.hasField, 1)
+    result = hasField(message, 1)
 
 proc setname*(message: google_protobuf_Option, value: string) =
     message.name = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc name*(message: google_protobuf_Option): string {.inline.} =
     message.name
@@ -147,14 +136,14 @@ proc `name=`*(message: google_protobuf_Option, value: string) {.inline.} =
 
 proc clearvalue*(message: google_protobuf_Option) =
     message.value = nil
-    excl(message.hasField, [2])
+    clearFields(message, [2])
 
 proc hasvalue*(message: google_protobuf_Option): bool =
-    result = contains(message.hasField, 2)
+    result = hasField(message, 2)
 
 proc setvalue*(message: google_protobuf_Option, value: google_protobuf_Any) =
     message.value = value
-    incl(message.hasField, 2)
+    setField(message, 2)
 
 proc value*(message: google_protobuf_Option): google_protobuf_Any {.inline.} =
     message.value
@@ -169,17 +158,16 @@ proc sizeOfgoogle_protobuf_Option*(message: google_protobuf_Option): uint64 =
     if hasvalue(message):
         result = result + sizeOfTag(2, WireType.LengthDelimited)
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_Any(message.value))
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_Option*(stream: ProtobufStream, message: google_protobuf_Option) =
+proc writegoogle_protobuf_Option*(stream: Stream, message: google_protobuf_Option) =
     if hasname(message):
-        writeString(stream, message.name, 1)
+        protoWriteString(stream, message.name, 1)
     if hasvalue(message):
         writeMessage(stream, message.value, 2)
-    writeUnknownFields(stream, message.unknownFields)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_Option*(stream: ProtobufStream): google_protobuf_Option =
+proc readgoogle_protobuf_Option*(stream: Stream): google_protobuf_Option =
     result = newgoogle_protobuf_Option()
     while not atEnd(stream):
         let
@@ -190,12 +178,12 @@ proc readgoogle_protobuf_Option*(stream: ProtobufStream): google_protobuf_Option
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.LengthDelimited)
-            setname(result, readString(stream))
+            setname(result, protoReadString(stream))
         of 2:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
             setvalue(result, newgoogle_protobuf_Any(data))
-        else: readUnknownField(stream, tag, result.unknownFields)
+        else: readUnknownField(stream, result, tag)
 
 proc toJson*(message: google_protobuf_Option): JsonNode =
     result = newJObject()
@@ -207,21 +195,18 @@ proc toJson*(message: google_protobuf_Option): JsonNode =
 proc serialize*(message: google_protobuf_Option): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_Option(pbs, message)
+    writegoogle_protobuf_Option(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_Option*(data: string): google_protobuf_Option =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_Option(pbs)
+    result = readgoogle_protobuf_Option(ss)
 
 
 proc newgoogle_protobuf_Field*(): google_protobuf_Field =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.kind = google_protobuf_Field_Kind.TYPE_UNKNOWN
     result.cardinality = google_protobuf_Field_Cardinality.CARDINALITY_UNKNOWN
     result.number = 0
@@ -235,14 +220,14 @@ proc newgoogle_protobuf_Field*(): google_protobuf_Field =
 
 proc clearkind*(message: google_protobuf_Field) =
     message.kind = google_protobuf_Field_Kind.TYPE_UNKNOWN
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc haskind*(message: google_protobuf_Field): bool =
-    result = contains(message.hasField, 1)
+    result = hasField(message, 1)
 
 proc setkind*(message: google_protobuf_Field, value: google_protobuf_Field_Kind) =
     message.kind = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc kind*(message: google_protobuf_Field): google_protobuf_Field_Kind {.inline.} =
     message.kind
@@ -252,14 +237,14 @@ 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
-    excl(message.hasField, [2])
+    clearFields(message, [2])
 
 proc hascardinality*(message: google_protobuf_Field): bool =
-    result = contains(message.hasField, 2)
+    result = hasField(message, 2)
 
 proc setcardinality*(message: google_protobuf_Field, value: google_protobuf_Field_Cardinality) =
     message.cardinality = value
-    incl(message.hasField, 2)
+    setField(message, 2)
 
 proc cardinality*(message: google_protobuf_Field): google_protobuf_Field_Cardinality {.inline.} =
     message.cardinality
@@ -269,14 +254,14 @@ proc `cardinality=`*(message: google_protobuf_Field, value: google_protobuf_Fiel
 
 proc clearnumber*(message: google_protobuf_Field) =
     message.number = 0
-    excl(message.hasField, [3])
+    clearFields(message, [3])
 
 proc hasnumber*(message: google_protobuf_Field): bool =
-    result = contains(message.hasField, 3)
+    result = hasField(message, 3)
 
 proc setnumber*(message: google_protobuf_Field, value: int32) =
     message.number = value
-    incl(message.hasField, 3)
+    setField(message, 3)
 
 proc number*(message: google_protobuf_Field): int32 {.inline.} =
     message.number
@@ -286,14 +271,14 @@ proc `number=`*(message: google_protobuf_Field, value: int32) {.inline.} =
 
 proc clearname*(message: google_protobuf_Field) =
     message.name = ""
-    excl(message.hasField, [4])
+    clearFields(message, [4])
 
 proc hasname*(message: google_protobuf_Field): bool =
-    result = contains(message.hasField, 4)
+    result = hasField(message, 4)
 
 proc setname*(message: google_protobuf_Field, value: string) =
     message.name = value
-    incl(message.hasField, 4)
+    setField(message, 4)
 
 proc name*(message: google_protobuf_Field): string {.inline.} =
     message.name
@@ -303,14 +288,14 @@ proc `name=`*(message: google_protobuf_Field, value: string) {.inline.} =
 
 proc cleartype_url*(message: google_protobuf_Field) =
     message.type_url = ""
-    excl(message.hasField, [6])
+    clearFields(message, [6])
 
 proc hastype_url*(message: google_protobuf_Field): bool =
-    result = contains(message.hasField, 6)
+    result = hasField(message, 6)
 
 proc settype_url*(message: google_protobuf_Field, value: string) =
     message.type_url = value
-    incl(message.hasField, 6)
+    setField(message, 6)
 
 proc type_url*(message: google_protobuf_Field): string {.inline.} =
     message.type_url
@@ -320,14 +305,14 @@ proc `type_url=`*(message: google_protobuf_Field, value: string) {.inline.} =
 
 proc clearoneof_index*(message: google_protobuf_Field) =
     message.oneof_index = 0
-    excl(message.hasField, [7])
+    clearFields(message, [7])
 
 proc hasoneof_index*(message: google_protobuf_Field): bool =
-    result = contains(message.hasField, 7)
+    result = hasField(message, 7)
 
 proc setoneof_index*(message: google_protobuf_Field, value: int32) =
     message.oneof_index = value
-    incl(message.hasField, 7)
+    setField(message, 7)
 
 proc oneof_index*(message: google_protobuf_Field): int32 {.inline.} =
     message.oneof_index
@@ -337,14 +322,14 @@ proc `oneof_index=`*(message: google_protobuf_Field, value: int32) {.inline.} =
 
 proc clearpacked*(message: google_protobuf_Field) =
     message.packed = false
-    excl(message.hasField, [8])
+    clearFields(message, [8])
 
 proc haspacked*(message: google_protobuf_Field): bool =
-    result = contains(message.hasField, 8)
+    result = hasField(message, 8)
 
 proc setpacked*(message: google_protobuf_Field, value: bool) =
     message.packed = value
-    incl(message.hasField, 8)
+    setField(message, 8)
 
 proc packed*(message: google_protobuf_Field): bool {.inline.} =
     message.packed
@@ -354,18 +339,18 @@ proc `packed=`*(message: google_protobuf_Field, value: bool) {.inline.} =
 
 proc clearoptions*(message: google_protobuf_Field) =
     message.options = @[]
-    excl(message.hasField, [9])
+    clearFields(message, [9])
 
 proc hasoptions*(message: google_protobuf_Field): bool =
-    result = contains(message.hasField, 9) or (len(message.options) > 0)
+    result = hasField(message, 9) or (len(message.options) > 0)
 
 proc setoptions*(message: google_protobuf_Field, value: seq[google_protobuf_Option]) =
     message.options = value
-    incl(message.hasField, 9)
+    setField(message, 9)
 
 proc addoptions*(message: google_protobuf_Field, value: google_protobuf_Option) =
     add(message.options, value)
-    incl(message.hasField, 9)
+    setField(message, 9)
 
 proc options*(message: google_protobuf_Field): seq[google_protobuf_Option] {.inline.} =
     message.options
@@ -375,14 +360,14 @@ proc `options=`*(message: google_protobuf_Field, value: seq[google_protobuf_Opti
 
 proc clearjson_name*(message: google_protobuf_Field) =
     message.json_name = ""
-    excl(message.hasField, [10])
+    clearFields(message, [10])
 
 proc hasjson_name*(message: google_protobuf_Field): bool =
-    result = contains(message.hasField, 10)
+    result = hasField(message, 10)
 
 proc setjson_name*(message: google_protobuf_Field, value: string) =
     message.json_name = value
-    incl(message.hasField, 10)
+    setField(message, 10)
 
 proc json_name*(message: google_protobuf_Field): string {.inline.} =
     message.json_name
@@ -392,14 +377,14 @@ proc `json_name=`*(message: google_protobuf_Field, value: string) {.inline.} =
 
 proc cleardefault_value*(message: google_protobuf_Field) =
     message.default_value = ""
-    excl(message.hasField, [11])
+    clearFields(message, [11])
 
 proc hasdefault_value*(message: google_protobuf_Field): bool =
-    result = contains(message.hasField, 11)
+    result = hasField(message, 11)
 
 proc setdefault_value*(message: google_protobuf_Field, value: string) =
     message.default_value = value
-    incl(message.hasField, 11)
+    setField(message, 11)
 
 proc default_value*(message: google_protobuf_Field): string {.inline.} =
     message.default_value
@@ -438,33 +423,32 @@ proc sizeOfgoogle_protobuf_Field*(message: google_protobuf_Field): uint64 =
     if hasdefault_value(message):
         result = result + sizeOfTag(11, WireType.LengthDelimited)
         result = result + sizeOfString(message.default_value)
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_Field*(stream: ProtobufStream, message: google_protobuf_Field) =
+proc writegoogle_protobuf_Field*(stream: Stream, message: google_protobuf_Field) =
     if haskind(message):
-        writeEnum(stream, message.kind, 1)
+        protoWriteEnum(stream, message.kind, 1)
     if hascardinality(message):
-        writeEnum(stream, message.cardinality, 2)
+        protoWriteEnum(stream, message.cardinality, 2)
     if hasnumber(message):
-        writeInt32(stream, message.number, 3)
+        protoWriteInt32(stream, message.number, 3)
     if hasname(message):
-        writeString(stream, message.name, 4)
+        protoWriteString(stream, message.name, 4)
     if hastype_url(message):
-        writeString(stream, message.type_url, 6)
+        protoWriteString(stream, message.type_url, 6)
     if hasoneof_index(message):
-        writeInt32(stream, message.oneof_index, 7)
+        protoWriteInt32(stream, message.oneof_index, 7)
     if haspacked(message):
-        writeBool(stream, message.packed, 8)
+        protoWriteBool(stream, message.packed, 8)
     for value in message.options:
         writeMessage(stream, value, 9)
     if hasjson_name(message):
-        writeString(stream, message.json_name, 10)
+        protoWriteString(stream, message.json_name, 10)
     if hasdefault_value(message):
-        writeString(stream, message.default_value, 11)
-    writeUnknownFields(stream, message.unknownFields)
+        protoWriteString(stream, message.default_value, 11)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_Field*(stream: ProtobufStream): google_protobuf_Field =
+proc readgoogle_protobuf_Field*(stream: Stream): google_protobuf_Field =
     result = newgoogle_protobuf_Field()
     while not atEnd(stream):
         let
@@ -475,36 +459,36 @@ proc readgoogle_protobuf_Field*(stream: ProtobufStream): google_protobuf_Field =
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.Varint)
-            setkind(result, readEnum[google_protobuf_Field_Kind](stream))
+            setkind(result, protoReadEnum[google_protobuf_Field_Kind](stream))
         of 2:
             expectWireType(wireType, WireType.Varint)
-            setcardinality(result, readEnum[google_protobuf_Field_Cardinality](stream))
+            setcardinality(result, protoReadEnum[google_protobuf_Field_Cardinality](stream))
         of 3:
             expectWireType(wireType, WireType.Varint)
-            setnumber(result, readInt32(stream))
+            setnumber(result, protoReadInt32(stream))
         of 4:
             expectWireType(wireType, WireType.LengthDelimited)
-            setname(result, readString(stream))
+            setname(result, protoReadString(stream))
         of 6:
             expectWireType(wireType, WireType.LengthDelimited)
-            settype_url(result, readString(stream))
+            settype_url(result, protoReadString(stream))
         of 7:
             expectWireType(wireType, WireType.Varint)
-            setoneof_index(result, readInt32(stream))
+            setoneof_index(result, protoReadInt32(stream))
         of 8:
             expectWireType(wireType, WireType.Varint)
-            setpacked(result, readBool(stream))
+            setpacked(result, protoReadBool(stream))
         of 9:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
             addoptions(result, newgoogle_protobuf_Option(data))
         of 10:
             expectWireType(wireType, WireType.LengthDelimited)
-            setjson_name(result, readString(stream))
+            setjson_name(result, protoReadString(stream))
         of 11:
             expectWireType(wireType, WireType.LengthDelimited)
-            setdefault_value(result, readString(stream))
-        else: readUnknownField(stream, tag, result.unknownFields)
+            setdefault_value(result, protoReadString(stream))
+        else: readUnknownField(stream, result, tag)
 
 proc toJson*(message: google_protobuf_Field): JsonNode =
     result = newJObject()
@@ -535,21 +519,18 @@ proc toJson*(message: google_protobuf_Field): JsonNode =
 proc serialize*(message: google_protobuf_Field): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_Field(pbs, message)
+    writegoogle_protobuf_Field(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_Field*(data: string): google_protobuf_Field =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_Field(pbs)
+    result = readgoogle_protobuf_Field(ss)
 
 
 proc newgoogle_protobuf_Type*(): google_protobuf_Type =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.name = ""
     result.fields = @[]
     result.oneofs = @[]
@@ -559,14 +540,14 @@ proc newgoogle_protobuf_Type*(): google_protobuf_Type =
 
 proc clearname*(message: google_protobuf_Type) =
     message.name = ""
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc hasname*(message: google_protobuf_Type): bool =
-    result = contains(message.hasField, 1)
+    result = hasField(message, 1)
 
 proc setname*(message: google_protobuf_Type, value: string) =
     message.name = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc name*(message: google_protobuf_Type): string {.inline.} =
     message.name
@@ -576,18 +557,18 @@ proc `name=`*(message: google_protobuf_Type, value: string) {.inline.} =
 
 proc clearfields*(message: google_protobuf_Type) =
     message.fields = @[]
-    excl(message.hasField, [2])
+    clearFields(message, [2])
 
 proc hasfields*(message: google_protobuf_Type): bool =
-    result = contains(message.hasField, 2) or (len(message.fields) > 0)
+    result = hasField(message, 2) or (len(message.fields) > 0)
 
 proc setfields*(message: google_protobuf_Type, value: seq[google_protobuf_Field]) =
     message.fields = value
-    incl(message.hasField, 2)
+    setField(message, 2)
 
 proc addfields*(message: google_protobuf_Type, value: google_protobuf_Field) =
     add(message.fields, value)
-    incl(message.hasField, 2)
+    setField(message, 2)
 
 proc fields*(message: google_protobuf_Type): seq[google_protobuf_Field] {.inline.} =
     message.fields
@@ -597,18 +578,18 @@ proc `fields=`*(message: google_protobuf_Type, value: seq[google_protobuf_Field]
 
 proc clearoneofs*(message: google_protobuf_Type) =
     message.oneofs = @[]
-    excl(message.hasField, [3])
+    clearFields(message, [3])
 
 proc hasoneofs*(message: google_protobuf_Type): bool =
-    result = contains(message.hasField, 3) or (len(message.oneofs) > 0)
+    result = hasField(message, 3) or (len(message.oneofs) > 0)
 
 proc setoneofs*(message: google_protobuf_Type, value: seq[string]) =
     message.oneofs = value
-    incl(message.hasField, 3)
+    setField(message, 3)
 
 proc addoneofs*(message: google_protobuf_Type, value: string) =
     add(message.oneofs, value)
-    incl(message.hasField, 3)
+    setField(message, 3)
 
 proc oneofs*(message: google_protobuf_Type): seq[string] {.inline.} =
     message.oneofs
@@ -618,18 +599,18 @@ proc `oneofs=`*(message: google_protobuf_Type, value: seq[string]) {.inline.} =
 
 proc clearoptions*(message: google_protobuf_Type) =
     message.options = @[]
-    excl(message.hasField, [4])
+    clearFields(message, [4])
 
 proc hasoptions*(message: google_protobuf_Type): bool =
-    result = contains(message.hasField, 4) or (len(message.options) > 0)
+    result = hasField(message, 4) or (len(message.options) > 0)
 
 proc setoptions*(message: google_protobuf_Type, value: seq[google_protobuf_Option]) =
     message.options = value
-    incl(message.hasField, 4)
+    setField(message, 4)
 
 proc addoptions*(message: google_protobuf_Type, value: google_protobuf_Option) =
     add(message.options, value)
-    incl(message.hasField, 4)
+    setField(message, 4)
 
 proc options*(message: google_protobuf_Type): seq[google_protobuf_Option] {.inline.} =
     message.options
@@ -639,14 +620,14 @@ proc `options=`*(message: google_protobuf_Type, value: seq[google_protobuf_Optio
 
 proc clearsource_context*(message: google_protobuf_Type) =
     message.source_context = nil
-    excl(message.hasField, [5])
+    clearFields(message, [5])
 
 proc hassource_context*(message: google_protobuf_Type): bool =
-    result = contains(message.hasField, 5)
+    result = hasField(message, 5)
 
 proc setsource_context*(message: google_protobuf_Type, value: google_protobuf_SourceContext) =
     message.source_context = value
-    incl(message.hasField, 5)
+    setField(message, 5)
 
 proc source_context*(message: google_protobuf_Type): google_protobuf_SourceContext {.inline.} =
     message.source_context
@@ -656,14 +637,14 @@ proc `source_context=`*(message: google_protobuf_Type, value: google_protobuf_So
 
 proc clearsyntax*(message: google_protobuf_Type) =
     message.syntax = google_protobuf_Syntax.SYNTAX_PROTO2
-    excl(message.hasField, [6])
+    clearFields(message, [6])
 
 proc hassyntax*(message: google_protobuf_Type): bool =
-    result = contains(message.hasField, 6)
+    result = hasField(message, 6)
 
 proc setsyntax*(message: google_protobuf_Type, value: google_protobuf_Syntax) =
     message.syntax = value
-    incl(message.hasField, 6)
+    setField(message, 6)
 
 proc syntax*(message: google_protobuf_Type): google_protobuf_Syntax {.inline.} =
     message.syntax
@@ -690,25 +671,24 @@ proc sizeOfgoogle_protobuf_Type*(message: google_protobuf_Type): uint64 =
     if hassyntax(message):
         result = result + sizeOfTag(6, WireType.Varint)
         result = result + sizeOfEnum[google_protobuf_Syntax](message.syntax)
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_Type*(stream: ProtobufStream, message: google_protobuf_Type) =
+proc writegoogle_protobuf_Type*(stream: Stream, message: google_protobuf_Type) =
     if hasname(message):
-        writeString(stream, message.name, 1)
+        protoWriteString(stream, message.name, 1)
     for value in message.fields:
         writeMessage(stream, value, 2)
     for value in message.oneofs:
-        writeString(stream, value, 3)
+        protoWriteString(stream, value, 3)
     for value in message.options:
         writeMessage(stream, value, 4)
     if hassource_context(message):
         writeMessage(stream, message.source_context, 5)
     if hassyntax(message):
-        writeEnum(stream, message.syntax, 6)
-    writeUnknownFields(stream, message.unknownFields)
+        protoWriteEnum(stream, message.syntax, 6)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_Type*(stream: ProtobufStream): google_protobuf_Type =
+proc readgoogle_protobuf_Type*(stream: Stream): google_protobuf_Type =
     result = newgoogle_protobuf_Type()
     while not atEnd(stream):
         let
@@ -719,14 +699,14 @@ proc readgoogle_protobuf_Type*(stream: ProtobufStream): google_protobuf_Type =
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.LengthDelimited)
-            setname(result, readString(stream))
+            setname(result, protoReadString(stream))
         of 2:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
             addfields(result, newgoogle_protobuf_Field(data))
         of 3:
             expectWireType(wireType, WireType.LengthDelimited)
-            addoneofs(result, readString(stream))
+            addoneofs(result, protoReadString(stream))
         of 4:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
@@ -737,8 +717,8 @@ proc readgoogle_protobuf_Type*(stream: ProtobufStream): google_protobuf_Type =
             setsource_context(result, newgoogle_protobuf_SourceContext(data))
         of 6:
             expectWireType(wireType, WireType.Varint)
-            setsyntax(result, readEnum[google_protobuf_Syntax](stream))
-        else: readUnknownField(stream, tag, result.unknownFields)
+            setsyntax(result, protoReadEnum[google_protobuf_Syntax](stream))
+        else: readUnknownField(stream, result, tag)
 
 proc toJson*(message: google_protobuf_Type): JsonNode =
     result = newJObject()
@@ -767,35 +747,32 @@ proc toJson*(message: google_protobuf_Type): JsonNode =
 proc serialize*(message: google_protobuf_Type): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_Type(pbs, message)
+    writegoogle_protobuf_Type(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_Type*(data: string): google_protobuf_Type =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_Type(pbs)
+    result = readgoogle_protobuf_Type(ss)
 
 
 proc newgoogle_protobuf_EnumValue*(): google_protobuf_EnumValue =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.name = ""
     result.number = 0
     result.options = @[]
 
 proc clearname*(message: google_protobuf_EnumValue) =
     message.name = ""
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc hasname*(message: google_protobuf_EnumValue): bool =
-    result = contains(message.hasField, 1)
+    result = hasField(message, 1)
 
 proc setname*(message: google_protobuf_EnumValue, value: string) =
     message.name = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc name*(message: google_protobuf_EnumValue): string {.inline.} =
     message.name
@@ -805,14 +782,14 @@ proc `name=`*(message: google_protobuf_EnumValue, value: string) {.inline.} =
 
 proc clearnumber*(message: google_protobuf_EnumValue) =
     message.number = 0
-    excl(message.hasField, [2])
+    clearFields(message, [2])
 
 proc hasnumber*(message: google_protobuf_EnumValue): bool =
-    result = contains(message.hasField, 2)
+    result = hasField(message, 2)
 
 proc setnumber*(message: google_protobuf_EnumValue, value: int32) =
     message.number = value
-    incl(message.hasField, 2)
+    setField(message, 2)
 
 proc number*(message: google_protobuf_EnumValue): int32 {.inline.} =
     message.number
@@ -822,18 +799,18 @@ proc `number=`*(message: google_protobuf_EnumValue, value: int32) {.inline.} =
 
 proc clearoptions*(message: google_protobuf_EnumValue) =
     message.options = @[]
-    excl(message.hasField, [3])
+    clearFields(message, [3])
 
 proc hasoptions*(message: google_protobuf_EnumValue): bool =
-    result = contains(message.hasField, 3) or (len(message.options) > 0)
+    result = hasField(message, 3) or (len(message.options) > 0)
 
 proc setoptions*(message: google_protobuf_EnumValue, value: seq[google_protobuf_Option]) =
     message.options = value
-    incl(message.hasField, 3)
+    setField(message, 3)
 
 proc addoptions*(message: google_protobuf_EnumValue, value: google_protobuf_Option) =
     add(message.options, value)
-    incl(message.hasField, 3)
+    setField(message, 3)
 
 proc options*(message: google_protobuf_EnumValue): seq[google_protobuf_Option] {.inline.} =
     message.options
@@ -851,19 +828,18 @@ proc sizeOfgoogle_protobuf_EnumValue*(message: google_protobuf_EnumValue): uint6
     for value in message.options:
         result = result + sizeOfTag(3, WireType.LengthDelimited)
         result = result + sizeOfLengthDelimited(sizeOfgoogle_protobuf_Option(value))
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_EnumValue*(stream: ProtobufStream, message: google_protobuf_EnumValue) =
+proc writegoogle_protobuf_EnumValue*(stream: Stream, message: google_protobuf_EnumValue) =
     if hasname(message):
-        writeString(stream, message.name, 1)
+        protoWriteString(stream, message.name, 1)
     if hasnumber(message):
-        writeInt32(stream, message.number, 2)
+        protoWriteInt32(stream, message.number, 2)
     for value in message.options:
         writeMessage(stream, value, 3)
-    writeUnknownFields(stream, message.unknownFields)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_EnumValue*(stream: ProtobufStream): google_protobuf_EnumValue =
+proc readgoogle_protobuf_EnumValue*(stream: Stream): google_protobuf_EnumValue =
     result = newgoogle_protobuf_EnumValue()
     while not atEnd(stream):
         let
@@ -874,15 +850,15 @@ proc readgoogle_protobuf_EnumValue*(stream: ProtobufStream): google_protobuf_Enu
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.LengthDelimited)
-            setname(result, readString(stream))
+            setname(result, protoReadString(stream))
         of 2:
             expectWireType(wireType, WireType.Varint)
-            setnumber(result, readInt32(stream))
+            setnumber(result, protoReadInt32(stream))
         of 3:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
             addoptions(result, newgoogle_protobuf_Option(data))
-        else: readUnknownField(stream, tag, result.unknownFields)
+        else: readUnknownField(stream, result, tag)
 
 proc toJson*(message: google_protobuf_EnumValue): JsonNode =
     result = newJObject()
@@ -899,21 +875,18 @@ proc toJson*(message: google_protobuf_EnumValue): JsonNode =
 proc serialize*(message: google_protobuf_EnumValue): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_EnumValue(pbs, message)
+    writegoogle_protobuf_EnumValue(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_EnumValue*(data: string): google_protobuf_EnumValue =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_EnumValue(pbs)
+    result = readgoogle_protobuf_EnumValue(ss)
 
 
 proc newgoogle_protobuf_Enum*(): google_protobuf_Enum =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.name = ""
     result.enumvalue = @[]
     result.options = @[]
@@ -922,14 +895,14 @@ proc newgoogle_protobuf_Enum*(): google_protobuf_Enum =
 
 proc clearname*(message: google_protobuf_Enum) =
     message.name = ""
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc hasname*(message: google_protobuf_Enum): bool =
-    result = contains(message.hasField, 1)
+    result = hasField(message, 1)
 
 proc setname*(message: google_protobuf_Enum, value: string) =
     message.name = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc name*(message: google_protobuf_Enum): string {.inline.} =
     message.name
@@ -939,18 +912,18 @@ proc `name=`*(message: google_protobuf_Enum, value: string) {.inline.} =
 
 proc clearenumvalue*(message: google_protobuf_Enum) =
     message.enumvalue = @[]
-    excl(message.hasField, [2])
+    clearFields(message, [2])
 
 proc hasenumvalue*(message: google_protobuf_Enum): bool =
-    result = contains(message.hasField, 2) or (len(message.enumvalue) > 0)
+    result = hasField(message, 2) or (len(message.enumvalue) > 0)
 
 proc setenumvalue*(message: google_protobuf_Enum, value: seq[google_protobuf_EnumValue]) =
     message.enumvalue = value
-    incl(message.hasField, 2)
+    setField(message, 2)
 
 proc addenumvalue*(message: google_protobuf_Enum, value: google_protobuf_EnumValue) =
     add(message.enumvalue, value)
-    incl(message.hasField, 2)
+    setField(message, 2)
 
 proc enumvalue*(message: google_protobuf_Enum): seq[google_protobuf_EnumValue] {.inline.} =
     message.enumvalue
@@ -960,18 +933,18 @@ proc `enumvalue=`*(message: google_protobuf_Enum, value: seq[google_protobuf_Enu
 
 proc clearoptions*(message: google_protobuf_Enum) =
     message.options = @[]
-    excl(message.hasField, [3])
+    clearFields(message, [3])
 
 proc hasoptions*(message: google_protobuf_Enum): bool =
-    result = contains(message.hasField, 3) or (len(message.options) > 0)
+    result = hasField(message, 3) or (len(message.options) > 0)
 
 proc setoptions*(message: google_protobuf_Enum, value: seq[google_protobuf_Option]) =
     message.options = value
-    incl(message.hasField, 3)
+    setField(message, 3)
 
 proc addoptions*(message: google_protobuf_Enum, value: google_protobuf_Option) =
     add(message.options, value)
-    incl(message.hasField, 3)
+    setField(message, 3)
 
 proc options*(message: google_protobuf_Enum): seq[google_protobuf_Option] {.inline.} =
     message.options
@@ -981,14 +954,14 @@ proc `options=`*(message: google_protobuf_Enum, value: seq[google_protobuf_Optio
 
 proc clearsource_context*(message: google_protobuf_Enum) =
     message.source_context = nil
-    excl(message.hasField, [4])
+    clearFields(message, [4])
 
 proc hassource_context*(message: google_protobuf_Enum): bool =
-    result = contains(message.hasField, 4)
+    result = hasField(message, 4)
 
 proc setsource_context*(message: google_protobuf_Enum, value: google_protobuf_SourceContext) =
     message.source_context = value
-    incl(message.hasField, 4)
+    setField(message, 4)
 
 proc source_context*(message: google_protobuf_Enum): google_protobuf_SourceContext {.inline.} =
     message.source_context
@@ -998,14 +971,14 @@ proc `source_context=`*(message: google_protobuf_Enum, value: google_protobuf_So
 
 proc clearsyntax*(message: google_protobuf_Enum) =
     message.syntax = google_protobuf_Syntax.SYNTAX_PROTO2
-    excl(message.hasField, [5])
+    clearFields(message, [5])
 
 proc hassyntax*(message: google_protobuf_Enum): bool =
-    result = contains(message.hasField, 5)
+    result = hasField(message, 5)
 
 proc setsyntax*(message: google_protobuf_Enum, value: google_protobuf_Syntax) =
     message.syntax = value
-    incl(message.hasField, 5)
+    setField(message, 5)
 
 proc syntax*(message: google_protobuf_Enum): google_protobuf_Syntax {.inline.} =
     message.syntax
@@ -1029,12 +1002,11 @@ proc sizeOfgoogle_protobuf_Enum*(message: google_protobuf_Enum): uint64 =
     if hassyntax(message):
         result = result + sizeOfTag(5, WireType.Varint)
         result = result + sizeOfEnum[google_protobuf_Syntax](message.syntax)
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_Enum*(stream: ProtobufStream, message: google_protobuf_Enum) =
+proc writegoogle_protobuf_Enum*(stream: Stream, message: google_protobuf_Enum) =
     if hasname(message):
-        writeString(stream, message.name, 1)
+        protoWriteString(stream, message.name, 1)
     for value in message.enumvalue:
         writeMessage(stream, value, 2)
     for value in message.options:
@@ -1042,10 +1014,10 @@ proc writegoogle_protobuf_Enum*(stream: ProtobufStream, message: google_protobuf
     if hassource_context(message):
         writeMessage(stream, message.source_context, 4)
     if hassyntax(message):
-        writeEnum(stream, message.syntax, 5)
-    writeUnknownFields(stream, message.unknownFields)
+        protoWriteEnum(stream, message.syntax, 5)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_Enum*(stream: ProtobufStream): google_protobuf_Enum =
+proc readgoogle_protobuf_Enum*(stream: Stream): google_protobuf_Enum =
     result = newgoogle_protobuf_Enum()
     while not atEnd(stream):
         let
@@ -1056,7 +1028,7 @@ proc readgoogle_protobuf_Enum*(stream: ProtobufStream): google_protobuf_Enum =
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.LengthDelimited)
-            setname(result, readString(stream))
+            setname(result, protoReadString(stream))
         of 2:
             expectWireType(wireType, WireType.LengthDelimited)
             let data = readLengthDelimited(stream)
@@ -1071,8 +1043,8 @@ proc readgoogle_protobuf_Enum*(stream: ProtobufStream): google_protobuf_Enum =
             setsource_context(result, newgoogle_protobuf_SourceContext(data))
         of 5:
             expectWireType(wireType, WireType.Varint)
-            setsyntax(result, readEnum[google_protobuf_Syntax](stream))
-        else: readUnknownField(stream, tag, result.unknownFields)
+            setsyntax(result, protoReadEnum[google_protobuf_Syntax](stream))
+        else: readUnknownField(stream, result, tag)
 
 proc toJson*(message: google_protobuf_Enum): JsonNode =
     result = newJObject()
@@ -1096,14 +1068,12 @@ proc toJson*(message: google_protobuf_Enum): JsonNode =
 proc serialize*(message: google_protobuf_Enum): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_Enum(pbs, message)
+    writegoogle_protobuf_Enum(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_Enum*(data: string): google_protobuf_Enum =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_Enum(pbs)
+    result = readgoogle_protobuf_Enum(ss)
 
 
diff --git a/nimpb/wkt/wrappers_pb.nim b/nimpb/wkt/wrappers_pb.nim
index d1b5f80..a1b163c 100644
--- a/nimpb/wkt/wrappers_pb.nim
+++ b/nimpb/wkt/wrappers_pb.nim
@@ -9,121 +9,102 @@ import nimpb/json as nimpb_json
 
 type
     google_protobuf_DoubleValue* = ref google_protobuf_DoubleValueObj
-    google_protobuf_DoubleValueObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_DoubleValueObj* = object of Message
         value: float64
     google_protobuf_FloatValue* = ref google_protobuf_FloatValueObj
-    google_protobuf_FloatValueObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_FloatValueObj* = object of Message
         value: float32
     google_protobuf_Int64Value* = ref google_protobuf_Int64ValueObj
-    google_protobuf_Int64ValueObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_Int64ValueObj* = object of Message
         value: int64
     google_protobuf_UInt64Value* = ref google_protobuf_UInt64ValueObj
-    google_protobuf_UInt64ValueObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_UInt64ValueObj* = object of Message
         value: uint64
     google_protobuf_Int32Value* = ref google_protobuf_Int32ValueObj
-    google_protobuf_Int32ValueObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_Int32ValueObj* = object of Message
         value: int32
     google_protobuf_UInt32Value* = ref google_protobuf_UInt32ValueObj
-    google_protobuf_UInt32ValueObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_UInt32ValueObj* = object of Message
         value: uint32
     google_protobuf_BoolValue* = ref google_protobuf_BoolValueObj
-    google_protobuf_BoolValueObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_BoolValueObj* = object of Message
         value: bool
     google_protobuf_StringValue* = ref google_protobuf_StringValueObj
-    google_protobuf_StringValueObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_StringValueObj* = object of Message
         value: string
     google_protobuf_BytesValue* = ref google_protobuf_BytesValueObj
-    google_protobuf_BytesValueObj* = object of RootObj
-        hasField: IntSet
-        unknownFields: seq[UnknownField]
+    google_protobuf_BytesValueObj* = object of Message
         value: bytes
 
 proc newgoogle_protobuf_Int32Value*(): google_protobuf_Int32Value
 proc newgoogle_protobuf_Int32Value*(data: string): google_protobuf_Int32Value
-proc writegoogle_protobuf_Int32Value*(stream: ProtobufStream, message: google_protobuf_Int32Value)
-proc readgoogle_protobuf_Int32Value*(stream: ProtobufStream): google_protobuf_Int32Value
+proc writegoogle_protobuf_Int32Value*(stream: Stream, message: google_protobuf_Int32Value)
+proc readgoogle_protobuf_Int32Value*(stream: Stream): google_protobuf_Int32Value
 proc sizeOfgoogle_protobuf_Int32Value*(message: google_protobuf_Int32Value): uint64
 
 proc newgoogle_protobuf_Int64Value*(): google_protobuf_Int64Value
 proc newgoogle_protobuf_Int64Value*(data: string): google_protobuf_Int64Value
-proc writegoogle_protobuf_Int64Value*(stream: ProtobufStream, message: google_protobuf_Int64Value)
-proc readgoogle_protobuf_Int64Value*(stream: ProtobufStream): google_protobuf_Int64Value
+proc writegoogle_protobuf_Int64Value*(stream: Stream, message: google_protobuf_Int64Value)
+proc readgoogle_protobuf_Int64Value*(stream: Stream): google_protobuf_Int64Value
 proc sizeOfgoogle_protobuf_Int64Value*(message: google_protobuf_Int64Value): uint64
 
 proc newgoogle_protobuf_DoubleValue*(): google_protobuf_DoubleValue
 proc newgoogle_protobuf_DoubleValue*(data: string): google_protobuf_DoubleValue
-proc writegoogle_protobuf_DoubleValue*(stream: ProtobufStream, message: google_protobuf_DoubleValue)
-proc readgoogle_protobuf_DoubleValue*(stream: ProtobufStream): google_protobuf_DoubleValue
+proc writegoogle_protobuf_DoubleValue*(stream: Stream, message: google_protobuf_DoubleValue)
+proc readgoogle_protobuf_DoubleValue*(stream: Stream): google_protobuf_DoubleValue
 proc sizeOfgoogle_protobuf_DoubleValue*(message: google_protobuf_DoubleValue): uint64
 
 proc newgoogle_protobuf_StringValue*(): google_protobuf_StringValue
 proc newgoogle_protobuf_StringValue*(data: string): google_protobuf_StringValue
-proc writegoogle_protobuf_StringValue*(stream: ProtobufStream, message: google_protobuf_StringValue)
-proc readgoogle_protobuf_StringValue*(stream: ProtobufStream): google_protobuf_StringValue
+proc writegoogle_protobuf_StringValue*(stream: Stream, message: google_protobuf_StringValue)
+proc readgoogle_protobuf_StringValue*(stream: Stream): google_protobuf_StringValue
 proc sizeOfgoogle_protobuf_StringValue*(message: google_protobuf_StringValue): uint64
 
 proc newgoogle_protobuf_BoolValue*(): google_protobuf_BoolValue
 proc newgoogle_protobuf_BoolValue*(data: string): google_protobuf_BoolValue
-proc writegoogle_protobuf_BoolValue*(stream: ProtobufStream, message: google_protobuf_BoolValue)
-proc readgoogle_protobuf_BoolValue*(stream: ProtobufStream): google_protobuf_BoolValue
+proc writegoogle_protobuf_BoolValue*(stream: Stream, message: google_protobuf_BoolValue)
+proc readgoogle_protobuf_BoolValue*(stream: Stream): google_protobuf_BoolValue
 proc sizeOfgoogle_protobuf_BoolValue*(message: google_protobuf_BoolValue): uint64
 
 proc newgoogle_protobuf_BytesValue*(): google_protobuf_BytesValue
 proc newgoogle_protobuf_BytesValue*(data: string): google_protobuf_BytesValue
-proc writegoogle_protobuf_BytesValue*(stream: ProtobufStream, message: google_protobuf_BytesValue)
-proc readgoogle_protobuf_BytesValue*(stream: ProtobufStream): google_protobuf_BytesValue
+proc writegoogle_protobuf_BytesValue*(stream: Stream, message: google_protobuf_BytesValue)
+proc readgoogle_protobuf_BytesValue*(stream: Stream): google_protobuf_BytesValue
 proc sizeOfgoogle_protobuf_BytesValue*(message: google_protobuf_BytesValue): uint64
 
 proc newgoogle_protobuf_FloatValue*(): google_protobuf_FloatValue
 proc newgoogle_protobuf_FloatValue*(data: string): google_protobuf_FloatValue
-proc writegoogle_protobuf_FloatValue*(stream: ProtobufStream, message: google_protobuf_FloatValue)
-proc readgoogle_protobuf_FloatValue*(stream: ProtobufStream): google_protobuf_FloatValue
+proc writegoogle_protobuf_FloatValue*(stream: Stream, message: google_protobuf_FloatValue)
+proc readgoogle_protobuf_FloatValue*(stream: Stream): google_protobuf_FloatValue
 proc sizeOfgoogle_protobuf_FloatValue*(message: google_protobuf_FloatValue): uint64
 
 proc newgoogle_protobuf_UInt64Value*(): google_protobuf_UInt64Value
 proc newgoogle_protobuf_UInt64Value*(data: string): google_protobuf_UInt64Value
-proc writegoogle_protobuf_UInt64Value*(stream: ProtobufStream, message: google_protobuf_UInt64Value)
-proc readgoogle_protobuf_UInt64Value*(stream: ProtobufStream): google_protobuf_UInt64Value
+proc writegoogle_protobuf_UInt64Value*(stream: Stream, message: google_protobuf_UInt64Value)
+proc readgoogle_protobuf_UInt64Value*(stream: Stream): google_protobuf_UInt64Value
 proc sizeOfgoogle_protobuf_UInt64Value*(message: google_protobuf_UInt64Value): uint64
 
 proc newgoogle_protobuf_UInt32Value*(): google_protobuf_UInt32Value
 proc newgoogle_protobuf_UInt32Value*(data: string): google_protobuf_UInt32Value
-proc writegoogle_protobuf_UInt32Value*(stream: ProtobufStream, message: google_protobuf_UInt32Value)
-proc readgoogle_protobuf_UInt32Value*(stream: ProtobufStream): google_protobuf_UInt32Value
+proc writegoogle_protobuf_UInt32Value*(stream: Stream, message: google_protobuf_UInt32Value)
+proc readgoogle_protobuf_UInt32Value*(stream: Stream): google_protobuf_UInt32Value
 proc sizeOfgoogle_protobuf_UInt32Value*(message: google_protobuf_UInt32Value): uint64
 
 proc newgoogle_protobuf_Int32Value*(): google_protobuf_Int32Value =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.value = 0
 
 proc clearvalue*(message: google_protobuf_Int32Value) =
     message.value = 0
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc hasvalue*(message: google_protobuf_Int32Value): bool =
-    result = contains(message.hasField, 1)
+    result = hasField(message, 1)
 
 proc setvalue*(message: google_protobuf_Int32Value, value: int32) =
     message.value = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc value*(message: google_protobuf_Int32Value): int32 {.inline.} =
     message.value
@@ -135,15 +116,14 @@ proc sizeOfgoogle_protobuf_Int32Value*(message: google_protobuf_Int32Value): uin
     if hasvalue(message):
         result = result + sizeOfTag(1, WireType.Varint)
         result = result + sizeOfInt32(message.value)
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_Int32Value*(stream: ProtobufStream, message: google_protobuf_Int32Value) =
+proc writegoogle_protobuf_Int32Value*(stream: Stream, message: google_protobuf_Int32Value) =
     if hasvalue(message):
-        writeInt32(stream, message.value, 1)
-    writeUnknownFields(stream, message.unknownFields)
+        protoWriteInt32(stream, message.value, 1)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_Int32Value*(stream: ProtobufStream): google_protobuf_Int32Value =
+proc readgoogle_protobuf_Int32Value*(stream: Stream): google_protobuf_Int32Value =
     result = newgoogle_protobuf_Int32Value()
     while not atEnd(stream):
         let
@@ -154,39 +134,36 @@ proc readgoogle_protobuf_Int32Value*(stream: ProtobufStream): google_protobuf_In
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.Varint)
-            setvalue(result, readInt32(stream))
-        else: readUnknownField(stream, tag, result.unknownFields)
+            setvalue(result, protoReadInt32(stream))
+        else: readUnknownField(stream, result, tag)
 
 proc serialize*(message: google_protobuf_Int32Value): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_Int32Value(pbs, message)
+    writegoogle_protobuf_Int32Value(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_Int32Value*(data: string): google_protobuf_Int32Value =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_Int32Value(pbs)
+    result = readgoogle_protobuf_Int32Value(ss)
 
 
 proc newgoogle_protobuf_Int64Value*(): google_protobuf_Int64Value =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.value = 0
 
 proc clearvalue*(message: google_protobuf_Int64Value) =
     message.value = 0
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc hasvalue*(message: google_protobuf_Int64Value): bool =
-    result = contains(message.hasField, 1)
+    result = hasField(message, 1)
 
 proc setvalue*(message: google_protobuf_Int64Value, value: int64) =
     message.value = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc value*(message: google_protobuf_Int64Value): int64 {.inline.} =
     message.value
@@ -198,15 +175,14 @@ proc sizeOfgoogle_protobuf_Int64Value*(message: google_protobuf_Int64Value): uin
     if hasvalue(message):
         result = result + sizeOfTag(1, WireType.Varint)
         result = result + sizeOfInt64(message.value)
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_Int64Value*(stream: ProtobufStream, message: google_protobuf_Int64Value) =
+proc writegoogle_protobuf_Int64Value*(stream: Stream, message: google_protobuf_Int64Value) =
     if hasvalue(message):
-        writeInt64(stream, message.value, 1)
-    writeUnknownFields(stream, message.unknownFields)
+        protoWriteInt64(stream, message.value, 1)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_Int64Value*(stream: ProtobufStream): google_protobuf_Int64Value =
+proc readgoogle_protobuf_Int64Value*(stream: Stream): google_protobuf_Int64Value =
     result = newgoogle_protobuf_Int64Value()
     while not atEnd(stream):
         let
@@ -217,39 +193,36 @@ proc readgoogle_protobuf_Int64Value*(stream: ProtobufStream): google_protobuf_In
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.Varint)
-            setvalue(result, readInt64(stream))
-        else: readUnknownField(stream, tag, result.unknownFields)
+            setvalue(result, protoReadInt64(stream))
+        else: readUnknownField(stream, result, tag)
 
 proc serialize*(message: google_protobuf_Int64Value): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_Int64Value(pbs, message)
+    writegoogle_protobuf_Int64Value(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_Int64Value*(data: string): google_protobuf_Int64Value =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_Int64Value(pbs)
+    result = readgoogle_protobuf_Int64Value(ss)
 
 
 proc newgoogle_protobuf_DoubleValue*(): google_protobuf_DoubleValue =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.value = 0
 
 proc clearvalue*(message: google_protobuf_DoubleValue) =
     message.value = 0
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc hasvalue*(message: google_protobuf_DoubleValue): bool =
-    result = contains(message.hasField, 1)
+    result = hasField(message, 1)
 
 proc setvalue*(message: google_protobuf_DoubleValue, value: float64) =
     message.value = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc value*(message: google_protobuf_DoubleValue): float64 {.inline.} =
     message.value
@@ -261,15 +234,14 @@ proc sizeOfgoogle_protobuf_DoubleValue*(message: google_protobuf_DoubleValue): u
     if hasvalue(message):
         result = result + sizeOfTag(1, WireType.Fixed64)
         result = result + sizeOfDouble(message.value)
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_DoubleValue*(stream: ProtobufStream, message: google_protobuf_DoubleValue) =
+proc writegoogle_protobuf_DoubleValue*(stream: Stream, message: google_protobuf_DoubleValue) =
     if hasvalue(message):
-        writeDouble(stream, message.value, 1)
-    writeUnknownFields(stream, message.unknownFields)
+        protoWriteDouble(stream, message.value, 1)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_DoubleValue*(stream: ProtobufStream): google_protobuf_DoubleValue =
+proc readgoogle_protobuf_DoubleValue*(stream: Stream): google_protobuf_DoubleValue =
     result = newgoogle_protobuf_DoubleValue()
     while not atEnd(stream):
         let
@@ -280,39 +252,36 @@ proc readgoogle_protobuf_DoubleValue*(stream: ProtobufStream): google_protobuf_D
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.Fixed64)
-            setvalue(result, readDouble(stream))
-        else: readUnknownField(stream, tag, result.unknownFields)
+            setvalue(result, protoReadDouble(stream))
+        else: readUnknownField(stream, result, tag)
 
 proc serialize*(message: google_protobuf_DoubleValue): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_DoubleValue(pbs, message)
+    writegoogle_protobuf_DoubleValue(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_DoubleValue*(data: string): google_protobuf_DoubleValue =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_DoubleValue(pbs)
+    result = readgoogle_protobuf_DoubleValue(ss)
 
 
 proc newgoogle_protobuf_StringValue*(): google_protobuf_StringValue =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.value = ""
 
 proc clearvalue*(message: google_protobuf_StringValue) =
     message.value = ""
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc hasvalue*(message: google_protobuf_StringValue): bool =
-    result = contains(message.hasField, 1)
+    result = hasField(message, 1)
 
 proc setvalue*(message: google_protobuf_StringValue, value: string) =
     message.value = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc value*(message: google_protobuf_StringValue): string {.inline.} =
     message.value
@@ -324,15 +293,14 @@ proc sizeOfgoogle_protobuf_StringValue*(message: google_protobuf_StringValue): u
     if hasvalue(message):
         result = result + sizeOfTag(1, WireType.LengthDelimited)
         result = result + sizeOfString(message.value)
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_StringValue*(stream: ProtobufStream, message: google_protobuf_StringValue) =
+proc writegoogle_protobuf_StringValue*(stream: Stream, message: google_protobuf_StringValue) =
     if hasvalue(message):
-        writeString(stream, message.value, 1)
-    writeUnknownFields(stream, message.unknownFields)
+        protoWriteString(stream, message.value, 1)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_StringValue*(stream: ProtobufStream): google_protobuf_StringValue =
+proc readgoogle_protobuf_StringValue*(stream: Stream): google_protobuf_StringValue =
     result = newgoogle_protobuf_StringValue()
     while not atEnd(stream):
         let
@@ -343,39 +311,36 @@ proc readgoogle_protobuf_StringValue*(stream: ProtobufStream): google_protobuf_S
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.LengthDelimited)
-            setvalue(result, readString(stream))
-        else: readUnknownField(stream, tag, result.unknownFields)
+            setvalue(result, protoReadString(stream))
+        else: readUnknownField(stream, result, tag)
 
 proc serialize*(message: google_protobuf_StringValue): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_StringValue(pbs, message)
+    writegoogle_protobuf_StringValue(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_StringValue*(data: string): google_protobuf_StringValue =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_StringValue(pbs)
+    result = readgoogle_protobuf_StringValue(ss)
 
 
 proc newgoogle_protobuf_BoolValue*(): google_protobuf_BoolValue =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.value = false
 
 proc clearvalue*(message: google_protobuf_BoolValue) =
     message.value = false
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc hasvalue*(message: google_protobuf_BoolValue): bool =
-    result = contains(message.hasField, 1)
+    result = hasField(message, 1)
 
 proc setvalue*(message: google_protobuf_BoolValue, value: bool) =
     message.value = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc value*(message: google_protobuf_BoolValue): bool {.inline.} =
     message.value
@@ -387,15 +352,14 @@ proc sizeOfgoogle_protobuf_BoolValue*(message: google_protobuf_BoolValue): uint6
     if hasvalue(message):
         result = result + sizeOfTag(1, WireType.Varint)
         result = result + sizeOfBool(message.value)
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_BoolValue*(stream: ProtobufStream, message: google_protobuf_BoolValue) =
+proc writegoogle_protobuf_BoolValue*(stream: Stream, message: google_protobuf_BoolValue) =
     if hasvalue(message):
-        writeBool(stream, message.value, 1)
-    writeUnknownFields(stream, message.unknownFields)
+        protoWriteBool(stream, message.value, 1)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_BoolValue*(stream: ProtobufStream): google_protobuf_BoolValue =
+proc readgoogle_protobuf_BoolValue*(stream: Stream): google_protobuf_BoolValue =
     result = newgoogle_protobuf_BoolValue()
     while not atEnd(stream):
         let
@@ -406,39 +370,36 @@ proc readgoogle_protobuf_BoolValue*(stream: ProtobufStream): google_protobuf_Boo
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.Varint)
-            setvalue(result, readBool(stream))
-        else: readUnknownField(stream, tag, result.unknownFields)
+            setvalue(result, protoReadBool(stream))
+        else: readUnknownField(stream, result, tag)
 
 proc serialize*(message: google_protobuf_BoolValue): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_BoolValue(pbs, message)
+    writegoogle_protobuf_BoolValue(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_BoolValue*(data: string): google_protobuf_BoolValue =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_BoolValue(pbs)
+    result = readgoogle_protobuf_BoolValue(ss)
 
 
 proc newgoogle_protobuf_BytesValue*(): google_protobuf_BytesValue =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.value = bytes("")
 
 proc clearvalue*(message: google_protobuf_BytesValue) =
     message.value = bytes("")
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc hasvalue*(message: google_protobuf_BytesValue): bool =
-    result = contains(message.hasField, 1)
+    result = hasField(message, 1)
 
 proc setvalue*(message: google_protobuf_BytesValue, value: bytes) =
     message.value = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc value*(message: google_protobuf_BytesValue): bytes {.inline.} =
     message.value
@@ -450,15 +411,14 @@ proc sizeOfgoogle_protobuf_BytesValue*(message: google_protobuf_BytesValue): uin
     if hasvalue(message):
         result = result + sizeOfTag(1, WireType.LengthDelimited)
         result = result + sizeOfBytes(message.value)
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_BytesValue*(stream: ProtobufStream, message: google_protobuf_BytesValue) =
+proc writegoogle_protobuf_BytesValue*(stream: Stream, message: google_protobuf_BytesValue) =
     if hasvalue(message):
-        writeBytes(stream, message.value, 1)
-    writeUnknownFields(stream, message.unknownFields)
+        protoWriteBytes(stream, message.value, 1)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_BytesValue*(stream: ProtobufStream): google_protobuf_BytesValue =
+proc readgoogle_protobuf_BytesValue*(stream: Stream): google_protobuf_BytesValue =
     result = newgoogle_protobuf_BytesValue()
     while not atEnd(stream):
         let
@@ -469,39 +429,36 @@ proc readgoogle_protobuf_BytesValue*(stream: ProtobufStream): google_protobuf_By
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.LengthDelimited)
-            setvalue(result, readBytes(stream))
-        else: readUnknownField(stream, tag, result.unknownFields)
+            setvalue(result, protoReadBytes(stream))
+        else: readUnknownField(stream, result, tag)
 
 proc serialize*(message: google_protobuf_BytesValue): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_BytesValue(pbs, message)
+    writegoogle_protobuf_BytesValue(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_BytesValue*(data: string): google_protobuf_BytesValue =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_BytesValue(pbs)
+    result = readgoogle_protobuf_BytesValue(ss)
 
 
 proc newgoogle_protobuf_FloatValue*(): google_protobuf_FloatValue =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.value = 0
 
 proc clearvalue*(message: google_protobuf_FloatValue) =
     message.value = 0
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc hasvalue*(message: google_protobuf_FloatValue): bool =
-    result = contains(message.hasField, 1)
+    result = hasField(message, 1)
 
 proc setvalue*(message: google_protobuf_FloatValue, value: float32) =
     message.value = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc value*(message: google_protobuf_FloatValue): float32 {.inline.} =
     message.value
@@ -513,15 +470,14 @@ proc sizeOfgoogle_protobuf_FloatValue*(message: google_protobuf_FloatValue): uin
     if hasvalue(message):
         result = result + sizeOfTag(1, WireType.Fixed32)
         result = result + sizeOfFloat(message.value)
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_FloatValue*(stream: ProtobufStream, message: google_protobuf_FloatValue) =
+proc writegoogle_protobuf_FloatValue*(stream: Stream, message: google_protobuf_FloatValue) =
     if hasvalue(message):
-        writeFloat(stream, message.value, 1)
-    writeUnknownFields(stream, message.unknownFields)
+        protoWriteFloat(stream, message.value, 1)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_FloatValue*(stream: ProtobufStream): google_protobuf_FloatValue =
+proc readgoogle_protobuf_FloatValue*(stream: Stream): google_protobuf_FloatValue =
     result = newgoogle_protobuf_FloatValue()
     while not atEnd(stream):
         let
@@ -532,39 +488,36 @@ proc readgoogle_protobuf_FloatValue*(stream: ProtobufStream): google_protobuf_Fl
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.Fixed32)
-            setvalue(result, readFloat(stream))
-        else: readUnknownField(stream, tag, result.unknownFields)
+            setvalue(result, protoReadFloat(stream))
+        else: readUnknownField(stream, result, tag)
 
 proc serialize*(message: google_protobuf_FloatValue): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_FloatValue(pbs, message)
+    writegoogle_protobuf_FloatValue(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_FloatValue*(data: string): google_protobuf_FloatValue =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_FloatValue(pbs)
+    result = readgoogle_protobuf_FloatValue(ss)
 
 
 proc newgoogle_protobuf_UInt64Value*(): google_protobuf_UInt64Value =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.value = 0
 
 proc clearvalue*(message: google_protobuf_UInt64Value) =
     message.value = 0
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc hasvalue*(message: google_protobuf_UInt64Value): bool =
-    result = contains(message.hasField, 1)
+    result = hasField(message, 1)
 
 proc setvalue*(message: google_protobuf_UInt64Value, value: uint64) =
     message.value = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc value*(message: google_protobuf_UInt64Value): uint64 {.inline.} =
     message.value
@@ -576,15 +529,14 @@ proc sizeOfgoogle_protobuf_UInt64Value*(message: google_protobuf_UInt64Value): u
     if hasvalue(message):
         result = result + sizeOfTag(1, WireType.Varint)
         result = result + sizeOfUInt64(message.value)
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_UInt64Value*(stream: ProtobufStream, message: google_protobuf_UInt64Value) =
+proc writegoogle_protobuf_UInt64Value*(stream: Stream, message: google_protobuf_UInt64Value) =
     if hasvalue(message):
-        writeUInt64(stream, message.value, 1)
-    writeUnknownFields(stream, message.unknownFields)
+        protoWriteUInt64(stream, message.value, 1)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_UInt64Value*(stream: ProtobufStream): google_protobuf_UInt64Value =
+proc readgoogle_protobuf_UInt64Value*(stream: Stream): google_protobuf_UInt64Value =
     result = newgoogle_protobuf_UInt64Value()
     while not atEnd(stream):
         let
@@ -595,39 +547,36 @@ proc readgoogle_protobuf_UInt64Value*(stream: ProtobufStream): google_protobuf_U
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.Varint)
-            setvalue(result, readUInt64(stream))
-        else: readUnknownField(stream, tag, result.unknownFields)
+            setvalue(result, protoReadUInt64(stream))
+        else: readUnknownField(stream, result, tag)
 
 proc serialize*(message: google_protobuf_UInt64Value): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_UInt64Value(pbs, message)
+    writegoogle_protobuf_UInt64Value(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_UInt64Value*(data: string): google_protobuf_UInt64Value =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_UInt64Value(pbs)
+    result = readgoogle_protobuf_UInt64Value(ss)
 
 
 proc newgoogle_protobuf_UInt32Value*(): google_protobuf_UInt32Value =
     new(result)
-    result.hasField = initIntSet()
-    result.unknownFields = @[]
+    initMessage(result[])
     result.value = 0
 
 proc clearvalue*(message: google_protobuf_UInt32Value) =
     message.value = 0
-    excl(message.hasField, [1])
+    clearFields(message, [1])
 
 proc hasvalue*(message: google_protobuf_UInt32Value): bool =
-    result = contains(message.hasField, 1)
+    result = hasField(message, 1)
 
 proc setvalue*(message: google_protobuf_UInt32Value, value: uint32) =
     message.value = value
-    incl(message.hasField, 1)
+    setField(message, 1)
 
 proc value*(message: google_protobuf_UInt32Value): uint32 {.inline.} =
     message.value
@@ -639,15 +588,14 @@ proc sizeOfgoogle_protobuf_UInt32Value*(message: google_protobuf_UInt32Value): u
     if hasvalue(message):
         result = result + sizeOfTag(1, WireType.Varint)
         result = result + sizeOfUInt32(message.value)
-    for field in message.unknownFields:
-        result = result + sizeOfUnknownField(field)
+    result = result + sizeOfUnknownFields(message)
 
-proc writegoogle_protobuf_UInt32Value*(stream: ProtobufStream, message: google_protobuf_UInt32Value) =
+proc writegoogle_protobuf_UInt32Value*(stream: Stream, message: google_protobuf_UInt32Value) =
     if hasvalue(message):
-        writeUInt32(stream, message.value, 1)
-    writeUnknownFields(stream, message.unknownFields)
+        protoWriteUInt32(stream, message.value, 1)
+    writeUnknownFields(stream, message)
 
-proc readgoogle_protobuf_UInt32Value*(stream: ProtobufStream): google_protobuf_UInt32Value =
+proc readgoogle_protobuf_UInt32Value*(stream: Stream): google_protobuf_UInt32Value =
     result = newgoogle_protobuf_UInt32Value()
     while not atEnd(stream):
         let
@@ -658,20 +606,18 @@ proc readgoogle_protobuf_UInt32Value*(stream: ProtobufStream): google_protobuf_U
             raise newException(InvalidFieldNumberError, "Invalid field number: 0")
         of 1:
             expectWireType(wireType, WireType.Varint)
-            setvalue(result, readUInt32(stream))
-        else: readUnknownField(stream, tag, result.unknownFields)
+            setvalue(result, protoReadUInt32(stream))
+        else: readUnknownField(stream, result, tag)
 
 proc serialize*(message: google_protobuf_UInt32Value): string =
     let
         ss = newStringStream()
-        pbs = newProtobufStream(ss)
-    writegoogle_protobuf_UInt32Value(pbs, message)
+    writegoogle_protobuf_UInt32Value(ss, message)
     result = ss.data
 
 proc newgoogle_protobuf_UInt32Value*(data: string): google_protobuf_UInt32Value =
     let
         ss = newStringStream(data)
-        pbs = newProtobufStream(ss)
-    result = readgoogle_protobuf_UInt32Value(pbs)
+    result = readgoogle_protobuf_UInt32Value(ss)