diff --git a/samples/OcelotGateway/OcelotGateway.csproj b/samples/OcelotGateway/OcelotGateway.csproj
index e121e47..3d2c8aa 100644
--- a/samples/OcelotGateway/OcelotGateway.csproj
+++ b/samples/OcelotGateway/OcelotGateway.csproj
@@ -1,14 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Ocelot" Version="14.0.11" />
+	  <PackageReference Include="Ocelot" Version="15.0.6" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/GrpcJsonTranscoder/DownStreamContextExtensions.cs b/src/GrpcJsonTranscoder/DownStreamContextExtensions.cs
index 6a01ef2..c452f25 100644
--- a/src/GrpcJsonTranscoder/DownStreamContextExtensions.cs
+++ b/src/GrpcJsonTranscoder/DownStreamContextExtensions.cs
@@ -32,7 +32,7 @@ public static async Task HandleGrpcRequestAsync(this DownstreamContext context,
             {
                 var methodPath = context.DownstreamReRoute.DownstreamPathTemplate.Value;
                 var grpcAssemblyResolver = context.HttpContext.RequestServices.GetService<GrpcAssemblyResolver>();
-                var methodDescriptor = grpcAssemblyResolver.FindMethodDescriptor(methodPath.Split('/').Last().ToUpperInvariant());
+                var methodDescriptor = grpcAssemblyResolver.FindMethodDescriptor(methodPath.TrimStart('/').Replace("/", ".").Last().ToUpperInvariant());
 
                 if (methodDescriptor == null)
                 {
@@ -55,7 +55,7 @@ public static async Task HandleGrpcRequestAsync(this DownstreamContext context,
                     logger.LogInformation($"Request object data is {requestJsonData}");
 
                     var loadBalancerFactory = context.HttpContext.RequestServices.GetService<ILoadBalancerFactory>();
-                    var loadBalancerResponse = await loadBalancerFactory.Get(context.DownstreamReRoute, context.Configuration.ServiceProviderConfiguration);
+                    var loadBalancerResponse =  loadBalancerFactory.Get(context.DownstreamReRoute, context.Configuration.ServiceProviderConfiguration);
                     var serviceHostPort = await loadBalancerResponse.Data.Lease(context);
 
                     var downstreamHost = $"{serviceHostPort.Data.DownstreamHost}:{serviceHostPort.Data.DownstreamPort}";
@@ -77,14 +77,13 @@ public static async Task HandleGrpcRequestAsync(this DownstreamContext context,
                     {
                         client = new MethodDescriptorCaller(channel);
                     }
-                    
-                    var concreteObject = JsonConvert.DeserializeObject(requestJsonData, methodDescriptor.InputType.ClrType);
+                    var concreteObject = Google.Protobuf.JsonParser.Default.Parse(upstreamHeaders["x-grpc-body-data"], methodDescriptor.InputType);
                     var result = await client.InvokeAsync(methodDescriptor, context.HttpContext.GetRequestHeaders(), concreteObject);
                     logger.LogDebug($"gRPC response called with {JsonConvert.SerializeObject(result)}");
 
                     var jsonSerializer = new JsonSerializerSettings { ContractResolver = new CamelCasePropertyNamesContractResolver() };
                     var response = new OkResponse<GrpcHttpContent>(new GrpcHttpContent(JsonConvert.SerializeObject(result, jsonSerializer)));
-
+                    context.HttpContext.Response.ContentLength = response.Data.ReadAsByteArrayAsync().Result.Length;
                     var httpResponseMessage = new HttpResponseMessage(HttpStatusCode.OK)
                     {
                         Content = response.Data
diff --git a/src/GrpcJsonTranscoder/Grpc/GrpcAssemblyResolver.cs b/src/GrpcJsonTranscoder/Grpc/GrpcAssemblyResolver.cs
index 2c310e1..5782c05 100644
--- a/src/GrpcJsonTranscoder/Grpc/GrpcAssemblyResolver.cs
+++ b/src/GrpcJsonTranscoder/Grpc/GrpcAssemblyResolver.cs
@@ -66,7 +66,7 @@ private ConcurrentDictionary<string, MethodDescriptor> GetMethodDescriptors(para
                     foreach (var method in svr.Methods)
                     {
                         _logger.LogInformation($"Add method name #{method.Name.ToUpper()} into the assembly resolver.");
-                        methodDescriptorDic.TryAdd(method.Name.ToUpper(), method);
+                        methodDescriptorDic.TryAdd(method.FullName.ToUpper(), method);
                     }
                 }
             }
diff --git a/src/GrpcJsonTranscoder/GrpcJsonTranscoder.csproj b/src/GrpcJsonTranscoder/GrpcJsonTranscoder.csproj
index f647836..cc86e40 100644
--- a/src/GrpcJsonTranscoder/GrpcJsonTranscoder.csproj
+++ b/src/GrpcJsonTranscoder/GrpcJsonTranscoder.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <!--<SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>GrpcJsonTranscoder.pfx</AssemblyOriginatorKeyFile>-->
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -17,16 +17,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.11.4" />
-    <PackageReference Include="Grpc.Core" Version="2.27.0" />
-    <PackageReference Include="Grpc.Reflection" Version="2.27.0" />
-    <PackageReference Include="Ocelot" Version="14.0.11" />
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+	  <PackageReference Include="Google.Protobuf" Version="3.19.1" />
+	  <PackageReference Include="Grpc.Core" Version="2.42.0" />
+	  <PackageReference Include="Grpc.Reflection" Version="2.42.0" />
+	  <PackageReference Include="Ocelot" Version="15.0.6" />
+	  <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
+	  <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
+	  <PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
+	  <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.2" />
+	  <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.2" />
+	  <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
 </Project>