diff --git a/lib/proto/grpc/reflection/v1/reflection.pb.ex b/lib/proto/grpc/reflection/v1/reflection.pb.ex
index d65aa22..3f1086a 100644
--- a/lib/proto/grpc/reflection/v1/reflection.pb.ex
+++ b/lib/proto/grpc/reflection/v1/reflection.pb.ex
@@ -3,7 +3,8 @@ defmodule Grpc.Reflection.V1.ServerReflectionRequest do
 
   use Protobuf,
     full_name: "grpc.reflection.v1.ServerReflectionRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "reflection.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -23,7 +24,8 @@ defmodule Grpc.Reflection.V1.ServerReflectionRequest do
           oneof_index: nil,
           json_name: "host",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "file_by_filename",
@@ -37,7 +39,8 @@ defmodule Grpc.Reflection.V1.ServerReflectionRequest do
           oneof_index: 0,
           json_name: "fileByFilename",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "file_containing_symbol",
@@ -51,7 +54,8 @@ defmodule Grpc.Reflection.V1.ServerReflectionRequest do
           oneof_index: 0,
           json_name: "fileContainingSymbol",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "file_containing_extension",
@@ -65,7 +69,8 @@ defmodule Grpc.Reflection.V1.ServerReflectionRequest do
           oneof_index: 0,
           json_name: "fileContainingExtension",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "all_extension_numbers_of_type",
@@ -79,7 +84,8 @@ defmodule Grpc.Reflection.V1.ServerReflectionRequest do
           oneof_index: 0,
           json_name: "allExtensionNumbersOfType",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "list_services",
@@ -93,7 +99,8 @@ defmodule Grpc.Reflection.V1.ServerReflectionRequest do
           oneof_index: 0,
           json_name: "listServices",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -105,12 +112,14 @@ defmodule Grpc.Reflection.V1.ServerReflectionRequest do
         %Google.Protobuf.OneofDescriptorProto{
           name: "message_request",
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -138,7 +147,8 @@ defmodule Grpc.Reflection.V1.ExtensionRequest do
 
   use Protobuf,
     full_name: "grpc.reflection.v1.ExtensionRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "reflection.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -158,7 +168,8 @@ defmodule Grpc.Reflection.V1.ExtensionRequest do
           oneof_index: nil,
           json_name: "containingType",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "extension_number",
@@ -172,7 +183,8 @@ defmodule Grpc.Reflection.V1.ExtensionRequest do
           oneof_index: nil,
           json_name: "extensionNumber",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -183,7 +195,8 @@ defmodule Grpc.Reflection.V1.ExtensionRequest do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -196,7 +209,8 @@ defmodule Grpc.Reflection.V1.ServerReflectionResponse do
 
   use Protobuf,
     full_name: "grpc.reflection.v1.ServerReflectionResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "reflection.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -216,7 +230,8 @@ defmodule Grpc.Reflection.V1.ServerReflectionResponse do
           oneof_index: nil,
           json_name: "validHost",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "original_request",
@@ -230,7 +245,8 @@ defmodule Grpc.Reflection.V1.ServerReflectionResponse do
           oneof_index: nil,
           json_name: "originalRequest",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "file_descriptor_response",
@@ -244,7 +260,8 @@ defmodule Grpc.Reflection.V1.ServerReflectionResponse do
           oneof_index: 0,
           json_name: "fileDescriptorResponse",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "all_extension_numbers_response",
@@ -258,7 +275,8 @@ defmodule Grpc.Reflection.V1.ServerReflectionResponse do
           oneof_index: 0,
           json_name: "allExtensionNumbersResponse",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "list_services_response",
@@ -272,7 +290,8 @@ defmodule Grpc.Reflection.V1.ServerReflectionResponse do
           oneof_index: 0,
           json_name: "listServicesResponse",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "error_response",
@@ -286,7 +305,8 @@ defmodule Grpc.Reflection.V1.ServerReflectionResponse do
           oneof_index: 0,
           json_name: "errorResponse",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -298,12 +318,14 @@ defmodule Grpc.Reflection.V1.ServerReflectionResponse do
         %Google.Protobuf.OneofDescriptorProto{
           name: "message_response",
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -341,7 +363,8 @@ defmodule Grpc.Reflection.V1.FileDescriptorResponse do
 
   use Protobuf,
     full_name: "grpc.reflection.v1.FileDescriptorResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "reflection.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -361,7 +384,8 @@ defmodule Grpc.Reflection.V1.FileDescriptorResponse do
           oneof_index: nil,
           json_name: "fileDescriptorProto",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -372,7 +396,8 @@ defmodule Grpc.Reflection.V1.FileDescriptorResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -384,7 +409,8 @@ defmodule Grpc.Reflection.V1.ExtensionNumberResponse do
 
   use Protobuf,
     full_name: "grpc.reflection.v1.ExtensionNumberResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "reflection.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -404,7 +430,8 @@ defmodule Grpc.Reflection.V1.ExtensionNumberResponse do
           oneof_index: nil,
           json_name: "baseTypeName",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "extension_number",
@@ -418,7 +445,8 @@ defmodule Grpc.Reflection.V1.ExtensionNumberResponse do
           oneof_index: nil,
           json_name: "extensionNumber",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -429,7 +457,8 @@ defmodule Grpc.Reflection.V1.ExtensionNumberResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -442,7 +471,8 @@ defmodule Grpc.Reflection.V1.ListServiceResponse do
 
   use Protobuf,
     full_name: "grpc.reflection.v1.ListServiceResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "reflection.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -462,7 +492,8 @@ defmodule Grpc.Reflection.V1.ListServiceResponse do
           oneof_index: nil,
           json_name: "service",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -473,7 +504,8 @@ defmodule Grpc.Reflection.V1.ListServiceResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -485,7 +517,8 @@ defmodule Grpc.Reflection.V1.ServiceResponse do
 
   use Protobuf,
     full_name: "grpc.reflection.v1.ServiceResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "reflection.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -505,7 +538,8 @@ defmodule Grpc.Reflection.V1.ServiceResponse do
           oneof_index: nil,
           json_name: "name",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -516,7 +550,8 @@ defmodule Grpc.Reflection.V1.ServiceResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -528,7 +563,8 @@ defmodule Grpc.Reflection.V1.ErrorResponse do
 
   use Protobuf,
     full_name: "grpc.reflection.v1.ErrorResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "reflection.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -548,7 +584,8 @@ defmodule Grpc.Reflection.V1.ErrorResponse do
           oneof_index: nil,
           json_name: "errorCode",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "error_message",
@@ -562,7 +599,8 @@ defmodule Grpc.Reflection.V1.ErrorResponse do
           oneof_index: nil,
           json_name: "errorMessage",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -573,7 +611,8 @@ defmodule Grpc.Reflection.V1.ErrorResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -586,7 +625,9 @@ defmodule Grpc.Reflection.V1.ServerReflection.Service do
 
   use GRPC.Service,
     name: "grpc.reflection.v1.ServerReflection",
-    protoc_gen_elixir_version: "0.16.0"
+    protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "reflection.proto"
 
   def descriptor do
     # credo:disable-for-next-line
@@ -600,11 +641,13 @@ defmodule Grpc.Reflection.V1.ServerReflection.Service do
           options: nil,
           client_streaming: true,
           server_streaming: true,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
diff --git a/lib/proto/grpc/reflection/v1alpha/reflection.pb.ex b/lib/proto/grpc/reflection/v1alpha/reflection.pb.ex
index 02bcd4f..5428323 100644
--- a/lib/proto/grpc/reflection/v1alpha/reflection.pb.ex
+++ b/lib/proto/grpc/reflection/v1alpha/reflection.pb.ex
@@ -3,7 +3,8 @@ defmodule Grpc.Reflection.V1alpha.ServerReflectionRequest do
 
   use Protobuf,
     full_name: "grpc.reflection.v1alpha.ServerReflectionRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "reflection.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -23,7 +24,8 @@ defmodule Grpc.Reflection.V1alpha.ServerReflectionRequest do
           oneof_index: nil,
           json_name: "host",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "file_by_filename",
@@ -37,7 +39,8 @@ defmodule Grpc.Reflection.V1alpha.ServerReflectionRequest do
           oneof_index: 0,
           json_name: "fileByFilename",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "file_containing_symbol",
@@ -51,7 +54,8 @@ defmodule Grpc.Reflection.V1alpha.ServerReflectionRequest do
           oneof_index: 0,
           json_name: "fileContainingSymbol",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "file_containing_extension",
@@ -65,7 +69,8 @@ defmodule Grpc.Reflection.V1alpha.ServerReflectionRequest do
           oneof_index: 0,
           json_name: "fileContainingExtension",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "all_extension_numbers_of_type",
@@ -79,7 +84,8 @@ defmodule Grpc.Reflection.V1alpha.ServerReflectionRequest do
           oneof_index: 0,
           json_name: "allExtensionNumbersOfType",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "list_services",
@@ -93,7 +99,8 @@ defmodule Grpc.Reflection.V1alpha.ServerReflectionRequest do
           oneof_index: 0,
           json_name: "listServices",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -105,12 +112,14 @@ defmodule Grpc.Reflection.V1alpha.ServerReflectionRequest do
         %Google.Protobuf.OneofDescriptorProto{
           name: "message_request",
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -138,7 +147,8 @@ defmodule Grpc.Reflection.V1alpha.ExtensionRequest do
 
   use Protobuf,
     full_name: "grpc.reflection.v1alpha.ExtensionRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "reflection.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -158,7 +168,8 @@ defmodule Grpc.Reflection.V1alpha.ExtensionRequest do
           oneof_index: nil,
           json_name: "containingType",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "extension_number",
@@ -172,7 +183,8 @@ defmodule Grpc.Reflection.V1alpha.ExtensionRequest do
           oneof_index: nil,
           json_name: "extensionNumber",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -183,7 +195,8 @@ defmodule Grpc.Reflection.V1alpha.ExtensionRequest do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -196,7 +209,8 @@ defmodule Grpc.Reflection.V1alpha.ServerReflectionResponse do
 
   use Protobuf,
     full_name: "grpc.reflection.v1alpha.ServerReflectionResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "reflection.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -216,7 +230,8 @@ defmodule Grpc.Reflection.V1alpha.ServerReflectionResponse do
           oneof_index: nil,
           json_name: "validHost",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "original_request",
@@ -230,7 +245,8 @@ defmodule Grpc.Reflection.V1alpha.ServerReflectionResponse do
           oneof_index: nil,
           json_name: "originalRequest",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "file_descriptor_response",
@@ -244,7 +260,8 @@ defmodule Grpc.Reflection.V1alpha.ServerReflectionResponse do
           oneof_index: 0,
           json_name: "fileDescriptorResponse",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "all_extension_numbers_response",
@@ -258,7 +275,8 @@ defmodule Grpc.Reflection.V1alpha.ServerReflectionResponse do
           oneof_index: 0,
           json_name: "allExtensionNumbersResponse",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "list_services_response",
@@ -272,7 +290,8 @@ defmodule Grpc.Reflection.V1alpha.ServerReflectionResponse do
           oneof_index: 0,
           json_name: "listServicesResponse",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "error_response",
@@ -286,7 +305,8 @@ defmodule Grpc.Reflection.V1alpha.ServerReflectionResponse do
           oneof_index: 0,
           json_name: "errorResponse",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -298,12 +318,14 @@ defmodule Grpc.Reflection.V1alpha.ServerReflectionResponse do
         %Google.Protobuf.OneofDescriptorProto{
           name: "message_response",
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -341,7 +363,8 @@ defmodule Grpc.Reflection.V1alpha.FileDescriptorResponse do
 
   use Protobuf,
     full_name: "grpc.reflection.v1alpha.FileDescriptorResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "reflection.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -361,7 +384,8 @@ defmodule Grpc.Reflection.V1alpha.FileDescriptorResponse do
           oneof_index: nil,
           json_name: "fileDescriptorProto",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -372,7 +396,8 @@ defmodule Grpc.Reflection.V1alpha.FileDescriptorResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -384,7 +409,8 @@ defmodule Grpc.Reflection.V1alpha.ExtensionNumberResponse do
 
   use Protobuf,
     full_name: "grpc.reflection.v1alpha.ExtensionNumberResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "reflection.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -404,7 +430,8 @@ defmodule Grpc.Reflection.V1alpha.ExtensionNumberResponse do
           oneof_index: nil,
           json_name: "baseTypeName",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "extension_number",
@@ -418,7 +445,8 @@ defmodule Grpc.Reflection.V1alpha.ExtensionNumberResponse do
           oneof_index: nil,
           json_name: "extensionNumber",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -429,7 +457,8 @@ defmodule Grpc.Reflection.V1alpha.ExtensionNumberResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -442,7 +471,8 @@ defmodule Grpc.Reflection.V1alpha.ListServiceResponse do
 
   use Protobuf,
     full_name: "grpc.reflection.v1alpha.ListServiceResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "reflection.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -462,7 +492,8 @@ defmodule Grpc.Reflection.V1alpha.ListServiceResponse do
           oneof_index: nil,
           json_name: "service",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -473,7 +504,8 @@ defmodule Grpc.Reflection.V1alpha.ListServiceResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -485,7 +517,8 @@ defmodule Grpc.Reflection.V1alpha.ServiceResponse do
 
   use Protobuf,
     full_name: "grpc.reflection.v1alpha.ServiceResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "reflection.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -505,7 +538,8 @@ defmodule Grpc.Reflection.V1alpha.ServiceResponse do
           oneof_index: nil,
           json_name: "name",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -516,7 +550,8 @@ defmodule Grpc.Reflection.V1alpha.ServiceResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -528,7 +563,8 @@ defmodule Grpc.Reflection.V1alpha.ErrorResponse do
 
   use Protobuf,
     full_name: "grpc.reflection.v1alpha.ErrorResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "reflection.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -548,7 +584,8 @@ defmodule Grpc.Reflection.V1alpha.ErrorResponse do
           oneof_index: nil,
           json_name: "errorCode",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "error_message",
@@ -562,7 +599,8 @@ defmodule Grpc.Reflection.V1alpha.ErrorResponse do
           oneof_index: nil,
           json_name: "errorMessage",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -573,7 +611,8 @@ defmodule Grpc.Reflection.V1alpha.ErrorResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -586,7 +625,9 @@ defmodule Grpc.Reflection.V1alpha.ServerReflection.Service do
 
   use GRPC.Service,
     name: "grpc.reflection.v1alpha.ServerReflection",
-    protoc_gen_elixir_version: "0.16.0"
+    protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "reflection.proto"
 
   def descriptor do
     # credo:disable-for-next-line
@@ -600,11 +641,13 @@ defmodule Grpc.Reflection.V1alpha.ServerReflection.Service do
           options: nil,
           client_streaming: true,
           server_streaming: true,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
diff --git a/mix.exs b/mix.exs
index 7c76088..4469180 100644
--- a/mix.exs
+++ b/mix.exs
@@ -75,8 +75,8 @@ defmodule GrpcReflection.MixProject do
     ]
   end
 
-  @protoc_opts "gen_descriptors=true,plugins=grpc"
-  @protoc_opts_no_descriptor "package_prefix=NoDescriptor,plugins=grpc"
+  @protoc_opts "gen_descriptors=true,gen_proto_source=true,paths=source_relative,plugins=grpc"
+  @protoc_opts_no_descriptor "package_prefix=NoDescriptor,gen_proto_source=true,paths=source_relative,plugins=grpc"
   # Protos that set (elixirpb.file).module_prefix must be skipped here: that option
   # overrides package_prefix entirely, so the no-descriptor pass would emit modules with
   # the same name as the descriptor pass, causing a compile-time conflict.
@@ -84,34 +84,50 @@ defmodule GrpcReflection.MixProject do
   @skip_no_descriptor ["custom_prefix_service.proto"]
 
   defp build_protos(_argv) do
+    {reflection, fixtures} =
+      "./priv/protos/**/*.proto"
+      |> Path.wildcard()
+      |> Enum.split_with(&String.contains?(&1, "reflection.proto"))
+
     # compile reflection protos
-    Enum.each(
-      [
-        "priv/protos/grpc/reflection/v1alpha/reflection.proto",
-        "priv/protos/grpc/reflection/v1/reflection.proto"
-      ],
-      fn reflection_proto ->
-        Mix.shell().cmd(
-          "protoc --elixir_out=#{@protoc_opts}:./lib/proto --proto_path=priv/protos/ #{reflection_proto}"
-        )
-      end
-    )
+    cmds =
+      reflection
+      |> Enum.map(fn reflection_proto ->
+        # protoc now grabs the path to the file and includes it with
+        # the message name, which for us leads to bad paths
+        i_path =
+          reflection_proto
+          |> Path.split()
+          |> List.delete_at(-1)
+          |> Path.join()
+
+        "protoc --elixir_out=#{@protoc_opts}:./lib/proto -I=#{i_path} #{reflection_proto}"
+      end)
 
     # compile test protos — once with descriptors, once without
-    "./priv/protos"
-    |> File.ls!()
-    |> Enum.filter(&Regex.match?(~r/.*.proto$/, &1))
-    |> Enum.each(fn proto ->
-      Mix.shell().cmd(
-        "protoc --elixir_out=#{@protoc_opts}:./test/support/protos -I priv/protos/ -I deps/protobuf/src #{proto}"
-      )
-
-      unless proto in @skip_no_descriptor do
-        Mix.shell().cmd(
-          "protoc --elixir_out=#{@protoc_opts_no_descriptor}:./test/support/protos/no_descriptor -I priv/protos/ -I deps/protobuf/src #{proto}"
-        )
+    fixtures
+    |> Enum.flat_map(fn proto ->
+      i_path =
+        proto
+        |> Path.split()
+        |> List.delete_at(-1)
+        |> Path.join()
+
+      with_descriptors =
+        "protoc --elixir_out=#{@protoc_opts}:./test/support/protos -I=#{i_path} -I priv/protos -I deps/protobuf/src #{proto}"
+
+      without_descriptors =
+        "protoc --elixir_out=#{@protoc_opts_no_descriptor}:./test/support/protos -I=#{i_path} -I priv/protos -I deps/protobuf/src #{proto}"
+
+      if Enum.any?(@skip_no_descriptor, &String.contains?(proto, &1)) do
+        [with_descriptors]
+      else
+        [with_descriptors, without_descriptors]
       end
     end)
+    |> Enum.concat(cmds)
+    |> Task.async_stream(&Mix.shell().cmd(&1))
+    |> Enum.to_list()
   end
 
   defp package do
diff --git a/mix.lock b/mix.lock
index 5ea1c49..fc2cd9a 100644
--- a/mix.lock
+++ b/mix.lock
@@ -20,7 +20,7 @@
   "makeup_erlang": {:hex, :makeup_erlang, "1.0.3", "4252d5d4098da7415c390e847c814bad3764c94a814a0b4245176215615e1035", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "953297c02582a33411ac6208f2c6e55f0e870df7f80da724ed613f10e6706afd"},
   "mint": {:hex, :mint, "1.7.1", "113fdb2b2f3b59e47c7955971854641c61f378549d73e829e1768de90fc1abf1", [:mix], [{:castore, "~> 0.1.0 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:hpax, "~> 0.1.1 or ~> 0.2.0 or ~> 1.0", [hex: :hpax, repo: "hexpm", optional: false]}], "hexpm", "fceba0a4d0f24301ddee3024ae116df1c3f4bb7a563a731f45fdfeb9d39a231b"},
   "nimble_parsec": {:hex, :nimble_parsec, "1.4.2", "8efba0122db06df95bfaa78f791344a89352ba04baedd3849593bfce4d0dc1c6", [:mix], [], "hexpm", "4b21398942dda052b403bbe1da991ccd03a053668d147d53fb8c4e0efe09c973"},
-  "protobuf": {:hex, :protobuf, "0.16.0", "d1878725105d49162977cf3408ccc3eac4f3532e26e5a9e250f2c624175d10f6", [:mix], [{:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "f0d0d3edd8768130f24cc2cfc41320637d32c80110e80d13f160fa699102c828"},
+  "protobuf": {:hex, :protobuf, "0.17.0", "39e24e43c9648e148feba16ed51100b5b2028ea900b55460377b0476f6e10613", [:mix], [{:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "ca6c91f6f63e2c147b47f03eefd10b80538aa6fc55ff4b12b795efb786b0152f"},
   "ranch": {:hex, :ranch, "2.2.0", "25528f82bc8d7c6152c57666ca99ec716510fe0925cb188172f41ce93117b1b0", [:make, :rebar3], [], "hexpm", "fa0b99a1780c80218a4197a59ea8d3bdae32fbff7e88527d7d8a4787eff4f8e7"},
   "telemetry": {:hex, :telemetry, "1.3.0", "fedebbae410d715cf8e7062c96a1ef32ec22e764197f70cda73d82778d61e7a2", [:rebar3], [], "hexpm", "7015fc8919dbe63764f4b4b87a95b7c0996bd539e0d499be6ec9d7f3875b79e6"},
 }
diff --git a/priv/protos/common_types.proto b/priv/protos/common/common_types.proto
similarity index 100%
rename from priv/protos/common_types.proto
rename to priv/protos/common/common_types.proto
diff --git a/priv/protos/custom_prefix_service.proto b/priv/protos/custom_prefix/custom_prefix_service.proto
similarity index 100%
rename from priv/protos/custom_prefix_service.proto
rename to priv/protos/custom_prefix/custom_prefix_service.proto
diff --git a/priv/protos/deprecated_fields.proto b/priv/protos/deprecated_fields/deprecated_fields.proto
similarity index 100%
rename from priv/protos/deprecated_fields.proto
rename to priv/protos/deprecated_fields/deprecated_fields.proto
diff --git a/priv/protos/edge_cases.proto b/priv/protos/edge_cases/edge_cases.proto
similarity index 100%
rename from priv/protos/edge_cases.proto
rename to priv/protos/edge_cases/edge_cases.proto
diff --git a/priv/protos/empty_service.proto b/priv/protos/empty_service/empty_service.proto
similarity index 100%
rename from priv/protos/empty_service.proto
rename to priv/protos/empty_service/empty_service.proto
diff --git a/priv/protos/imports_test.proto b/priv/protos/imports_test/imports_test.proto
similarity index 97%
rename from priv/protos/imports_test.proto
rename to priv/protos/imports_test/imports_test.proto
index 336b402..5e88589 100644
--- a/priv/protos/imports_test.proto
+++ b/priv/protos/imports_test/imports_test.proto
@@ -3,7 +3,7 @@ syntax = "proto3";
 package imports_test;
 
 // Import from local proto file
-import "common_types.proto";
+import "common/common_types.proto";
 
 // Import from google protos
 import "google/protobuf/timestamp.proto";
diff --git a/priv/protos/nested_messages.proto b/priv/protos/nested/nested_messages.proto
similarity index 100%
rename from priv/protos/nested_messages.proto
rename to priv/protos/nested/nested_messages.proto
diff --git a/priv/protos/nested_enum_conflict.proto b/priv/protos/nested_enum_conflict/nested_enum_conflict.proto
similarity index 100%
rename from priv/protos/nested_enum_conflict.proto
rename to priv/protos/nested_enum_conflict/nested_enum_conflict.proto
diff --git a/priv/protos/package_a.proto b/priv/protos/package_a/package_a.proto
similarity index 100%
rename from priv/protos/package_a.proto
rename to priv/protos/package_a/package_a.proto
diff --git a/priv/protos/package_b.proto b/priv/protos/package_b/package_b.proto
similarity index 91%
rename from priv/protos/package_b.proto
rename to priv/protos/package_b/package_b.proto
index 098e20d..3d04312 100644
--- a/priv/protos/package_b.proto
+++ b/priv/protos/package_b/package_b.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package package_b;
 
-import "package_a.proto";
+import "package_a/package_a.proto";
 
 message MessageB {
   string field_b = 1;
diff --git a/priv/protos/proto2_features.proto b/priv/protos/proto2_features/proto2_features.proto
similarity index 100%
rename from priv/protos/proto2_features.proto
rename to priv/protos/proto2_features/proto2_features.proto
diff --git a/priv/protos/recursive_message.proto b/priv/protos/recursive_message/recursive_message.proto
similarity index 100%
rename from priv/protos/recursive_message.proto
rename to priv/protos/recursive_message/recursive_message.proto
diff --git a/priv/protos/scalar_types.proto b/priv/protos/scalar_types/scalar_types.proto
similarity index 100%
rename from priv/protos/scalar_types.proto
rename to priv/protos/scalar_types/scalar_types.proto
diff --git a/priv/protos/streaming_service.proto b/priv/protos/streaming/streaming_service.proto
similarity index 100%
rename from priv/protos/streaming_service.proto
rename to priv/protos/streaming/streaming_service.proto
diff --git a/priv/protos/well_known_types.proto b/priv/protos/well_known_tyoes/well_known_types.proto
similarity index 100%
rename from priv/protos/well_known_types.proto
rename to priv/protos/well_known_tyoes/well_known_types.proto
diff --git a/test/support/protos/common_types.pb.ex b/test/support/protos/common/common_types.pb.ex
similarity index 81%
rename from test/support/protos/common_types.pb.ex
rename to test/support/protos/common/common_types.pb.ex
index 4a30dd4..5d61358 100644
--- a/test/support/protos/common_types.pb.ex
+++ b/test/support/protos/common/common_types.pb.ex
@@ -4,7 +4,7 @@ defmodule Common.Priority do
   use Protobuf,
     enum: true,
     full_name: "common.Priority",
-    protoc_gen_elixir_version: "0.16.0",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -16,37 +16,43 @@ defmodule Common.Priority do
           name: "PRIORITY_UNSPECIFIED",
           number: 0,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.EnumValueDescriptorProto{
           name: "LOW",
           number: 1,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.EnumValueDescriptorProto{
           name: "MEDIUM",
           number: 2,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.EnumValueDescriptorProto{
           name: "HIGH",
           number: 3,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.EnumValueDescriptorProto{
           name: "CRITICAL",
           number: 4,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -60,7 +66,11 @@ end
 defmodule Common.Address do
   @moduledoc false
 
-  use Protobuf, full_name: "common.Address", protoc_gen_elixir_version: "0.16.0", syntax: :proto3
+  use Protobuf,
+    full_name: "common.Address",
+    proto_source: "common_types.proto",
+    protoc_gen_elixir_version: "0.17.0",
+    syntax: :proto3
 
   def descriptor do
     # credo:disable-for-next-line
@@ -79,7 +89,8 @@ defmodule Common.Address do
           oneof_index: nil,
           json_name: "street",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "city",
@@ -93,7 +104,8 @@ defmodule Common.Address do
           oneof_index: nil,
           json_name: "city",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "state",
@@ -107,7 +119,8 @@ defmodule Common.Address do
           oneof_index: nil,
           json_name: "state",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "postal_code",
@@ -121,7 +134,8 @@ defmodule Common.Address do
           oneof_index: nil,
           json_name: "postalCode",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "country",
@@ -135,7 +149,8 @@ defmodule Common.Address do
           oneof_index: nil,
           json_name: "country",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -146,7 +161,8 @@ defmodule Common.Address do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -162,7 +178,8 @@ defmodule Common.Coordinates do
 
   use Protobuf,
     full_name: "common.Coordinates",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "common_types.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -182,7 +199,8 @@ defmodule Common.Coordinates do
           oneof_index: nil,
           json_name: "latitude",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "longitude",
@@ -196,7 +214,8 @@ defmodule Common.Coordinates do
           oneof_index: nil,
           json_name: "longitude",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "altitude",
@@ -210,7 +229,8 @@ defmodule Common.Coordinates do
           oneof_index: nil,
           json_name: "altitude",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -221,7 +241,8 @@ defmodule Common.Coordinates do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -233,7 +254,11 @@ end
 defmodule Common.Money do
   @moduledoc false
 
-  use Protobuf, full_name: "common.Money", protoc_gen_elixir_version: "0.16.0", syntax: :proto3
+  use Protobuf,
+    full_name: "common.Money",
+    proto_source: "common_types.proto",
+    protoc_gen_elixir_version: "0.17.0",
+    syntax: :proto3
 
   def descriptor do
     # credo:disable-for-next-line
@@ -252,7 +277,8 @@ defmodule Common.Money do
           oneof_index: nil,
           json_name: "currencyCode",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "units",
@@ -266,7 +292,8 @@ defmodule Common.Money do
           oneof_index: nil,
           json_name: "units",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "nanos",
@@ -280,7 +307,8 @@ defmodule Common.Money do
           oneof_index: nil,
           json_name: "nanos",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -291,7 +319,8 @@ defmodule Common.Money do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -305,7 +334,8 @@ defmodule Common.TimeRange do
 
   use Protobuf,
     full_name: "common.TimeRange",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "common_types.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -325,7 +355,8 @@ defmodule Common.TimeRange do
           oneof_index: nil,
           json_name: "startTime",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "end_time",
@@ -339,7 +370,8 @@ defmodule Common.TimeRange do
           oneof_index: nil,
           json_name: "endTime",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -350,7 +382,8 @@ defmodule Common.TimeRange do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
diff --git a/test/support/protos/custom_prefix_service.pb.ex b/test/support/protos/customized_prefix/custom_prefix_service.pb.ex
similarity index 80%
rename from test/support/protos/custom_prefix_service.pb.ex
rename to test/support/protos/customized_prefix/custom_prefix_service.pb.ex
index baa47e5..f0cb400 100644
--- a/test/support/protos/custom_prefix_service.pb.ex
+++ b/test/support/protos/customized_prefix/custom_prefix_service.pb.ex
@@ -3,7 +3,8 @@ defmodule CustomizedPrefix.EchoRequest do
 
   use Protobuf,
     full_name: "custom_prefix.EchoRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "custom_prefix_service.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -23,7 +24,8 @@ defmodule CustomizedPrefix.EchoRequest do
           oneof_index: nil,
           json_name: "message",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -34,7 +36,8 @@ defmodule CustomizedPrefix.EchoRequest do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -46,7 +49,8 @@ defmodule CustomizedPrefix.EchoResponse do
 
   use Protobuf,
     full_name: "custom_prefix.EchoResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "custom_prefix_service.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -66,7 +70,8 @@ defmodule CustomizedPrefix.EchoResponse do
           oneof_index: nil,
           json_name: "reply",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -77,7 +82,8 @@ defmodule CustomizedPrefix.EchoResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -87,7 +93,9 @@ end
 defmodule CustomizedPrefix.PrefixService.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "custom_prefix.PrefixService", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "custom_prefix.PrefixService", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "custom_prefix_service.proto"
 
   def descriptor do
     # credo:disable-for-next-line
@@ -104,15 +112,18 @@ defmodule CustomizedPrefix.PrefixService.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: false,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
diff --git a/test/support/protos/deprecated_fields.pb.ex b/test/support/protos/deprecated_fields/deprecated_fields.pb.ex
similarity index 84%
rename from test/support/protos/deprecated_fields.pb.ex
rename to test/support/protos/deprecated_fields/deprecated_fields.pb.ex
index 4af0dad..5990473 100644
--- a/test/support/protos/deprecated_fields.pb.ex
+++ b/test/support/protos/deprecated_fields/deprecated_fields.pb.ex
@@ -3,7 +3,8 @@ defmodule DeprecatedFields.DeprecatedRequest do
 
   use Protobuf,
     full_name: "deprecated_fields.DeprecatedRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "deprecated_fields.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -23,7 +24,8 @@ defmodule DeprecatedFields.DeprecatedRequest do
           oneof_index: nil,
           json_name: "activeField",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "legacy_field",
@@ -49,12 +51,14 @@ defmodule DeprecatedFields.DeprecatedRequest do
             feature_support: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           oneof_index: nil,
           json_name: "legacyField",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "active_id",
@@ -68,7 +72,8 @@ defmodule DeprecatedFields.DeprecatedRequest do
           oneof_index: nil,
           json_name: "activeId",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "old_id",
@@ -94,12 +99,14 @@ defmodule DeprecatedFields.DeprecatedRequest do
             feature_support: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           oneof_index: nil,
           json_name: "oldId",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -110,7 +117,8 @@ defmodule DeprecatedFields.DeprecatedRequest do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -125,7 +133,8 @@ defmodule DeprecatedFields.DeprecatedResponse do
 
   use Protobuf,
     full_name: "deprecated_fields.DeprecatedResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "deprecated_fields.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -145,7 +154,8 @@ defmodule DeprecatedFields.DeprecatedResponse do
           oneof_index: nil,
           json_name: "success",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "result",
@@ -159,7 +169,8 @@ defmodule DeprecatedFields.DeprecatedResponse do
           oneof_index: nil,
           json_name: "result",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "old_result",
@@ -185,12 +196,14 @@ defmodule DeprecatedFields.DeprecatedResponse do
             feature_support: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           oneof_index: nil,
           json_name: "oldResult",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -201,7 +214,8 @@ defmodule DeprecatedFields.DeprecatedResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -215,7 +229,9 @@ defmodule DeprecatedFields.DeprecatedFieldsService.Service do
 
   use GRPC.Service,
     name: "deprecated_fields.DeprecatedFieldsService",
-    protoc_gen_elixir_version: "0.16.0"
+    protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "deprecated_fields.proto"
 
   def descriptor do
     # credo:disable-for-next-line
@@ -229,11 +245,13 @@ defmodule DeprecatedFields.DeprecatedFieldsService.Service do
           options: nil,
           client_streaming: false,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
diff --git a/test/support/protos/edge_cases.pb.ex b/test/support/protos/edge_cases/edge_cases.pb.ex
similarity index 83%
rename from test/support/protos/edge_cases.pb.ex
rename to test/support/protos/edge_cases/edge_cases.pb.ex
index 01bcf93..f2342b4 100644
--- a/test/support/protos/edge_cases.pb.ex
+++ b/test/support/protos/edge_cases/edge_cases.pb.ex
@@ -4,7 +4,7 @@ defmodule EdgeCases.DetailedStatus do
   use Protobuf,
     enum: true,
     full_name: "edge_cases.DetailedStatus",
-    protoc_gen_elixir_version: "0.16.0",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -16,49 +16,57 @@ defmodule EdgeCases.DetailedStatus do
           name: "DETAILED_STATUS_UNSPECIFIED",
           number: 0,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.EnumValueDescriptorProto{
           name: "status_active",
           number: 1,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.EnumValueDescriptorProto{
           name: "STATUS_INACTIVE",
           number: 2,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.EnumValueDescriptorProto{
           name: "Status_Pending",
           number: 3,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.EnumValueDescriptorProto{
           name: "ERROR_STATE",
           number: -1,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.EnumValueDescriptorProto{
           name: "CRITICAL_ERROR",
           number: -100,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.EnumValueDescriptorProto{
           name: "MAX_STATUS",
           number: 2_147_483_647,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -76,7 +84,8 @@ defmodule EdgeCases.EmptyInputRequest do
 
   use Protobuf,
     full_name: "edge_cases.EmptyInputRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -92,7 +101,8 @@ defmodule EdgeCases.EmptyInputRequest do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 end
@@ -102,7 +112,8 @@ defmodule EdgeCases.EmptyInputResponse do
 
   use Protobuf,
     full_name: "edge_cases.EmptyInputResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -122,7 +133,8 @@ defmodule EdgeCases.EmptyInputResponse do
           oneof_index: nil,
           json_name: "data",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -133,7 +145,8 @@ defmodule EdgeCases.EmptyInputResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -145,7 +158,8 @@ defmodule EdgeCases.EmptyOutputRequest do
 
   use Protobuf,
     full_name: "edge_cases.EmptyOutputRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -165,7 +179,8 @@ defmodule EdgeCases.EmptyOutputRequest do
           oneof_index: nil,
           json_name: "data",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -176,7 +191,8 @@ defmodule EdgeCases.EmptyOutputRequest do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -188,7 +204,8 @@ defmodule EdgeCases.EmptyOutputResponse do
 
   use Protobuf,
     full_name: "edge_cases.EmptyOutputResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -204,7 +221,8 @@ defmodule EdgeCases.EmptyOutputResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 end
@@ -214,7 +232,8 @@ defmodule EdgeCases.BothEmptyRequest do
 
   use Protobuf,
     full_name: "edge_cases.BothEmptyRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -230,7 +249,8 @@ defmodule EdgeCases.BothEmptyRequest do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 end
@@ -240,7 +260,8 @@ defmodule EdgeCases.BothEmptyResponse do
 
   use Protobuf,
     full_name: "edge_cases.BothEmptyResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -256,7 +277,8 @@ defmodule EdgeCases.BothEmptyResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 end
@@ -266,7 +288,8 @@ defmodule EdgeCases.ComplicatedRequest do
 
   use Protobuf,
     full_name: "edge_cases.ComplicatedRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -286,7 +309,8 @@ defmodule EdgeCases.ComplicatedRequest do
           oneof_index: nil,
           json_name: "numbers",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "fields",
@@ -300,7 +324,8 @@ defmodule EdgeCases.ComplicatedRequest do
           oneof_index: nil,
           json_name: "fields",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "status",
@@ -314,7 +339,8 @@ defmodule EdgeCases.ComplicatedRequest do
           oneof_index: nil,
           json_name: "status",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "oneofs",
@@ -328,7 +354,8 @@ defmodule EdgeCases.ComplicatedRequest do
           oneof_index: nil,
           json_name: "oneofs",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "nested_maps",
@@ -342,7 +369,8 @@ defmodule EdgeCases.ComplicatedRequest do
           oneof_index: nil,
           json_name: "nestedMaps",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "circular",
@@ -356,7 +384,8 @@ defmodule EdgeCases.ComplicatedRequest do
           oneof_index: nil,
           json_name: "circular",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "reserved_fields",
@@ -370,7 +399,8 @@ defmodule EdgeCases.ComplicatedRequest do
           oneof_index: nil,
           json_name: "reservedFields",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "unicode_test",
@@ -384,7 +414,8 @@ defmodule EdgeCases.ComplicatedRequest do
           oneof_index: nil,
           json_name: "unicodeTest",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -395,7 +426,8 @@ defmodule EdgeCases.ComplicatedRequest do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -414,7 +446,8 @@ defmodule EdgeCases.ComplicatedResponse do
 
   use Protobuf,
     full_name: "edge_cases.ComplicatedResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -434,7 +467,8 @@ defmodule EdgeCases.ComplicatedResponse do
           oneof_index: nil,
           json_name: "numbers",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "fields",
@@ -448,7 +482,8 @@ defmodule EdgeCases.ComplicatedResponse do
           oneof_index: nil,
           json_name: "fields",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "status",
@@ -462,7 +497,8 @@ defmodule EdgeCases.ComplicatedResponse do
           oneof_index: nil,
           json_name: "status",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "oneofs",
@@ -476,7 +512,8 @@ defmodule EdgeCases.ComplicatedResponse do
           oneof_index: nil,
           json_name: "oneofs",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "nested_maps",
@@ -490,7 +527,8 @@ defmodule EdgeCases.ComplicatedResponse do
           oneof_index: nil,
           json_name: "nestedMaps",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "circular",
@@ -504,7 +542,8 @@ defmodule EdgeCases.ComplicatedResponse do
           oneof_index: nil,
           json_name: "circular",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "reserved_fields",
@@ -518,7 +557,8 @@ defmodule EdgeCases.ComplicatedResponse do
           oneof_index: nil,
           json_name: "reservedFields",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "unicode_test",
@@ -532,7 +572,8 @@ defmodule EdgeCases.ComplicatedResponse do
           oneof_index: nil,
           json_name: "unicodeTest",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -543,7 +584,8 @@ defmodule EdgeCases.ComplicatedResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -562,7 +604,8 @@ defmodule EdgeCases.SparseFieldNumbers do
 
   use Protobuf,
     full_name: "edge_cases.SparseFieldNumbers",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -582,7 +625,8 @@ defmodule EdgeCases.SparseFieldNumbers do
           oneof_index: nil,
           json_name: "field1",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "field_536870911",
@@ -596,7 +640,8 @@ defmodule EdgeCases.SparseFieldNumbers do
           oneof_index: nil,
           json_name: "field536870911",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -607,7 +652,8 @@ defmodule EdgeCases.SparseFieldNumbers do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -620,7 +666,8 @@ defmodule EdgeCases.ManyFields do
 
   use Protobuf,
     full_name: "edge_cases.ManyFields",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -640,7 +687,8 @@ defmodule EdgeCases.ManyFields do
           oneof_index: nil,
           json_name: "field001",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "field_002",
@@ -654,7 +702,8 @@ defmodule EdgeCases.ManyFields do
           oneof_index: nil,
           json_name: "field002",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "field_003",
@@ -668,7 +717,8 @@ defmodule EdgeCases.ManyFields do
           oneof_index: nil,
           json_name: "field003",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "field_004",
@@ -682,7 +732,8 @@ defmodule EdgeCases.ManyFields do
           oneof_index: nil,
           json_name: "field004",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "field_005",
@@ -696,7 +747,8 @@ defmodule EdgeCases.ManyFields do
           oneof_index: nil,
           json_name: "field005",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "field_006",
@@ -710,7 +762,8 @@ defmodule EdgeCases.ManyFields do
           oneof_index: nil,
           json_name: "field006",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "field_007",
@@ -724,7 +777,8 @@ defmodule EdgeCases.ManyFields do
           oneof_index: nil,
           json_name: "field007",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "field_008",
@@ -738,7 +792,8 @@ defmodule EdgeCases.ManyFields do
           oneof_index: nil,
           json_name: "field008",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "field_009",
@@ -752,7 +807,8 @@ defmodule EdgeCases.ManyFields do
           oneof_index: nil,
           json_name: "field009",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "field_010",
@@ -766,7 +822,8 @@ defmodule EdgeCases.ManyFields do
           oneof_index: nil,
           json_name: "field010",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "field_011",
@@ -780,7 +837,8 @@ defmodule EdgeCases.ManyFields do
           oneof_index: nil,
           json_name: "field011",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "field_012",
@@ -794,7 +852,8 @@ defmodule EdgeCases.ManyFields do
           oneof_index: nil,
           json_name: "field012",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "field_013",
@@ -808,7 +867,8 @@ defmodule EdgeCases.ManyFields do
           oneof_index: nil,
           json_name: "field013",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "field_014",
@@ -822,7 +882,8 @@ defmodule EdgeCases.ManyFields do
           oneof_index: nil,
           json_name: "field014",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "field_015",
@@ -836,7 +897,8 @@ defmodule EdgeCases.ManyFields do
           oneof_index: nil,
           json_name: "field015",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "field_016",
@@ -850,7 +912,8 @@ defmodule EdgeCases.ManyFields do
           oneof_index: nil,
           json_name: "field016",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "field_017",
@@ -864,7 +927,8 @@ defmodule EdgeCases.ManyFields do
           oneof_index: nil,
           json_name: "field017",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "field_018",
@@ -878,7 +942,8 @@ defmodule EdgeCases.ManyFields do
           oneof_index: nil,
           json_name: "field018",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "field_019",
@@ -892,7 +957,8 @@ defmodule EdgeCases.ManyFields do
           oneof_index: nil,
           json_name: "field019",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "field_020",
@@ -906,7 +972,8 @@ defmodule EdgeCases.ManyFields do
           oneof_index: nil,
           json_name: "field020",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -917,7 +984,8 @@ defmodule EdgeCases.ManyFields do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -948,7 +1016,8 @@ defmodule EdgeCases.MultipleOneofs do
 
   use Protobuf,
     full_name: "edge_cases.MultipleOneofs",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -968,7 +1037,8 @@ defmodule EdgeCases.MultipleOneofs do
           oneof_index: 0,
           json_name: "optionA1",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "option_a2",
@@ -982,7 +1052,8 @@ defmodule EdgeCases.MultipleOneofs do
           oneof_index: 0,
           json_name: "optionA2",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "option_b1",
@@ -996,7 +1067,8 @@ defmodule EdgeCases.MultipleOneofs do
           oneof_index: 1,
           json_name: "optionB1",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "option_b2",
@@ -1010,7 +1082,8 @@ defmodule EdgeCases.MultipleOneofs do
           oneof_index: 1,
           json_name: "optionB2",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "option_c1",
@@ -1024,7 +1097,8 @@ defmodule EdgeCases.MultipleOneofs do
           oneof_index: 2,
           json_name: "optionC1",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "option_c2",
@@ -1038,7 +1112,8 @@ defmodule EdgeCases.MultipleOneofs do
           oneof_index: 2,
           json_name: "optionC2",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "regular_field",
@@ -1052,7 +1127,8 @@ defmodule EdgeCases.MultipleOneofs do
           oneof_index: nil,
           json_name: "regularField",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -1064,22 +1140,26 @@ defmodule EdgeCases.MultipleOneofs do
         %Google.Protobuf.OneofDescriptorProto{
           name: "first_choice",
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.OneofDescriptorProto{
           name: "second_choice",
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.OneofDescriptorProto{
           name: "third_choice",
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -1104,7 +1184,8 @@ defmodule EdgeCases.NestedMaps.OuterMapEntry do
   use Protobuf,
     full_name: "edge_cases.NestedMaps.OuterMapEntry",
     map: true,
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -1124,7 +1205,8 @@ defmodule EdgeCases.NestedMaps.OuterMapEntry do
           oneof_index: nil,
           json_name: "key",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "value",
@@ -1138,7 +1220,8 @@ defmodule EdgeCases.NestedMaps.OuterMapEntry do
           oneof_index: nil,
           json_name: "value",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -1154,12 +1237,14 @@ defmodule EdgeCases.NestedMaps.OuterMapEntry do
         features: nil,
         uninterpreted_option: [],
         __pb_extensions__: %{},
-        __unknown_fields__: []
+        __unknown_fields__: [],
+        __protobuf__: true
       },
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -1173,7 +1258,8 @@ defmodule EdgeCases.NestedMaps.IntKeyMapEntry do
   use Protobuf,
     full_name: "edge_cases.NestedMaps.IntKeyMapEntry",
     map: true,
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -1193,7 +1279,8 @@ defmodule EdgeCases.NestedMaps.IntKeyMapEntry do
           oneof_index: nil,
           json_name: "key",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "value",
@@ -1207,7 +1294,8 @@ defmodule EdgeCases.NestedMaps.IntKeyMapEntry do
           oneof_index: nil,
           json_name: "value",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -1223,12 +1311,14 @@ defmodule EdgeCases.NestedMaps.IntKeyMapEntry do
         features: nil,
         uninterpreted_option: [],
         __pb_extensions__: %{},
-        __unknown_fields__: []
+        __unknown_fields__: [],
+        __protobuf__: true
       },
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -1242,7 +1332,8 @@ defmodule EdgeCases.NestedMaps.NumericMapEntry do
   use Protobuf,
     full_name: "edge_cases.NestedMaps.NumericMapEntry",
     map: true,
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -1262,7 +1353,8 @@ defmodule EdgeCases.NestedMaps.NumericMapEntry do
           oneof_index: nil,
           json_name: "key",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "value",
@@ -1276,7 +1368,8 @@ defmodule EdgeCases.NestedMaps.NumericMapEntry do
           oneof_index: nil,
           json_name: "value",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -1292,12 +1385,14 @@ defmodule EdgeCases.NestedMaps.NumericMapEntry do
         features: nil,
         uninterpreted_option: [],
         __pb_extensions__: %{},
-        __unknown_fields__: []
+        __unknown_fields__: [],
+        __protobuf__: true
       },
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -1311,7 +1406,8 @@ defmodule EdgeCases.NestedMaps.BoolKeyMapEntry do
   use Protobuf,
     full_name: "edge_cases.NestedMaps.BoolKeyMapEntry",
     map: true,
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -1331,7 +1427,8 @@ defmodule EdgeCases.NestedMaps.BoolKeyMapEntry do
           oneof_index: nil,
           json_name: "key",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "value",
@@ -1345,7 +1442,8 @@ defmodule EdgeCases.NestedMaps.BoolKeyMapEntry do
           oneof_index: nil,
           json_name: "value",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -1361,12 +1459,14 @@ defmodule EdgeCases.NestedMaps.BoolKeyMapEntry do
         features: nil,
         uninterpreted_option: [],
         __pb_extensions__: %{},
-        __unknown_fields__: []
+        __unknown_fields__: [],
+        __protobuf__: true
       },
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -1379,7 +1479,8 @@ defmodule EdgeCases.NestedMaps do
 
   use Protobuf,
     full_name: "edge_cases.NestedMaps",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -1399,7 +1500,8 @@ defmodule EdgeCases.NestedMaps do
           oneof_index: nil,
           json_name: "outerMap",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "int_key_map",
@@ -1413,7 +1515,8 @@ defmodule EdgeCases.NestedMaps do
           oneof_index: nil,
           json_name: "intKeyMap",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "numeric_map",
@@ -1427,7 +1530,8 @@ defmodule EdgeCases.NestedMaps do
           oneof_index: nil,
           json_name: "numericMap",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "bool_key_map",
@@ -1441,7 +1545,8 @@ defmodule EdgeCases.NestedMaps do
           oneof_index: nil,
           json_name: "boolKeyMap",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [
@@ -1460,7 +1565,8 @@ defmodule EdgeCases.NestedMaps do
               oneof_index: nil,
               json_name: "key",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.FieldDescriptorProto{
               name: "value",
@@ -1474,7 +1580,8 @@ defmodule EdgeCases.NestedMaps do
               oneof_index: nil,
               json_name: "value",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           nested_type: [],
@@ -1490,12 +1597,14 @@ defmodule EdgeCases.NestedMaps do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           oneof_decl: [],
           reserved_range: [],
           reserved_name: [],
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.DescriptorProto{
           name: "IntKeyMapEntry",
@@ -1512,7 +1621,8 @@ defmodule EdgeCases.NestedMaps do
               oneof_index: nil,
               json_name: "key",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.FieldDescriptorProto{
               name: "value",
@@ -1526,7 +1636,8 @@ defmodule EdgeCases.NestedMaps do
               oneof_index: nil,
               json_name: "value",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           nested_type: [],
@@ -1542,12 +1653,14 @@ defmodule EdgeCases.NestedMaps do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           oneof_decl: [],
           reserved_range: [],
           reserved_name: [],
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.DescriptorProto{
           name: "NumericMapEntry",
@@ -1564,7 +1677,8 @@ defmodule EdgeCases.NestedMaps do
               oneof_index: nil,
               json_name: "key",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.FieldDescriptorProto{
               name: "value",
@@ -1578,7 +1692,8 @@ defmodule EdgeCases.NestedMaps do
               oneof_index: nil,
               json_name: "value",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           nested_type: [],
@@ -1594,12 +1709,14 @@ defmodule EdgeCases.NestedMaps do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           oneof_decl: [],
           reserved_range: [],
           reserved_name: [],
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.DescriptorProto{
           name: "BoolKeyMapEntry",
@@ -1616,7 +1733,8 @@ defmodule EdgeCases.NestedMaps do
               oneof_index: nil,
               json_name: "key",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.FieldDescriptorProto{
               name: "value",
@@ -1630,7 +1748,8 @@ defmodule EdgeCases.NestedMaps do
               oneof_index: nil,
               json_name: "value",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           nested_type: [],
@@ -1646,12 +1765,14 @@ defmodule EdgeCases.NestedMaps do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           oneof_decl: [],
           reserved_range: [],
           reserved_name: [],
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       enum_type: [],
@@ -1661,7 +1782,8 @@ defmodule EdgeCases.NestedMaps do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -1696,7 +1818,8 @@ defmodule EdgeCases.InnerMap.DataEntry do
   use Protobuf,
     full_name: "edge_cases.InnerMap.DataEntry",
     map: true,
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -1716,7 +1839,8 @@ defmodule EdgeCases.InnerMap.DataEntry do
           oneof_index: nil,
           json_name: "key",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "value",
@@ -1730,7 +1854,8 @@ defmodule EdgeCases.InnerMap.DataEntry do
           oneof_index: nil,
           json_name: "value",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -1746,12 +1871,14 @@ defmodule EdgeCases.InnerMap.DataEntry do
         features: nil,
         uninterpreted_option: [],
         __pb_extensions__: %{},
-        __unknown_fields__: []
+        __unknown_fields__: [],
+        __protobuf__: true
       },
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -1765,7 +1892,8 @@ defmodule EdgeCases.InnerMap.CountsEntry do
   use Protobuf,
     full_name: "edge_cases.InnerMap.CountsEntry",
     map: true,
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -1785,7 +1913,8 @@ defmodule EdgeCases.InnerMap.CountsEntry do
           oneof_index: nil,
           json_name: "key",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "value",
@@ -1799,7 +1928,8 @@ defmodule EdgeCases.InnerMap.CountsEntry do
           oneof_index: nil,
           json_name: "value",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -1815,12 +1945,14 @@ defmodule EdgeCases.InnerMap.CountsEntry do
         features: nil,
         uninterpreted_option: [],
         __pb_extensions__: %{},
-        __unknown_fields__: []
+        __unknown_fields__: [],
+        __protobuf__: true
       },
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -1833,7 +1965,8 @@ defmodule EdgeCases.InnerMap do
 
   use Protobuf,
     full_name: "edge_cases.InnerMap",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -1853,7 +1986,8 @@ defmodule EdgeCases.InnerMap do
           oneof_index: nil,
           json_name: "data",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "counts",
@@ -1867,7 +2001,8 @@ defmodule EdgeCases.InnerMap do
           oneof_index: nil,
           json_name: "counts",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [
@@ -1886,7 +2021,8 @@ defmodule EdgeCases.InnerMap do
               oneof_index: nil,
               json_name: "key",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.FieldDescriptorProto{
               name: "value",
@@ -1900,7 +2036,8 @@ defmodule EdgeCases.InnerMap do
               oneof_index: nil,
               json_name: "value",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           nested_type: [],
@@ -1916,12 +2053,14 @@ defmodule EdgeCases.InnerMap do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           oneof_decl: [],
           reserved_range: [],
           reserved_name: [],
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.DescriptorProto{
           name: "CountsEntry",
@@ -1938,7 +2077,8 @@ defmodule EdgeCases.InnerMap do
               oneof_index: nil,
               json_name: "key",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.FieldDescriptorProto{
               name: "value",
@@ -1952,7 +2092,8 @@ defmodule EdgeCases.InnerMap do
               oneof_index: nil,
               json_name: "value",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           nested_type: [],
@@ -1968,12 +2109,14 @@ defmodule EdgeCases.InnerMap do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           oneof_decl: [],
           reserved_range: [],
           reserved_name: [],
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       enum_type: [],
@@ -1983,7 +2126,8 @@ defmodule EdgeCases.InnerMap do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -1996,7 +2140,8 @@ defmodule EdgeCases.CircularA do
 
   use Protobuf,
     full_name: "edge_cases.CircularA",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -2016,7 +2161,8 @@ defmodule EdgeCases.CircularA do
           oneof_index: nil,
           json_name: "bField",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "data",
@@ -2030,7 +2176,8 @@ defmodule EdgeCases.CircularA do
           oneof_index: nil,
           json_name: "data",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -2041,7 +2188,8 @@ defmodule EdgeCases.CircularA do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -2054,7 +2202,8 @@ defmodule EdgeCases.CircularB do
 
   use Protobuf,
     full_name: "edge_cases.CircularB",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -2074,7 +2223,8 @@ defmodule EdgeCases.CircularB do
           oneof_index: nil,
           json_name: "cField",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "data",
@@ -2088,7 +2238,8 @@ defmodule EdgeCases.CircularB do
           oneof_index: nil,
           json_name: "data",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -2099,7 +2250,8 @@ defmodule EdgeCases.CircularB do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -2112,7 +2264,8 @@ defmodule EdgeCases.CircularC do
 
   use Protobuf,
     full_name: "edge_cases.CircularC",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -2132,7 +2285,8 @@ defmodule EdgeCases.CircularC do
           oneof_index: nil,
           json_name: "aField",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "data",
@@ -2146,7 +2300,8 @@ defmodule EdgeCases.CircularC do
           oneof_index: nil,
           json_name: "data",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -2157,7 +2312,8 @@ defmodule EdgeCases.CircularC do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -2170,7 +2326,8 @@ defmodule EdgeCases.WithReservedFields do
 
   use Protobuf,
     full_name: "edge_cases.WithReservedFields",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -2190,7 +2347,8 @@ defmodule EdgeCases.WithReservedFields do
           oneof_index: nil,
           json_name: "activeField1",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "active_field_16",
@@ -2204,7 +2362,8 @@ defmodule EdgeCases.WithReservedFields do
           oneof_index: nil,
           json_name: "activeField16",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -2214,21 +2373,34 @@ defmodule EdgeCases.WithReservedFields do
       options: nil,
       oneof_decl: [],
       reserved_range: [
-        %Google.Protobuf.DescriptorProto.ReservedRange{start: 2, end: 3, __unknown_fields__: []},
+        %Google.Protobuf.DescriptorProto.ReservedRange{
+          start: 2,
+          end: 3,
+          __unknown_fields__: [],
+          __protobuf__: true
+        },
         %Google.Protobuf.DescriptorProto.ReservedRange{
           start: 15,
           end: 16,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
+        },
+        %Google.Protobuf.DescriptorProto.ReservedRange{
+          start: 9,
+          end: 12,
+          __unknown_fields__: [],
+          __protobuf__: true
         },
-        %Google.Protobuf.DescriptorProto.ReservedRange{start: 9, end: 12, __unknown_fields__: []},
         %Google.Protobuf.DescriptorProto.ReservedRange{
           start: 100,
           end: 536_870_912,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       reserved_name: ["foo", "bar", "old_field"],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -2241,7 +2413,8 @@ defmodule EdgeCases.UnicodeTest do
 
   use Protobuf,
     full_name: "edge_cases.UnicodeTest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -2261,7 +2434,8 @@ defmodule EdgeCases.UnicodeTest do
           oneof_index: nil,
           json_name: "rocketField",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "pi_field",
@@ -2275,7 +2449,8 @@ defmodule EdgeCases.UnicodeTest do
           oneof_index: nil,
           json_name: "piField",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "greeting",
@@ -2289,7 +2464,8 @@ defmodule EdgeCases.UnicodeTest do
           oneof_index: nil,
           json_name: "greeting",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -2300,7 +2476,8 @@ defmodule EdgeCases.UnicodeTest do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -2312,7 +2489,9 @@ end
 defmodule EdgeCases.EdgeCaseService.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "edge_cases.EdgeCaseService", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "edge_cases.EdgeCaseService", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "edge_cases.proto"
 
   def descriptor do
     # credo:disable-for-next-line
@@ -2329,11 +2508,13 @@ defmodule EdgeCases.EdgeCaseService.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: false,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.MethodDescriptorProto{
           name: "EmptyOutput",
@@ -2345,11 +2526,13 @@ defmodule EdgeCases.EdgeCaseService.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: false,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.MethodDescriptorProto{
           name: "BothEmpty",
@@ -2361,15 +2544,18 @@ defmodule EdgeCases.EdgeCaseService.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: false,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
diff --git a/test/support/protos/empty_service.pb.ex b/test/support/protos/empty_service/empty_service.pb.ex
similarity index 77%
rename from test/support/protos/empty_service.pb.ex
rename to test/support/protos/empty_service/empty_service.pb.ex
index 119eba6..aabe527 100644
--- a/test/support/protos/empty_service.pb.ex
+++ b/test/support/protos/empty_service/empty_service.pb.ex
@@ -1,7 +1,9 @@
 defmodule EmptyService.EmptyService.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "empty_service.EmptyService", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "empty_service.EmptyService", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "empty_service.proto"
 
   def descriptor do
     # credo:disable-for-next-line
@@ -9,7 +11,8 @@ defmodule EmptyService.EmptyService.Service do
       name: "EmptyService",
       method: [],
       options: nil,
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 end
diff --git a/test/support/protos/global_service.pb.ex b/test/support/protos/global_service.pb.ex
index d5f66bd..fe650f6 100644
--- a/test/support/protos/global_service.pb.ex
+++ b/test/support/protos/global_service.pb.ex
@@ -1,7 +1,11 @@
 defmodule GlobalRequest do
   @moduledoc false
 
-  use Protobuf, full_name: "GlobalRequest", protoc_gen_elixir_version: "0.16.0", syntax: :proto3
+  use Protobuf,
+    full_name: "GlobalRequest",
+    proto_source: "global_service.proto",
+    protoc_gen_elixir_version: "0.17.0",
+    syntax: :proto3
 
   def descriptor do
     # credo:disable-for-next-line
@@ -20,7 +24,8 @@ defmodule GlobalRequest do
           oneof_index: nil,
           json_name: "data",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -31,7 +36,8 @@ defmodule GlobalRequest do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -41,7 +47,11 @@ end
 defmodule GlobalResponse do
   @moduledoc false
 
-  use Protobuf, full_name: "GlobalResponse", protoc_gen_elixir_version: "0.16.0", syntax: :proto3
+  use Protobuf,
+    full_name: "GlobalResponse",
+    proto_source: "global_service.proto",
+    protoc_gen_elixir_version: "0.17.0",
+    syntax: :proto3
 
   def descriptor do
     # credo:disable-for-next-line
@@ -60,7 +70,8 @@ defmodule GlobalResponse do
           oneof_index: nil,
           json_name: "result",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -71,7 +82,8 @@ defmodule GlobalResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -81,7 +93,9 @@ end
 defmodule GlobalService.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "GlobalService", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "GlobalService", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "global_service.proto"
 
   def descriptor do
     # credo:disable-for-next-line
@@ -98,15 +112,18 @@ defmodule GlobalService.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: false,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
diff --git a/test/support/protos/imports_test.pb.ex b/test/support/protos/imports_test/imports_test.pb.ex
similarity index 84%
rename from test/support/protos/imports_test.pb.ex
rename to test/support/protos/imports_test/imports_test.pb.ex
index ccee1da..fc95c82 100644
--- a/test/support/protos/imports_test.pb.ex
+++ b/test/support/protos/imports_test/imports_test.pb.ex
@@ -3,7 +3,8 @@ defmodule ImportsTest.UserRequest do
 
   use Protobuf,
     full_name: "imports_test.UserRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "imports_test.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -23,7 +24,8 @@ defmodule ImportsTest.UserRequest do
           oneof_index: nil,
           json_name: "name",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "email",
@@ -37,7 +39,8 @@ defmodule ImportsTest.UserRequest do
           oneof_index: nil,
           json_name: "email",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "address",
@@ -51,7 +54,8 @@ defmodule ImportsTest.UserRequest do
           oneof_index: nil,
           json_name: "address",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "location",
@@ -65,7 +69,8 @@ defmodule ImportsTest.UserRequest do
           oneof_index: nil,
           json_name: "location",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "registered_at",
@@ -79,7 +84,8 @@ defmodule ImportsTest.UserRequest do
           oneof_index: nil,
           json_name: "registeredAt",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -90,7 +96,8 @@ defmodule ImportsTest.UserRequest do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -106,7 +113,8 @@ defmodule ImportsTest.UserResponse.Profile do
 
   use Protobuf,
     full_name: "imports_test.UserResponse.Profile",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "imports_test.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -126,7 +134,8 @@ defmodule ImportsTest.UserResponse.Profile do
           oneof_index: nil,
           json_name: "billingAddress",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "shipping_address",
@@ -140,7 +149,8 @@ defmodule ImportsTest.UserResponse.Profile do
           oneof_index: nil,
           json_name: "shippingAddress",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "recent_locations",
@@ -154,7 +164,8 @@ defmodule ImportsTest.UserResponse.Profile do
           oneof_index: nil,
           json_name: "recentLocations",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -165,7 +176,8 @@ defmodule ImportsTest.UserResponse.Profile do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -183,7 +195,8 @@ defmodule ImportsTest.UserResponse do
 
   use Protobuf,
     full_name: "imports_test.UserResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "imports_test.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -203,7 +216,8 @@ defmodule ImportsTest.UserResponse do
           oneof_index: nil,
           json_name: "userId",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "priority",
@@ -217,7 +231,8 @@ defmodule ImportsTest.UserResponse do
           oneof_index: nil,
           json_name: "priority",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "created_at",
@@ -231,7 +246,8 @@ defmodule ImportsTest.UserResponse do
           oneof_index: nil,
           json_name: "createdAt",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "profile",
@@ -245,7 +261,8 @@ defmodule ImportsTest.UserResponse do
           oneof_index: nil,
           json_name: "profile",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [
@@ -264,7 +281,8 @@ defmodule ImportsTest.UserResponse do
               oneof_index: nil,
               json_name: "billingAddress",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.FieldDescriptorProto{
               name: "shipping_address",
@@ -278,7 +296,8 @@ defmodule ImportsTest.UserResponse do
               oneof_index: nil,
               json_name: "shippingAddress",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.FieldDescriptorProto{
               name: "recent_locations",
@@ -292,7 +311,8 @@ defmodule ImportsTest.UserResponse do
               oneof_index: nil,
               json_name: "recentLocations",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           nested_type: [],
@@ -303,7 +323,8 @@ defmodule ImportsTest.UserResponse do
           oneof_decl: [],
           reserved_range: [],
           reserved_name: [],
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       enum_type: [],
@@ -313,7 +334,8 @@ defmodule ImportsTest.UserResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -328,7 +350,8 @@ defmodule ImportsTest.LocationUpdate do
 
   use Protobuf,
     full_name: "imports_test.LocationUpdate",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "imports_test.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -348,7 +371,8 @@ defmodule ImportsTest.LocationUpdate do
           oneof_index: nil,
           json_name: "userId",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "new_location",
@@ -362,7 +386,8 @@ defmodule ImportsTest.LocationUpdate do
           oneof_index: nil,
           json_name: "newLocation",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "timestamp",
@@ -376,7 +401,8 @@ defmodule ImportsTest.LocationUpdate do
           oneof_index: nil,
           json_name: "timestamp",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -387,7 +413,8 @@ defmodule ImportsTest.LocationUpdate do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -402,7 +429,8 @@ defmodule ImportsTest.LocationResponse.VisitHistoryEntry do
   use Protobuf,
     full_name: "imports_test.LocationResponse.VisitHistoryEntry",
     map: true,
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "imports_test.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -422,7 +450,8 @@ defmodule ImportsTest.LocationResponse.VisitHistoryEntry do
           oneof_index: nil,
           json_name: "key",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "value",
@@ -436,7 +465,8 @@ defmodule ImportsTest.LocationResponse.VisitHistoryEntry do
           oneof_index: nil,
           json_name: "value",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -452,12 +482,14 @@ defmodule ImportsTest.LocationResponse.VisitHistoryEntry do
         features: nil,
         uninterpreted_option: [],
         __pb_extensions__: %{},
-        __unknown_fields__: []
+        __unknown_fields__: [],
+        __protobuf__: true
       },
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -470,7 +502,8 @@ defmodule ImportsTest.LocationResponse do
 
   use Protobuf,
     full_name: "imports_test.LocationResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "imports_test.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -490,7 +523,8 @@ defmodule ImportsTest.LocationResponse do
           oneof_index: nil,
           json_name: "success",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "confirmed_location",
@@ -504,7 +538,8 @@ defmodule ImportsTest.LocationResponse do
           oneof_index: nil,
           json_name: "confirmedLocation",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "visit_history",
@@ -518,7 +553,8 @@ defmodule ImportsTest.LocationResponse do
           oneof_index: nil,
           json_name: "visitHistory",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [
@@ -537,7 +573,8 @@ defmodule ImportsTest.LocationResponse do
               oneof_index: nil,
               json_name: "key",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.FieldDescriptorProto{
               name: "value",
@@ -551,7 +588,8 @@ defmodule ImportsTest.LocationResponse do
               oneof_index: nil,
               json_name: "value",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           nested_type: [],
@@ -567,12 +605,14 @@ defmodule ImportsTest.LocationResponse do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           oneof_decl: [],
           reserved_range: [],
           reserved_name: [],
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       enum_type: [],
@@ -582,7 +622,8 @@ defmodule ImportsTest.LocationResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -602,7 +643,8 @@ defmodule ImportsTest.BulkOperation.TaskPrioritiesEntry do
   use Protobuf,
     full_name: "imports_test.BulkOperation.TaskPrioritiesEntry",
     map: true,
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "imports_test.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -622,7 +664,8 @@ defmodule ImportsTest.BulkOperation.TaskPrioritiesEntry do
           oneof_index: nil,
           json_name: "key",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "value",
@@ -636,7 +679,8 @@ defmodule ImportsTest.BulkOperation.TaskPrioritiesEntry do
           oneof_index: nil,
           json_name: "value",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -652,12 +696,14 @@ defmodule ImportsTest.BulkOperation.TaskPrioritiesEntry do
         features: nil,
         uninterpreted_option: [],
         __pb_extensions__: %{},
-        __unknown_fields__: []
+        __unknown_fields__: [],
+        __protobuf__: true
       },
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -670,7 +716,8 @@ defmodule ImportsTest.BulkOperation do
 
   use Protobuf,
     full_name: "imports_test.BulkOperation",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "imports_test.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -690,7 +737,8 @@ defmodule ImportsTest.BulkOperation do
           oneof_index: nil,
           json_name: "addresses",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "transactions",
@@ -704,7 +752,8 @@ defmodule ImportsTest.BulkOperation do
           oneof_index: nil,
           json_name: "transactions",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "task_priorities",
@@ -718,7 +767,8 @@ defmodule ImportsTest.BulkOperation do
           oneof_index: nil,
           json_name: "taskPriorities",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [
@@ -737,7 +787,8 @@ defmodule ImportsTest.BulkOperation do
               oneof_index: nil,
               json_name: "key",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.FieldDescriptorProto{
               name: "value",
@@ -751,7 +802,8 @@ defmodule ImportsTest.BulkOperation do
               oneof_index: nil,
               json_name: "value",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           nested_type: [],
@@ -767,12 +819,14 @@ defmodule ImportsTest.BulkOperation do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           oneof_decl: [],
           reserved_range: [],
           reserved_name: [],
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       enum_type: [],
@@ -782,7 +836,8 @@ defmodule ImportsTest.BulkOperation do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -799,7 +854,9 @@ end
 defmodule ImportsTest.ImportTestService.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "imports_test.ImportTestService", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "imports_test.ImportTestService", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "imports_test.proto"
 
   def descriptor do
     # credo:disable-for-next-line
@@ -816,11 +873,13 @@ defmodule ImportsTest.ImportTestService.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: false,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.MethodDescriptorProto{
           name: "UpdateLocation",
@@ -832,15 +891,18 @@ defmodule ImportsTest.ImportTestService.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: false,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
diff --git a/test/support/protos/nested_messages.pb.ex b/test/support/protos/nested/nested_messages.pb.ex
similarity index 84%
rename from test/support/protos/nested_messages.pb.ex
rename to test/support/protos/nested/nested_messages.pb.ex
index 2de8fa6..ccdf6cf 100644
--- a/test/support/protos/nested_messages.pb.ex
+++ b/test/support/protos/nested/nested_messages.pb.ex
@@ -4,7 +4,7 @@ defmodule Nested.ComplexNested.Status do
   use Protobuf,
     enum: true,
     full_name: "nested.ComplexNested.Status",
-    protoc_gen_elixir_version: "0.16.0",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -16,25 +16,29 @@ defmodule Nested.ComplexNested.Status do
           name: "UNKNOWN",
           number: 0,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.EnumValueDescriptorProto{
           name: "ACTIVE",
           number: 1,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.EnumValueDescriptorProto{
           name: "INACTIVE",
           number: 2,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -49,7 +53,7 @@ defmodule Nested.ComplexNested.Node.NodeType do
   use Protobuf,
     enum: true,
     full_name: "nested.ComplexNested.Node.NodeType",
-    protoc_gen_elixir_version: "0.16.0",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -61,25 +65,29 @@ defmodule Nested.ComplexNested.Node.NodeType do
           name: "LEAF",
           number: 0,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.EnumValueDescriptorProto{
           name: "BRANCH",
           number: 1,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.EnumValueDescriptorProto{
           name: "ROOT",
           number: 2,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -93,7 +101,8 @@ defmodule Nested.OuterMessage.MiddleMessage.InnerMessage.DeepMessage.VeryDeepMes
 
   use Protobuf,
     full_name: "nested.OuterMessage.MiddleMessage.InnerMessage.DeepMessage.VeryDeepMessage",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_messages.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -113,7 +122,8 @@ defmodule Nested.OuterMessage.MiddleMessage.InnerMessage.DeepMessage.VeryDeepMes
           oneof_index: nil,
           json_name: "veryDeepField",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "values",
@@ -127,7 +137,8 @@ defmodule Nested.OuterMessage.MiddleMessage.InnerMessage.DeepMessage.VeryDeepMes
           oneof_index: nil,
           json_name: "values",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -138,7 +149,8 @@ defmodule Nested.OuterMessage.MiddleMessage.InnerMessage.DeepMessage.VeryDeepMes
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -151,7 +163,8 @@ defmodule Nested.OuterMessage.MiddleMessage.InnerMessage.DeepMessage do
 
   use Protobuf,
     full_name: "nested.OuterMessage.MiddleMessage.InnerMessage.DeepMessage",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_messages.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -171,7 +184,8 @@ defmodule Nested.OuterMessage.MiddleMessage.InnerMessage.DeepMessage do
           oneof_index: nil,
           json_name: "deepField",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "very_deep",
@@ -186,7 +200,8 @@ defmodule Nested.OuterMessage.MiddleMessage.InnerMessage.DeepMessage do
           oneof_index: nil,
           json_name: "veryDeep",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [
@@ -205,7 +220,8 @@ defmodule Nested.OuterMessage.MiddleMessage.InnerMessage.DeepMessage do
               oneof_index: nil,
               json_name: "veryDeepField",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.FieldDescriptorProto{
               name: "values",
@@ -219,7 +235,8 @@ defmodule Nested.OuterMessage.MiddleMessage.InnerMessage.DeepMessage do
               oneof_index: nil,
               json_name: "values",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           nested_type: [],
@@ -230,7 +247,8 @@ defmodule Nested.OuterMessage.MiddleMessage.InnerMessage.DeepMessage do
           oneof_decl: [],
           reserved_range: [],
           reserved_name: [],
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       enum_type: [],
@@ -240,7 +258,8 @@ defmodule Nested.OuterMessage.MiddleMessage.InnerMessage.DeepMessage do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -256,7 +275,8 @@ defmodule Nested.OuterMessage.MiddleMessage.InnerMessage do
 
   use Protobuf,
     full_name: "nested.OuterMessage.MiddleMessage.InnerMessage",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_messages.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -276,7 +296,8 @@ defmodule Nested.OuterMessage.MiddleMessage.InnerMessage do
           oneof_index: nil,
           json_name: "innerField",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "deep",
@@ -290,7 +311,8 @@ defmodule Nested.OuterMessage.MiddleMessage.InnerMessage do
           oneof_index: nil,
           json_name: "deep",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [
@@ -309,7 +331,8 @@ defmodule Nested.OuterMessage.MiddleMessage.InnerMessage do
               oneof_index: nil,
               json_name: "deepField",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.FieldDescriptorProto{
               name: "very_deep",
@@ -324,7 +347,8 @@ defmodule Nested.OuterMessage.MiddleMessage.InnerMessage do
               oneof_index: nil,
               json_name: "veryDeep",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           nested_type: [
@@ -343,7 +367,8 @@ defmodule Nested.OuterMessage.MiddleMessage.InnerMessage do
                   oneof_index: nil,
                   json_name: "veryDeepField",
                   proto3_optional: nil,
-                  __unknown_fields__: []
+                  __unknown_fields__: [],
+                  __protobuf__: true
                 },
                 %Google.Protobuf.FieldDescriptorProto{
                   name: "values",
@@ -357,7 +382,8 @@ defmodule Nested.OuterMessage.MiddleMessage.InnerMessage do
                   oneof_index: nil,
                   json_name: "values",
                   proto3_optional: nil,
-                  __unknown_fields__: []
+                  __unknown_fields__: [],
+                  __protobuf__: true
                 }
               ],
               nested_type: [],
@@ -368,7 +394,8 @@ defmodule Nested.OuterMessage.MiddleMessage.InnerMessage do
               oneof_decl: [],
               reserved_range: [],
               reserved_name: [],
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           enum_type: [],
@@ -378,7 +405,8 @@ defmodule Nested.OuterMessage.MiddleMessage.InnerMessage do
           oneof_decl: [],
           reserved_range: [],
           reserved_name: [],
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       enum_type: [],
@@ -388,7 +416,8 @@ defmodule Nested.OuterMessage.MiddleMessage.InnerMessage do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -401,7 +430,8 @@ defmodule Nested.OuterMessage.MiddleMessage do
 
   use Protobuf,
     full_name: "nested.OuterMessage.MiddleMessage",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_messages.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -421,7 +451,8 @@ defmodule Nested.OuterMessage.MiddleMessage do
           oneof_index: nil,
           json_name: "middleField",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "inner",
@@ -435,7 +466,8 @@ defmodule Nested.OuterMessage.MiddleMessage do
           oneof_index: nil,
           json_name: "inner",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "inner_list",
@@ -449,7 +481,8 @@ defmodule Nested.OuterMessage.MiddleMessage do
           oneof_index: nil,
           json_name: "innerList",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [
@@ -468,7 +501,8 @@ defmodule Nested.OuterMessage.MiddleMessage do
               oneof_index: nil,
               json_name: "innerField",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.FieldDescriptorProto{
               name: "deep",
@@ -482,7 +516,8 @@ defmodule Nested.OuterMessage.MiddleMessage do
               oneof_index: nil,
               json_name: "deep",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           nested_type: [
@@ -501,7 +536,8 @@ defmodule Nested.OuterMessage.MiddleMessage do
                   oneof_index: nil,
                   json_name: "deepField",
                   proto3_optional: nil,
-                  __unknown_fields__: []
+                  __unknown_fields__: [],
+                  __protobuf__: true
                 },
                 %Google.Protobuf.FieldDescriptorProto{
                   name: "very_deep",
@@ -516,7 +552,8 @@ defmodule Nested.OuterMessage.MiddleMessage do
                   oneof_index: nil,
                   json_name: "veryDeep",
                   proto3_optional: nil,
-                  __unknown_fields__: []
+                  __unknown_fields__: [],
+                  __protobuf__: true
                 }
               ],
               nested_type: [
@@ -535,7 +572,8 @@ defmodule Nested.OuterMessage.MiddleMessage do
                       oneof_index: nil,
                       json_name: "veryDeepField",
                       proto3_optional: nil,
-                      __unknown_fields__: []
+                      __unknown_fields__: [],
+                      __protobuf__: true
                     },
                     %Google.Protobuf.FieldDescriptorProto{
                       name: "values",
@@ -549,7 +587,8 @@ defmodule Nested.OuterMessage.MiddleMessage do
                       oneof_index: nil,
                       json_name: "values",
                       proto3_optional: nil,
-                      __unknown_fields__: []
+                      __unknown_fields__: [],
+                      __protobuf__: true
                     }
                   ],
                   nested_type: [],
@@ -560,7 +599,8 @@ defmodule Nested.OuterMessage.MiddleMessage do
                   oneof_decl: [],
                   reserved_range: [],
                   reserved_name: [],
-                  __unknown_fields__: []
+                  __unknown_fields__: [],
+                  __protobuf__: true
                 }
               ],
               enum_type: [],
@@ -570,7 +610,8 @@ defmodule Nested.OuterMessage.MiddleMessage do
               oneof_decl: [],
               reserved_range: [],
               reserved_name: [],
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           enum_type: [],
@@ -580,7 +621,8 @@ defmodule Nested.OuterMessage.MiddleMessage do
           oneof_decl: [],
           reserved_range: [],
           reserved_name: [],
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       enum_type: [],
@@ -590,7 +632,8 @@ defmodule Nested.OuterMessage.MiddleMessage do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -609,7 +652,8 @@ defmodule Nested.OuterMessage.NestedMapEntry do
   use Protobuf,
     full_name: "nested.OuterMessage.NestedMapEntry",
     map: true,
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_messages.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -629,7 +673,8 @@ defmodule Nested.OuterMessage.NestedMapEntry do
           oneof_index: nil,
           json_name: "key",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "value",
@@ -643,7 +688,8 @@ defmodule Nested.OuterMessage.NestedMapEntry do
           oneof_index: nil,
           json_name: "value",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -659,12 +705,14 @@ defmodule Nested.OuterMessage.NestedMapEntry do
         features: nil,
         uninterpreted_option: [],
         __pb_extensions__: %{},
-        __unknown_fields__: []
+        __unknown_fields__: [],
+        __protobuf__: true
       },
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -677,7 +725,8 @@ defmodule Nested.OuterMessage do
 
   use Protobuf,
     full_name: "nested.OuterMessage",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_messages.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -697,7 +746,8 @@ defmodule Nested.OuterMessage do
           oneof_index: nil,
           json_name: "outerField",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "middle",
@@ -711,7 +761,8 @@ defmodule Nested.OuterMessage do
           oneof_index: nil,
           json_name: "middle",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "middle_list",
@@ -725,7 +776,8 @@ defmodule Nested.OuterMessage do
           oneof_index: nil,
           json_name: "middleList",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "nested_map",
@@ -739,7 +791,8 @@ defmodule Nested.OuterMessage do
           oneof_index: nil,
           json_name: "nestedMap",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "option_a",
@@ -753,7 +806,8 @@ defmodule Nested.OuterMessage do
           oneof_index: 0,
           json_name: "optionA",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "option_b",
@@ -767,7 +821,8 @@ defmodule Nested.OuterMessage do
           oneof_index: 0,
           json_name: "optionB",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "simple_option",
@@ -781,7 +836,8 @@ defmodule Nested.OuterMessage do
           oneof_index: 0,
           json_name: "simpleOption",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [
@@ -800,7 +856,8 @@ defmodule Nested.OuterMessage do
               oneof_index: nil,
               json_name: "middleField",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.FieldDescriptorProto{
               name: "inner",
@@ -814,7 +871,8 @@ defmodule Nested.OuterMessage do
               oneof_index: nil,
               json_name: "inner",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.FieldDescriptorProto{
               name: "inner_list",
@@ -828,7 +886,8 @@ defmodule Nested.OuterMessage do
               oneof_index: nil,
               json_name: "innerList",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           nested_type: [
@@ -847,7 +906,8 @@ defmodule Nested.OuterMessage do
                   oneof_index: nil,
                   json_name: "innerField",
                   proto3_optional: nil,
-                  __unknown_fields__: []
+                  __unknown_fields__: [],
+                  __protobuf__: true
                 },
                 %Google.Protobuf.FieldDescriptorProto{
                   name: "deep",
@@ -861,7 +921,8 @@ defmodule Nested.OuterMessage do
                   oneof_index: nil,
                   json_name: "deep",
                   proto3_optional: nil,
-                  __unknown_fields__: []
+                  __unknown_fields__: [],
+                  __protobuf__: true
                 }
               ],
               nested_type: [
@@ -880,7 +941,8 @@ defmodule Nested.OuterMessage do
                       oneof_index: nil,
                       json_name: "deepField",
                       proto3_optional: nil,
-                      __unknown_fields__: []
+                      __unknown_fields__: [],
+                      __protobuf__: true
                     },
                     %Google.Protobuf.FieldDescriptorProto{
                       name: "very_deep",
@@ -895,7 +957,8 @@ defmodule Nested.OuterMessage do
                       oneof_index: nil,
                       json_name: "veryDeep",
                       proto3_optional: nil,
-                      __unknown_fields__: []
+                      __unknown_fields__: [],
+                      __protobuf__: true
                     }
                   ],
                   nested_type: [
@@ -914,7 +977,8 @@ defmodule Nested.OuterMessage do
                           oneof_index: nil,
                           json_name: "veryDeepField",
                           proto3_optional: nil,
-                          __unknown_fields__: []
+                          __unknown_fields__: [],
+                          __protobuf__: true
                         },
                         %Google.Protobuf.FieldDescriptorProto{
                           name: "values",
@@ -928,7 +992,8 @@ defmodule Nested.OuterMessage do
                           oneof_index: nil,
                           json_name: "values",
                           proto3_optional: nil,
-                          __unknown_fields__: []
+                          __unknown_fields__: [],
+                          __protobuf__: true
                         }
                       ],
                       nested_type: [],
@@ -939,7 +1004,8 @@ defmodule Nested.OuterMessage do
                       oneof_decl: [],
                       reserved_range: [],
                       reserved_name: [],
-                      __unknown_fields__: []
+                      __unknown_fields__: [],
+                      __protobuf__: true
                     }
                   ],
                   enum_type: [],
@@ -949,7 +1015,8 @@ defmodule Nested.OuterMessage do
                   oneof_decl: [],
                   reserved_range: [],
                   reserved_name: [],
-                  __unknown_fields__: []
+                  __unknown_fields__: [],
+                  __protobuf__: true
                 }
               ],
               enum_type: [],
@@ -959,7 +1026,8 @@ defmodule Nested.OuterMessage do
               oneof_decl: [],
               reserved_range: [],
               reserved_name: [],
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           enum_type: [],
@@ -969,7 +1037,8 @@ defmodule Nested.OuterMessage do
           oneof_decl: [],
           reserved_range: [],
           reserved_name: [],
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.DescriptorProto{
           name: "NestedMapEntry",
@@ -986,7 +1055,8 @@ defmodule Nested.OuterMessage do
               oneof_index: nil,
               json_name: "key",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.FieldDescriptorProto{
               name: "value",
@@ -1000,7 +1070,8 @@ defmodule Nested.OuterMessage do
               oneof_index: nil,
               json_name: "value",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           nested_type: [],
@@ -1016,12 +1087,14 @@ defmodule Nested.OuterMessage do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           oneof_decl: [],
           reserved_range: [],
           reserved_name: [],
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       enum_type: [],
@@ -1032,12 +1105,14 @@ defmodule Nested.OuterMessage do
         %Google.Protobuf.OneofDescriptorProto{
           name: "nested_oneof",
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -1072,7 +1147,8 @@ defmodule Nested.OuterResponse do
 
   use Protobuf,
     full_name: "nested.OuterResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_messages.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -1092,7 +1168,8 @@ defmodule Nested.OuterResponse do
           oneof_index: nil,
           json_name: "deepResult",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "middle_results",
@@ -1106,7 +1183,8 @@ defmodule Nested.OuterResponse do
           oneof_index: nil,
           json_name: "middleResults",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -1117,7 +1195,8 @@ defmodule Nested.OuterResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -1137,7 +1216,8 @@ defmodule Nested.ComplexNested.Node.NamedChildrenEntry do
   use Protobuf,
     full_name: "nested.ComplexNested.Node.NamedChildrenEntry",
     map: true,
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_messages.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -1157,7 +1237,8 @@ defmodule Nested.ComplexNested.Node.NamedChildrenEntry do
           oneof_index: nil,
           json_name: "key",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "value",
@@ -1171,7 +1252,8 @@ defmodule Nested.ComplexNested.Node.NamedChildrenEntry do
           oneof_index: nil,
           json_name: "value",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -1187,12 +1269,14 @@ defmodule Nested.ComplexNested.Node.NamedChildrenEntry do
         features: nil,
         uninterpreted_option: [],
         __pb_extensions__: %{},
-        __unknown_fields__: []
+        __unknown_fields__: [],
+        __protobuf__: true
       },
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -1205,7 +1289,8 @@ defmodule Nested.ComplexNested.Node do
 
   use Protobuf,
     full_name: "nested.ComplexNested.Node",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_messages.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -1225,7 +1310,8 @@ defmodule Nested.ComplexNested.Node do
           oneof_index: nil,
           json_name: "id",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "type",
@@ -1239,7 +1325,8 @@ defmodule Nested.ComplexNested.Node do
           oneof_index: nil,
           json_name: "type",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "children",
@@ -1253,7 +1340,8 @@ defmodule Nested.ComplexNested.Node do
           oneof_index: nil,
           json_name: "children",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "parent",
@@ -1267,7 +1355,8 @@ defmodule Nested.ComplexNested.Node do
           oneof_index: nil,
           json_name: "parent",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "named_children",
@@ -1281,7 +1370,8 @@ defmodule Nested.ComplexNested.Node do
           oneof_index: nil,
           json_name: "namedChildren",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [
@@ -1300,7 +1390,8 @@ defmodule Nested.ComplexNested.Node do
               oneof_index: nil,
               json_name: "key",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.FieldDescriptorProto{
               name: "value",
@@ -1314,7 +1405,8 @@ defmodule Nested.ComplexNested.Node do
               oneof_index: nil,
               json_name: "value",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           nested_type: [],
@@ -1330,12 +1422,14 @@ defmodule Nested.ComplexNested.Node do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           oneof_decl: [],
           reserved_range: [],
           reserved_name: [],
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       enum_type: [
@@ -1346,25 +1440,29 @@ defmodule Nested.ComplexNested.Node do
               name: "LEAF",
               number: 0,
               options: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.EnumValueDescriptorProto{
               name: "BRANCH",
               number: 1,
               options: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.EnumValueDescriptorProto{
               name: "ROOT",
               number: 2,
               options: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           options: nil,
           reserved_range: [],
           reserved_name: [],
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       extension_range: [],
@@ -1373,7 +1471,8 @@ defmodule Nested.ComplexNested.Node do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -1394,7 +1493,8 @@ defmodule Nested.ComplexNested do
 
   use Protobuf,
     full_name: "nested.ComplexNested",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_messages.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -1414,7 +1514,8 @@ defmodule Nested.ComplexNested do
           oneof_index: nil,
           json_name: "status",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "root",
@@ -1428,7 +1529,8 @@ defmodule Nested.ComplexNested do
           oneof_index: nil,
           json_name: "root",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "all_nodes",
@@ -1442,7 +1544,8 @@ defmodule Nested.ComplexNested do
           oneof_index: nil,
           json_name: "allNodes",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [
@@ -1461,7 +1564,8 @@ defmodule Nested.ComplexNested do
               oneof_index: nil,
               json_name: "id",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.FieldDescriptorProto{
               name: "type",
@@ -1475,7 +1579,8 @@ defmodule Nested.ComplexNested do
               oneof_index: nil,
               json_name: "type",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.FieldDescriptorProto{
               name: "children",
@@ -1489,7 +1594,8 @@ defmodule Nested.ComplexNested do
               oneof_index: nil,
               json_name: "children",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.FieldDescriptorProto{
               name: "parent",
@@ -1503,7 +1609,8 @@ defmodule Nested.ComplexNested do
               oneof_index: nil,
               json_name: "parent",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.FieldDescriptorProto{
               name: "named_children",
@@ -1517,7 +1624,8 @@ defmodule Nested.ComplexNested do
               oneof_index: nil,
               json_name: "namedChildren",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           nested_type: [
@@ -1536,7 +1644,8 @@ defmodule Nested.ComplexNested do
                   oneof_index: nil,
                   json_name: "key",
                   proto3_optional: nil,
-                  __unknown_fields__: []
+                  __unknown_fields__: [],
+                  __protobuf__: true
                 },
                 %Google.Protobuf.FieldDescriptorProto{
                   name: "value",
@@ -1550,7 +1659,8 @@ defmodule Nested.ComplexNested do
                   oneof_index: nil,
                   json_name: "value",
                   proto3_optional: nil,
-                  __unknown_fields__: []
+                  __unknown_fields__: [],
+                  __protobuf__: true
                 }
               ],
               nested_type: [],
@@ -1566,12 +1676,14 @@ defmodule Nested.ComplexNested do
                 features: nil,
                 uninterpreted_option: [],
                 __pb_extensions__: %{},
-                __unknown_fields__: []
+                __unknown_fields__: [],
+                __protobuf__: true
               },
               oneof_decl: [],
               reserved_range: [],
               reserved_name: [],
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           enum_type: [
@@ -1582,25 +1694,29 @@ defmodule Nested.ComplexNested do
                   name: "LEAF",
                   number: 0,
                   options: nil,
-                  __unknown_fields__: []
+                  __unknown_fields__: [],
+                  __protobuf__: true
                 },
                 %Google.Protobuf.EnumValueDescriptorProto{
                   name: "BRANCH",
                   number: 1,
                   options: nil,
-                  __unknown_fields__: []
+                  __unknown_fields__: [],
+                  __protobuf__: true
                 },
                 %Google.Protobuf.EnumValueDescriptorProto{
                   name: "ROOT",
                   number: 2,
                   options: nil,
-                  __unknown_fields__: []
+                  __unknown_fields__: [],
+                  __protobuf__: true
                 }
               ],
               options: nil,
               reserved_range: [],
               reserved_name: [],
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           extension_range: [],
@@ -1609,7 +1725,8 @@ defmodule Nested.ComplexNested do
           oneof_decl: [],
           reserved_range: [],
           reserved_name: [],
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       enum_type: [
@@ -1620,25 +1737,29 @@ defmodule Nested.ComplexNested do
               name: "UNKNOWN",
               number: 0,
               options: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.EnumValueDescriptorProto{
               name: "ACTIVE",
               number: 1,
               options: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.EnumValueDescriptorProto{
               name: "INACTIVE",
               number: 2,
               options: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           options: nil,
           reserved_range: [],
           reserved_name: [],
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       extension_range: [],
@@ -1647,7 +1768,8 @@ defmodule Nested.ComplexNested do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -1659,7 +1781,9 @@ end
 defmodule Nested.NestedService.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "nested.NestedService", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "nested.NestedService", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "nested_messages.proto"
 
   def descriptor do
     # credo:disable-for-next-line
@@ -1676,15 +1800,18 @@ defmodule Nested.NestedService.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: false,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -1700,7 +1827,9 @@ end
 defmodule Nested.AnotherNestedService.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "nested.AnotherNestedService", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "nested.AnotherNestedService", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "nested_messages.proto"
 
   def descriptor do
     # credo:disable-for-next-line
@@ -1717,11 +1846,13 @@ defmodule Nested.AnotherNestedService.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: false,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.MethodDescriptorProto{
           name: "ProcessMiddle",
@@ -1733,11 +1864,13 @@ defmodule Nested.AnotherNestedService.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: false,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.MethodDescriptorProto{
           name: "ProcessInner",
@@ -1749,15 +1882,18 @@ defmodule Nested.AnotherNestedService.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: false,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
diff --git a/test/support/protos/nested_enum_conflict.pb.ex b/test/support/protos/nested_enum_conflict/nested_enum_conflict.pb.ex
similarity index 78%
rename from test/support/protos/nested_enum_conflict.pb.ex
rename to test/support/protos/nested_enum_conflict/nested_enum_conflict.pb.ex
index 1e31af0..3ae425b 100644
--- a/test/support/protos/nested_enum_conflict.pb.ex
+++ b/test/support/protos/nested_enum_conflict/nested_enum_conflict.pb.ex
@@ -4,7 +4,7 @@ defmodule NestedEnumConflict.ListFoosRequest.SortOrder do
   use Protobuf,
     enum: true,
     full_name: "nestedEnumConflict.ListFoosRequest.SortOrder",
-    protoc_gen_elixir_version: "0.16.0",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -16,25 +16,29 @@ defmodule NestedEnumConflict.ListFoosRequest.SortOrder do
           name: "SORT_ORDER_UNSPECIFIED",
           number: 0,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.EnumValueDescriptorProto{
           name: "SORT_ORDER_NEWEST_FIRST",
           number: 1,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.EnumValueDescriptorProto{
           name: "SORT_ORDER_OLDEST_FIRST",
           number: 2,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -49,7 +53,7 @@ defmodule NestedEnumConflict.ListBarsRequest.SortOrder do
   use Protobuf,
     enum: true,
     full_name: "nestedEnumConflict.ListBarsRequest.SortOrder",
-    protoc_gen_elixir_version: "0.16.0",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -61,25 +65,29 @@ defmodule NestedEnumConflict.ListBarsRequest.SortOrder do
           name: "SORT_ORDER_UNSPECIFIED",
           number: 0,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.EnumValueDescriptorProto{
           name: "SORT_ORDER_NEWEST_FIRST",
           number: 1,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.EnumValueDescriptorProto{
           name: "SORT_ORDER_OLDEST_FIRST",
           number: 2,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -93,7 +101,8 @@ defmodule NestedEnumConflict.ListFoosRequest do
 
   use Protobuf,
     full_name: "nestedEnumConflict.ListFoosRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_enum_conflict.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -113,7 +122,8 @@ defmodule NestedEnumConflict.ListFoosRequest do
           oneof_index: nil,
           json_name: "sortOrder",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -125,25 +135,29 @@ defmodule NestedEnumConflict.ListFoosRequest do
               name: "SORT_ORDER_UNSPECIFIED",
               number: 0,
               options: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.EnumValueDescriptorProto{
               name: "SORT_ORDER_NEWEST_FIRST",
               number: 1,
               options: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.EnumValueDescriptorProto{
               name: "SORT_ORDER_OLDEST_FIRST",
               number: 2,
               options: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           options: nil,
           reserved_range: [],
           reserved_name: [],
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       extension_range: [],
@@ -152,7 +166,8 @@ defmodule NestedEnumConflict.ListFoosRequest do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -167,7 +182,8 @@ defmodule NestedEnumConflict.ListFoosResponse do
 
   use Protobuf,
     full_name: "nestedEnumConflict.ListFoosResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_enum_conflict.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -183,7 +199,8 @@ defmodule NestedEnumConflict.ListFoosResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 end
@@ -193,7 +210,8 @@ defmodule NestedEnumConflict.ListBarsRequest do
 
   use Protobuf,
     full_name: "nestedEnumConflict.ListBarsRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_enum_conflict.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -213,7 +231,8 @@ defmodule NestedEnumConflict.ListBarsRequest do
           oneof_index: nil,
           json_name: "sortOrder",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -225,25 +244,29 @@ defmodule NestedEnumConflict.ListBarsRequest do
               name: "SORT_ORDER_UNSPECIFIED",
               number: 0,
               options: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.EnumValueDescriptorProto{
               name: "SORT_ORDER_NEWEST_FIRST",
               number: 1,
               options: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.EnumValueDescriptorProto{
               name: "SORT_ORDER_OLDEST_FIRST",
               number: 2,
               options: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           options: nil,
           reserved_range: [],
           reserved_name: [],
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       extension_range: [],
@@ -252,7 +275,8 @@ defmodule NestedEnumConflict.ListBarsRequest do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -267,7 +291,8 @@ defmodule NestedEnumConflict.ListBarsResponse do
 
   use Protobuf,
     full_name: "nestedEnumConflict.ListBarsResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_enum_conflict.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -283,7 +308,8 @@ defmodule NestedEnumConflict.ListBarsResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 end
@@ -293,7 +319,9 @@ defmodule NestedEnumConflict.ConflictService.Service do
 
   use GRPC.Service,
     name: "nestedEnumConflict.ConflictService",
-    protoc_gen_elixir_version: "0.16.0"
+    protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "nested_enum_conflict.proto"
 
   def descriptor do
     # credo:disable-for-next-line
@@ -310,11 +338,13 @@ defmodule NestedEnumConflict.ConflictService.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: false,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.MethodDescriptorProto{
           name: "ListBars",
@@ -326,15 +356,18 @@ defmodule NestedEnumConflict.ConflictService.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: false,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
diff --git a/test/support/protos/no_descriptor/common_types.pb.ex b/test/support/protos/no_descriptor/common/common_types.pb.ex
similarity index 71%
rename from test/support/protos/no_descriptor/common_types.pb.ex
rename to test/support/protos/no_descriptor/common/common_types.pb.ex
index e1b22b6..9c0d39f 100644
--- a/test/support/protos/no_descriptor/common_types.pb.ex
+++ b/test/support/protos/no_descriptor/common/common_types.pb.ex
@@ -4,7 +4,7 @@ defmodule NoDescriptor.Common.Priority do
   use Protobuf,
     enum: true,
     full_name: "common.Priority",
-    protoc_gen_elixir_version: "0.16.0",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :PRIORITY_UNSPECIFIED, 0
@@ -17,7 +17,11 @@ end
 defmodule NoDescriptor.Common.Address do
   @moduledoc false
 
-  use Protobuf, full_name: "common.Address", protoc_gen_elixir_version: "0.16.0", syntax: :proto3
+  use Protobuf,
+    full_name: "common.Address",
+    proto_source: "common_types.proto",
+    protoc_gen_elixir_version: "0.17.0",
+    syntax: :proto3
 
   field :street, 1, type: :string
   field :city, 2, type: :string
@@ -31,7 +35,8 @@ defmodule NoDescriptor.Common.Coordinates do
 
   use Protobuf,
     full_name: "common.Coordinates",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "common_types.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :latitude, 1, type: :double
@@ -42,7 +47,11 @@ end
 defmodule NoDescriptor.Common.Money do
   @moduledoc false
 
-  use Protobuf, full_name: "common.Money", protoc_gen_elixir_version: "0.16.0", syntax: :proto3
+  use Protobuf,
+    full_name: "common.Money",
+    proto_source: "common_types.proto",
+    protoc_gen_elixir_version: "0.17.0",
+    syntax: :proto3
 
   field :currency_code, 1, type: :string, json_name: "currencyCode"
   field :units, 2, type: :int64
@@ -54,7 +63,8 @@ defmodule NoDescriptor.Common.TimeRange do
 
   use Protobuf,
     full_name: "common.TimeRange",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "common_types.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :start_time, 1, type: :int64, json_name: "startTime"
diff --git a/test/support/protos/no_descriptor/deprecated_fields.pb.ex b/test/support/protos/no_descriptor/deprecated_fields/deprecated_fields.pb.ex
similarity index 82%
rename from test/support/protos/no_descriptor/deprecated_fields.pb.ex
rename to test/support/protos/no_descriptor/deprecated_fields/deprecated_fields.pb.ex
index 2b8e301..83f1cc1 100644
--- a/test/support/protos/no_descriptor/deprecated_fields.pb.ex
+++ b/test/support/protos/no_descriptor/deprecated_fields/deprecated_fields.pb.ex
@@ -3,7 +3,8 @@ defmodule NoDescriptor.DeprecatedFields.DeprecatedRequest do
 
   use Protobuf,
     full_name: "deprecated_fields.DeprecatedRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "deprecated_fields.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :active_field, 1, type: :string, json_name: "activeField"
@@ -17,7 +18,8 @@ defmodule NoDescriptor.DeprecatedFields.DeprecatedResponse do
 
   use Protobuf,
     full_name: "deprecated_fields.DeprecatedResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "deprecated_fields.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :success, 1, type: :bool
@@ -30,7 +32,9 @@ defmodule NoDescriptor.DeprecatedFields.DeprecatedFieldsService.Service do
 
   use GRPC.Service,
     name: "deprecated_fields.DeprecatedFieldsService",
-    protoc_gen_elixir_version: "0.16.0"
+    protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "deprecated_fields.proto"
 
   rpc :Process,
       NoDescriptor.DeprecatedFields.DeprecatedRequest,
diff --git a/test/support/protos/no_descriptor/edge_cases.pb.ex b/test/support/protos/no_descriptor/edge_cases/edge_cases.pb.ex
similarity index 83%
rename from test/support/protos/no_descriptor/edge_cases.pb.ex
rename to test/support/protos/no_descriptor/edge_cases/edge_cases.pb.ex
index 6d201ed..073477a 100644
--- a/test/support/protos/no_descriptor/edge_cases.pb.ex
+++ b/test/support/protos/no_descriptor/edge_cases/edge_cases.pb.ex
@@ -4,7 +4,7 @@ defmodule NoDescriptor.EdgeCases.DetailedStatus do
   use Protobuf,
     enum: true,
     full_name: "edge_cases.DetailedStatus",
-    protoc_gen_elixir_version: "0.16.0",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :DETAILED_STATUS_UNSPECIFIED, 0
@@ -21,7 +21,8 @@ defmodule NoDescriptor.EdgeCases.EmptyInputRequest do
 
   use Protobuf,
     full_name: "edge_cases.EmptyInputRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 end
 
@@ -30,7 +31,8 @@ defmodule NoDescriptor.EdgeCases.EmptyInputResponse do
 
   use Protobuf,
     full_name: "edge_cases.EmptyInputResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :data, 1, type: :string
@@ -41,7 +43,8 @@ defmodule NoDescriptor.EdgeCases.EmptyOutputRequest do
 
   use Protobuf,
     full_name: "edge_cases.EmptyOutputRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :data, 1, type: :string
@@ -52,7 +55,8 @@ defmodule NoDescriptor.EdgeCases.EmptyOutputResponse do
 
   use Protobuf,
     full_name: "edge_cases.EmptyOutputResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 end
 
@@ -61,7 +65,8 @@ defmodule NoDescriptor.EdgeCases.BothEmptyRequest do
 
   use Protobuf,
     full_name: "edge_cases.BothEmptyRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 end
 
@@ -70,7 +75,8 @@ defmodule NoDescriptor.EdgeCases.BothEmptyResponse do
 
   use Protobuf,
     full_name: "edge_cases.BothEmptyResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 end
 
@@ -79,7 +85,8 @@ defmodule NoDescriptor.EdgeCases.ComplicatedRequest do
 
   use Protobuf,
     full_name: "edge_cases.ComplicatedRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :numbers, 1, type: NoDescriptor.EdgeCases.SparseFieldNumbers
@@ -101,7 +108,8 @@ defmodule NoDescriptor.EdgeCases.ComplicatedResponse do
 
   use Protobuf,
     full_name: "edge_cases.ComplicatedResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :numbers, 1, type: NoDescriptor.EdgeCases.SparseFieldNumbers
@@ -123,7 +131,8 @@ defmodule NoDescriptor.EdgeCases.SparseFieldNumbers do
 
   use Protobuf,
     full_name: "edge_cases.SparseFieldNumbers",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :field_1, 1, type: :string, json_name: "field1"
@@ -135,7 +144,8 @@ defmodule NoDescriptor.EdgeCases.ManyFields do
 
   use Protobuf,
     full_name: "edge_cases.ManyFields",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :field_001, 1, type: :string, json_name: "field001"
@@ -165,7 +175,8 @@ defmodule NoDescriptor.EdgeCases.MultipleOneofs do
 
   use Protobuf,
     full_name: "edge_cases.MultipleOneofs",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   oneof :first_choice, 0
@@ -189,7 +200,8 @@ defmodule NoDescriptor.EdgeCases.NestedMaps.OuterMapEntry do
   use Protobuf,
     full_name: "edge_cases.NestedMaps.OuterMapEntry",
     map: true,
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :key, 1, type: :string
@@ -202,7 +214,8 @@ defmodule NoDescriptor.EdgeCases.NestedMaps.IntKeyMapEntry do
   use Protobuf,
     full_name: "edge_cases.NestedMaps.IntKeyMapEntry",
     map: true,
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :key, 1, type: :int32
@@ -215,7 +228,8 @@ defmodule NoDescriptor.EdgeCases.NestedMaps.NumericMapEntry do
   use Protobuf,
     full_name: "edge_cases.NestedMaps.NumericMapEntry",
     map: true,
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :key, 1, type: :int64
@@ -228,7 +242,8 @@ defmodule NoDescriptor.EdgeCases.NestedMaps.BoolKeyMapEntry do
   use Protobuf,
     full_name: "edge_cases.NestedMaps.BoolKeyMapEntry",
     map: true,
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :key, 1, type: :bool
@@ -240,7 +255,8 @@ defmodule NoDescriptor.EdgeCases.NestedMaps do
 
   use Protobuf,
     full_name: "edge_cases.NestedMaps",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :outer_map, 1,
@@ -274,7 +290,8 @@ defmodule NoDescriptor.EdgeCases.InnerMap.DataEntry do
   use Protobuf,
     full_name: "edge_cases.InnerMap.DataEntry",
     map: true,
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :key, 1, type: :string
@@ -287,7 +304,8 @@ defmodule NoDescriptor.EdgeCases.InnerMap.CountsEntry do
   use Protobuf,
     full_name: "edge_cases.InnerMap.CountsEntry",
     map: true,
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :key, 1, type: :string
@@ -299,7 +317,8 @@ defmodule NoDescriptor.EdgeCases.InnerMap do
 
   use Protobuf,
     full_name: "edge_cases.InnerMap",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :data, 1, repeated: true, type: NoDescriptor.EdgeCases.InnerMap.DataEntry, map: true
@@ -311,7 +330,8 @@ defmodule NoDescriptor.EdgeCases.CircularA do
 
   use Protobuf,
     full_name: "edge_cases.CircularA",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :b_field, 1, type: NoDescriptor.EdgeCases.CircularB, json_name: "bField"
@@ -323,7 +343,8 @@ defmodule NoDescriptor.EdgeCases.CircularB do
 
   use Protobuf,
     full_name: "edge_cases.CircularB",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :c_field, 1, type: NoDescriptor.EdgeCases.CircularC, json_name: "cField"
@@ -335,7 +356,8 @@ defmodule NoDescriptor.EdgeCases.CircularC do
 
   use Protobuf,
     full_name: "edge_cases.CircularC",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :a_field, 1, type: NoDescriptor.EdgeCases.CircularA, json_name: "aField"
@@ -347,7 +369,8 @@ defmodule NoDescriptor.EdgeCases.WithReservedFields do
 
   use Protobuf,
     full_name: "edge_cases.WithReservedFields",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :active_field_1, 1, type: :string, json_name: "activeField1"
@@ -359,7 +382,8 @@ defmodule NoDescriptor.EdgeCases.UnicodeTest do
 
   use Protobuf,
     full_name: "edge_cases.UnicodeTest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "edge_cases.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :rocket_field, 1, type: :string, json_name: "rocketField"
@@ -370,7 +394,9 @@ end
 defmodule NoDescriptor.EdgeCases.EdgeCaseService.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "edge_cases.EdgeCaseService", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "edge_cases.EdgeCaseService", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "edge_cases.proto"
 
   rpc :EmptyInput,
       NoDescriptor.EdgeCases.EmptyInputRequest,
diff --git a/test/support/protos/no_descriptor/empty_service.pb.ex b/test/support/protos/no_descriptor/empty_service/empty_service.pb.ex
similarity index 79%
rename from test/support/protos/no_descriptor/empty_service.pb.ex
rename to test/support/protos/no_descriptor/empty_service/empty_service.pb.ex
index 64d3640..f1d91c1 100644
--- a/test/support/protos/no_descriptor/empty_service.pb.ex
+++ b/test/support/protos/no_descriptor/empty_service/empty_service.pb.ex
@@ -1,7 +1,9 @@
 defmodule NoDescriptor.EmptyService.EmptyService.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "empty_service.EmptyService", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "empty_service.EmptyService", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "empty_service.proto"
 end
 
 defmodule NoDescriptor.EmptyService.EmptyService.Stub do
diff --git a/test/support/protos/no_descriptor/global_service.pb.ex b/test/support/protos/no_descriptor/global_service.pb.ex
index ece0906..1ac16a7 100644
--- a/test/support/protos/no_descriptor/global_service.pb.ex
+++ b/test/support/protos/no_descriptor/global_service.pb.ex
@@ -1,7 +1,11 @@
 defmodule NoDescriptor.GlobalRequest do
   @moduledoc false
 
-  use Protobuf, full_name: "GlobalRequest", protoc_gen_elixir_version: "0.16.0", syntax: :proto3
+  use Protobuf,
+    full_name: "GlobalRequest",
+    proto_source: "global_service.proto",
+    protoc_gen_elixir_version: "0.17.0",
+    syntax: :proto3
 
   field :data, 1, type: :string
 end
@@ -9,7 +13,11 @@ end
 defmodule NoDescriptor.GlobalResponse do
   @moduledoc false
 
-  use Protobuf, full_name: "GlobalResponse", protoc_gen_elixir_version: "0.16.0", syntax: :proto3
+  use Protobuf,
+    full_name: "GlobalResponse",
+    proto_source: "global_service.proto",
+    protoc_gen_elixir_version: "0.17.0",
+    syntax: :proto3
 
   field :result, 1, type: :string
 end
@@ -17,7 +25,9 @@ end
 defmodule NoDescriptor.GlobalService.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "GlobalService", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "GlobalService", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "global_service.proto"
 
   rpc :GlobalMethod, NoDescriptor.GlobalRequest, NoDescriptor.GlobalResponse
 end
diff --git a/test/support/protos/no_descriptor/imports_test.pb.ex b/test/support/protos/no_descriptor/imports_test/imports_test.pb.ex
similarity index 83%
rename from test/support/protos/no_descriptor/imports_test.pb.ex
rename to test/support/protos/no_descriptor/imports_test/imports_test.pb.ex
index 876fcfd..b7db8f1 100644
--- a/test/support/protos/no_descriptor/imports_test.pb.ex
+++ b/test/support/protos/no_descriptor/imports_test/imports_test.pb.ex
@@ -3,7 +3,8 @@ defmodule NoDescriptor.ImportsTest.UserRequest do
 
   use Protobuf,
     full_name: "imports_test.UserRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "imports_test.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :name, 1, type: :string
@@ -18,7 +19,8 @@ defmodule NoDescriptor.ImportsTest.UserResponse.Profile do
 
   use Protobuf,
     full_name: "imports_test.UserResponse.Profile",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "imports_test.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :billing_address, 1, type: Common.Address, json_name: "billingAddress"
@@ -35,7 +37,8 @@ defmodule NoDescriptor.ImportsTest.UserResponse do
 
   use Protobuf,
     full_name: "imports_test.UserResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "imports_test.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :user_id, 1, type: :string, json_name: "userId"
@@ -49,7 +52,8 @@ defmodule NoDescriptor.ImportsTest.LocationUpdate do
 
   use Protobuf,
     full_name: "imports_test.LocationUpdate",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "imports_test.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :user_id, 1, type: :string, json_name: "userId"
@@ -63,7 +67,8 @@ defmodule NoDescriptor.ImportsTest.LocationResponse.VisitHistoryEntry do
   use Protobuf,
     full_name: "imports_test.LocationResponse.VisitHistoryEntry",
     map: true,
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "imports_test.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :key, 1, type: :string
@@ -75,7 +80,8 @@ defmodule NoDescriptor.ImportsTest.LocationResponse do
 
   use Protobuf,
     full_name: "imports_test.LocationResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "imports_test.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :success, 1, type: :bool
@@ -94,7 +100,8 @@ defmodule NoDescriptor.ImportsTest.BulkOperation.TaskPrioritiesEntry do
   use Protobuf,
     full_name: "imports_test.BulkOperation.TaskPrioritiesEntry",
     map: true,
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "imports_test.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :key, 1, type: :string
@@ -106,7 +113,8 @@ defmodule NoDescriptor.ImportsTest.BulkOperation do
 
   use Protobuf,
     full_name: "imports_test.BulkOperation",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "imports_test.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :addresses, 1, repeated: true, type: Common.Address
@@ -122,7 +130,9 @@ end
 defmodule NoDescriptor.ImportsTest.ImportTestService.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "imports_test.ImportTestService", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "imports_test.ImportTestService", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "imports_test.proto"
 
   rpc :CreateUser, NoDescriptor.ImportsTest.UserRequest, NoDescriptor.ImportsTest.UserResponse
 
diff --git a/test/support/protos/no_descriptor/nested_messages.pb.ex b/test/support/protos/no_descriptor/nested/nested_messages.pb.ex
similarity index 85%
rename from test/support/protos/no_descriptor/nested_messages.pb.ex
rename to test/support/protos/no_descriptor/nested/nested_messages.pb.ex
index ddbf967..aab1ced 100644
--- a/test/support/protos/no_descriptor/nested_messages.pb.ex
+++ b/test/support/protos/no_descriptor/nested/nested_messages.pb.ex
@@ -4,7 +4,7 @@ defmodule NoDescriptor.Nested.ComplexNested.Status do
   use Protobuf,
     enum: true,
     full_name: "nested.ComplexNested.Status",
-    protoc_gen_elixir_version: "0.16.0",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :UNKNOWN, 0
@@ -18,7 +18,7 @@ defmodule NoDescriptor.Nested.ComplexNested.Node.NodeType do
   use Protobuf,
     enum: true,
     full_name: "nested.ComplexNested.Node.NodeType",
-    protoc_gen_elixir_version: "0.16.0",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :LEAF, 0
@@ -31,7 +31,8 @@ defmodule NoDescriptor.Nested.OuterMessage.MiddleMessage.InnerMessage.DeepMessag
 
   use Protobuf,
     full_name: "nested.OuterMessage.MiddleMessage.InnerMessage.DeepMessage.VeryDeepMessage",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_messages.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :very_deep_field, 1, type: :string, json_name: "veryDeepField"
@@ -43,7 +44,8 @@ defmodule NoDescriptor.Nested.OuterMessage.MiddleMessage.InnerMessage.DeepMessag
 
   use Protobuf,
     full_name: "nested.OuterMessage.MiddleMessage.InnerMessage.DeepMessage",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_messages.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :deep_field, 1, type: :string, json_name: "deepField"
@@ -58,7 +60,8 @@ defmodule NoDescriptor.Nested.OuterMessage.MiddleMessage.InnerMessage do
 
   use Protobuf,
     full_name: "nested.OuterMessage.MiddleMessage.InnerMessage",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_messages.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :inner_field, 1, type: :string, json_name: "innerField"
@@ -70,7 +73,8 @@ defmodule NoDescriptor.Nested.OuterMessage.MiddleMessage do
 
   use Protobuf,
     full_name: "nested.OuterMessage.MiddleMessage",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_messages.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :middle_field, 1, type: :string, json_name: "middleField"
@@ -88,7 +92,8 @@ defmodule NoDescriptor.Nested.OuterMessage.NestedMapEntry do
   use Protobuf,
     full_name: "nested.OuterMessage.NestedMapEntry",
     map: true,
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_messages.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :key, 1, type: :string
@@ -100,7 +105,8 @@ defmodule NoDescriptor.Nested.OuterMessage do
 
   use Protobuf,
     full_name: "nested.OuterMessage",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_messages.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   oneof :nested_oneof, 0
@@ -137,7 +143,8 @@ defmodule NoDescriptor.Nested.OuterResponse do
 
   use Protobuf,
     full_name: "nested.OuterResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_messages.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :deep_result, 1,
@@ -156,7 +163,8 @@ defmodule NoDescriptor.Nested.ComplexNested.Node.NamedChildrenEntry do
   use Protobuf,
     full_name: "nested.ComplexNested.Node.NamedChildrenEntry",
     map: true,
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_messages.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :key, 1, type: :string
@@ -168,7 +176,8 @@ defmodule NoDescriptor.Nested.ComplexNested.Node do
 
   use Protobuf,
     full_name: "nested.ComplexNested.Node",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_messages.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :id, 1, type: :string
@@ -188,7 +197,8 @@ defmodule NoDescriptor.Nested.ComplexNested do
 
   use Protobuf,
     full_name: "nested.ComplexNested",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_messages.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :status, 1, type: NoDescriptor.Nested.ComplexNested.Status, enum: true
@@ -203,7 +213,9 @@ end
 defmodule NoDescriptor.Nested.NestedService.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "nested.NestedService", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "nested.NestedService", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "nested_messages.proto"
 
   rpc :ProcessNested, NoDescriptor.Nested.OuterMessage, NoDescriptor.Nested.OuterResponse
 end
@@ -217,7 +229,9 @@ end
 defmodule NoDescriptor.Nested.AnotherNestedService.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "nested.AnotherNestedService", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "nested.AnotherNestedService", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "nested_messages.proto"
 
   rpc :ProcessOuter, NoDescriptor.Nested.OuterMessage, NoDescriptor.Nested.OuterResponse
 
diff --git a/test/support/protos/no_descriptor/nested_enum_conflict.pb.ex b/test/support/protos/no_descriptor/nested_enum_conflict/nested_enum_conflict.pb.ex
similarity index 80%
rename from test/support/protos/no_descriptor/nested_enum_conflict.pb.ex
rename to test/support/protos/no_descriptor/nested_enum_conflict/nested_enum_conflict.pb.ex
index 1376726..1caced3 100644
--- a/test/support/protos/no_descriptor/nested_enum_conflict.pb.ex
+++ b/test/support/protos/no_descriptor/nested_enum_conflict/nested_enum_conflict.pb.ex
@@ -4,7 +4,7 @@ defmodule NoDescriptor.NestedEnumConflict.ListFoosRequest.SortOrder do
   use Protobuf,
     enum: true,
     full_name: "nestedEnumConflict.ListFoosRequest.SortOrder",
-    protoc_gen_elixir_version: "0.16.0",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :SORT_ORDER_UNSPECIFIED, 0
@@ -18,7 +18,7 @@ defmodule NoDescriptor.NestedEnumConflict.ListBarsRequest.SortOrder do
   use Protobuf,
     enum: true,
     full_name: "nestedEnumConflict.ListBarsRequest.SortOrder",
-    protoc_gen_elixir_version: "0.16.0",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :SORT_ORDER_UNSPECIFIED, 0
@@ -31,7 +31,8 @@ defmodule NoDescriptor.NestedEnumConflict.ListFoosRequest do
 
   use Protobuf,
     full_name: "nestedEnumConflict.ListFoosRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_enum_conflict.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :sort_order, 1,
@@ -45,7 +46,8 @@ defmodule NoDescriptor.NestedEnumConflict.ListFoosResponse do
 
   use Protobuf,
     full_name: "nestedEnumConflict.ListFoosResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_enum_conflict.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 end
 
@@ -54,7 +56,8 @@ defmodule NoDescriptor.NestedEnumConflict.ListBarsRequest do
 
   use Protobuf,
     full_name: "nestedEnumConflict.ListBarsRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_enum_conflict.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :sort_order, 1,
@@ -68,7 +71,8 @@ defmodule NoDescriptor.NestedEnumConflict.ListBarsResponse do
 
   use Protobuf,
     full_name: "nestedEnumConflict.ListBarsResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "nested_enum_conflict.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 end
 
@@ -77,7 +81,9 @@ defmodule NoDescriptor.NestedEnumConflict.ConflictService.Service do
 
   use GRPC.Service,
     name: "nestedEnumConflict.ConflictService",
-    protoc_gen_elixir_version: "0.16.0"
+    protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "nested_enum_conflict.proto"
 
   rpc :ListFoos,
       NoDescriptor.NestedEnumConflict.ListFoosRequest,
diff --git a/test/support/protos/no_descriptor/package_a.pb.ex b/test/support/protos/no_descriptor/package_a/package_a.pb.ex
similarity index 79%
rename from test/support/protos/no_descriptor/package_a.pb.ex
rename to test/support/protos/no_descriptor/package_a/package_a.pb.ex
index 64902a7..c457d0f 100644
--- a/test/support/protos/no_descriptor/package_a.pb.ex
+++ b/test/support/protos/no_descriptor/package_a/package_a.pb.ex
@@ -4,7 +4,7 @@ defmodule NoDescriptor.PackageA.EnumA do
   use Protobuf,
     enum: true,
     full_name: "package_a.EnumA",
-    protoc_gen_elixir_version: "0.16.0",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :ENUM_A_UNSPECIFIED, 0
@@ -17,7 +17,8 @@ defmodule NoDescriptor.PackageA.MessageA do
 
   use Protobuf,
     full_name: "package_a.MessageA",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "package_a.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :field_a, 1, type: :string, json_name: "fieldA"
diff --git a/test/support/protos/no_descriptor/package_b.pb.ex b/test/support/protos/no_descriptor/package_b/package_b.pb.ex
similarity index 81%
rename from test/support/protos/no_descriptor/package_b.pb.ex
rename to test/support/protos/no_descriptor/package_b/package_b.pb.ex
index 3f592b6..0e3e824 100644
--- a/test/support/protos/no_descriptor/package_b.pb.ex
+++ b/test/support/protos/no_descriptor/package_b/package_b.pb.ex
@@ -3,7 +3,8 @@ defmodule NoDescriptor.PackageB.MessageB do
 
   use Protobuf,
     full_name: "package_b.MessageB",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "package_b.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :field_b, 1, type: :string, json_name: "fieldB"
@@ -16,7 +17,8 @@ defmodule NoDescriptor.PackageB.ResponseB do
 
   use Protobuf,
     full_name: "package_b.ResponseB",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "package_b.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :results, 1, repeated: true, type: PackageA.MessageA
@@ -25,7 +27,9 @@ end
 defmodule NoDescriptor.PackageB.ServiceB.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "package_b.ServiceB", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "package_b.ServiceB", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "package_b.proto"
 
   rpc :ProcessB, NoDescriptor.PackageB.MessageB, NoDescriptor.PackageB.ResponseB
 
diff --git a/test/support/protos/no_descriptor/no_descriptor/proto2_features/pb_extension.pb.ex b/test/support/protos/no_descriptor/proto2_features/pb_extension.pb.ex
similarity index 96%
rename from test/support/protos/no_descriptor/no_descriptor/proto2_features/pb_extension.pb.ex
rename to test/support/protos/no_descriptor/proto2_features/pb_extension.pb.ex
index b5e3ddd..180c95a 100644
--- a/test/support/protos/no_descriptor/no_descriptor/proto2_features/pb_extension.pb.ex
+++ b/test/support/protos/no_descriptor/proto2_features/pb_extension.pb.ex
@@ -1,7 +1,7 @@
 defmodule NoDescriptor.Proto2Features.PbExtension do
   @moduledoc false
 
-  use Protobuf, protoc_gen_elixir_version: "0.16.0"
+  use Protobuf, protoc_gen_elixir_version: "0.17.0"
 
   extend NoDescriptor.Proto2Features.Proto2Request, :extended_field, 100,
     optional: true,
diff --git a/test/support/protos/no_descriptor/proto2_features.pb.ex b/test/support/protos/no_descriptor/proto2_features/proto2_features.pb.ex
similarity index 84%
rename from test/support/protos/no_descriptor/proto2_features.pb.ex
rename to test/support/protos/no_descriptor/proto2_features/proto2_features.pb.ex
index aad0b1e..e268744 100644
--- a/test/support/protos/no_descriptor/proto2_features.pb.ex
+++ b/test/support/protos/no_descriptor/proto2_features/proto2_features.pb.ex
@@ -4,7 +4,7 @@ defmodule NoDescriptor.Proto2Features.Status do
   use Protobuf,
     enum: true,
     full_name: "proto2_features.Status",
-    protoc_gen_elixir_version: "0.16.0",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto2
 
   field :UNKNOWN, 0
@@ -18,7 +18,7 @@ defmodule NoDescriptor.Proto2Features.ExtendableMessage.ExtendableEnum do
   use Protobuf,
     enum: true,
     full_name: "proto2_features.ExtendableMessage.ExtendableEnum",
-    protoc_gen_elixir_version: "0.16.0",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto2
 
   field :OPTION_A, 0
@@ -31,7 +31,8 @@ defmodule NoDescriptor.Proto2Features.Proto2Request.MetadataMapEntry do
   use Protobuf,
     full_name: "proto2_features.Proto2Request.MetadataMapEntry",
     map: true,
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "proto2_features.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto2
 
   field :key, 1, optional: true, type: :string
@@ -43,7 +44,8 @@ defmodule NoDescriptor.Proto2Features.Proto2Request do
 
   use Protobuf,
     full_name: "proto2_features.Proto2Request",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "proto2_features.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto2
 
   oneof :proto2_oneof, 0
@@ -88,7 +90,8 @@ defmodule NoDescriptor.Proto2Features.ExtensionData do
 
   use Protobuf,
     full_name: "proto2_features.ExtensionData",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "proto2_features.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto2
 
   field :key, 1, optional: true, type: :string
@@ -100,7 +103,8 @@ defmodule NoDescriptor.Proto2Features.Proto2Response do
 
   use Protobuf,
     full_name: "proto2_features.Proto2Response",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "proto2_features.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto2
 
   field :success, 1, required: true, type: :bool
@@ -112,7 +116,8 @@ defmodule NoDescriptor.Proto2Features.ExtendableMessage.NestedInExtendable do
 
   use Protobuf,
     full_name: "proto2_features.ExtendableMessage.NestedInExtendable",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "proto2_features.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto2
 
   field :data, 1, optional: true, type: :string
@@ -123,7 +128,8 @@ defmodule NoDescriptor.Proto2Features.ExtendableMessage do
 
   use Protobuf,
     full_name: "proto2_features.ExtendableMessage",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "proto2_features.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto2
 
   field :id, 1, required: true, type: :string
@@ -134,7 +140,9 @@ end
 defmodule NoDescriptor.Proto2Features.Proto2Service.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "proto2_features.Proto2Service", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "proto2_features.Proto2Service", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "proto2_features.proto"
 
   rpc :ProcessProto2,
       NoDescriptor.Proto2Features.Proto2Request,
diff --git a/test/support/protos/no_descriptor/recursive_message.pb.ex b/test/support/protos/no_descriptor/recursive_message/recursive_message.pb.ex
similarity index 76%
rename from test/support/protos/no_descriptor/recursive_message.pb.ex
rename to test/support/protos/no_descriptor/recursive_message/recursive_message.pb.ex
index d73faa6..2b174d2 100644
--- a/test/support/protos/no_descriptor/recursive_message.pb.ex
+++ b/test/support/protos/no_descriptor/recursive_message/recursive_message.pb.ex
@@ -3,7 +3,8 @@ defmodule NoDescriptor.RecursiveMessage.Request do
 
   use Protobuf,
     full_name: "recursive_message.Request",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "recursive_message.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :reply, 1, type: NoDescriptor.RecursiveMessage.Reply
@@ -14,7 +15,8 @@ defmodule NoDescriptor.RecursiveMessage.Reply do
 
   use Protobuf,
     full_name: "recursive_message.Reply",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "recursive_message.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :request, 1, type: NoDescriptor.RecursiveMessage.Request
@@ -23,7 +25,9 @@ end
 defmodule NoDescriptor.RecursiveMessage.Service.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "recursive_message.Service", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "recursive_message.Service", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "recursive_message.proto"
 
   rpc :call, NoDescriptor.RecursiveMessage.Request, NoDescriptor.RecursiveMessage.Reply
 end
diff --git a/test/support/protos/no_descriptor/scalar_types.pb.ex b/test/support/protos/no_descriptor/scalar_types/scalar_types.pb.ex
similarity index 93%
rename from test/support/protos/no_descriptor/scalar_types.pb.ex
rename to test/support/protos/no_descriptor/scalar_types/scalar_types.pb.ex
index de57a07..31c70e5 100644
--- a/test/support/protos/no_descriptor/scalar_types.pb.ex
+++ b/test/support/protos/no_descriptor/scalar_types/scalar_types.pb.ex
@@ -3,7 +3,8 @@ defmodule NoDescriptor.ScalarTypes.ScalarRequest do
 
   use Protobuf,
     full_name: "scalar_types.ScalarRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "scalar_types.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :double_field, 1, type: :double, json_name: "doubleField"
@@ -33,7 +34,8 @@ defmodule NoDescriptor.ScalarTypes.ScalarReply do
 
   use Protobuf,
     full_name: "scalar_types.ScalarReply",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "scalar_types.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :double_list, 1, repeated: true, type: :double, json_name: "doubleList"
@@ -56,7 +58,9 @@ end
 defmodule NoDescriptor.ScalarTypes.ScalarService.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "scalar_types.ScalarService", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "scalar_types.ScalarService", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "scalar_types.proto"
 
   rpc :ProcessScalars,
       NoDescriptor.ScalarTypes.ScalarRequest,
diff --git a/test/support/protos/no_descriptor/streaming_service.pb.ex b/test/support/protos/no_descriptor/streaming/streaming_service.pb.ex
similarity index 82%
rename from test/support/protos/no_descriptor/streaming_service.pb.ex
rename to test/support/protos/no_descriptor/streaming/streaming_service.pb.ex
index b6338d5..1cfec6c 100644
--- a/test/support/protos/no_descriptor/streaming_service.pb.ex
+++ b/test/support/protos/no_descriptor/streaming/streaming_service.pb.ex
@@ -3,7 +3,8 @@ defmodule NoDescriptor.Streaming.StreamRequest do
 
   use Protobuf,
     full_name: "streaming.StreamRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "streaming_service.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :message, 1, type: :string
@@ -15,7 +16,8 @@ defmodule NoDescriptor.Streaming.StreamResponse do
 
   use Protobuf,
     full_name: "streaming.StreamResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "streaming_service.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :result, 1, type: :string
@@ -28,7 +30,8 @@ defmodule NoDescriptor.Streaming.DataChunk do
 
   use Protobuf,
     full_name: "streaming.DataChunk",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "streaming_service.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :data, 1, type: :bytes
@@ -41,7 +44,8 @@ defmodule NoDescriptor.Streaming.UploadStatus do
 
   use Protobuf,
     full_name: "streaming.UploadStatus",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "streaming_service.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :success, 1, type: :bool
@@ -54,7 +58,8 @@ defmodule NoDescriptor.Streaming.DownloadRequest do
 
   use Protobuf,
     full_name: "streaming.DownloadRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "streaming_service.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :file_id, 1, type: :string, json_name: "fileId"
@@ -65,7 +70,9 @@ end
 defmodule NoDescriptor.Streaming.StreamingService.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "streaming.StreamingService", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "streaming.StreamingService", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "streaming_service.proto"
 
   rpc :UnaryCall, NoDescriptor.Streaming.StreamRequest, NoDescriptor.Streaming.StreamResponse
 
@@ -91,7 +98,9 @@ end
 defmodule NoDescriptor.Streaming.MultiStreamService.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "streaming.MultiStreamService", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "streaming.MultiStreamService", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "streaming_service.proto"
 
   rpc :UploadData, stream(NoDescriptor.Streaming.DataChunk), NoDescriptor.Streaming.UploadStatus
 
diff --git a/test/support/protos/no_descriptor/well_known_types.pb.ex b/test/support/protos/no_descriptor/well_known_types/well_known_types.pb.ex
similarity index 89%
rename from test/support/protos/no_descriptor/well_known_types.pb.ex
rename to test/support/protos/no_descriptor/well_known_types/well_known_types.pb.ex
index 5672dfb..38dced5 100644
--- a/test/support/protos/no_descriptor/well_known_types.pb.ex
+++ b/test/support/protos/no_descriptor/well_known_types/well_known_types.pb.ex
@@ -3,7 +3,8 @@ defmodule NoDescriptor.WellKnownTypes.WellKnownRequest do
 
   use Protobuf,
     full_name: "well_known_types.WellKnownRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "well_known_types.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :payload, 1, type: Google.Protobuf.Any
@@ -32,7 +33,8 @@ defmodule NoDescriptor.WellKnownTypes.WellKnownResponse do
 
   use Protobuf,
     full_name: "well_known_types.WellKnownResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "well_known_types.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :processed_at, 1, type: Google.Protobuf.Timestamp, json_name: "processedAt"
@@ -52,7 +54,8 @@ defmodule NoDescriptor.WellKnownTypes.CustomPayload do
 
   use Protobuf,
     full_name: "well_known_types.CustomPayload",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "well_known_types.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   field :data, 1, type: :string
@@ -64,7 +67,9 @@ defmodule NoDescriptor.WellKnownTypes.WellKnownTypesService.Service do
 
   use GRPC.Service,
     name: "well_known_types.WellKnownTypesService",
-    protoc_gen_elixir_version: "0.16.0"
+    protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "well_known_types.proto"
 
   rpc :ProcessWellKnownTypes,
       NoDescriptor.WellKnownTypes.WellKnownRequest,
diff --git a/test/support/protos/package_a.pb.ex b/test/support/protos/package_a/package_a.pb.ex
similarity index 79%
rename from test/support/protos/package_a.pb.ex
rename to test/support/protos/package_a/package_a.pb.ex
index 5dfc84b..430e04e 100644
--- a/test/support/protos/package_a.pb.ex
+++ b/test/support/protos/package_a/package_a.pb.ex
@@ -4,7 +4,7 @@ defmodule PackageA.EnumA do
   use Protobuf,
     enum: true,
     full_name: "package_a.EnumA",
-    protoc_gen_elixir_version: "0.16.0",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -16,25 +16,29 @@ defmodule PackageA.EnumA do
           name: "ENUM_A_UNSPECIFIED",
           number: 0,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.EnumValueDescriptorProto{
           name: "OPTION_1",
           number: 1,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.EnumValueDescriptorProto{
           name: "OPTION_2",
           number: 2,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -48,7 +52,8 @@ defmodule PackageA.MessageA do
 
   use Protobuf,
     full_name: "package_a.MessageA",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "package_a.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -68,7 +73,8 @@ defmodule PackageA.MessageA do
           oneof_index: nil,
           json_name: "fieldA",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "count",
@@ -82,7 +88,8 @@ defmodule PackageA.MessageA do
           oneof_index: nil,
           json_name: "count",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -93,7 +100,8 @@ defmodule PackageA.MessageA do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
diff --git a/test/support/protos/package_b.pb.ex b/test/support/protos/package_b/package_b.pb.ex
similarity index 82%
rename from test/support/protos/package_b.pb.ex
rename to test/support/protos/package_b/package_b.pb.ex
index beb8244..aa37c16 100644
--- a/test/support/protos/package_b.pb.ex
+++ b/test/support/protos/package_b/package_b.pb.ex
@@ -3,7 +3,8 @@ defmodule PackageB.MessageB do
 
   use Protobuf,
     full_name: "package_b.MessageB",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "package_b.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -23,7 +24,8 @@ defmodule PackageB.MessageB do
           oneof_index: nil,
           json_name: "fieldB",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "message_from_a",
@@ -37,7 +39,8 @@ defmodule PackageB.MessageB do
           oneof_index: nil,
           json_name: "messageFromA",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "enum_from_a",
@@ -51,7 +54,8 @@ defmodule PackageB.MessageB do
           oneof_index: nil,
           json_name: "enumFromA",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -62,7 +66,8 @@ defmodule PackageB.MessageB do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -76,7 +81,8 @@ defmodule PackageB.ResponseB do
 
   use Protobuf,
     full_name: "package_b.ResponseB",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "package_b.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -96,7 +102,8 @@ defmodule PackageB.ResponseB do
           oneof_index: nil,
           json_name: "results",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -107,7 +114,8 @@ defmodule PackageB.ResponseB do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -117,7 +125,9 @@ end
 defmodule PackageB.ServiceB.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "package_b.ServiceB", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "package_b.ServiceB", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "package_b.proto"
 
   def descriptor do
     # credo:disable-for-next-line
@@ -134,11 +144,13 @@ defmodule PackageB.ServiceB.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: false,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.MethodDescriptorProto{
           name: "ProcessA",
@@ -150,15 +162,18 @@ defmodule PackageB.ServiceB.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: false,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
diff --git a/test/support/protos/proto2_features/pb_extension.pb.ex b/test/support/protos/proto2_features/pb_extension.pb.ex
index ba5c1a4..aa751a8 100644
--- a/test/support/protos/proto2_features/pb_extension.pb.ex
+++ b/test/support/protos/proto2_features/pb_extension.pb.ex
@@ -1,7 +1,7 @@
 defmodule Proto2Features.PbExtension do
   @moduledoc false
 
-  use Protobuf, protoc_gen_elixir_version: "0.16.0"
+  use Protobuf, protoc_gen_elixir_version: "0.17.0"
 
   extend Proto2Features.Proto2Request, :extended_field, 100,
     optional: true,
diff --git a/test/support/protos/proto2_features.pb.ex b/test/support/protos/proto2_features/proto2_features.pb.ex
similarity index 83%
rename from test/support/protos/proto2_features.pb.ex
rename to test/support/protos/proto2_features/proto2_features.pb.ex
index fd99f78..f8b6095 100644
--- a/test/support/protos/proto2_features.pb.ex
+++ b/test/support/protos/proto2_features/proto2_features.pb.ex
@@ -4,7 +4,7 @@ defmodule Proto2Features.Status do
   use Protobuf,
     enum: true,
     full_name: "proto2_features.Status",
-    protoc_gen_elixir_version: "0.16.0",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto2
 
   def descriptor do
@@ -16,25 +16,29 @@ defmodule Proto2Features.Status do
           name: "UNKNOWN",
           number: 0,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.EnumValueDescriptorProto{
           name: "ACTIVE",
           number: 1,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.EnumValueDescriptorProto{
           name: "INACTIVE",
           number: 2,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -49,7 +53,7 @@ defmodule Proto2Features.ExtendableMessage.ExtendableEnum do
   use Protobuf,
     enum: true,
     full_name: "proto2_features.ExtendableMessage.ExtendableEnum",
-    protoc_gen_elixir_version: "0.16.0",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto2
 
   def descriptor do
@@ -61,19 +65,22 @@ defmodule Proto2Features.ExtendableMessage.ExtendableEnum do
           name: "OPTION_A",
           number: 0,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.EnumValueDescriptorProto{
           name: "OPTION_B",
           number: 1,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -87,7 +94,8 @@ defmodule Proto2Features.Proto2Request.MetadataMapEntry do
   use Protobuf,
     full_name: "proto2_features.Proto2Request.MetadataMapEntry",
     map: true,
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "proto2_features.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto2
 
   def descriptor do
@@ -107,7 +115,8 @@ defmodule Proto2Features.Proto2Request.MetadataMapEntry do
           oneof_index: nil,
           json_name: "key",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "value",
@@ -121,7 +130,8 @@ defmodule Proto2Features.Proto2Request.MetadataMapEntry do
           oneof_index: nil,
           json_name: "value",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -137,12 +147,14 @@ defmodule Proto2Features.Proto2Request.MetadataMapEntry do
         features: nil,
         uninterpreted_option: [],
         __pb_extensions__: %{},
-        __unknown_fields__: []
+        __unknown_fields__: [],
+        __protobuf__: true
       },
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -155,7 +167,8 @@ defmodule Proto2Features.Proto2Request do
 
   use Protobuf,
     full_name: "proto2_features.Proto2Request",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "proto2_features.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto2
 
   def descriptor do
@@ -175,7 +188,8 @@ defmodule Proto2Features.Proto2Request do
           oneof_index: nil,
           json_name: "requiredField",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "required_id",
@@ -189,7 +203,8 @@ defmodule Proto2Features.Proto2Request do
           oneof_index: nil,
           json_name: "requiredId",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "optional_field",
@@ -203,7 +218,8 @@ defmodule Proto2Features.Proto2Request do
           oneof_index: nil,
           json_name: "optionalField",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "optional_id",
@@ -217,7 +233,8 @@ defmodule Proto2Features.Proto2Request do
           oneof_index: nil,
           json_name: "optionalId",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "name",
@@ -231,7 +248,8 @@ defmodule Proto2Features.Proto2Request do
           oneof_index: nil,
           json_name: "name",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "port",
@@ -245,7 +263,8 @@ defmodule Proto2Features.Proto2Request do
           oneof_index: nil,
           json_name: "port",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "enabled",
@@ -259,7 +278,8 @@ defmodule Proto2Features.Proto2Request do
           oneof_index: nil,
           json_name: "enabled",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "status",
@@ -273,7 +293,8 @@ defmodule Proto2Features.Proto2Request do
           oneof_index: nil,
           json_name: "status",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "oneof_string",
@@ -287,7 +308,8 @@ defmodule Proto2Features.Proto2Request do
           oneof_index: 0,
           json_name: "oneofString",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "oneof_int",
@@ -301,7 +323,8 @@ defmodule Proto2Features.Proto2Request do
           oneof_index: 0,
           json_name: "oneofInt",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "metadata_map",
@@ -315,7 +338,8 @@ defmodule Proto2Features.Proto2Request do
           oneof_index: nil,
           json_name: "metadataMap",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "any_values",
@@ -329,7 +353,8 @@ defmodule Proto2Features.Proto2Request do
           oneof_index: nil,
           json_name: "anyValues",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "packed_ints",
@@ -355,12 +380,14 @@ defmodule Proto2Features.Proto2Request do
             feature_support: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           oneof_index: nil,
           json_name: "packedInts",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [
@@ -379,7 +406,8 @@ defmodule Proto2Features.Proto2Request do
               oneof_index: nil,
               json_name: "key",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.FieldDescriptorProto{
               name: "value",
@@ -393,7 +421,8 @@ defmodule Proto2Features.Proto2Request do
               oneof_index: nil,
               json_name: "value",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           nested_type: [],
@@ -409,12 +438,14 @@ defmodule Proto2Features.Proto2Request do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           oneof_decl: [],
           reserved_range: [],
           reserved_name: [],
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       enum_type: [],
@@ -423,7 +454,8 @@ defmodule Proto2Features.Proto2Request do
           start: 100,
           end: 200,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       extension: [],
@@ -432,12 +464,14 @@ defmodule Proto2Features.Proto2Request do
         %Google.Protobuf.OneofDescriptorProto{
           name: "proto2_oneof",
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -477,7 +511,8 @@ defmodule Proto2Features.ExtensionData do
 
   use Protobuf,
     full_name: "proto2_features.ExtensionData",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "proto2_features.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto2
 
   def descriptor do
@@ -497,7 +532,8 @@ defmodule Proto2Features.ExtensionData do
           oneof_index: nil,
           json_name: "key",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "value",
@@ -511,7 +547,8 @@ defmodule Proto2Features.ExtensionData do
           oneof_index: nil,
           json_name: "value",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -522,7 +559,8 @@ defmodule Proto2Features.ExtensionData do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -535,7 +573,8 @@ defmodule Proto2Features.Proto2Response do
 
   use Protobuf,
     full_name: "proto2_features.Proto2Response",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "proto2_features.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto2
 
   def descriptor do
@@ -555,7 +594,8 @@ defmodule Proto2Features.Proto2Response do
           oneof_index: nil,
           json_name: "success",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "message",
@@ -569,7 +609,8 @@ defmodule Proto2Features.Proto2Response do
           oneof_index: nil,
           json_name: "message",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -580,7 +621,8 @@ defmodule Proto2Features.Proto2Response do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -593,7 +635,8 @@ defmodule Proto2Features.ExtendableMessage.NestedInExtendable do
 
   use Protobuf,
     full_name: "proto2_features.ExtendableMessage.NestedInExtendable",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "proto2_features.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto2
 
   def descriptor do
@@ -613,7 +656,8 @@ defmodule Proto2Features.ExtendableMessage.NestedInExtendable do
           oneof_index: nil,
           json_name: "data",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -624,7 +668,8 @@ defmodule Proto2Features.ExtendableMessage.NestedInExtendable do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -636,7 +681,8 @@ defmodule Proto2Features.ExtendableMessage do
 
   use Protobuf,
     full_name: "proto2_features.ExtendableMessage",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "proto2_features.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto2
 
   def descriptor do
@@ -656,7 +702,8 @@ defmodule Proto2Features.ExtendableMessage do
           oneof_index: nil,
           json_name: "id",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [
@@ -675,7 +722,8 @@ defmodule Proto2Features.ExtendableMessage do
               oneof_index: nil,
               json_name: "data",
               proto3_optional: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           nested_type: [],
@@ -686,7 +734,8 @@ defmodule Proto2Features.ExtendableMessage do
           oneof_decl: [],
           reserved_range: [],
           reserved_name: [],
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       enum_type: [
@@ -697,19 +746,22 @@ defmodule Proto2Features.ExtendableMessage do
               name: "OPTION_A",
               number: 0,
               options: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             },
             %Google.Protobuf.EnumValueDescriptorProto{
               name: "OPTION_B",
               number: 1,
               options: nil,
-              __unknown_fields__: []
+              __unknown_fields__: [],
+              __protobuf__: true
             }
           ],
           options: nil,
           reserved_range: [],
           reserved_name: [],
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       extension_range: [
@@ -717,7 +769,8 @@ defmodule Proto2Features.ExtendableMessage do
           start: 1000,
           end: 536_870_912,
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       extension: [],
@@ -725,7 +778,8 @@ defmodule Proto2Features.ExtendableMessage do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -737,7 +791,9 @@ end
 defmodule Proto2Features.Proto2Service.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "proto2_features.Proto2Service", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "proto2_features.Proto2Service", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "proto2_features.proto"
 
   def descriptor do
     # credo:disable-for-next-line
@@ -754,15 +810,18 @@ defmodule Proto2Features.Proto2Service.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: false,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
diff --git a/test/support/protos/recursive_message.pb.ex b/test/support/protos/recursive_message/recursive_message.pb.ex
similarity index 80%
rename from test/support/protos/recursive_message.pb.ex
rename to test/support/protos/recursive_message/recursive_message.pb.ex
index 6b9aaba..b8033e3 100644
--- a/test/support/protos/recursive_message.pb.ex
+++ b/test/support/protos/recursive_message/recursive_message.pb.ex
@@ -3,7 +3,8 @@ defmodule RecursiveMessage.Request do
 
   use Protobuf,
     full_name: "recursive_message.Request",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "recursive_message.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -23,7 +24,8 @@ defmodule RecursiveMessage.Request do
           oneof_index: nil,
           json_name: "reply",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -34,7 +36,8 @@ defmodule RecursiveMessage.Request do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -46,7 +49,8 @@ defmodule RecursiveMessage.Reply do
 
   use Protobuf,
     full_name: "recursive_message.Reply",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "recursive_message.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -66,7 +70,8 @@ defmodule RecursiveMessage.Reply do
           oneof_index: nil,
           json_name: "request",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -77,7 +82,8 @@ defmodule RecursiveMessage.Reply do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -87,7 +93,9 @@ end
 defmodule RecursiveMessage.Service.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "recursive_message.Service", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "recursive_message.Service", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "recursive_message.proto"
 
   def descriptor do
     # credo:disable-for-next-line
@@ -104,15 +112,18 @@ defmodule RecursiveMessage.Service.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: false,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
diff --git a/test/support/protos/scalar_types.pb.ex b/test/support/protos/scalar_types/scalar_types.pb.ex
similarity index 85%
rename from test/support/protos/scalar_types.pb.ex
rename to test/support/protos/scalar_types/scalar_types.pb.ex
index 570aab2..c87cd70 100644
--- a/test/support/protos/scalar_types.pb.ex
+++ b/test/support/protos/scalar_types/scalar_types.pb.ex
@@ -3,7 +3,8 @@ defmodule ScalarTypes.ScalarRequest do
 
   use Protobuf,
     full_name: "scalar_types.ScalarRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "scalar_types.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -23,7 +24,8 @@ defmodule ScalarTypes.ScalarRequest do
           oneof_index: nil,
           json_name: "doubleField",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "float_field",
@@ -37,7 +39,8 @@ defmodule ScalarTypes.ScalarRequest do
           oneof_index: nil,
           json_name: "floatField",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "int32_field",
@@ -51,7 +54,8 @@ defmodule ScalarTypes.ScalarRequest do
           oneof_index: nil,
           json_name: "int32Field",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "int64_field",
@@ -65,7 +69,8 @@ defmodule ScalarTypes.ScalarRequest do
           oneof_index: nil,
           json_name: "int64Field",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "uint32_field",
@@ -79,7 +84,8 @@ defmodule ScalarTypes.ScalarRequest do
           oneof_index: nil,
           json_name: "uint32Field",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "uint64_field",
@@ -93,7 +99,8 @@ defmodule ScalarTypes.ScalarRequest do
           oneof_index: nil,
           json_name: "uint64Field",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "sint32_field",
@@ -107,7 +114,8 @@ defmodule ScalarTypes.ScalarRequest do
           oneof_index: nil,
           json_name: "sint32Field",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "sint64_field",
@@ -121,7 +129,8 @@ defmodule ScalarTypes.ScalarRequest do
           oneof_index: nil,
           json_name: "sint64Field",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "fixed32_field",
@@ -135,7 +144,8 @@ defmodule ScalarTypes.ScalarRequest do
           oneof_index: nil,
           json_name: "fixed32Field",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "fixed64_field",
@@ -149,7 +159,8 @@ defmodule ScalarTypes.ScalarRequest do
           oneof_index: nil,
           json_name: "fixed64Field",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "sfixed32_field",
@@ -163,7 +174,8 @@ defmodule ScalarTypes.ScalarRequest do
           oneof_index: nil,
           json_name: "sfixed32Field",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "sfixed64_field",
@@ -177,7 +189,8 @@ defmodule ScalarTypes.ScalarRequest do
           oneof_index: nil,
           json_name: "sfixed64Field",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "bool_field",
@@ -191,7 +204,8 @@ defmodule ScalarTypes.ScalarRequest do
           oneof_index: nil,
           json_name: "boolField",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "string_field",
@@ -205,7 +219,8 @@ defmodule ScalarTypes.ScalarRequest do
           oneof_index: nil,
           json_name: "stringField",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "bytes_field",
@@ -219,7 +234,8 @@ defmodule ScalarTypes.ScalarRequest do
           oneof_index: nil,
           json_name: "bytesField",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "optional_string",
@@ -233,7 +249,8 @@ defmodule ScalarTypes.ScalarRequest do
           oneof_index: 0,
           json_name: "optionalString",
           proto3_optional: true,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "optional_int",
@@ -247,7 +264,8 @@ defmodule ScalarTypes.ScalarRequest do
           oneof_index: 1,
           json_name: "optionalInt",
           proto3_optional: true,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "sparse_field_1",
@@ -261,7 +279,8 @@ defmodule ScalarTypes.ScalarRequest do
           oneof_index: nil,
           json_name: "sparseField1",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "sparse_field_2",
@@ -275,7 +294,8 @@ defmodule ScalarTypes.ScalarRequest do
           oneof_index: nil,
           json_name: "sparseField2",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "sparse_field_3",
@@ -289,7 +309,8 @@ defmodule ScalarTypes.ScalarRequest do
           oneof_index: nil,
           json_name: "sparseField3",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -301,29 +322,39 @@ defmodule ScalarTypes.ScalarRequest do
         %Google.Protobuf.OneofDescriptorProto{
           name: "_optional_string",
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.OneofDescriptorProto{
           name: "_optional_int",
           options: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       reserved_range: [
         %Google.Protobuf.DescriptorProto.ReservedRange{
           start: 16,
           end: 17,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.DescriptorProto.ReservedRange{
           start: 17,
           end: 18,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
-        %Google.Protobuf.DescriptorProto.ReservedRange{start: 20, end: 26, __unknown_fields__: []}
+        %Google.Protobuf.DescriptorProto.ReservedRange{
+          start: 20,
+          end: 26,
+          __unknown_fields__: [],
+          __protobuf__: true
+        }
       ],
       reserved_name: ["old_field", "deprecated_field"],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -354,7 +385,8 @@ defmodule ScalarTypes.ScalarReply do
 
   use Protobuf,
     full_name: "scalar_types.ScalarReply",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "scalar_types.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -374,7 +406,8 @@ defmodule ScalarTypes.ScalarReply do
           oneof_index: nil,
           json_name: "doubleList",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "float_list",
@@ -388,7 +421,8 @@ defmodule ScalarTypes.ScalarReply do
           oneof_index: nil,
           json_name: "floatList",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "int32_list",
@@ -402,7 +436,8 @@ defmodule ScalarTypes.ScalarReply do
           oneof_index: nil,
           json_name: "int32List",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "int64_list",
@@ -416,7 +451,8 @@ defmodule ScalarTypes.ScalarReply do
           oneof_index: nil,
           json_name: "int64List",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "uint32_list",
@@ -430,7 +466,8 @@ defmodule ScalarTypes.ScalarReply do
           oneof_index: nil,
           json_name: "uint32List",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "uint64_list",
@@ -444,7 +481,8 @@ defmodule ScalarTypes.ScalarReply do
           oneof_index: nil,
           json_name: "uint64List",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "sint32_list",
@@ -458,7 +496,8 @@ defmodule ScalarTypes.ScalarReply do
           oneof_index: nil,
           json_name: "sint32List",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "sint64_list",
@@ -472,7 +511,8 @@ defmodule ScalarTypes.ScalarReply do
           oneof_index: nil,
           json_name: "sint64List",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "fixed32_list",
@@ -486,7 +526,8 @@ defmodule ScalarTypes.ScalarReply do
           oneof_index: nil,
           json_name: "fixed32List",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "fixed64_list",
@@ -500,7 +541,8 @@ defmodule ScalarTypes.ScalarReply do
           oneof_index: nil,
           json_name: "fixed64List",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "sfixed32_list",
@@ -514,7 +556,8 @@ defmodule ScalarTypes.ScalarReply do
           oneof_index: nil,
           json_name: "sfixed32List",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "sfixed64_list",
@@ -528,7 +571,8 @@ defmodule ScalarTypes.ScalarReply do
           oneof_index: nil,
           json_name: "sfixed64List",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "bool_list",
@@ -542,7 +586,8 @@ defmodule ScalarTypes.ScalarReply do
           oneof_index: nil,
           json_name: "boolList",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "string_list",
@@ -556,7 +601,8 @@ defmodule ScalarTypes.ScalarReply do
           oneof_index: nil,
           json_name: "stringList",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "bytes_list",
@@ -570,7 +616,8 @@ defmodule ScalarTypes.ScalarReply do
           oneof_index: nil,
           json_name: "bytesList",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -581,7 +628,8 @@ defmodule ScalarTypes.ScalarReply do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -605,7 +653,9 @@ end
 defmodule ScalarTypes.ScalarService.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "scalar_types.ScalarService", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "scalar_types.ScalarService", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "scalar_types.proto"
 
   def descriptor do
     # credo:disable-for-next-line
@@ -622,15 +672,18 @@ defmodule ScalarTypes.ScalarService.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: false,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
diff --git a/test/support/protos/streaming_service.pb.ex b/test/support/protos/streaming/streaming_service.pb.ex
similarity index 82%
rename from test/support/protos/streaming_service.pb.ex
rename to test/support/protos/streaming/streaming_service.pb.ex
index 002a722..83a0c73 100644
--- a/test/support/protos/streaming_service.pb.ex
+++ b/test/support/protos/streaming/streaming_service.pb.ex
@@ -3,7 +3,8 @@ defmodule Streaming.StreamRequest do
 
   use Protobuf,
     full_name: "streaming.StreamRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "streaming_service.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -23,7 +24,8 @@ defmodule Streaming.StreamRequest do
           oneof_index: nil,
           json_name: "message",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "sequence",
@@ -37,7 +39,8 @@ defmodule Streaming.StreamRequest do
           oneof_index: nil,
           json_name: "sequence",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -48,7 +51,8 @@ defmodule Streaming.StreamRequest do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -61,7 +65,8 @@ defmodule Streaming.StreamResponse do
 
   use Protobuf,
     full_name: "streaming.StreamResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "streaming_service.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -81,7 +86,8 @@ defmodule Streaming.StreamResponse do
           oneof_index: nil,
           json_name: "result",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "sequence",
@@ -95,7 +101,8 @@ defmodule Streaming.StreamResponse do
           oneof_index: nil,
           json_name: "sequence",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "is_final",
@@ -109,7 +116,8 @@ defmodule Streaming.StreamResponse do
           oneof_index: nil,
           json_name: "isFinal",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -120,7 +128,8 @@ defmodule Streaming.StreamResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -134,7 +143,8 @@ defmodule Streaming.DataChunk do
 
   use Protobuf,
     full_name: "streaming.DataChunk",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "streaming_service.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -154,7 +164,8 @@ defmodule Streaming.DataChunk do
           oneof_index: nil,
           json_name: "data",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "offset",
@@ -168,7 +179,8 @@ defmodule Streaming.DataChunk do
           oneof_index: nil,
           json_name: "offset",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "size",
@@ -182,7 +194,8 @@ defmodule Streaming.DataChunk do
           oneof_index: nil,
           json_name: "size",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -193,7 +206,8 @@ defmodule Streaming.DataChunk do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -207,7 +221,8 @@ defmodule Streaming.UploadStatus do
 
   use Protobuf,
     full_name: "streaming.UploadStatus",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "streaming_service.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -227,7 +242,8 @@ defmodule Streaming.UploadStatus do
           oneof_index: nil,
           json_name: "success",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "total_bytes",
@@ -241,7 +257,8 @@ defmodule Streaming.UploadStatus do
           oneof_index: nil,
           json_name: "totalBytes",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "checksum",
@@ -255,7 +272,8 @@ defmodule Streaming.UploadStatus do
           oneof_index: nil,
           json_name: "checksum",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -266,7 +284,8 @@ defmodule Streaming.UploadStatus do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -280,7 +299,8 @@ defmodule Streaming.DownloadRequest do
 
   use Protobuf,
     full_name: "streaming.DownloadRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "streaming_service.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -300,7 +320,8 @@ defmodule Streaming.DownloadRequest do
           oneof_index: nil,
           json_name: "fileId",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "start_offset",
@@ -314,7 +335,8 @@ defmodule Streaming.DownloadRequest do
           oneof_index: nil,
           json_name: "startOffset",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "max_bytes",
@@ -328,7 +350,8 @@ defmodule Streaming.DownloadRequest do
           oneof_index: nil,
           json_name: "maxBytes",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -339,7 +362,8 @@ defmodule Streaming.DownloadRequest do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -351,7 +375,9 @@ end
 defmodule Streaming.StreamingService.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "streaming.StreamingService", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "streaming.StreamingService", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "streaming_service.proto"
 
   def descriptor do
     # credo:disable-for-next-line
@@ -368,11 +394,13 @@ defmodule Streaming.StreamingService.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: false,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.MethodDescriptorProto{
           name: "ServerStreamingCall",
@@ -384,11 +412,13 @@ defmodule Streaming.StreamingService.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: false,
           server_streaming: true,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.MethodDescriptorProto{
           name: "ClientStreamingCall",
@@ -400,11 +430,13 @@ defmodule Streaming.StreamingService.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: true,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.MethodDescriptorProto{
           name: "BidirectionalStreamingCall",
@@ -416,15 +448,18 @@ defmodule Streaming.StreamingService.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: true,
           server_streaming: true,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -448,7 +483,9 @@ end
 defmodule Streaming.MultiStreamService.Service do
   @moduledoc false
 
-  use GRPC.Service, name: "streaming.MultiStreamService", protoc_gen_elixir_version: "0.16.0"
+  use GRPC.Service, name: "streaming.MultiStreamService", protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "streaming_service.proto"
 
   def descriptor do
     # credo:disable-for-next-line
@@ -465,11 +502,13 @@ defmodule Streaming.MultiStreamService.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: true,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.MethodDescriptorProto{
           name: "DownloadData",
@@ -481,11 +520,13 @@ defmodule Streaming.MultiStreamService.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: false,
           server_streaming: true,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.MethodDescriptorProto{
           name: "SyncData",
@@ -497,15 +538,18 @@ defmodule Streaming.MultiStreamService.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: true,
           server_streaming: true,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
diff --git a/test/support/protos/well_known_types.pb.ex b/test/support/protos/well_known_types/well_known_types.pb.ex
similarity index 86%
rename from test/support/protos/well_known_types.pb.ex
rename to test/support/protos/well_known_types/well_known_types.pb.ex
index 97f6954..b34ffd3 100644
--- a/test/support/protos/well_known_types.pb.ex
+++ b/test/support/protos/well_known_types/well_known_types.pb.ex
@@ -3,7 +3,8 @@ defmodule WellKnownTypes.WellKnownRequest do
 
   use Protobuf,
     full_name: "well_known_types.WellKnownRequest",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "well_known_types.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -23,7 +24,8 @@ defmodule WellKnownTypes.WellKnownRequest do
           oneof_index: nil,
           json_name: "payload",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "items",
@@ -37,7 +39,8 @@ defmodule WellKnownTypes.WellKnownRequest do
           oneof_index: nil,
           json_name: "items",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "created_at",
@@ -51,7 +54,8 @@ defmodule WellKnownTypes.WellKnownRequest do
           oneof_index: nil,
           json_name: "createdAt",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "updated_at",
@@ -65,7 +69,8 @@ defmodule WellKnownTypes.WellKnownRequest do
           oneof_index: nil,
           json_name: "updatedAt",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "timeout",
@@ -79,7 +84,8 @@ defmodule WellKnownTypes.WellKnownRequest do
           oneof_index: nil,
           json_name: "timeout",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "retry_delay",
@@ -93,7 +99,8 @@ defmodule WellKnownTypes.WellKnownRequest do
           oneof_index: nil,
           json_name: "retryDelay",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "metadata",
@@ -107,7 +114,8 @@ defmodule WellKnownTypes.WellKnownRequest do
           oneof_index: nil,
           json_name: "metadata",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "dynamic_value",
@@ -121,7 +129,8 @@ defmodule WellKnownTypes.WellKnownRequest do
           oneof_index: nil,
           json_name: "dynamicValue",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "list_value",
@@ -135,7 +144,8 @@ defmodule WellKnownTypes.WellKnownRequest do
           oneof_index: nil,
           json_name: "listValue",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "nullable_string",
@@ -149,7 +159,8 @@ defmodule WellKnownTypes.WellKnownRequest do
           oneof_index: nil,
           json_name: "nullableString",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "nullable_int32",
@@ -163,7 +174,8 @@ defmodule WellKnownTypes.WellKnownRequest do
           oneof_index: nil,
           json_name: "nullableInt32",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "nullable_int64",
@@ -177,7 +189,8 @@ defmodule WellKnownTypes.WellKnownRequest do
           oneof_index: nil,
           json_name: "nullableInt64",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "nullable_uint32",
@@ -191,7 +204,8 @@ defmodule WellKnownTypes.WellKnownRequest do
           oneof_index: nil,
           json_name: "nullableUint32",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "nullable_uint64",
@@ -205,7 +219,8 @@ defmodule WellKnownTypes.WellKnownRequest do
           oneof_index: nil,
           json_name: "nullableUint64",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "nullable_float",
@@ -219,7 +234,8 @@ defmodule WellKnownTypes.WellKnownRequest do
           oneof_index: nil,
           json_name: "nullableFloat",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "nullable_double",
@@ -233,7 +249,8 @@ defmodule WellKnownTypes.WellKnownRequest do
           oneof_index: nil,
           json_name: "nullableDouble",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "nullable_bool",
@@ -247,7 +264,8 @@ defmodule WellKnownTypes.WellKnownRequest do
           oneof_index: nil,
           json_name: "nullableBool",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "nullable_bytes",
@@ -261,7 +279,8 @@ defmodule WellKnownTypes.WellKnownRequest do
           oneof_index: nil,
           json_name: "nullableBytes",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "field_mask",
@@ -275,7 +294,8 @@ defmodule WellKnownTypes.WellKnownRequest do
           oneof_index: nil,
           json_name: "fieldMask",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -286,7 +306,8 @@ defmodule WellKnownTypes.WellKnownRequest do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -316,7 +337,8 @@ defmodule WellKnownTypes.WellKnownResponse do
 
   use Protobuf,
     full_name: "well_known_types.WellKnownResponse",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "well_known_types.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -336,7 +358,8 @@ defmodule WellKnownTypes.WellKnownResponse do
           oneof_index: nil,
           json_name: "processedAt",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "elapsed_time",
@@ -350,7 +373,8 @@ defmodule WellKnownTypes.WellKnownResponse do
           oneof_index: nil,
           json_name: "elapsedTime",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "result",
@@ -364,7 +388,8 @@ defmodule WellKnownTypes.WellKnownResponse do
           oneof_index: nil,
           json_name: "result",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "string_values",
@@ -378,7 +403,8 @@ defmodule WellKnownTypes.WellKnownResponse do
           oneof_index: nil,
           json_name: "stringValues",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "int_values",
@@ -392,7 +418,8 @@ defmodule WellKnownTypes.WellKnownResponse do
           oneof_index: nil,
           json_name: "intValues",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -403,7 +430,8 @@ defmodule WellKnownTypes.WellKnownResponse do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -424,7 +452,8 @@ defmodule WellKnownTypes.CustomPayload do
 
   use Protobuf,
     full_name: "well_known_types.CustomPayload",
-    protoc_gen_elixir_version: "0.16.0",
+    proto_source: "well_known_types.proto",
+    protoc_gen_elixir_version: "0.17.0",
     syntax: :proto3
 
   def descriptor do
@@ -444,7 +473,8 @@ defmodule WellKnownTypes.CustomPayload do
           oneof_index: nil,
           json_name: "data",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.FieldDescriptorProto{
           name: "version",
@@ -458,7 +488,8 @@ defmodule WellKnownTypes.CustomPayload do
           oneof_index: nil,
           json_name: "version",
           proto3_optional: nil,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       nested_type: [],
@@ -469,7 +500,8 @@ defmodule WellKnownTypes.CustomPayload do
       oneof_decl: [],
       reserved_range: [],
       reserved_name: [],
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end
 
@@ -482,7 +514,9 @@ defmodule WellKnownTypes.WellKnownTypesService.Service do
 
   use GRPC.Service,
     name: "well_known_types.WellKnownTypesService",
-    protoc_gen_elixir_version: "0.16.0"
+    protoc_gen_elixir_version: "0.17.0"
+
+  def proto_source(), do: "well_known_types.proto"
 
   def descriptor do
     # credo:disable-for-next-line
@@ -499,11 +533,13 @@ defmodule WellKnownTypes.WellKnownTypesService.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: false,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         },
         %Google.Protobuf.MethodDescriptorProto{
           name: "EmptyMethod",
@@ -515,15 +551,18 @@ defmodule WellKnownTypes.WellKnownTypesService.Service do
             features: nil,
             uninterpreted_option: [],
             __pb_extensions__: %{},
-            __unknown_fields__: []
+            __unknown_fields__: [],
+            __protobuf__: true
           },
           client_streaming: false,
           server_streaming: false,
-          __unknown_fields__: []
+          __unknown_fields__: [],
+          __protobuf__: true
         }
       ],
       options: nil,
-      __unknown_fields__: []
+      __unknown_fields__: [],
+      __protobuf__: true
     }
   end