diff --git a/.circleci/config.yml b/.circleci/config.yml
index 37df05e50a..efb04a8841 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,7 +34,7 @@ jobs:
 
   generate:
     docker:
-      - image: bertychat/protoc
+      - image: bertychat/protoc:latest
     working_directory: /go/src/berty.tech
     environment:
       GOPATH: /go
@@ -42,26 +42,21 @@ jobs:
       - checkout
       - setup_remote_docker
       - run:
-          name: update dev deps
+          name: cleanup existing generated files
           command: |
             cd core
-            make dev-deps
+            make clean
       - run:
-          name: cleanup existing generated files
+          name: make generate_local
           command: |
             cd core
-            make clean
-      #- run:
-      #    name: make generate
-      #    command: |
-      #      cd core
-      #      make generate
-      #- run:
-      #    name: check if files changed
-      #    command: |
-      #      git status | cat
-      #      git diff | cat
-      #      git diff-index --quiet HEAD --
+            make generate_local
+      - run:
+          name: check if files changed
+          command: |
+            git status | cat
+            git diff | cat
+            git diff-index --quiet HEAD --
 
   docker.build:
     docker:
diff --git a/.circleci/docker/Dockerfile.protoc b/.circleci/docker/Dockerfile.protoc
index 3c7a04af15..0d8d923a82 100644
--- a/.circleci/docker/Dockerfile.protoc
+++ b/.circleci/docker/Dockerfile.protoc
@@ -1,14 +1,8 @@
-FROM    znly/protoc as znly
+FROM moul/protoc-gen-gotemplate
 
-#FROM    golang:1.10-alpine
+RUN     apk --update add make git go rsync libc-dev openssh docker
 
-RUN     apk --update add make git go rsync libc-dev openssh
-
-RUN go version
-
-#COPY --from=znly
-
-RUN     go get -u -v \
+RUN go get -u -v \
 	  github.com/gogo/protobuf/proto \
 	  github.com/gogo/protobuf/protoc-gen-gogo \
 	  github.com/gogo/protobuf/gogoproto \
@@ -17,7 +11,10 @@ RUN     go get -u -v \
 	  github.com/moul/protoc-gen-gotemplate \
 	  golang.org/x/tools/cmd/goimports \
 	  github.com/99designs/gqlgen \
-	  github.com/vektah/gorunpkg
+	  github.com/vektah/gorunpkg \
+	  github.com/spf13/cobra
+
+RUN cd /go/src/github.com/99designs/gqlgen && git checkout v0.4.4 && go install github.com/99designs/gqlgen
 
 ENV	GOPATH=/go \
 	PATH=/go/bin:${PATH}
diff --git a/core/Makefile b/core/Makefile
index 29bb288f1a..e0422839ef 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -20,16 +20,6 @@ TEST_PATHS ?= ./...
 TEST_CMD ?= $(BUILD_ENV) go test -test.timeout 3m -v $(TEST_PATHS)
 PROTOC ?= protoc
 GQLGEN ?= gqlgen
-DOCKER_PROTOC = docker run --user="$(shell id -u)" --rm -v "$(GOPATH)/src:/go/src" -v "$(PWD)/..:/go/src/github.com/berty/berty" -w "/go/src/github.com/berty/berty/core"  bertychat/protoc protoc
-DOCKER_GQLGEN = docker run --user="$(shell id -u)" --rm -v "$(GOPATH)/src:/go/src" -v "$(PWD)/..:/go/src/github.com/berty/berty" -w "/go/src/github.com/berty/berty/core"  bertychat/protoc gqlgen
-ifeq (, $(shell which protoc))
-PROTOC=$(DOCKER_PROTOC)
-GQLGEN=$(DOCKER_GQLGEN)
-endif
-ifeq (1, $(USE_DOCKER))
-PROTOC=$(DOCKER_PROTOC)
-GQLGEN=$(DOCKER_GQLGEN)
-endif
 
 ##
 ## phonies
@@ -52,7 +42,7 @@ run: $(BIN)
 .PHONY: install
 install: $(BIN)
 
-$(BIN): generate $(SOURCES)
+$(BIN): generate_local $(SOURCES)
 	$(BUILD_ENV) go install -v ./cmd/...
 
 .PHONY: testwatch
@@ -63,7 +53,7 @@ testwatch:
 	  while true; do watchman-wait . -p "**/*.go"; clear; $(TEST_CMD); sleep .3; done
 
 .PHONY: test
-test: generate
+test: generate_local
 	$(TEST_CMD)
 
 .PHONY: integration
@@ -82,8 +72,8 @@ lint: generate
 clean:
 	rm -f $(GENERATED_FILES) $(BIN)
 
-.PHONY: generate
-generate: $(GENERATED_FILES)
+.PHONY: generate_local
+generate_local: $(GENERATED_FILES)
 
 .PHONY: _ci_prepare
 _ci_prepare:
diff --git a/core/api/node/graphql/graph/graph.gen.go b/core/api/node/graphql/graph/graph.gen.go
index fa8908199f..fe081dac49 100644
--- a/core/api/node/graphql/graph/graph.gen.go
+++ b/core/api/node/graphql/graph/graph.gen.go
@@ -7,7 +7,6 @@ import (
 	context "context"
 	fmt "fmt"
 	strconv "strconv"
-	sync "sync"
 
 	model "berty.tech/core/api/node/graphql/model"
 	scalar "berty.tech/core/api/node/graphql/scalar"
@@ -137,7 +136,6 @@ func (ec *executionContext) _BertyEntityContact(ctx context.Context, sel ast.Sel
 	fields := graphql.CollectFields(ctx, sel, bertyEntityContactImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -171,19 +169,16 @@ func (ec *executionContext) _BertyEntityContact(ctx context.Context, sel ast.Sel
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _BertyEntityContact_id(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityContact) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityContact",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityContact"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.ID, nil
 	})
@@ -191,7 +186,6 @@ func (ec *executionContext) _BertyEntityContact_id(ctx context.Context, field gr
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -199,12 +193,12 @@ func (ec *executionContext) _BertyEntityContact_id(ctx context.Context, field gr
 }
 
 func (ec *executionContext) _BertyEntityContact_createdAt(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityContact) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityContact",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityContact"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.CreatedAt, nil
 	})
@@ -212,7 +206,6 @@ func (ec *executionContext) _BertyEntityContact_createdAt(ctx context.Context, f
 		return graphql.Null
 	}
 	res := resTmp.(*scalar.DateTime)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -220,12 +213,12 @@ func (ec *executionContext) _BertyEntityContact_createdAt(ctx context.Context, f
 }
 
 func (ec *executionContext) _BertyEntityContact_updatedAt(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityContact) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityContact",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityContact"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.UpdatedAt, nil
 	})
@@ -233,7 +226,6 @@ func (ec *executionContext) _BertyEntityContact_updatedAt(ctx context.Context, f
 		return graphql.Null
 	}
 	res := resTmp.(*scalar.DateTime)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -241,12 +233,12 @@ func (ec *executionContext) _BertyEntityContact_updatedAt(ctx context.Context, f
 }
 
 func (ec *executionContext) _BertyEntityContact_deletedAt(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityContact) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityContact",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityContact"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.DeletedAt, nil
 	})
@@ -254,7 +246,6 @@ func (ec *executionContext) _BertyEntityContact_deletedAt(ctx context.Context, f
 		return graphql.Null
 	}
 	res := resTmp.(*scalar.DateTime)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -262,12 +253,12 @@ func (ec *executionContext) _BertyEntityContact_deletedAt(ctx context.Context, f
 }
 
 func (ec *executionContext) _BertyEntityContact_sigchain(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityContact) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityContact",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityContact"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Sigchain, nil
 	})
@@ -275,7 +266,6 @@ func (ec *executionContext) _BertyEntityContact_sigchain(ctx context.Context, fi
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -283,12 +273,12 @@ func (ec *executionContext) _BertyEntityContact_sigchain(ctx context.Context, fi
 }
 
 func (ec *executionContext) _BertyEntityContact_status(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityContact) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityContact",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityContact"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Status, nil
 	})
@@ -296,7 +286,6 @@ func (ec *executionContext) _BertyEntityContact_status(ctx context.Context, fiel
 		return graphql.Null
 	}
 	res := resTmp.(*model.BertyEntityContactStatus)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -304,12 +293,12 @@ func (ec *executionContext) _BertyEntityContact_status(ctx context.Context, fiel
 }
 
 func (ec *executionContext) _BertyEntityContact_devices(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityContact) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityContact",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityContact"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Devices, nil
 	})
@@ -323,7 +312,6 @@ func (ec *executionContext) _BertyEntityContact_devices(ctx context.Context, fie
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -334,12 +322,12 @@ func (ec *executionContext) _BertyEntityContact_devices(ctx context.Context, fie
 }
 
 func (ec *executionContext) _BertyEntityContact_displayName(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityContact) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityContact",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityContact"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.DisplayName, nil
 	})
@@ -347,7 +335,6 @@ func (ec *executionContext) _BertyEntityContact_displayName(ctx context.Context,
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -355,12 +342,12 @@ func (ec *executionContext) _BertyEntityContact_displayName(ctx context.Context,
 }
 
 func (ec *executionContext) _BertyEntityContact_displayStatus(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityContact) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityContact",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityContact"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.DisplayStatus, nil
 	})
@@ -368,7 +355,6 @@ func (ec *executionContext) _BertyEntityContact_displayStatus(ctx context.Contex
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -376,12 +362,12 @@ func (ec *executionContext) _BertyEntityContact_displayStatus(ctx context.Contex
 }
 
 func (ec *executionContext) _BertyEntityContact_overrideDisplayName(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityContact) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityContact",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityContact"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.OverrideDisplayName, nil
 	})
@@ -389,7 +375,6 @@ func (ec *executionContext) _BertyEntityContact_overrideDisplayName(ctx context.
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -397,12 +382,12 @@ func (ec *executionContext) _BertyEntityContact_overrideDisplayName(ctx context.
 }
 
 func (ec *executionContext) _BertyEntityContact_overrideDisplayStatus(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityContact) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityContact",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityContact"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.OverrideDisplayStatus, nil
 	})
@@ -410,7 +395,6 @@ func (ec *executionContext) _BertyEntityContact_overrideDisplayStatus(ctx contex
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -424,7 +408,6 @@ func (ec *executionContext) _BertyEntityConversation(ctx context.Context, sel as
 	fields := graphql.CollectFields(ctx, sel, bertyEntityConversationImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -450,19 +433,16 @@ func (ec *executionContext) _BertyEntityConversation(ctx context.Context, sel as
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _BertyEntityConversation_id(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityConversation) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityConversation",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityConversation"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.ID, nil
 	})
@@ -470,7 +450,6 @@ func (ec *executionContext) _BertyEntityConversation_id(ctx context.Context, fie
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -478,12 +457,12 @@ func (ec *executionContext) _BertyEntityConversation_id(ctx context.Context, fie
 }
 
 func (ec *executionContext) _BertyEntityConversation_createdAt(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityConversation) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityConversation",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityConversation"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.CreatedAt, nil
 	})
@@ -491,7 +470,6 @@ func (ec *executionContext) _BertyEntityConversation_createdAt(ctx context.Conte
 		return graphql.Null
 	}
 	res := resTmp.(*scalar.DateTime)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -499,12 +477,12 @@ func (ec *executionContext) _BertyEntityConversation_createdAt(ctx context.Conte
 }
 
 func (ec *executionContext) _BertyEntityConversation_updatedAt(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityConversation) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityConversation",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityConversation"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.UpdatedAt, nil
 	})
@@ -512,7 +490,6 @@ func (ec *executionContext) _BertyEntityConversation_updatedAt(ctx context.Conte
 		return graphql.Null
 	}
 	res := resTmp.(*scalar.DateTime)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -520,12 +497,12 @@ func (ec *executionContext) _BertyEntityConversation_updatedAt(ctx context.Conte
 }
 
 func (ec *executionContext) _BertyEntityConversation_deletedAt(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityConversation) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityConversation",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityConversation"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.DeletedAt, nil
 	})
@@ -533,7 +510,6 @@ func (ec *executionContext) _BertyEntityConversation_deletedAt(ctx context.Conte
 		return graphql.Null
 	}
 	res := resTmp.(*scalar.DateTime)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -541,12 +517,12 @@ func (ec *executionContext) _BertyEntityConversation_deletedAt(ctx context.Conte
 }
 
 func (ec *executionContext) _BertyEntityConversation_title(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityConversation) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityConversation",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityConversation"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Title, nil
 	})
@@ -554,7 +530,6 @@ func (ec *executionContext) _BertyEntityConversation_title(ctx context.Context,
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -562,12 +537,12 @@ func (ec *executionContext) _BertyEntityConversation_title(ctx context.Context,
 }
 
 func (ec *executionContext) _BertyEntityConversation_topic(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityConversation) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityConversation",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityConversation"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Topic, nil
 	})
@@ -575,7 +550,6 @@ func (ec *executionContext) _BertyEntityConversation_topic(ctx context.Context,
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -583,12 +557,12 @@ func (ec *executionContext) _BertyEntityConversation_topic(ctx context.Context,
 }
 
 func (ec *executionContext) _BertyEntityConversation_members(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityConversation) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityConversation",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityConversation"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Members, nil
 	})
@@ -602,7 +576,6 @@ func (ec *executionContext) _BertyEntityConversation_members(ctx context.Context
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -619,7 +592,6 @@ func (ec *executionContext) _BertyEntityConversationMember(ctx context.Context,
 	fields := graphql.CollectFields(ctx, sel, bertyEntityConversationMemberImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -647,19 +619,16 @@ func (ec *executionContext) _BertyEntityConversationMember(ctx context.Context,
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _BertyEntityConversationMember_id(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityConversationMember) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityConversationMember",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityConversationMember"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.ID, nil
 	})
@@ -667,7 +636,6 @@ func (ec *executionContext) _BertyEntityConversationMember_id(ctx context.Contex
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -675,12 +643,12 @@ func (ec *executionContext) _BertyEntityConversationMember_id(ctx context.Contex
 }
 
 func (ec *executionContext) _BertyEntityConversationMember_createdAt(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityConversationMember) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityConversationMember",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityConversationMember"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.CreatedAt, nil
 	})
@@ -688,7 +656,6 @@ func (ec *executionContext) _BertyEntityConversationMember_createdAt(ctx context
 		return graphql.Null
 	}
 	res := resTmp.(*scalar.DateTime)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -696,12 +663,12 @@ func (ec *executionContext) _BertyEntityConversationMember_createdAt(ctx context
 }
 
 func (ec *executionContext) _BertyEntityConversationMember_updatedAt(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityConversationMember) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityConversationMember",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityConversationMember"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.UpdatedAt, nil
 	})
@@ -709,7 +676,6 @@ func (ec *executionContext) _BertyEntityConversationMember_updatedAt(ctx context
 		return graphql.Null
 	}
 	res := resTmp.(*scalar.DateTime)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -717,12 +683,12 @@ func (ec *executionContext) _BertyEntityConversationMember_updatedAt(ctx context
 }
 
 func (ec *executionContext) _BertyEntityConversationMember_deletedAt(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityConversationMember) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityConversationMember",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityConversationMember"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.DeletedAt, nil
 	})
@@ -730,7 +696,6 @@ func (ec *executionContext) _BertyEntityConversationMember_deletedAt(ctx context
 		return graphql.Null
 	}
 	res := resTmp.(*scalar.DateTime)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -738,12 +703,12 @@ func (ec *executionContext) _BertyEntityConversationMember_deletedAt(ctx context
 }
 
 func (ec *executionContext) _BertyEntityConversationMember_status(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityConversationMember) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityConversationMember",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityConversationMember"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Status, nil
 	})
@@ -751,7 +716,6 @@ func (ec *executionContext) _BertyEntityConversationMember_status(ctx context.Co
 		return graphql.Null
 	}
 	res := resTmp.(*model.BertyEntityConversationMemberStatus)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -759,12 +723,12 @@ func (ec *executionContext) _BertyEntityConversationMember_status(ctx context.Co
 }
 
 func (ec *executionContext) _BertyEntityConversationMember_contact(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityConversationMember) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityConversationMember",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityConversationMember"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Contact, nil
 	})
@@ -772,7 +736,6 @@ func (ec *executionContext) _BertyEntityConversationMember_contact(ctx context.C
 		return graphql.Null
 	}
 	res := resTmp.(*model.BertyEntityContact)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -780,12 +743,12 @@ func (ec *executionContext) _BertyEntityConversationMember_contact(ctx context.C
 }
 
 func (ec *executionContext) _BertyEntityConversationMember_conversationId(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityConversationMember) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityConversationMember",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityConversationMember"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.ConversationID, nil
 	})
@@ -793,7 +756,6 @@ func (ec *executionContext) _BertyEntityConversationMember_conversationId(ctx co
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -801,12 +763,12 @@ func (ec *executionContext) _BertyEntityConversationMember_conversationId(ctx co
 }
 
 func (ec *executionContext) _BertyEntityConversationMember_contactId(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityConversationMember) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityConversationMember",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityConversationMember"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.ContactID, nil
 	})
@@ -814,7 +776,6 @@ func (ec *executionContext) _BertyEntityConversationMember_contactId(ctx context
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -828,7 +789,6 @@ func (ec *executionContext) _BertyEntityDevice(ctx context.Context, sel ast.Sele
 	fields := graphql.CollectFields(ctx, sel, bertyEntityDeviceImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -856,19 +816,16 @@ func (ec *executionContext) _BertyEntityDevice(ctx context.Context, sel ast.Sele
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _BertyEntityDevice_id(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityDevice) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityDevice",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityDevice"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.ID, nil
 	})
@@ -876,7 +833,6 @@ func (ec *executionContext) _BertyEntityDevice_id(ctx context.Context, field gra
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -884,12 +840,12 @@ func (ec *executionContext) _BertyEntityDevice_id(ctx context.Context, field gra
 }
 
 func (ec *executionContext) _BertyEntityDevice_createdAt(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityDevice) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityDevice",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityDevice"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.CreatedAt, nil
 	})
@@ -897,7 +853,6 @@ func (ec *executionContext) _BertyEntityDevice_createdAt(ctx context.Context, fi
 		return graphql.Null
 	}
 	res := resTmp.(*scalar.DateTime)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -905,12 +860,12 @@ func (ec *executionContext) _BertyEntityDevice_createdAt(ctx context.Context, fi
 }
 
 func (ec *executionContext) _BertyEntityDevice_updatedAt(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityDevice) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityDevice",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityDevice"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.UpdatedAt, nil
 	})
@@ -918,7 +873,6 @@ func (ec *executionContext) _BertyEntityDevice_updatedAt(ctx context.Context, fi
 		return graphql.Null
 	}
 	res := resTmp.(*scalar.DateTime)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -926,12 +880,12 @@ func (ec *executionContext) _BertyEntityDevice_updatedAt(ctx context.Context, fi
 }
 
 func (ec *executionContext) _BertyEntityDevice_deletedAt(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityDevice) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityDevice",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityDevice"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.DeletedAt, nil
 	})
@@ -939,7 +893,6 @@ func (ec *executionContext) _BertyEntityDevice_deletedAt(ctx context.Context, fi
 		return graphql.Null
 	}
 	res := resTmp.(*scalar.DateTime)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -947,12 +900,12 @@ func (ec *executionContext) _BertyEntityDevice_deletedAt(ctx context.Context, fi
 }
 
 func (ec *executionContext) _BertyEntityDevice_name(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityDevice) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityDevice",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityDevice"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Name, nil
 	})
@@ -960,7 +913,6 @@ func (ec *executionContext) _BertyEntityDevice_name(ctx context.Context, field g
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -968,12 +920,12 @@ func (ec *executionContext) _BertyEntityDevice_name(ctx context.Context, field g
 }
 
 func (ec *executionContext) _BertyEntityDevice_status(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityDevice) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityDevice",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityDevice"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Status, nil
 	})
@@ -981,7 +933,6 @@ func (ec *executionContext) _BertyEntityDevice_status(ctx context.Context, field
 		return graphql.Null
 	}
 	res := resTmp.(*model.BertyEntityDeviceStatus)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -989,12 +940,12 @@ func (ec *executionContext) _BertyEntityDevice_status(ctx context.Context, field
 }
 
 func (ec *executionContext) _BertyEntityDevice_apiVersion(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityDevice) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityDevice",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityDevice"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.APIVersion, nil
 	})
@@ -1002,7 +953,6 @@ func (ec *executionContext) _BertyEntityDevice_apiVersion(ctx context.Context, f
 		return graphql.Null
 	}
 	res := resTmp.(*int)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1010,12 +960,12 @@ func (ec *executionContext) _BertyEntityDevice_apiVersion(ctx context.Context, f
 }
 
 func (ec *executionContext) _BertyEntityDevice_contactId(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityDevice) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityDevice",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityDevice"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.ContactID, nil
 	})
@@ -1023,7 +973,6 @@ func (ec *executionContext) _BertyEntityDevice_contactId(ctx context.Context, fi
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1037,7 +986,6 @@ func (ec *executionContext) _BertyEntityMessage(ctx context.Context, sel ast.Sel
 	fields := graphql.CollectFields(ctx, sel, bertyEntityMessageImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -1051,19 +999,16 @@ func (ec *executionContext) _BertyEntityMessage(ctx context.Context, sel ast.Sel
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _BertyEntityMessage_text(ctx context.Context, field graphql.CollectedField, obj *model.BertyEntityMessage) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyEntityMessage",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyEntityMessage"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Text, nil
 	})
@@ -1071,7 +1016,6 @@ func (ec *executionContext) _BertyEntityMessage_text(ctx context.Context, field
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1085,7 +1029,6 @@ func (ec *executionContext) _BertyNodeContactRequestInput(ctx context.Context, s
 	fields := graphql.CollectFields(ctx, sel, bertyNodeContactRequestInputImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -1101,19 +1044,16 @@ func (ec *executionContext) _BertyNodeContactRequestInput(ctx context.Context, s
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _BertyNodeContactRequestInput_contact(ctx context.Context, field graphql.CollectedField, obj *model.BertyNodeContactRequestInput) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyNodeContactRequestInput",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyNodeContactRequestInput"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Contact, nil
 	})
@@ -1121,7 +1061,6 @@ func (ec *executionContext) _BertyNodeContactRequestInput_contact(ctx context.Co
 		return graphql.Null
 	}
 	res := resTmp.(*model.BertyEntityContact)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1129,12 +1068,12 @@ func (ec *executionContext) _BertyNodeContactRequestInput_contact(ctx context.Co
 }
 
 func (ec *executionContext) _BertyNodeContactRequestInput_introText(ctx context.Context, field graphql.CollectedField, obj *model.BertyNodeContactRequestInput) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyNodeContactRequestInput",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyNodeContactRequestInput"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.IntroText, nil
 	})
@@ -1142,7 +1081,6 @@ func (ec *executionContext) _BertyNodeContactRequestInput_introText(ctx context.
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1156,7 +1094,6 @@ func (ec *executionContext) _BertyNodeConversationAddMessageInput(ctx context.Co
 	fields := graphql.CollectFields(ctx, sel, bertyNodeConversationAddMessageInputImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -1172,19 +1109,16 @@ func (ec *executionContext) _BertyNodeConversationAddMessageInput(ctx context.Co
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _BertyNodeConversationAddMessageInput_conversation(ctx context.Context, field graphql.CollectedField, obj *model.BertyNodeConversationAddMessageInput) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyNodeConversationAddMessageInput",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyNodeConversationAddMessageInput"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Conversation, nil
 	})
@@ -1192,7 +1126,6 @@ func (ec *executionContext) _BertyNodeConversationAddMessageInput_conversation(c
 		return graphql.Null
 	}
 	res := resTmp.(*model.BertyEntityConversation)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1200,12 +1133,12 @@ func (ec *executionContext) _BertyNodeConversationAddMessageInput_conversation(c
 }
 
 func (ec *executionContext) _BertyNodeConversationAddMessageInput_message(ctx context.Context, field graphql.CollectedField, obj *model.BertyNodeConversationAddMessageInput) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyNodeConversationAddMessageInput",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyNodeConversationAddMessageInput"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Message, nil
 	})
@@ -1213,7 +1146,6 @@ func (ec *executionContext) _BertyNodeConversationAddMessageInput_message(ctx co
 		return graphql.Null
 	}
 	res := resTmp.(*model.BertyEntityMessage)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1227,7 +1159,6 @@ func (ec *executionContext) _BertyNodeConversationManageMembersInput(ctx context
 	fields := graphql.CollectFields(ctx, sel, bertyNodeConversationManageMembersInputImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -1243,19 +1174,16 @@ func (ec *executionContext) _BertyNodeConversationManageMembersInput(ctx context
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _BertyNodeConversationManageMembersInput_conversation(ctx context.Context, field graphql.CollectedField, obj *model.BertyNodeConversationManageMembersInput) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyNodeConversationManageMembersInput",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyNodeConversationManageMembersInput"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Conversation, nil
 	})
@@ -1263,7 +1191,6 @@ func (ec *executionContext) _BertyNodeConversationManageMembersInput_conversatio
 		return graphql.Null
 	}
 	res := resTmp.(*model.BertyEntityConversation)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1271,12 +1198,12 @@ func (ec *executionContext) _BertyNodeConversationManageMembersInput_conversatio
 }
 
 func (ec *executionContext) _BertyNodeConversationManageMembersInput_members(ctx context.Context, field graphql.CollectedField, obj *model.BertyNodeConversationManageMembersInput) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyNodeConversationManageMembersInput",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyNodeConversationManageMembersInput"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Members, nil
 	})
@@ -1290,7 +1217,6 @@ func (ec *executionContext) _BertyNodeConversationManageMembersInput_members(ctx
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -1307,7 +1233,6 @@ func (ec *executionContext) _BertyNodeEventListInput(ctx context.Context, sel as
 	fields := graphql.CollectFields(ctx, sel, bertyNodeEventListInputImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -1323,19 +1248,16 @@ func (ec *executionContext) _BertyNodeEventListInput(ctx context.Context, sel as
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _BertyNodeEventListInput_limit(ctx context.Context, field graphql.CollectedField, obj *model.BertyNodeEventListInput) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyNodeEventListInput",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyNodeEventListInput"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Limit, nil
 	})
@@ -1343,7 +1265,6 @@ func (ec *executionContext) _BertyNodeEventListInput_limit(ctx context.Context,
 		return graphql.Null
 	}
 	res := resTmp.(*int)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1351,12 +1272,12 @@ func (ec *executionContext) _BertyNodeEventListInput_limit(ctx context.Context,
 }
 
 func (ec *executionContext) _BertyNodeEventListInput_filter(ctx context.Context, field graphql.CollectedField, obj *model.BertyNodeEventListInput) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyNodeEventListInput",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyNodeEventListInput"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Filter, nil
 	})
@@ -1364,7 +1285,6 @@ func (ec *executionContext) _BertyNodeEventListInput_filter(ctx context.Context,
 		return graphql.Null
 	}
 	res := resTmp.(*model.BertyP2pEvent)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1378,7 +1298,6 @@ func (ec *executionContext) _BertyNodeVoid(ctx context.Context, sel ast.Selectio
 	fields := graphql.CollectFields(ctx, sel, bertyNodeVoidImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -1392,19 +1311,16 @@ func (ec *executionContext) _BertyNodeVoid(ctx context.Context, sel ast.Selectio
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _BertyNodeVoid_T(ctx context.Context, field graphql.CollectedField, obj *model.BertyNodeVoid) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyNodeVoid",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyNodeVoid"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.T, nil
 	})
@@ -1412,7 +1328,6 @@ func (ec *executionContext) _BertyNodeVoid_T(ctx context.Context, field graphql.
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1426,7 +1341,6 @@ func (ec *executionContext) _BertyP2pAckAttrs(ctx context.Context, sel ast.Selec
 	fields := graphql.CollectFields(ctx, sel, bertyP2pAckAttrsImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -1442,19 +1356,16 @@ func (ec *executionContext) _BertyP2pAckAttrs(ctx context.Context, sel ast.Selec
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _BertyP2pAckAttrs_ids(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pAckAttrs) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pAckAttrs",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pAckAttrs"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Ids, nil
 	})
@@ -1468,7 +1379,6 @@ func (ec *executionContext) _BertyP2pAckAttrs_ids(ctx context.Context, field gra
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -1479,12 +1389,12 @@ func (ec *executionContext) _BertyP2pAckAttrs_ids(ctx context.Context, field gra
 }
 
 func (ec *executionContext) _BertyP2pAckAttrs_ErrMsg(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pAckAttrs) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pAckAttrs",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pAckAttrs"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.ErrMsg, nil
 	})
@@ -1492,7 +1402,6 @@ func (ec *executionContext) _BertyP2pAckAttrs_ErrMsg(ctx context.Context, field
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1506,7 +1415,6 @@ func (ec *executionContext) _BertyP2pContactRequestAcceptedAttrs(ctx context.Con
 	fields := graphql.CollectFields(ctx, sel, bertyP2pContactRequestAcceptedAttrsImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -1520,19 +1428,16 @@ func (ec *executionContext) _BertyP2pContactRequestAcceptedAttrs(ctx context.Con
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _BertyP2pContactRequestAcceptedAttrs_T(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pContactRequestAcceptedAttrs) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pContactRequestAcceptedAttrs",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pContactRequestAcceptedAttrs"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.T, nil
 	})
@@ -1540,7 +1445,6 @@ func (ec *executionContext) _BertyP2pContactRequestAcceptedAttrs_T(ctx context.C
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1554,7 +1458,6 @@ func (ec *executionContext) _BertyP2pContactRequestAttrs(ctx context.Context, se
 	fields := graphql.CollectFields(ctx, sel, bertyP2pContactRequestAttrsImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -1570,19 +1473,16 @@ func (ec *executionContext) _BertyP2pContactRequestAttrs(ctx context.Context, se
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _BertyP2pContactRequestAttrs_me(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pContactRequestAttrs) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pContactRequestAttrs",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pContactRequestAttrs"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Me, nil
 	})
@@ -1590,7 +1490,6 @@ func (ec *executionContext) _BertyP2pContactRequestAttrs_me(ctx context.Context,
 		return graphql.Null
 	}
 	res := resTmp.(*model.BertyEntityContact)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1598,12 +1497,12 @@ func (ec *executionContext) _BertyP2pContactRequestAttrs_me(ctx context.Context,
 }
 
 func (ec *executionContext) _BertyP2pContactRequestAttrs_introText(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pContactRequestAttrs) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pContactRequestAttrs",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pContactRequestAttrs"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.IntroText, nil
 	})
@@ -1611,7 +1510,6 @@ func (ec *executionContext) _BertyP2pContactRequestAttrs_introText(ctx context.C
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1625,7 +1523,6 @@ func (ec *executionContext) _BertyP2pContactShareAttrs(ctx context.Context, sel
 	fields := graphql.CollectFields(ctx, sel, bertyP2pContactShareAttrsImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -1639,19 +1536,16 @@ func (ec *executionContext) _BertyP2pContactShareAttrs(ctx context.Context, sel
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _BertyP2pContactShareAttrs_contact(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pContactShareAttrs) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pContactShareAttrs",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pContactShareAttrs"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Contact, nil
 	})
@@ -1659,7 +1553,6 @@ func (ec *executionContext) _BertyP2pContactShareAttrs_contact(ctx context.Conte
 		return graphql.Null
 	}
 	res := resTmp.(*model.BertyEntityContact)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1673,7 +1566,6 @@ func (ec *executionContext) _BertyP2pContactShareMeAttrs(ctx context.Context, se
 	fields := graphql.CollectFields(ctx, sel, bertyP2pContactShareMeAttrsImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -1687,19 +1579,16 @@ func (ec *executionContext) _BertyP2pContactShareMeAttrs(ctx context.Context, se
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _BertyP2pContactShareMeAttrs_me(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pContactShareMeAttrs) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pContactShareMeAttrs",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pContactShareMeAttrs"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Me, nil
 	})
@@ -1707,7 +1596,6 @@ func (ec *executionContext) _BertyP2pContactShareMeAttrs_me(ctx context.Context,
 		return graphql.Null
 	}
 	res := resTmp.(*model.BertyEntityContact)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1721,7 +1609,6 @@ func (ec *executionContext) _BertyP2pConversationInviteAttrs(ctx context.Context
 	fields := graphql.CollectFields(ctx, sel, bertyP2pConversationInviteAttrsImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -1735,19 +1622,16 @@ func (ec *executionContext) _BertyP2pConversationInviteAttrs(ctx context.Context
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _BertyP2pConversationInviteAttrs_conversation(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pConversationInviteAttrs) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pConversationInviteAttrs",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pConversationInviteAttrs"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Conversation, nil
 	})
@@ -1755,7 +1639,6 @@ func (ec *executionContext) _BertyP2pConversationInviteAttrs_conversation(ctx co
 		return graphql.Null
 	}
 	res := resTmp.(*model.BertyEntityConversation)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1769,7 +1652,6 @@ func (ec *executionContext) _BertyP2pConversationNewMessageAttrs(ctx context.Con
 	fields := graphql.CollectFields(ctx, sel, bertyP2pConversationNewMessageAttrsImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -1783,19 +1665,16 @@ func (ec *executionContext) _BertyP2pConversationNewMessageAttrs(ctx context.Con
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _BertyP2pConversationNewMessageAttrs_message(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pConversationNewMessageAttrs) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pConversationNewMessageAttrs",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pConversationNewMessageAttrs"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Message, nil
 	})
@@ -1803,7 +1682,6 @@ func (ec *executionContext) _BertyP2pConversationNewMessageAttrs_message(ctx con
 		return graphql.Null
 	}
 	res := resTmp.(*model.BertyEntityMessage)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1817,7 +1695,6 @@ func (ec *executionContext) _BertyP2pEvent(ctx context.Context, sel ast.Selectio
 	fields := graphql.CollectFields(ctx, sel, bertyP2pEventImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -1859,19 +1736,16 @@ func (ec *executionContext) _BertyP2pEvent(ctx context.Context, sel ast.Selectio
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _BertyP2pEvent_id(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pEvent) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pEvent",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pEvent"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.ID, nil
 	})
@@ -1879,7 +1753,6 @@ func (ec *executionContext) _BertyP2pEvent_id(ctx context.Context, field graphql
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1887,12 +1760,12 @@ func (ec *executionContext) _BertyP2pEvent_id(ctx context.Context, field graphql
 }
 
 func (ec *executionContext) _BertyP2pEvent_senderId(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pEvent) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pEvent",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pEvent"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.SenderID, nil
 	})
@@ -1900,7 +1773,6 @@ func (ec *executionContext) _BertyP2pEvent_senderId(ctx context.Context, field g
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1908,12 +1780,12 @@ func (ec *executionContext) _BertyP2pEvent_senderId(ctx context.Context, field g
 }
 
 func (ec *executionContext) _BertyP2pEvent_createdAt(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pEvent) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pEvent",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pEvent"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.CreatedAt, nil
 	})
@@ -1921,7 +1793,6 @@ func (ec *executionContext) _BertyP2pEvent_createdAt(ctx context.Context, field
 		return graphql.Null
 	}
 	res := resTmp.(*scalar.DateTime)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1929,12 +1800,12 @@ func (ec *executionContext) _BertyP2pEvent_createdAt(ctx context.Context, field
 }
 
 func (ec *executionContext) _BertyP2pEvent_updatedAt(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pEvent) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pEvent",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pEvent"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.UpdatedAt, nil
 	})
@@ -1942,7 +1813,6 @@ func (ec *executionContext) _BertyP2pEvent_updatedAt(ctx context.Context, field
 		return graphql.Null
 	}
 	res := resTmp.(*scalar.DateTime)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1950,12 +1820,12 @@ func (ec *executionContext) _BertyP2pEvent_updatedAt(ctx context.Context, field
 }
 
 func (ec *executionContext) _BertyP2pEvent_deletedAt(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pEvent) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pEvent",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pEvent"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.DeletedAt, nil
 	})
@@ -1963,7 +1833,6 @@ func (ec *executionContext) _BertyP2pEvent_deletedAt(ctx context.Context, field
 		return graphql.Null
 	}
 	res := resTmp.(*scalar.DateTime)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1971,12 +1840,12 @@ func (ec *executionContext) _BertyP2pEvent_deletedAt(ctx context.Context, field
 }
 
 func (ec *executionContext) _BertyP2pEvent_sentAt(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pEvent) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pEvent",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pEvent"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.SentAt, nil
 	})
@@ -1984,7 +1853,6 @@ func (ec *executionContext) _BertyP2pEvent_sentAt(ctx context.Context, field gra
 		return graphql.Null
 	}
 	res := resTmp.(*scalar.DateTime)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -1992,12 +1860,12 @@ func (ec *executionContext) _BertyP2pEvent_sentAt(ctx context.Context, field gra
 }
 
 func (ec *executionContext) _BertyP2pEvent_receivedAt(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pEvent) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pEvent",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pEvent"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.ReceivedAt, nil
 	})
@@ -2005,7 +1873,6 @@ func (ec *executionContext) _BertyP2pEvent_receivedAt(ctx context.Context, field
 		return graphql.Null
 	}
 	res := resTmp.(*scalar.DateTime)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -2013,12 +1880,12 @@ func (ec *executionContext) _BertyP2pEvent_receivedAt(ctx context.Context, field
 }
 
 func (ec *executionContext) _BertyP2pEvent_ackedAt(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pEvent) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pEvent",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pEvent"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.AckedAt, nil
 	})
@@ -2026,7 +1893,6 @@ func (ec *executionContext) _BertyP2pEvent_ackedAt(ctx context.Context, field gr
 		return graphql.Null
 	}
 	res := resTmp.(*scalar.DateTime)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -2034,12 +1900,12 @@ func (ec *executionContext) _BertyP2pEvent_ackedAt(ctx context.Context, field gr
 }
 
 func (ec *executionContext) _BertyP2pEvent_direction(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pEvent) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pEvent",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pEvent"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Direction, nil
 	})
@@ -2047,7 +1913,6 @@ func (ec *executionContext) _BertyP2pEvent_direction(ctx context.Context, field
 		return graphql.Null
 	}
 	res := resTmp.(*model.BertyP2pEventDirection)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -2055,12 +1920,12 @@ func (ec *executionContext) _BertyP2pEvent_direction(ctx context.Context, field
 }
 
 func (ec *executionContext) _BertyP2pEvent_senderApiVersion(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pEvent) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pEvent",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pEvent"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.SenderAPIVersion, nil
 	})
@@ -2068,7 +1933,6 @@ func (ec *executionContext) _BertyP2pEvent_senderApiVersion(ctx context.Context,
 		return graphql.Null
 	}
 	res := resTmp.(*int)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -2076,12 +1940,12 @@ func (ec *executionContext) _BertyP2pEvent_senderApiVersion(ctx context.Context,
 }
 
 func (ec *executionContext) _BertyP2pEvent_receiverApiVersion(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pEvent) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pEvent",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pEvent"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.ReceiverAPIVersion, nil
 	})
@@ -2089,7 +1953,6 @@ func (ec *executionContext) _BertyP2pEvent_receiverApiVersion(ctx context.Contex
 		return graphql.Null
 	}
 	res := resTmp.(*int)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -2097,12 +1960,12 @@ func (ec *executionContext) _BertyP2pEvent_receiverApiVersion(ctx context.Contex
 }
 
 func (ec *executionContext) _BertyP2pEvent_receiverId(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pEvent) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pEvent",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pEvent"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.ReceiverID, nil
 	})
@@ -2110,7 +1973,6 @@ func (ec *executionContext) _BertyP2pEvent_receiverId(ctx context.Context, field
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -2118,12 +1980,12 @@ func (ec *executionContext) _BertyP2pEvent_receiverId(ctx context.Context, field
 }
 
 func (ec *executionContext) _BertyP2pEvent_kind(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pEvent) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pEvent",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pEvent"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Kind, nil
 	})
@@ -2131,7 +1993,6 @@ func (ec *executionContext) _BertyP2pEvent_kind(ctx context.Context, field graph
 		return graphql.Null
 	}
 	res := resTmp.(*model.BertyP2pKind)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -2139,12 +2000,12 @@ func (ec *executionContext) _BertyP2pEvent_kind(ctx context.Context, field graph
 }
 
 func (ec *executionContext) _BertyP2pEvent_attributes(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pEvent) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pEvent",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pEvent"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Attributes, nil
 	})
@@ -2152,7 +2013,6 @@ func (ec *executionContext) _BertyP2pEvent_attributes(ctx context.Context, field
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -2160,12 +2020,12 @@ func (ec *executionContext) _BertyP2pEvent_attributes(ctx context.Context, field
 }
 
 func (ec *executionContext) _BertyP2pEvent_conversationId(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pEvent) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pEvent",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pEvent"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.ConversationID, nil
 	})
@@ -2173,7 +2033,6 @@ func (ec *executionContext) _BertyP2pEvent_conversationId(ctx context.Context, f
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -2187,7 +2046,6 @@ func (ec *executionContext) _BertyP2pPingAttrs(ctx context.Context, sel ast.Sele
 	fields := graphql.CollectFields(ctx, sel, bertyP2pPingAttrsImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -2201,19 +2059,16 @@ func (ec *executionContext) _BertyP2pPingAttrs(ctx context.Context, sel ast.Sele
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _BertyP2pPingAttrs_T(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pPingAttrs) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pPingAttrs",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pPingAttrs"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.T, nil
 	})
@@ -2221,7 +2076,6 @@ func (ec *executionContext) _BertyP2pPingAttrs_T(ctx context.Context, field grap
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -2235,7 +2089,6 @@ func (ec *executionContext) _BertyP2pSentAttrs(ctx context.Context, sel ast.Sele
 	fields := graphql.CollectFields(ctx, sel, bertyP2pSentAttrsImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -2249,19 +2102,16 @@ func (ec *executionContext) _BertyP2pSentAttrs(ctx context.Context, sel ast.Sele
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _BertyP2pSentAttrs_ids(ctx context.Context, field graphql.CollectedField, obj *model.BertyP2pSentAttrs) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "BertyP2pSentAttrs",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "BertyP2pSentAttrs"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Ids, nil
 	})
@@ -2275,7 +2125,6 @@ func (ec *executionContext) _BertyP2pSentAttrs_ids(ctx context.Context, field gr
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -2292,7 +2141,6 @@ func (ec *executionContext) _GoogleProtobufDescriptorProto(ctx context.Context,
 	fields := graphql.CollectFields(ctx, sel, googleProtobufDescriptorProtoImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -2324,19 +2172,16 @@ func (ec *executionContext) _GoogleProtobufDescriptorProto(ctx context.Context,
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufDescriptorProto_name(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Name, nil
 	})
@@ -2344,7 +2189,6 @@ func (ec *executionContext) _GoogleProtobufDescriptorProto_name(ctx context.Cont
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -2352,12 +2196,12 @@ func (ec *executionContext) _GoogleProtobufDescriptorProto_name(ctx context.Cont
 }
 
 func (ec *executionContext) _GoogleProtobufDescriptorProto_field(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Field, nil
 	})
@@ -2371,7 +2215,6 @@ func (ec *executionContext) _GoogleProtobufDescriptorProto_field(ctx context.Con
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -2382,12 +2225,12 @@ func (ec *executionContext) _GoogleProtobufDescriptorProto_field(ctx context.Con
 }
 
 func (ec *executionContext) _GoogleProtobufDescriptorProto_extension(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Extension, nil
 	})
@@ -2401,7 +2244,6 @@ func (ec *executionContext) _GoogleProtobufDescriptorProto_extension(ctx context
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -2412,12 +2254,12 @@ func (ec *executionContext) _GoogleProtobufDescriptorProto_extension(ctx context
 }
 
 func (ec *executionContext) _GoogleProtobufDescriptorProto_nestedType(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.NestedType, nil
 	})
@@ -2431,7 +2273,6 @@ func (ec *executionContext) _GoogleProtobufDescriptorProto_nestedType(ctx contex
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -2442,12 +2283,12 @@ func (ec *executionContext) _GoogleProtobufDescriptorProto_nestedType(ctx contex
 }
 
 func (ec *executionContext) _GoogleProtobufDescriptorProto_enumType(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.EnumType, nil
 	})
@@ -2461,7 +2302,6 @@ func (ec *executionContext) _GoogleProtobufDescriptorProto_enumType(ctx context.
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -2472,12 +2312,12 @@ func (ec *executionContext) _GoogleProtobufDescriptorProto_enumType(ctx context.
 }
 
 func (ec *executionContext) _GoogleProtobufDescriptorProto_extensionRange(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.ExtensionRange, nil
 	})
@@ -2491,7 +2331,6 @@ func (ec *executionContext) _GoogleProtobufDescriptorProto_extensionRange(ctx co
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -2502,12 +2341,12 @@ func (ec *executionContext) _GoogleProtobufDescriptorProto_extensionRange(ctx co
 }
 
 func (ec *executionContext) _GoogleProtobufDescriptorProto_oneofDecl(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.OneofDecl, nil
 	})
@@ -2521,7 +2360,6 @@ func (ec *executionContext) _GoogleProtobufDescriptorProto_oneofDecl(ctx context
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -2532,12 +2370,12 @@ func (ec *executionContext) _GoogleProtobufDescriptorProto_oneofDecl(ctx context
 }
 
 func (ec *executionContext) _GoogleProtobufDescriptorProto_options(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Options, nil
 	})
@@ -2545,7 +2383,6 @@ func (ec *executionContext) _GoogleProtobufDescriptorProto_options(ctx context.C
 		return graphql.Null
 	}
 	res := resTmp.(*model.GoogleProtobufMessageOptions)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -2553,12 +2390,12 @@ func (ec *executionContext) _GoogleProtobufDescriptorProto_options(ctx context.C
 }
 
 func (ec *executionContext) _GoogleProtobufDescriptorProto_reservedRange(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.ReservedRange, nil
 	})
@@ -2572,7 +2409,6 @@ func (ec *executionContext) _GoogleProtobufDescriptorProto_reservedRange(ctx con
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -2583,12 +2419,12 @@ func (ec *executionContext) _GoogleProtobufDescriptorProto_reservedRange(ctx con
 }
 
 func (ec *executionContext) _GoogleProtobufDescriptorProto_reservedName(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.ReservedName, nil
 	})
@@ -2602,7 +2438,6 @@ func (ec *executionContext) _GoogleProtobufDescriptorProto_reservedName(ctx cont
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -2619,7 +2454,6 @@ func (ec *executionContext) _GoogleProtobufDescriptorProtoExtensionRange(ctx con
 	fields := graphql.CollectFields(ctx, sel, googleProtobufDescriptorProtoExtensionRangeImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -2637,19 +2471,16 @@ func (ec *executionContext) _GoogleProtobufDescriptorProtoExtensionRange(ctx con
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufDescriptorProtoExtensionRange_start(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufDescriptorProtoExtensionRange) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufDescriptorProtoExtensionRange",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufDescriptorProtoExtensionRange"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Start, nil
 	})
@@ -2657,7 +2488,6 @@ func (ec *executionContext) _GoogleProtobufDescriptorProtoExtensionRange_start(c
 		return graphql.Null
 	}
 	res := resTmp.(*int)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -2665,12 +2495,12 @@ func (ec *executionContext) _GoogleProtobufDescriptorProtoExtensionRange_start(c
 }
 
 func (ec *executionContext) _GoogleProtobufDescriptorProtoExtensionRange_end(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufDescriptorProtoExtensionRange) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufDescriptorProtoExtensionRange",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufDescriptorProtoExtensionRange"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.End, nil
 	})
@@ -2678,7 +2508,6 @@ func (ec *executionContext) _GoogleProtobufDescriptorProtoExtensionRange_end(ctx
 		return graphql.Null
 	}
 	res := resTmp.(*int)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -2686,12 +2515,12 @@ func (ec *executionContext) _GoogleProtobufDescriptorProtoExtensionRange_end(ctx
 }
 
 func (ec *executionContext) _GoogleProtobufDescriptorProtoExtensionRange_options(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufDescriptorProtoExtensionRange) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufDescriptorProtoExtensionRange",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufDescriptorProtoExtensionRange"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Options, nil
 	})
@@ -2699,7 +2528,6 @@ func (ec *executionContext) _GoogleProtobufDescriptorProtoExtensionRange_options
 		return graphql.Null
 	}
 	res := resTmp.(*model.GoogleProtobufExtensionRangeOptions)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -2713,7 +2541,6 @@ func (ec *executionContext) _GoogleProtobufDescriptorProtoReservedRange(ctx cont
 	fields := graphql.CollectFields(ctx, sel, googleProtobufDescriptorProtoReservedRangeImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -2729,19 +2556,16 @@ func (ec *executionContext) _GoogleProtobufDescriptorProtoReservedRange(ctx cont
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufDescriptorProtoReservedRange_start(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufDescriptorProtoReservedRange) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufDescriptorProtoReservedRange",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufDescriptorProtoReservedRange"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Start, nil
 	})
@@ -2749,7 +2573,6 @@ func (ec *executionContext) _GoogleProtobufDescriptorProtoReservedRange_start(ct
 		return graphql.Null
 	}
 	res := resTmp.(*int)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -2757,12 +2580,12 @@ func (ec *executionContext) _GoogleProtobufDescriptorProtoReservedRange_start(ct
 }
 
 func (ec *executionContext) _GoogleProtobufDescriptorProtoReservedRange_end(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufDescriptorProtoReservedRange) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufDescriptorProtoReservedRange",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufDescriptorProtoReservedRange"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.End, nil
 	})
@@ -2770,7 +2593,6 @@ func (ec *executionContext) _GoogleProtobufDescriptorProtoReservedRange_end(ctx
 		return graphql.Null
 	}
 	res := resTmp.(*int)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -2784,7 +2606,6 @@ func (ec *executionContext) _GoogleProtobufEnumDescriptorProto(ctx context.Conte
 	fields := graphql.CollectFields(ctx, sel, googleProtobufEnumDescriptorProtoImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -2806,19 +2627,16 @@ func (ec *executionContext) _GoogleProtobufEnumDescriptorProto(ctx context.Conte
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufEnumDescriptorProto_name(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufEnumDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufEnumDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufEnumDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Name, nil
 	})
@@ -2826,7 +2644,6 @@ func (ec *executionContext) _GoogleProtobufEnumDescriptorProto_name(ctx context.
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -2834,12 +2651,12 @@ func (ec *executionContext) _GoogleProtobufEnumDescriptorProto_name(ctx context.
 }
 
 func (ec *executionContext) _GoogleProtobufEnumDescriptorProto_value(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufEnumDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufEnumDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufEnumDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Value, nil
 	})
@@ -2853,7 +2670,6 @@ func (ec *executionContext) _GoogleProtobufEnumDescriptorProto_value(ctx context
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -2864,12 +2680,12 @@ func (ec *executionContext) _GoogleProtobufEnumDescriptorProto_value(ctx context
 }
 
 func (ec *executionContext) _GoogleProtobufEnumDescriptorProto_options(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufEnumDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufEnumDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufEnumDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Options, nil
 	})
@@ -2877,7 +2693,6 @@ func (ec *executionContext) _GoogleProtobufEnumDescriptorProto_options(ctx conte
 		return graphql.Null
 	}
 	res := resTmp.(*model.GoogleProtobufEnumOptions)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -2885,12 +2700,12 @@ func (ec *executionContext) _GoogleProtobufEnumDescriptorProto_options(ctx conte
 }
 
 func (ec *executionContext) _GoogleProtobufEnumDescriptorProto_reservedRange(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufEnumDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufEnumDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufEnumDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.ReservedRange, nil
 	})
@@ -2904,7 +2719,6 @@ func (ec *executionContext) _GoogleProtobufEnumDescriptorProto_reservedRange(ctx
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -2915,12 +2729,12 @@ func (ec *executionContext) _GoogleProtobufEnumDescriptorProto_reservedRange(ctx
 }
 
 func (ec *executionContext) _GoogleProtobufEnumDescriptorProto_reservedName(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufEnumDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufEnumDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufEnumDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.ReservedName, nil
 	})
@@ -2934,7 +2748,6 @@ func (ec *executionContext) _GoogleProtobufEnumDescriptorProto_reservedName(ctx
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -2951,7 +2764,6 @@ func (ec *executionContext) _GoogleProtobufEnumDescriptorProtoEnumReservedRange(
 	fields := graphql.CollectFields(ctx, sel, googleProtobufEnumDescriptorProtoEnumReservedRangeImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -2967,19 +2779,16 @@ func (ec *executionContext) _GoogleProtobufEnumDescriptorProtoEnumReservedRange(
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufEnumDescriptorProtoEnumReservedRange_start(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufEnumDescriptorProtoEnumReservedRange) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufEnumDescriptorProtoEnumReservedRange",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufEnumDescriptorProtoEnumReservedRange"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Start, nil
 	})
@@ -2987,7 +2796,6 @@ func (ec *executionContext) _GoogleProtobufEnumDescriptorProtoEnumReservedRange_
 		return graphql.Null
 	}
 	res := resTmp.(*int)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -2995,12 +2803,12 @@ func (ec *executionContext) _GoogleProtobufEnumDescriptorProtoEnumReservedRange_
 }
 
 func (ec *executionContext) _GoogleProtobufEnumDescriptorProtoEnumReservedRange_end(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufEnumDescriptorProtoEnumReservedRange) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufEnumDescriptorProtoEnumReservedRange",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufEnumDescriptorProtoEnumReservedRange"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.End, nil
 	})
@@ -3008,7 +2816,6 @@ func (ec *executionContext) _GoogleProtobufEnumDescriptorProtoEnumReservedRange_
 		return graphql.Null
 	}
 	res := resTmp.(*int)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3022,7 +2829,6 @@ func (ec *executionContext) _GoogleProtobufEnumOptions(ctx context.Context, sel
 	fields := graphql.CollectFields(ctx, sel, googleProtobufEnumOptionsImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -3040,19 +2846,16 @@ func (ec *executionContext) _GoogleProtobufEnumOptions(ctx context.Context, sel
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufEnumOptions_allowAlias(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufEnumOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufEnumOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufEnumOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.AllowAlias, nil
 	})
@@ -3060,7 +2863,6 @@ func (ec *executionContext) _GoogleProtobufEnumOptions_allowAlias(ctx context.Co
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3068,12 +2870,12 @@ func (ec *executionContext) _GoogleProtobufEnumOptions_allowAlias(ctx context.Co
 }
 
 func (ec *executionContext) _GoogleProtobufEnumOptions_deprecated(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufEnumOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufEnumOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufEnumOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Deprecated, nil
 	})
@@ -3081,7 +2883,6 @@ func (ec *executionContext) _GoogleProtobufEnumOptions_deprecated(ctx context.Co
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3089,12 +2890,12 @@ func (ec *executionContext) _GoogleProtobufEnumOptions_deprecated(ctx context.Co
 }
 
 func (ec *executionContext) _GoogleProtobufEnumOptions_uninterpretedOption(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufEnumOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufEnumOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufEnumOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.UninterpretedOption, nil
 	})
@@ -3108,7 +2909,6 @@ func (ec *executionContext) _GoogleProtobufEnumOptions_uninterpretedOption(ctx c
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -3125,7 +2925,6 @@ func (ec *executionContext) _GoogleProtobufEnumValueDescriptorProto(ctx context.
 	fields := graphql.CollectFields(ctx, sel, googleProtobufEnumValueDescriptorProtoImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -3143,19 +2942,16 @@ func (ec *executionContext) _GoogleProtobufEnumValueDescriptorProto(ctx context.
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufEnumValueDescriptorProto_name(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufEnumValueDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufEnumValueDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufEnumValueDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Name, nil
 	})
@@ -3163,7 +2959,6 @@ func (ec *executionContext) _GoogleProtobufEnumValueDescriptorProto_name(ctx con
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3171,12 +2966,12 @@ func (ec *executionContext) _GoogleProtobufEnumValueDescriptorProto_name(ctx con
 }
 
 func (ec *executionContext) _GoogleProtobufEnumValueDescriptorProto_number(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufEnumValueDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufEnumValueDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufEnumValueDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Number, nil
 	})
@@ -3184,7 +2979,6 @@ func (ec *executionContext) _GoogleProtobufEnumValueDescriptorProto_number(ctx c
 		return graphql.Null
 	}
 	res := resTmp.(*int)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3192,12 +2986,12 @@ func (ec *executionContext) _GoogleProtobufEnumValueDescriptorProto_number(ctx c
 }
 
 func (ec *executionContext) _GoogleProtobufEnumValueDescriptorProto_options(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufEnumValueDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufEnumValueDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufEnumValueDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Options, nil
 	})
@@ -3205,7 +2999,6 @@ func (ec *executionContext) _GoogleProtobufEnumValueDescriptorProto_options(ctx
 		return graphql.Null
 	}
 	res := resTmp.(*model.GoogleProtobufEnumValueOptions)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3219,7 +3012,6 @@ func (ec *executionContext) _GoogleProtobufEnumValueOptions(ctx context.Context,
 	fields := graphql.CollectFields(ctx, sel, googleProtobufEnumValueOptionsImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -3235,19 +3027,16 @@ func (ec *executionContext) _GoogleProtobufEnumValueOptions(ctx context.Context,
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufEnumValueOptions_deprecated(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufEnumValueOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufEnumValueOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufEnumValueOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Deprecated, nil
 	})
@@ -3255,7 +3044,6 @@ func (ec *executionContext) _GoogleProtobufEnumValueOptions_deprecated(ctx conte
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3263,12 +3051,12 @@ func (ec *executionContext) _GoogleProtobufEnumValueOptions_deprecated(ctx conte
 }
 
 func (ec *executionContext) _GoogleProtobufEnumValueOptions_uninterpretedOption(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufEnumValueOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufEnumValueOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufEnumValueOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.UninterpretedOption, nil
 	})
@@ -3282,7 +3070,6 @@ func (ec *executionContext) _GoogleProtobufEnumValueOptions_uninterpretedOption(
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -3299,7 +3086,6 @@ func (ec *executionContext) _GoogleProtobufExtensionRangeOptions(ctx context.Con
 	fields := graphql.CollectFields(ctx, sel, googleProtobufExtensionRangeOptionsImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -3313,19 +3099,16 @@ func (ec *executionContext) _GoogleProtobufExtensionRangeOptions(ctx context.Con
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufExtensionRangeOptions_uninterpretedOption(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufExtensionRangeOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufExtensionRangeOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufExtensionRangeOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.UninterpretedOption, nil
 	})
@@ -3339,7 +3122,6 @@ func (ec *executionContext) _GoogleProtobufExtensionRangeOptions_uninterpretedOp
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -3356,7 +3138,6 @@ func (ec *executionContext) _GoogleProtobufFieldDescriptorProto(ctx context.Cont
 	fields := graphql.CollectFields(ctx, sel, googleProtobufFieldDescriptorProtoImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -3388,19 +3169,16 @@ func (ec *executionContext) _GoogleProtobufFieldDescriptorProto(ctx context.Cont
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_name(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFieldDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFieldDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFieldDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Name, nil
 	})
@@ -3408,7 +3186,6 @@ func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_name(ctx context
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3416,12 +3193,12 @@ func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_name(ctx context
 }
 
 func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_number(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFieldDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFieldDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFieldDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Number, nil
 	})
@@ -3429,7 +3206,6 @@ func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_number(ctx conte
 		return graphql.Null
 	}
 	res := resTmp.(*int)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3437,12 +3213,12 @@ func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_number(ctx conte
 }
 
 func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_label(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFieldDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFieldDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFieldDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Label, nil
 	})
@@ -3450,7 +3226,6 @@ func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_label(ctx contex
 		return graphql.Null
 	}
 	res := resTmp.(*model.GoogleProtobufFieldDescriptorProtoLabel)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3458,12 +3233,12 @@ func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_label(ctx contex
 }
 
 func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_type(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFieldDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFieldDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFieldDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Type, nil
 	})
@@ -3471,7 +3246,6 @@ func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_type(ctx context
 		return graphql.Null
 	}
 	res := resTmp.(*model.GoogleProtobufFieldDescriptorProtoType)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3479,12 +3253,12 @@ func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_type(ctx context
 }
 
 func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_typeName(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFieldDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFieldDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFieldDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.TypeName, nil
 	})
@@ -3492,7 +3266,6 @@ func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_typeName(ctx con
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3500,12 +3273,12 @@ func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_typeName(ctx con
 }
 
 func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_extendee(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFieldDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFieldDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFieldDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Extendee, nil
 	})
@@ -3513,7 +3286,6 @@ func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_extendee(ctx con
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3521,12 +3293,12 @@ func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_extendee(ctx con
 }
 
 func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_defaultValue(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFieldDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFieldDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFieldDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.DefaultValue, nil
 	})
@@ -3534,7 +3306,6 @@ func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_defaultValue(ctx
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3542,12 +3313,12 @@ func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_defaultValue(ctx
 }
 
 func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_oneofIndex(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFieldDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFieldDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFieldDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.OneofIndex, nil
 	})
@@ -3555,7 +3326,6 @@ func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_oneofIndex(ctx c
 		return graphql.Null
 	}
 	res := resTmp.(*int)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3563,12 +3333,12 @@ func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_oneofIndex(ctx c
 }
 
 func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_jsonName(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFieldDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFieldDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFieldDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.JSONName, nil
 	})
@@ -3576,7 +3346,6 @@ func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_jsonName(ctx con
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3584,12 +3353,12 @@ func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_jsonName(ctx con
 }
 
 func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_options(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFieldDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFieldDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFieldDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Options, nil
 	})
@@ -3597,7 +3366,6 @@ func (ec *executionContext) _GoogleProtobufFieldDescriptorProto_options(ctx cont
 		return graphql.Null
 	}
 	res := resTmp.(*model.GoogleProtobufFieldOptions)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3611,7 +3379,6 @@ func (ec *executionContext) _GoogleProtobufFieldOptions(ctx context.Context, sel
 	fields := graphql.CollectFields(ctx, sel, googleProtobufFieldOptionsImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -3637,19 +3404,16 @@ func (ec *executionContext) _GoogleProtobufFieldOptions(ctx context.Context, sel
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufFieldOptions_ctype(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFieldOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFieldOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFieldOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Ctype, nil
 	})
@@ -3657,7 +3421,6 @@ func (ec *executionContext) _GoogleProtobufFieldOptions_ctype(ctx context.Contex
 		return graphql.Null
 	}
 	res := resTmp.(*model.GoogleProtobufFieldOptionsCtype)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3665,12 +3428,12 @@ func (ec *executionContext) _GoogleProtobufFieldOptions_ctype(ctx context.Contex
 }
 
 func (ec *executionContext) _GoogleProtobufFieldOptions_packed(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFieldOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFieldOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFieldOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Packed, nil
 	})
@@ -3678,7 +3441,6 @@ func (ec *executionContext) _GoogleProtobufFieldOptions_packed(ctx context.Conte
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3686,12 +3448,12 @@ func (ec *executionContext) _GoogleProtobufFieldOptions_packed(ctx context.Conte
 }
 
 func (ec *executionContext) _GoogleProtobufFieldOptions_jstype(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFieldOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFieldOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFieldOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Jstype, nil
 	})
@@ -3699,7 +3461,6 @@ func (ec *executionContext) _GoogleProtobufFieldOptions_jstype(ctx context.Conte
 		return graphql.Null
 	}
 	res := resTmp.(*model.GoogleProtobufFieldOptionsJstype)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3707,12 +3468,12 @@ func (ec *executionContext) _GoogleProtobufFieldOptions_jstype(ctx context.Conte
 }
 
 func (ec *executionContext) _GoogleProtobufFieldOptions_lazy(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFieldOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFieldOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFieldOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Lazy, nil
 	})
@@ -3720,7 +3481,6 @@ func (ec *executionContext) _GoogleProtobufFieldOptions_lazy(ctx context.Context
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3728,12 +3488,12 @@ func (ec *executionContext) _GoogleProtobufFieldOptions_lazy(ctx context.Context
 }
 
 func (ec *executionContext) _GoogleProtobufFieldOptions_deprecated(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFieldOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFieldOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFieldOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Deprecated, nil
 	})
@@ -3741,7 +3501,6 @@ func (ec *executionContext) _GoogleProtobufFieldOptions_deprecated(ctx context.C
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3749,12 +3508,12 @@ func (ec *executionContext) _GoogleProtobufFieldOptions_deprecated(ctx context.C
 }
 
 func (ec *executionContext) _GoogleProtobufFieldOptions_weak(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFieldOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFieldOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFieldOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Weak, nil
 	})
@@ -3762,7 +3521,6 @@ func (ec *executionContext) _GoogleProtobufFieldOptions_weak(ctx context.Context
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3770,12 +3528,12 @@ func (ec *executionContext) _GoogleProtobufFieldOptions_weak(ctx context.Context
 }
 
 func (ec *executionContext) _GoogleProtobufFieldOptions_uninterpretedOption(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFieldOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFieldOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFieldOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.UninterpretedOption, nil
 	})
@@ -3789,7 +3547,6 @@ func (ec *executionContext) _GoogleProtobufFieldOptions_uninterpretedOption(ctx
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -3806,7 +3563,6 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto(ctx context.Conte
 	fields := graphql.CollectFields(ctx, sel, googleProtobufFileDescriptorProtoImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -3842,19 +3598,16 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto(ctx context.Conte
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufFileDescriptorProto_name(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Name, nil
 	})
@@ -3862,7 +3615,6 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto_name(ctx context.
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3870,12 +3622,12 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto_name(ctx context.
 }
 
 func (ec *executionContext) _GoogleProtobufFileDescriptorProto_package(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Package, nil
 	})
@@ -3883,7 +3635,6 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto_package(ctx conte
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -3891,12 +3642,12 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto_package(ctx conte
 }
 
 func (ec *executionContext) _GoogleProtobufFileDescriptorProto_dependency(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Dependency, nil
 	})
@@ -3910,7 +3661,6 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto_dependency(ctx co
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -3921,12 +3671,12 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto_dependency(ctx co
 }
 
 func (ec *executionContext) _GoogleProtobufFileDescriptorProto_publicDependency(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.PublicDependency, nil
 	})
@@ -3940,7 +3690,6 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto_publicDependency(
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -3951,12 +3700,12 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto_publicDependency(
 }
 
 func (ec *executionContext) _GoogleProtobufFileDescriptorProto_weakDependency(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.WeakDependency, nil
 	})
@@ -3970,7 +3719,6 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto_weakDependency(ct
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -3981,12 +3729,12 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto_weakDependency(ct
 }
 
 func (ec *executionContext) _GoogleProtobufFileDescriptorProto_messageType(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.MessageType, nil
 	})
@@ -4000,7 +3748,6 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto_messageType(ctx c
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -4011,12 +3758,12 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto_messageType(ctx c
 }
 
 func (ec *executionContext) _GoogleProtobufFileDescriptorProto_enumType(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.EnumType, nil
 	})
@@ -4030,7 +3777,6 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto_enumType(ctx cont
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -4041,12 +3787,12 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto_enumType(ctx cont
 }
 
 func (ec *executionContext) _GoogleProtobufFileDescriptorProto_service(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Service, nil
 	})
@@ -4060,7 +3806,6 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto_service(ctx conte
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -4071,12 +3816,12 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto_service(ctx conte
 }
 
 func (ec *executionContext) _GoogleProtobufFileDescriptorProto_extension(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Extension, nil
 	})
@@ -4090,7 +3835,6 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto_extension(ctx con
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -4101,12 +3845,12 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto_extension(ctx con
 }
 
 func (ec *executionContext) _GoogleProtobufFileDescriptorProto_options(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Options, nil
 	})
@@ -4114,7 +3858,6 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto_options(ctx conte
 		return graphql.Null
 	}
 	res := resTmp.(*model.GoogleProtobufFileOptions)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4122,12 +3865,12 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto_options(ctx conte
 }
 
 func (ec *executionContext) _GoogleProtobufFileDescriptorProto_sourceCodeInfo(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.SourceCodeInfo, nil
 	})
@@ -4135,7 +3878,6 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto_sourceCodeInfo(ct
 		return graphql.Null
 	}
 	res := resTmp.(*model.GoogleProtobufSourceCodeInfo)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4143,12 +3885,12 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto_sourceCodeInfo(ct
 }
 
 func (ec *executionContext) _GoogleProtobufFileDescriptorProto_syntax(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Syntax, nil
 	})
@@ -4156,7 +3898,6 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorProto_syntax(ctx contex
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4170,7 +3911,6 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorSet(ctx context.Context
 	fields := graphql.CollectFields(ctx, sel, googleProtobufFileDescriptorSetImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -4184,19 +3924,16 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorSet(ctx context.Context
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufFileDescriptorSet_file(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileDescriptorSet) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileDescriptorSet",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileDescriptorSet"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.File, nil
 	})
@@ -4210,7 +3947,6 @@ func (ec *executionContext) _GoogleProtobufFileDescriptorSet_file(ctx context.Co
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -4227,7 +3963,6 @@ func (ec *executionContext) _GoogleProtobufFileOptions(ctx context.Context, sel
 	fields := graphql.CollectFields(ctx, sel, googleProtobufFileOptionsImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -4270,10 +4005,6 @@ func (ec *executionContext) _GoogleProtobufFileOptions(ctx context.Context, sel
 			out.Values[i] = ec._GoogleProtobufFileOptions_phpClassPrefix(ctx, field, obj)
 		case "phpNamespace":
 			out.Values[i] = ec._GoogleProtobufFileOptions_phpNamespace(ctx, field, obj)
-		case "phpMetadataNamespace":
-			out.Values[i] = ec._GoogleProtobufFileOptions_phpMetadataNamespace(ctx, field, obj)
-		case "rubyPackage":
-			out.Values[i] = ec._GoogleProtobufFileOptions_rubyPackage(ctx, field, obj)
 		case "uninterpretedOption":
 			out.Values[i] = ec._GoogleProtobufFileOptions_uninterpretedOption(ctx, field, obj)
 		default:
@@ -4281,19 +4012,16 @@ func (ec *executionContext) _GoogleProtobufFileOptions(ctx context.Context, sel
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufFileOptions_javaPackage(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.JavaPackage, nil
 	})
@@ -4301,7 +4029,6 @@ func (ec *executionContext) _GoogleProtobufFileOptions_javaPackage(ctx context.C
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4309,12 +4036,12 @@ func (ec *executionContext) _GoogleProtobufFileOptions_javaPackage(ctx context.C
 }
 
 func (ec *executionContext) _GoogleProtobufFileOptions_javaOuterClassname(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.JavaOuterClassname, nil
 	})
@@ -4322,7 +4049,6 @@ func (ec *executionContext) _GoogleProtobufFileOptions_javaOuterClassname(ctx co
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4330,12 +4056,12 @@ func (ec *executionContext) _GoogleProtobufFileOptions_javaOuterClassname(ctx co
 }
 
 func (ec *executionContext) _GoogleProtobufFileOptions_javaMultipleFiles(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.JavaMultipleFiles, nil
 	})
@@ -4343,7 +4069,6 @@ func (ec *executionContext) _GoogleProtobufFileOptions_javaMultipleFiles(ctx con
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4351,12 +4076,12 @@ func (ec *executionContext) _GoogleProtobufFileOptions_javaMultipleFiles(ctx con
 }
 
 func (ec *executionContext) _GoogleProtobufFileOptions_javaGenerateEqualsAndHash(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.JavaGenerateEqualsAndHash, nil
 	})
@@ -4364,7 +4089,6 @@ func (ec *executionContext) _GoogleProtobufFileOptions_javaGenerateEqualsAndHash
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4372,12 +4096,12 @@ func (ec *executionContext) _GoogleProtobufFileOptions_javaGenerateEqualsAndHash
 }
 
 func (ec *executionContext) _GoogleProtobufFileOptions_javaStringCheckUtf8(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.JavaStringCheckUtf8, nil
 	})
@@ -4385,7 +4109,6 @@ func (ec *executionContext) _GoogleProtobufFileOptions_javaStringCheckUtf8(ctx c
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4393,12 +4116,12 @@ func (ec *executionContext) _GoogleProtobufFileOptions_javaStringCheckUtf8(ctx c
 }
 
 func (ec *executionContext) _GoogleProtobufFileOptions_optimizeFor(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.OptimizeFor, nil
 	})
@@ -4406,7 +4129,6 @@ func (ec *executionContext) _GoogleProtobufFileOptions_optimizeFor(ctx context.C
 		return graphql.Null
 	}
 	res := resTmp.(*model.GoogleProtobufFileOptionsOptimizeMode)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4414,12 +4136,12 @@ func (ec *executionContext) _GoogleProtobufFileOptions_optimizeFor(ctx context.C
 }
 
 func (ec *executionContext) _GoogleProtobufFileOptions_goPackage(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.GoPackage, nil
 	})
@@ -4427,7 +4149,6 @@ func (ec *executionContext) _GoogleProtobufFileOptions_goPackage(ctx context.Con
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4435,12 +4156,12 @@ func (ec *executionContext) _GoogleProtobufFileOptions_goPackage(ctx context.Con
 }
 
 func (ec *executionContext) _GoogleProtobufFileOptions_ccGenericServices(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.CcGenericServices, nil
 	})
@@ -4448,7 +4169,6 @@ func (ec *executionContext) _GoogleProtobufFileOptions_ccGenericServices(ctx con
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4456,12 +4176,12 @@ func (ec *executionContext) _GoogleProtobufFileOptions_ccGenericServices(ctx con
 }
 
 func (ec *executionContext) _GoogleProtobufFileOptions_javaGenericServices(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.JavaGenericServices, nil
 	})
@@ -4469,7 +4189,6 @@ func (ec *executionContext) _GoogleProtobufFileOptions_javaGenericServices(ctx c
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4477,12 +4196,12 @@ func (ec *executionContext) _GoogleProtobufFileOptions_javaGenericServices(ctx c
 }
 
 func (ec *executionContext) _GoogleProtobufFileOptions_pyGenericServices(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.PyGenericServices, nil
 	})
@@ -4490,7 +4209,6 @@ func (ec *executionContext) _GoogleProtobufFileOptions_pyGenericServices(ctx con
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4498,12 +4216,12 @@ func (ec *executionContext) _GoogleProtobufFileOptions_pyGenericServices(ctx con
 }
 
 func (ec *executionContext) _GoogleProtobufFileOptions_phpGenericServices(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.PhpGenericServices, nil
 	})
@@ -4511,7 +4229,6 @@ func (ec *executionContext) _GoogleProtobufFileOptions_phpGenericServices(ctx co
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4519,12 +4236,12 @@ func (ec *executionContext) _GoogleProtobufFileOptions_phpGenericServices(ctx co
 }
 
 func (ec *executionContext) _GoogleProtobufFileOptions_deprecated(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Deprecated, nil
 	})
@@ -4532,7 +4249,6 @@ func (ec *executionContext) _GoogleProtobufFileOptions_deprecated(ctx context.Co
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4540,12 +4256,12 @@ func (ec *executionContext) _GoogleProtobufFileOptions_deprecated(ctx context.Co
 }
 
 func (ec *executionContext) _GoogleProtobufFileOptions_ccEnableArenas(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.CcEnableArenas, nil
 	})
@@ -4553,7 +4269,6 @@ func (ec *executionContext) _GoogleProtobufFileOptions_ccEnableArenas(ctx contex
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4561,12 +4276,12 @@ func (ec *executionContext) _GoogleProtobufFileOptions_ccEnableArenas(ctx contex
 }
 
 func (ec *executionContext) _GoogleProtobufFileOptions_objcClassPrefix(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.ObjcClassPrefix, nil
 	})
@@ -4574,7 +4289,6 @@ func (ec *executionContext) _GoogleProtobufFileOptions_objcClassPrefix(ctx conte
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4582,12 +4296,12 @@ func (ec *executionContext) _GoogleProtobufFileOptions_objcClassPrefix(ctx conte
 }
 
 func (ec *executionContext) _GoogleProtobufFileOptions_csharpNamespace(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.CsharpNamespace, nil
 	})
@@ -4595,7 +4309,6 @@ func (ec *executionContext) _GoogleProtobufFileOptions_csharpNamespace(ctx conte
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4603,12 +4316,12 @@ func (ec *executionContext) _GoogleProtobufFileOptions_csharpNamespace(ctx conte
 }
 
 func (ec *executionContext) _GoogleProtobufFileOptions_swiftPrefix(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.SwiftPrefix, nil
 	})
@@ -4616,7 +4329,6 @@ func (ec *executionContext) _GoogleProtobufFileOptions_swiftPrefix(ctx context.C
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4624,12 +4336,12 @@ func (ec *executionContext) _GoogleProtobufFileOptions_swiftPrefix(ctx context.C
 }
 
 func (ec *executionContext) _GoogleProtobufFileOptions_phpClassPrefix(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.PhpClassPrefix, nil
 	})
@@ -4637,7 +4349,6 @@ func (ec *executionContext) _GoogleProtobufFileOptions_phpClassPrefix(ctx contex
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4645,12 +4356,12 @@ func (ec *executionContext) _GoogleProtobufFileOptions_phpClassPrefix(ctx contex
 }
 
 func (ec *executionContext) _GoogleProtobufFileOptions_phpNamespace(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.PhpNamespace, nil
 	})
@@ -4658,49 +4369,6 @@ func (ec *executionContext) _GoogleProtobufFileOptions_phpNamespace(ctx context.
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
-	if res == nil {
-		return graphql.Null
-	}
-	return graphql.MarshalString(*res)
-}
-
-func (ec *executionContext) _GoogleProtobufFileOptions_phpMetadataNamespace(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
-	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
-		return obj.PhpMetadataNamespace, nil
-	})
-	if resTmp == nil {
-		return graphql.Null
-	}
-	res := resTmp.(*string)
-
-	if res == nil {
-		return graphql.Null
-	}
-	return graphql.MarshalString(*res)
-}
-
-func (ec *executionContext) _GoogleProtobufFileOptions_rubyPackage(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
-	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
-		return obj.RubyPackage, nil
-	})
-	if resTmp == nil {
-		return graphql.Null
-	}
-	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4708,12 +4376,12 @@ func (ec *executionContext) _GoogleProtobufFileOptions_rubyPackage(ctx context.C
 }
 
 func (ec *executionContext) _GoogleProtobufFileOptions_uninterpretedOption(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufFileOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufFileOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufFileOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.UninterpretedOption, nil
 	})
@@ -4727,7 +4395,6 @@ func (ec *executionContext) _GoogleProtobufFileOptions_uninterpretedOption(ctx c
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -4744,7 +4411,6 @@ func (ec *executionContext) _GoogleProtobufGeneratedCodeInfo(ctx context.Context
 	fields := graphql.CollectFields(ctx, sel, googleProtobufGeneratedCodeInfoImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -4758,19 +4424,16 @@ func (ec *executionContext) _GoogleProtobufGeneratedCodeInfo(ctx context.Context
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufGeneratedCodeInfo_annotation(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufGeneratedCodeInfo) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufGeneratedCodeInfo",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufGeneratedCodeInfo"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Annotation, nil
 	})
@@ -4784,7 +4447,6 @@ func (ec *executionContext) _GoogleProtobufGeneratedCodeInfo_annotation(ctx cont
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -4801,7 +4463,6 @@ func (ec *executionContext) _GoogleProtobufGeneratedCodeInfoAnnotation(ctx conte
 	fields := graphql.CollectFields(ctx, sel, googleProtobufGeneratedCodeInfoAnnotationImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -4821,19 +4482,16 @@ func (ec *executionContext) _GoogleProtobufGeneratedCodeInfoAnnotation(ctx conte
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufGeneratedCodeInfoAnnotation_path(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufGeneratedCodeInfoAnnotation) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufGeneratedCodeInfoAnnotation",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufGeneratedCodeInfoAnnotation"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Path, nil
 	})
@@ -4847,7 +4505,6 @@ func (ec *executionContext) _GoogleProtobufGeneratedCodeInfoAnnotation_path(ctx
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -4858,12 +4515,12 @@ func (ec *executionContext) _GoogleProtobufGeneratedCodeInfoAnnotation_path(ctx
 }
 
 func (ec *executionContext) _GoogleProtobufGeneratedCodeInfoAnnotation_sourceFile(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufGeneratedCodeInfoAnnotation) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufGeneratedCodeInfoAnnotation",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufGeneratedCodeInfoAnnotation"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.SourceFile, nil
 	})
@@ -4871,7 +4528,6 @@ func (ec *executionContext) _GoogleProtobufGeneratedCodeInfoAnnotation_sourceFil
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4879,12 +4535,12 @@ func (ec *executionContext) _GoogleProtobufGeneratedCodeInfoAnnotation_sourceFil
 }
 
 func (ec *executionContext) _GoogleProtobufGeneratedCodeInfoAnnotation_begin(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufGeneratedCodeInfoAnnotation) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufGeneratedCodeInfoAnnotation",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufGeneratedCodeInfoAnnotation"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Begin, nil
 	})
@@ -4892,7 +4548,6 @@ func (ec *executionContext) _GoogleProtobufGeneratedCodeInfoAnnotation_begin(ctx
 		return graphql.Null
 	}
 	res := resTmp.(*int)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4900,12 +4555,12 @@ func (ec *executionContext) _GoogleProtobufGeneratedCodeInfoAnnotation_begin(ctx
 }
 
 func (ec *executionContext) _GoogleProtobufGeneratedCodeInfoAnnotation_end(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufGeneratedCodeInfoAnnotation) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufGeneratedCodeInfoAnnotation",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufGeneratedCodeInfoAnnotation"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.End, nil
 	})
@@ -4913,7 +4568,6 @@ func (ec *executionContext) _GoogleProtobufGeneratedCodeInfoAnnotation_end(ctx c
 		return graphql.Null
 	}
 	res := resTmp.(*int)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4927,7 +4581,6 @@ func (ec *executionContext) _GoogleProtobufMessageOptions(ctx context.Context, s
 	fields := graphql.CollectFields(ctx, sel, googleProtobufMessageOptionsImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -4949,19 +4602,16 @@ func (ec *executionContext) _GoogleProtobufMessageOptions(ctx context.Context, s
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufMessageOptions_messageSetWireFormat(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufMessageOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufMessageOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufMessageOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.MessageSetWireFormat, nil
 	})
@@ -4969,7 +4619,6 @@ func (ec *executionContext) _GoogleProtobufMessageOptions_messageSetWireFormat(c
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4977,12 +4626,12 @@ func (ec *executionContext) _GoogleProtobufMessageOptions_messageSetWireFormat(c
 }
 
 func (ec *executionContext) _GoogleProtobufMessageOptions_noStandardDescriptorAccessor(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufMessageOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufMessageOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufMessageOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.NoStandardDescriptorAccessor, nil
 	})
@@ -4990,7 +4639,6 @@ func (ec *executionContext) _GoogleProtobufMessageOptions_noStandardDescriptorAc
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -4998,12 +4646,12 @@ func (ec *executionContext) _GoogleProtobufMessageOptions_noStandardDescriptorAc
 }
 
 func (ec *executionContext) _GoogleProtobufMessageOptions_deprecated(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufMessageOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufMessageOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufMessageOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Deprecated, nil
 	})
@@ -5011,7 +4659,6 @@ func (ec *executionContext) _GoogleProtobufMessageOptions_deprecated(ctx context
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -5019,12 +4666,12 @@ func (ec *executionContext) _GoogleProtobufMessageOptions_deprecated(ctx context
 }
 
 func (ec *executionContext) _GoogleProtobufMessageOptions_mapEntry(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufMessageOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufMessageOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufMessageOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.MapEntry, nil
 	})
@@ -5032,7 +4679,6 @@ func (ec *executionContext) _GoogleProtobufMessageOptions_mapEntry(ctx context.C
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -5040,12 +4686,12 @@ func (ec *executionContext) _GoogleProtobufMessageOptions_mapEntry(ctx context.C
 }
 
 func (ec *executionContext) _GoogleProtobufMessageOptions_uninterpretedOption(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufMessageOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufMessageOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufMessageOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.UninterpretedOption, nil
 	})
@@ -5059,7 +4705,6 @@ func (ec *executionContext) _GoogleProtobufMessageOptions_uninterpretedOption(ct
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -5076,7 +4721,6 @@ func (ec *executionContext) _GoogleProtobufMethodDescriptorProto(ctx context.Con
 	fields := graphql.CollectFields(ctx, sel, googleProtobufMethodDescriptorProtoImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -5100,19 +4744,16 @@ func (ec *executionContext) _GoogleProtobufMethodDescriptorProto(ctx context.Con
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufMethodDescriptorProto_name(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufMethodDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufMethodDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufMethodDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Name, nil
 	})
@@ -5120,7 +4761,6 @@ func (ec *executionContext) _GoogleProtobufMethodDescriptorProto_name(ctx contex
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -5128,12 +4768,12 @@ func (ec *executionContext) _GoogleProtobufMethodDescriptorProto_name(ctx contex
 }
 
 func (ec *executionContext) _GoogleProtobufMethodDescriptorProto_inputType(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufMethodDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufMethodDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufMethodDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.InputType, nil
 	})
@@ -5141,7 +4781,6 @@ func (ec *executionContext) _GoogleProtobufMethodDescriptorProto_inputType(ctx c
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -5149,12 +4788,12 @@ func (ec *executionContext) _GoogleProtobufMethodDescriptorProto_inputType(ctx c
 }
 
 func (ec *executionContext) _GoogleProtobufMethodDescriptorProto_outputType(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufMethodDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufMethodDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufMethodDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.OutputType, nil
 	})
@@ -5162,7 +4801,6 @@ func (ec *executionContext) _GoogleProtobufMethodDescriptorProto_outputType(ctx
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -5170,12 +4808,12 @@ func (ec *executionContext) _GoogleProtobufMethodDescriptorProto_outputType(ctx
 }
 
 func (ec *executionContext) _GoogleProtobufMethodDescriptorProto_options(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufMethodDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufMethodDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufMethodDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Options, nil
 	})
@@ -5183,7 +4821,6 @@ func (ec *executionContext) _GoogleProtobufMethodDescriptorProto_options(ctx con
 		return graphql.Null
 	}
 	res := resTmp.(*model.GoogleProtobufMethodOptions)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -5191,12 +4828,12 @@ func (ec *executionContext) _GoogleProtobufMethodDescriptorProto_options(ctx con
 }
 
 func (ec *executionContext) _GoogleProtobufMethodDescriptorProto_clientStreaming(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufMethodDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufMethodDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufMethodDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.ClientStreaming, nil
 	})
@@ -5204,7 +4841,6 @@ func (ec *executionContext) _GoogleProtobufMethodDescriptorProto_clientStreaming
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -5212,12 +4848,12 @@ func (ec *executionContext) _GoogleProtobufMethodDescriptorProto_clientStreaming
 }
 
 func (ec *executionContext) _GoogleProtobufMethodDescriptorProto_serverStreaming(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufMethodDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufMethodDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufMethodDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.ServerStreaming, nil
 	})
@@ -5225,7 +4861,6 @@ func (ec *executionContext) _GoogleProtobufMethodDescriptorProto_serverStreaming
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -5239,7 +4874,6 @@ func (ec *executionContext) _GoogleProtobufMethodOptions(ctx context.Context, se
 	fields := graphql.CollectFields(ctx, sel, googleProtobufMethodOptionsImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -5257,19 +4891,16 @@ func (ec *executionContext) _GoogleProtobufMethodOptions(ctx context.Context, se
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufMethodOptions_deprecated(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufMethodOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufMethodOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufMethodOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Deprecated, nil
 	})
@@ -5277,7 +4908,6 @@ func (ec *executionContext) _GoogleProtobufMethodOptions_deprecated(ctx context.
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -5285,12 +4915,12 @@ func (ec *executionContext) _GoogleProtobufMethodOptions_deprecated(ctx context.
 }
 
 func (ec *executionContext) _GoogleProtobufMethodOptions_idempotencyLevel(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufMethodOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufMethodOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufMethodOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.IdempotencyLevel, nil
 	})
@@ -5298,7 +4928,6 @@ func (ec *executionContext) _GoogleProtobufMethodOptions_idempotencyLevel(ctx co
 		return graphql.Null
 	}
 	res := resTmp.(*model.GoogleProtobufMethodOptionsIdempotencyLevel)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -5306,12 +4935,12 @@ func (ec *executionContext) _GoogleProtobufMethodOptions_idempotencyLevel(ctx co
 }
 
 func (ec *executionContext) _GoogleProtobufMethodOptions_uninterpretedOption(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufMethodOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufMethodOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufMethodOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.UninterpretedOption, nil
 	})
@@ -5325,7 +4954,6 @@ func (ec *executionContext) _GoogleProtobufMethodOptions_uninterpretedOption(ctx
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -5342,7 +4970,6 @@ func (ec *executionContext) _GoogleProtobufOneofDescriptorProto(ctx context.Cont
 	fields := graphql.CollectFields(ctx, sel, googleProtobufOneofDescriptorProtoImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -5358,19 +4985,16 @@ func (ec *executionContext) _GoogleProtobufOneofDescriptorProto(ctx context.Cont
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufOneofDescriptorProto_name(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufOneofDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufOneofDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufOneofDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Name, nil
 	})
@@ -5378,7 +5002,6 @@ func (ec *executionContext) _GoogleProtobufOneofDescriptorProto_name(ctx context
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -5386,12 +5009,12 @@ func (ec *executionContext) _GoogleProtobufOneofDescriptorProto_name(ctx context
 }
 
 func (ec *executionContext) _GoogleProtobufOneofDescriptorProto_options(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufOneofDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufOneofDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufOneofDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Options, nil
 	})
@@ -5399,7 +5022,6 @@ func (ec *executionContext) _GoogleProtobufOneofDescriptorProto_options(ctx cont
 		return graphql.Null
 	}
 	res := resTmp.(*model.GoogleProtobufOneofOptions)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -5413,7 +5035,6 @@ func (ec *executionContext) _GoogleProtobufOneofOptions(ctx context.Context, sel
 	fields := graphql.CollectFields(ctx, sel, googleProtobufOneofOptionsImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -5427,19 +5048,16 @@ func (ec *executionContext) _GoogleProtobufOneofOptions(ctx context.Context, sel
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufOneofOptions_uninterpretedOption(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufOneofOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufOneofOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufOneofOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.UninterpretedOption, nil
 	})
@@ -5453,7 +5071,6 @@ func (ec *executionContext) _GoogleProtobufOneofOptions_uninterpretedOption(ctx
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -5470,7 +5087,6 @@ func (ec *executionContext) _GoogleProtobufServiceDescriptorProto(ctx context.Co
 	fields := graphql.CollectFields(ctx, sel, googleProtobufServiceDescriptorProtoImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -5488,19 +5104,16 @@ func (ec *executionContext) _GoogleProtobufServiceDescriptorProto(ctx context.Co
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufServiceDescriptorProto_name(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufServiceDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufServiceDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufServiceDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Name, nil
 	})
@@ -5508,7 +5121,6 @@ func (ec *executionContext) _GoogleProtobufServiceDescriptorProto_name(ctx conte
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -5516,12 +5128,12 @@ func (ec *executionContext) _GoogleProtobufServiceDescriptorProto_name(ctx conte
 }
 
 func (ec *executionContext) _GoogleProtobufServiceDescriptorProto_method(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufServiceDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufServiceDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufServiceDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Method, nil
 	})
@@ -5535,7 +5147,6 @@ func (ec *executionContext) _GoogleProtobufServiceDescriptorProto_method(ctx con
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -5546,12 +5157,12 @@ func (ec *executionContext) _GoogleProtobufServiceDescriptorProto_method(ctx con
 }
 
 func (ec *executionContext) _GoogleProtobufServiceDescriptorProto_options(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufServiceDescriptorProto) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufServiceDescriptorProto",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufServiceDescriptorProto"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Options, nil
 	})
@@ -5559,7 +5170,6 @@ func (ec *executionContext) _GoogleProtobufServiceDescriptorProto_options(ctx co
 		return graphql.Null
 	}
 	res := resTmp.(*model.GoogleProtobufServiceOptions)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -5573,7 +5183,6 @@ func (ec *executionContext) _GoogleProtobufServiceOptions(ctx context.Context, s
 	fields := graphql.CollectFields(ctx, sel, googleProtobufServiceOptionsImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -5589,19 +5198,16 @@ func (ec *executionContext) _GoogleProtobufServiceOptions(ctx context.Context, s
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufServiceOptions_deprecated(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufServiceOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufServiceOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufServiceOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Deprecated, nil
 	})
@@ -5609,7 +5215,6 @@ func (ec *executionContext) _GoogleProtobufServiceOptions_deprecated(ctx context
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -5617,12 +5222,12 @@ func (ec *executionContext) _GoogleProtobufServiceOptions_deprecated(ctx context
 }
 
 func (ec *executionContext) _GoogleProtobufServiceOptions_uninterpretedOption(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufServiceOptions) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufServiceOptions",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufServiceOptions"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.UninterpretedOption, nil
 	})
@@ -5636,7 +5241,6 @@ func (ec *executionContext) _GoogleProtobufServiceOptions_uninterpretedOption(ct
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -5653,7 +5257,6 @@ func (ec *executionContext) _GoogleProtobufSourceCodeInfo(ctx context.Context, s
 	fields := graphql.CollectFields(ctx, sel, googleProtobufSourceCodeInfoImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -5667,19 +5270,16 @@ func (ec *executionContext) _GoogleProtobufSourceCodeInfo(ctx context.Context, s
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufSourceCodeInfo_location(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufSourceCodeInfo) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufSourceCodeInfo",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufSourceCodeInfo"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Location, nil
 	})
@@ -5693,7 +5293,6 @@ func (ec *executionContext) _GoogleProtobufSourceCodeInfo_location(ctx context.C
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -5710,7 +5309,6 @@ func (ec *executionContext) _GoogleProtobufSourceCodeInfoLocation(ctx context.Co
 	fields := graphql.CollectFields(ctx, sel, googleProtobufSourceCodeInfoLocationImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -5732,19 +5330,16 @@ func (ec *executionContext) _GoogleProtobufSourceCodeInfoLocation(ctx context.Co
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufSourceCodeInfoLocation_path(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufSourceCodeInfoLocation) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufSourceCodeInfoLocation",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufSourceCodeInfoLocation"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Path, nil
 	})
@@ -5758,7 +5353,6 @@ func (ec *executionContext) _GoogleProtobufSourceCodeInfoLocation_path(ctx conte
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -5769,12 +5363,12 @@ func (ec *executionContext) _GoogleProtobufSourceCodeInfoLocation_path(ctx conte
 }
 
 func (ec *executionContext) _GoogleProtobufSourceCodeInfoLocation_span(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufSourceCodeInfoLocation) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufSourceCodeInfoLocation",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufSourceCodeInfoLocation"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Span, nil
 	})
@@ -5788,7 +5382,6 @@ func (ec *executionContext) _GoogleProtobufSourceCodeInfoLocation_span(ctx conte
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -5799,12 +5392,12 @@ func (ec *executionContext) _GoogleProtobufSourceCodeInfoLocation_span(ctx conte
 }
 
 func (ec *executionContext) _GoogleProtobufSourceCodeInfoLocation_leadingComments(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufSourceCodeInfoLocation) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufSourceCodeInfoLocation",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufSourceCodeInfoLocation"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.LeadingComments, nil
 	})
@@ -5812,7 +5405,6 @@ func (ec *executionContext) _GoogleProtobufSourceCodeInfoLocation_leadingComment
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -5820,12 +5412,12 @@ func (ec *executionContext) _GoogleProtobufSourceCodeInfoLocation_leadingComment
 }
 
 func (ec *executionContext) _GoogleProtobufSourceCodeInfoLocation_trailingComments(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufSourceCodeInfoLocation) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufSourceCodeInfoLocation",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufSourceCodeInfoLocation"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.TrailingComments, nil
 	})
@@ -5833,7 +5425,6 @@ func (ec *executionContext) _GoogleProtobufSourceCodeInfoLocation_trailingCommen
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -5841,12 +5432,12 @@ func (ec *executionContext) _GoogleProtobufSourceCodeInfoLocation_trailingCommen
 }
 
 func (ec *executionContext) _GoogleProtobufSourceCodeInfoLocation_leadingDetachedComments(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufSourceCodeInfoLocation) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufSourceCodeInfoLocation",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufSourceCodeInfoLocation"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.LeadingDetachedComments, nil
 	})
@@ -5860,7 +5451,6 @@ func (ec *executionContext) _GoogleProtobufSourceCodeInfoLocation_leadingDetache
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -5877,7 +5467,6 @@ func (ec *executionContext) _GoogleProtobufTimestamp(ctx context.Context, sel as
 	fields := graphql.CollectFields(ctx, sel, googleProtobufTimestampImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -5893,19 +5482,16 @@ func (ec *executionContext) _GoogleProtobufTimestamp(ctx context.Context, sel as
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufTimestamp_seconds(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufTimestamp) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufTimestamp",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufTimestamp"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Seconds, nil
 	})
@@ -5913,7 +5499,6 @@ func (ec *executionContext) _GoogleProtobufTimestamp_seconds(ctx context.Context
 		return graphql.Null
 	}
 	res := resTmp.(*int)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -5921,12 +5506,12 @@ func (ec *executionContext) _GoogleProtobufTimestamp_seconds(ctx context.Context
 }
 
 func (ec *executionContext) _GoogleProtobufTimestamp_nanos(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufTimestamp) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufTimestamp",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufTimestamp"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Nanos, nil
 	})
@@ -5934,7 +5519,6 @@ func (ec *executionContext) _GoogleProtobufTimestamp_nanos(ctx context.Context,
 		return graphql.Null
 	}
 	res := resTmp.(*int)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -5948,7 +5532,6 @@ func (ec *executionContext) _GoogleProtobufUninterpretedOption(ctx context.Conte
 	fields := graphql.CollectFields(ctx, sel, googleProtobufUninterpretedOptionImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -5974,19 +5557,16 @@ func (ec *executionContext) _GoogleProtobufUninterpretedOption(ctx context.Conte
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufUninterpretedOption_name(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufUninterpretedOption) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufUninterpretedOption",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufUninterpretedOption"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Name, nil
 	})
@@ -6000,7 +5580,6 @@ func (ec *executionContext) _GoogleProtobufUninterpretedOption_name(ctx context.
 			rctx := graphql.GetResolverContext(ctx)
 			rctx.PushIndex(idx1)
 			defer rctx.Pop()
-
 			if res[idx1] == nil {
 				return graphql.Null
 			}
@@ -6011,12 +5590,12 @@ func (ec *executionContext) _GoogleProtobufUninterpretedOption_name(ctx context.
 }
 
 func (ec *executionContext) _GoogleProtobufUninterpretedOption_identifierValue(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufUninterpretedOption) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufUninterpretedOption",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufUninterpretedOption"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.IdentifierValue, nil
 	})
@@ -6024,7 +5603,6 @@ func (ec *executionContext) _GoogleProtobufUninterpretedOption_identifierValue(c
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -6032,12 +5610,12 @@ func (ec *executionContext) _GoogleProtobufUninterpretedOption_identifierValue(c
 }
 
 func (ec *executionContext) _GoogleProtobufUninterpretedOption_positiveIntValue(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufUninterpretedOption) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufUninterpretedOption",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufUninterpretedOption"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.PositiveIntValue, nil
 	})
@@ -6045,7 +5623,6 @@ func (ec *executionContext) _GoogleProtobufUninterpretedOption_positiveIntValue(
 		return graphql.Null
 	}
 	res := resTmp.(*int)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -6053,12 +5630,12 @@ func (ec *executionContext) _GoogleProtobufUninterpretedOption_positiveIntValue(
 }
 
 func (ec *executionContext) _GoogleProtobufUninterpretedOption_negativeIntValue(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufUninterpretedOption) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufUninterpretedOption",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufUninterpretedOption"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.NegativeIntValue, nil
 	})
@@ -6066,7 +5643,6 @@ func (ec *executionContext) _GoogleProtobufUninterpretedOption_negativeIntValue(
 		return graphql.Null
 	}
 	res := resTmp.(*int)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -6074,12 +5650,12 @@ func (ec *executionContext) _GoogleProtobufUninterpretedOption_negativeIntValue(
 }
 
 func (ec *executionContext) _GoogleProtobufUninterpretedOption_doubleValue(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufUninterpretedOption) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufUninterpretedOption",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufUninterpretedOption"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.DoubleValue, nil
 	})
@@ -6087,7 +5663,6 @@ func (ec *executionContext) _GoogleProtobufUninterpretedOption_doubleValue(ctx c
 		return graphql.Null
 	}
 	res := resTmp.(*float64)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -6095,12 +5670,12 @@ func (ec *executionContext) _GoogleProtobufUninterpretedOption_doubleValue(ctx c
 }
 
 func (ec *executionContext) _GoogleProtobufUninterpretedOption_stringValue(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufUninterpretedOption) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufUninterpretedOption",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufUninterpretedOption"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.StringValue, nil
 	})
@@ -6108,7 +5683,6 @@ func (ec *executionContext) _GoogleProtobufUninterpretedOption_stringValue(ctx c
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -6116,12 +5690,12 @@ func (ec *executionContext) _GoogleProtobufUninterpretedOption_stringValue(ctx c
 }
 
 func (ec *executionContext) _GoogleProtobufUninterpretedOption_aggregateValue(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufUninterpretedOption) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufUninterpretedOption",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufUninterpretedOption"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.AggregateValue, nil
 	})
@@ -6129,7 +5703,6 @@ func (ec *executionContext) _GoogleProtobufUninterpretedOption_aggregateValue(ct
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -6143,7 +5716,6 @@ func (ec *executionContext) _GoogleProtobufUninterpretedOptionNamePart(ctx conte
 	fields := graphql.CollectFields(ctx, sel, googleProtobufUninterpretedOptionNamePartImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -6159,19 +5731,16 @@ func (ec *executionContext) _GoogleProtobufUninterpretedOptionNamePart(ctx conte
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) _GoogleProtobufUninterpretedOptionNamePart_namePart(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufUninterpretedOptionNamePart) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufUninterpretedOptionNamePart",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufUninterpretedOptionNamePart"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.NamePart, nil
 	})
@@ -6179,7 +5748,6 @@ func (ec *executionContext) _GoogleProtobufUninterpretedOptionNamePart_namePart(
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -6187,12 +5755,12 @@ func (ec *executionContext) _GoogleProtobufUninterpretedOptionNamePart_namePart(
 }
 
 func (ec *executionContext) _GoogleProtobufUninterpretedOptionNamePart_isExtension(ctx context.Context, field graphql.CollectedField, obj *model.GoogleProtobufUninterpretedOptionNamePart) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "GoogleProtobufUninterpretedOptionNamePart",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "GoogleProtobufUninterpretedOptionNamePart"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.IsExtension, nil
 	})
@@ -6200,7 +5768,6 @@ func (ec *executionContext) _GoogleProtobufUninterpretedOptionNamePart_isExtensi
 		return graphql.Null
 	}
 	res := resTmp.(*bool)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -6218,7 +5785,6 @@ func (ec *executionContext) _Mutation(ctx context.Context, sel ast.SelectionSet)
 	})
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -6244,9 +5810,6 @@ func (ec *executionContext) _Mutation(ctx context.Context, sel ast.SelectionSet)
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
@@ -6278,12 +5841,12 @@ func (ec *executionContext) _Mutation_ContactRequest(ctx context.Context, field
 		}
 	}
 	args["introText"] = arg1
-	rctx := &graphql.ResolverContext{
-		Object: "Mutation",
-		Args:   args,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "Mutation"
+	rctx.Args = args
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return ec.resolvers.Mutation().ContactRequest(ctx, args["contactID"].(string), args["introText"].(*string))
 	})
@@ -6291,7 +5854,6 @@ func (ec *executionContext) _Mutation_ContactRequest(ctx context.Context, field
 		return graphql.Null
 	}
 	res := resTmp.(*model.BertyEntityContact)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -6311,12 +5873,12 @@ func (ec *executionContext) _Mutation_ContactRemove(ctx context.Context, field g
 		}
 	}
 	args["contactID"] = arg0
-	rctx := &graphql.ResolverContext{
-		Object: "Mutation",
-		Args:   args,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "Mutation"
+	rctx.Args = args
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return ec.resolvers.Mutation().ContactRemove(ctx, args["contactID"].(string))
 	})
@@ -6324,7 +5886,6 @@ func (ec *executionContext) _Mutation_ContactRemove(ctx context.Context, field g
 		return graphql.Null
 	}
 	res := resTmp.(*model.BertyEntityContact)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -6359,12 +5920,12 @@ func (ec *executionContext) _Mutation_ContactUpdate(ctx context.Context, field g
 		}
 	}
 	args["displayName"] = arg1
-	rctx := &graphql.ResolverContext{
-		Object: "Mutation",
-		Args:   args,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "Mutation"
+	rctx.Args = args
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return ec.resolvers.Mutation().ContactUpdate(ctx, args["contactID"].(string), args["displayName"].(*string))
 	})
@@ -6372,7 +5933,6 @@ func (ec *executionContext) _Mutation_ContactUpdate(ctx context.Context, field g
 		return graphql.Null
 	}
 	res := resTmp.(*model.BertyEntityContact)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -6403,12 +5963,12 @@ func (ec *executionContext) _Mutation_ConversationCreate(ctx context.Context, fi
 		}
 	}
 	args["contactsID"] = arg0
-	rctx := &graphql.ResolverContext{
-		Object: "Mutation",
-		Args:   args,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "Mutation"
+	rctx.Args = args
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return ec.resolvers.Mutation().ConversationCreate(ctx, args["contactsID"].([]string))
 	})
@@ -6416,7 +5976,6 @@ func (ec *executionContext) _Mutation_ConversationCreate(ctx context.Context, fi
 		return graphql.Null
 	}
 	res := resTmp.(*model.BertyEntityConversation)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -6457,12 +6016,12 @@ func (ec *executionContext) _Mutation_ConversationInvite(ctx context.Context, fi
 		}
 	}
 	args["contactsID"] = arg1
-	rctx := &graphql.ResolverContext{
-		Object: "Mutation",
-		Args:   args,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "Mutation"
+	rctx.Args = args
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return ec.resolvers.Mutation().ConversationInvite(ctx, args["conversationID"].(string), args["contactsID"].([]string))
 	})
@@ -6470,7 +6029,6 @@ func (ec *executionContext) _Mutation_ConversationInvite(ctx context.Context, fi
 		return graphql.Null
 	}
 	res := resTmp.(*model.BertyEntityConversation)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -6511,12 +6069,12 @@ func (ec *executionContext) _Mutation_ConversationExclude(ctx context.Context, f
 		}
 	}
 	args["contactsID"] = arg1
-	rctx := &graphql.ResolverContext{
-		Object: "Mutation",
-		Args:   args,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "Mutation"
+	rctx.Args = args
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return ec.resolvers.Mutation().ConversationExclude(ctx, args["conversationID"].(string), args["contactsID"].([]string))
 	})
@@ -6524,7 +6082,6 @@ func (ec *executionContext) _Mutation_ConversationExclude(ctx context.Context, f
 		return graphql.Null
 	}
 	res := resTmp.(*model.BertyEntityConversation)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -6554,12 +6111,12 @@ func (ec *executionContext) _Mutation_ConversationAddMessage(ctx context.Context
 		}
 	}
 	args["message"] = arg1
-	rctx := &graphql.ResolverContext{
-		Object: "Mutation",
-		Args:   args,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "Mutation"
+	rctx.Args = args
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return ec.resolvers.Mutation().ConversationAddMessage(ctx, args["conversationID"].(string), args["message"].(string))
 	})
@@ -6567,7 +6124,6 @@ func (ec *executionContext) _Mutation_ConversationAddMessage(ctx context.Context
 		return graphql.Null
 	}
 	res := resTmp.(*model.BertyP2pEvent)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -6584,9 +6140,7 @@ func (ec *executionContext) _Query(ctx context.Context, sel ast.SelectionSet) gr
 		Object: "Query",
 	})
 
-	var wg sync.WaitGroup
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -6594,23 +6148,11 @@ func (ec *executionContext) _Query(ctx context.Context, sel ast.SelectionSet) gr
 		case "__typename":
 			out.Values[i] = graphql.MarshalString("Query")
 		case "EventList":
-			wg.Add(1)
-			go func(i int, field graphql.CollectedField) {
-				out.Values[i] = ec._Query_EventList(ctx, field)
-				wg.Done()
-			}(i, field)
+			out.Values[i] = ec._Query_EventList(ctx, field)
 		case "ContactList":
-			wg.Add(1)
-			go func(i int, field graphql.CollectedField) {
-				out.Values[i] = ec._Query_ContactList(ctx, field)
-				wg.Done()
-			}(i, field)
+			out.Values[i] = ec._Query_ContactList(ctx, field)
 		case "ConversationList":
-			wg.Add(1)
-			go func(i int, field graphql.CollectedField) {
-				out.Values[i] = ec._Query_ConversationList(ctx, field)
-				wg.Done()
-			}(i, field)
+			out.Values[i] = ec._Query_ConversationList(ctx, field)
 		case "__type":
 			out.Values[i] = ec._Query___type(ctx, field)
 		case "__schema":
@@ -6619,10 +6161,7 @@ func (ec *executionContext) _Query(ctx context.Context, sel ast.SelectionSet) gr
 			panic("unknown field " + strconv.Quote(field.Name))
 		}
 	}
-	wg.Wait()
-	if invalid {
-		return graphql.Null
-	}
+
 	return out
 }
 
@@ -6644,93 +6183,117 @@ func (ec *executionContext) _Query_EventList(ctx context.Context, field graphql.
 		}
 	}
 	args["limit"] = arg0
-	rctx := &graphql.ResolverContext{
+	ctx = graphql.WithResolverContext(ctx, &graphql.ResolverContext{
 		Object: "Query",
 		Args:   args,
 		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
-	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
-		return ec.resolvers.Query().EventList(ctx, args["limit"].(*int))
 	})
-	if resTmp == nil {
-		return graphql.Null
-	}
-	res := resTmp.([]*model.BertyP2pEvent)
-	arr1 := graphql.Array{}
-	for idx1 := range res {
-		arr1 = append(arr1, func() graphql.Marshaler {
-			rctx := graphql.GetResolverContext(ctx)
-			rctx.PushIndex(idx1)
-			defer rctx.Pop()
-
-			if res[idx1] == nil {
-				return graphql.Null
+	return graphql.Defer(func() (ret graphql.Marshaler) {
+		defer func() {
+			if r := recover(); r != nil {
+				userErr := ec.Recover(ctx, r)
+				ec.Error(ctx, userErr)
+				ret = graphql.Null
 			}
-			return ec._BertyP2pEvent(ctx, field.Selections, res[idx1])
-		}())
-	}
-	return arr1
+		}()
+
+		resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
+			return ec.resolvers.Query().EventList(ctx, args["limit"].(*int))
+		})
+		if resTmp == nil {
+			return graphql.Null
+		}
+		res := resTmp.([]*model.BertyP2pEvent)
+		arr1 := graphql.Array{}
+		for idx1 := range res {
+			arr1 = append(arr1, func() graphql.Marshaler {
+				rctx := graphql.GetResolverContext(ctx)
+				rctx.PushIndex(idx1)
+				defer rctx.Pop()
+				if res[idx1] == nil {
+					return graphql.Null
+				}
+				return ec._BertyP2pEvent(ctx, field.Selections, res[idx1])
+			}())
+		}
+		return arr1
+	})
 }
 
 func (ec *executionContext) _Query_ContactList(ctx context.Context, field graphql.CollectedField) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
+	ctx = graphql.WithResolverContext(ctx, &graphql.ResolverContext{
 		Object: "Query",
 		Args:   nil,
 		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
-	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
-		return ec.resolvers.Query().ContactList(ctx)
 	})
-	if resTmp == nil {
-		return graphql.Null
-	}
-	res := resTmp.([]*model.BertyEntityContact)
-	arr1 := graphql.Array{}
-	for idx1 := range res {
-		arr1 = append(arr1, func() graphql.Marshaler {
-			rctx := graphql.GetResolverContext(ctx)
-			rctx.PushIndex(idx1)
-			defer rctx.Pop()
-
-			if res[idx1] == nil {
-				return graphql.Null
+	return graphql.Defer(func() (ret graphql.Marshaler) {
+		defer func() {
+			if r := recover(); r != nil {
+				userErr := ec.Recover(ctx, r)
+				ec.Error(ctx, userErr)
+				ret = graphql.Null
 			}
-			return ec._BertyEntityContact(ctx, field.Selections, res[idx1])
-		}())
-	}
-	return arr1
+		}()
+
+		resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
+			return ec.resolvers.Query().ContactList(ctx)
+		})
+		if resTmp == nil {
+			return graphql.Null
+		}
+		res := resTmp.([]*model.BertyEntityContact)
+		arr1 := graphql.Array{}
+		for idx1 := range res {
+			arr1 = append(arr1, func() graphql.Marshaler {
+				rctx := graphql.GetResolverContext(ctx)
+				rctx.PushIndex(idx1)
+				defer rctx.Pop()
+				if res[idx1] == nil {
+					return graphql.Null
+				}
+				return ec._BertyEntityContact(ctx, field.Selections, res[idx1])
+			}())
+		}
+		return arr1
+	})
 }
 
 func (ec *executionContext) _Query_ConversationList(ctx context.Context, field graphql.CollectedField) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
+	ctx = graphql.WithResolverContext(ctx, &graphql.ResolverContext{
 		Object: "Query",
 		Args:   nil,
 		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
-	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
-		return ec.resolvers.Query().ConversationList(ctx)
 	})
-	if resTmp == nil {
-		return graphql.Null
-	}
-	res := resTmp.([]*model.BertyEntityConversation)
-	arr1 := graphql.Array{}
-	for idx1 := range res {
-		arr1 = append(arr1, func() graphql.Marshaler {
-			rctx := graphql.GetResolverContext(ctx)
-			rctx.PushIndex(idx1)
-			defer rctx.Pop()
-
-			if res[idx1] == nil {
-				return graphql.Null
+	return graphql.Defer(func() (ret graphql.Marshaler) {
+		defer func() {
+			if r := recover(); r != nil {
+				userErr := ec.Recover(ctx, r)
+				ec.Error(ctx, userErr)
+				ret = graphql.Null
 			}
-			return ec._BertyEntityConversation(ctx, field.Selections, res[idx1])
-		}())
-	}
-	return arr1
+		}()
+
+		resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
+			return ec.resolvers.Query().ConversationList(ctx)
+		})
+		if resTmp == nil {
+			return graphql.Null
+		}
+		res := resTmp.([]*model.BertyEntityConversation)
+		arr1 := graphql.Array{}
+		for idx1 := range res {
+			arr1 = append(arr1, func() graphql.Marshaler {
+				rctx := graphql.GetResolverContext(ctx)
+				rctx.PushIndex(idx1)
+				defer rctx.Pop()
+				if res[idx1] == nil {
+					return graphql.Null
+				}
+				return ec._BertyEntityConversation(ctx, field.Selections, res[idx1])
+			}())
+		}
+		return arr1
+	})
 }
 
 func (ec *executionContext) _Query___type(ctx context.Context, field graphql.CollectedField) graphql.Marshaler {
@@ -6746,12 +6309,12 @@ func (ec *executionContext) _Query___type(ctx context.Context, field graphql.Col
 		}
 	}
 	args["name"] = arg0
-	rctx := &graphql.ResolverContext{
-		Object: "Query",
-		Args:   args,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "Query"
+	rctx.Args = args
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return ec.introspectType(args["name"].(string)), nil
 	})
@@ -6759,7 +6322,6 @@ func (ec *executionContext) _Query___type(ctx context.Context, field graphql.Col
 		return graphql.Null
 	}
 	res := resTmp.(*introspection.Type)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -6767,12 +6329,12 @@ func (ec *executionContext) _Query___type(ctx context.Context, field graphql.Col
 }
 
 func (ec *executionContext) _Query___schema(ctx context.Context, field graphql.CollectedField) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "Query",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "Query"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return ec.introspectSchema(), nil
 	})
@@ -6780,7 +6342,6 @@ func (ec *executionContext) _Query___schema(ctx context.Context, field graphql.C
 		return graphql.Null
 	}
 	res := resTmp.(*introspection.Schema)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -6838,7 +6399,6 @@ func (ec *executionContext) ___Directive(ctx context.Context, sel ast.SelectionS
 	fields := graphql.CollectFields(ctx, sel, __DirectiveImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -6847,46 +6407,31 @@ func (ec *executionContext) ___Directive(ctx context.Context, sel ast.SelectionS
 			out.Values[i] = graphql.MarshalString("__Directive")
 		case "name":
 			out.Values[i] = ec.___Directive_name(ctx, field, obj)
-			if out.Values[i] == graphql.Null {
-				invalid = true
-			}
 		case "description":
 			out.Values[i] = ec.___Directive_description(ctx, field, obj)
 		case "locations":
 			out.Values[i] = ec.___Directive_locations(ctx, field, obj)
-			if out.Values[i] == graphql.Null {
-				invalid = true
-			}
 		case "args":
 			out.Values[i] = ec.___Directive_args(ctx, field, obj)
-			if out.Values[i] == graphql.Null {
-				invalid = true
-			}
 		default:
 			panic("unknown field " + strconv.Quote(field.Name))
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) ___Directive_name(ctx context.Context, field graphql.CollectedField, obj *introspection.Directive) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__Directive",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Directive"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Name, nil
 	})
 	if resTmp == nil {
-		if !ec.HasError(rctx) {
-			ec.Errorf(ctx, "must not be null")
-		}
 		return graphql.Null
 	}
 	res := resTmp.(string)
@@ -6894,12 +6439,12 @@ func (ec *executionContext) ___Directive_name(ctx context.Context, field graphql
 }
 
 func (ec *executionContext) ___Directive_description(ctx context.Context, field graphql.CollectedField, obj *introspection.Directive) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__Directive",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Directive"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Description, nil
 	})
@@ -6911,19 +6456,16 @@ func (ec *executionContext) ___Directive_description(ctx context.Context, field
 }
 
 func (ec *executionContext) ___Directive_locations(ctx context.Context, field graphql.CollectedField, obj *introspection.Directive) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__Directive",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Directive"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Locations, nil
 	})
 	if resTmp == nil {
-		if !ec.HasError(rctx) {
-			ec.Errorf(ctx, "must not be null")
-		}
 		return graphql.Null
 	}
 	res := resTmp.([]string)
@@ -6940,19 +6482,16 @@ func (ec *executionContext) ___Directive_locations(ctx context.Context, field gr
 }
 
 func (ec *executionContext) ___Directive_args(ctx context.Context, field graphql.CollectedField, obj *introspection.Directive) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__Directive",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Directive"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Args, nil
 	})
 	if resTmp == nil {
-		if !ec.HasError(rctx) {
-			ec.Errorf(ctx, "must not be null")
-		}
 		return graphql.Null
 	}
 	res := resTmp.([]introspection.InputValue)
@@ -6975,7 +6514,6 @@ func (ec *executionContext) ___EnumValue(ctx context.Context, sel ast.SelectionS
 	fields := graphql.CollectFields(ctx, sel, __EnumValueImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -6984,16 +6522,10 @@ func (ec *executionContext) ___EnumValue(ctx context.Context, sel ast.SelectionS
 			out.Values[i] = graphql.MarshalString("__EnumValue")
 		case "name":
 			out.Values[i] = ec.___EnumValue_name(ctx, field, obj)
-			if out.Values[i] == graphql.Null {
-				invalid = true
-			}
 		case "description":
 			out.Values[i] = ec.___EnumValue_description(ctx, field, obj)
 		case "isDeprecated":
 			out.Values[i] = ec.___EnumValue_isDeprecated(ctx, field, obj)
-			if out.Values[i] == graphql.Null {
-				invalid = true
-			}
 		case "deprecationReason":
 			out.Values[i] = ec.___EnumValue_deprecationReason(ctx, field, obj)
 		default:
@@ -7001,26 +6533,20 @@ func (ec *executionContext) ___EnumValue(ctx context.Context, sel ast.SelectionS
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) ___EnumValue_name(ctx context.Context, field graphql.CollectedField, obj *introspection.EnumValue) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__EnumValue",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__EnumValue"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Name, nil
 	})
 	if resTmp == nil {
-		if !ec.HasError(rctx) {
-			ec.Errorf(ctx, "must not be null")
-		}
 		return graphql.Null
 	}
 	res := resTmp.(string)
@@ -7028,12 +6554,12 @@ func (ec *executionContext) ___EnumValue_name(ctx context.Context, field graphql
 }
 
 func (ec *executionContext) ___EnumValue_description(ctx context.Context, field graphql.CollectedField, obj *introspection.EnumValue) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__EnumValue",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__EnumValue"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Description, nil
 	})
@@ -7045,19 +6571,16 @@ func (ec *executionContext) ___EnumValue_description(ctx context.Context, field
 }
 
 func (ec *executionContext) ___EnumValue_isDeprecated(ctx context.Context, field graphql.CollectedField, obj *introspection.EnumValue) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__EnumValue",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__EnumValue"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.IsDeprecated, nil
 	})
 	if resTmp == nil {
-		if !ec.HasError(rctx) {
-			ec.Errorf(ctx, "must not be null")
-		}
 		return graphql.Null
 	}
 	res := resTmp.(bool)
@@ -7065,12 +6588,12 @@ func (ec *executionContext) ___EnumValue_isDeprecated(ctx context.Context, field
 }
 
 func (ec *executionContext) ___EnumValue_deprecationReason(ctx context.Context, field graphql.CollectedField, obj *introspection.EnumValue) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__EnumValue",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__EnumValue"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.DeprecationReason, nil
 	})
@@ -7088,7 +6611,6 @@ func (ec *executionContext) ___Field(ctx context.Context, sel ast.SelectionSet,
 	fields := graphql.CollectFields(ctx, sel, __FieldImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -7097,26 +6619,14 @@ func (ec *executionContext) ___Field(ctx context.Context, sel ast.SelectionSet,
 			out.Values[i] = graphql.MarshalString("__Field")
 		case "name":
 			out.Values[i] = ec.___Field_name(ctx, field, obj)
-			if out.Values[i] == graphql.Null {
-				invalid = true
-			}
 		case "description":
 			out.Values[i] = ec.___Field_description(ctx, field, obj)
 		case "args":
 			out.Values[i] = ec.___Field_args(ctx, field, obj)
-			if out.Values[i] == graphql.Null {
-				invalid = true
-			}
 		case "type":
 			out.Values[i] = ec.___Field_type(ctx, field, obj)
-			if out.Values[i] == graphql.Null {
-				invalid = true
-			}
 		case "isDeprecated":
 			out.Values[i] = ec.___Field_isDeprecated(ctx, field, obj)
-			if out.Values[i] == graphql.Null {
-				invalid = true
-			}
 		case "deprecationReason":
 			out.Values[i] = ec.___Field_deprecationReason(ctx, field, obj)
 		default:
@@ -7124,26 +6634,20 @@ func (ec *executionContext) ___Field(ctx context.Context, sel ast.SelectionSet,
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) ___Field_name(ctx context.Context, field graphql.CollectedField, obj *introspection.Field) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__Field",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Field"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Name, nil
 	})
 	if resTmp == nil {
-		if !ec.HasError(rctx) {
-			ec.Errorf(ctx, "must not be null")
-		}
 		return graphql.Null
 	}
 	res := resTmp.(string)
@@ -7151,12 +6655,12 @@ func (ec *executionContext) ___Field_name(ctx context.Context, field graphql.Col
 }
 
 func (ec *executionContext) ___Field_description(ctx context.Context, field graphql.CollectedField, obj *introspection.Field) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__Field",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Field"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Description, nil
 	})
@@ -7168,19 +6672,16 @@ func (ec *executionContext) ___Field_description(ctx context.Context, field grap
 }
 
 func (ec *executionContext) ___Field_args(ctx context.Context, field graphql.CollectedField, obj *introspection.Field) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__Field",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Field"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Args, nil
 	})
 	if resTmp == nil {
-		if !ec.HasError(rctx) {
-			ec.Errorf(ctx, "must not be null")
-		}
 		return graphql.Null
 	}
 	res := resTmp.([]introspection.InputValue)
@@ -7197,46 +6698,36 @@ func (ec *executionContext) ___Field_args(ctx context.Context, field graphql.Col
 }
 
 func (ec *executionContext) ___Field_type(ctx context.Context, field graphql.CollectedField, obj *introspection.Field) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__Field",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Field"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Type, nil
 	})
 	if resTmp == nil {
-		if !ec.HasError(rctx) {
-			ec.Errorf(ctx, "must not be null")
-		}
 		return graphql.Null
 	}
 	res := resTmp.(*introspection.Type)
-
 	if res == nil {
-		if !ec.HasError(rctx) {
-			ec.Errorf(ctx, "must not be null")
-		}
 		return graphql.Null
 	}
 	return ec.___Type(ctx, field.Selections, res)
 }
 
 func (ec *executionContext) ___Field_isDeprecated(ctx context.Context, field graphql.CollectedField, obj *introspection.Field) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__Field",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Field"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.IsDeprecated, nil
 	})
 	if resTmp == nil {
-		if !ec.HasError(rctx) {
-			ec.Errorf(ctx, "must not be null")
-		}
 		return graphql.Null
 	}
 	res := resTmp.(bool)
@@ -7244,12 +6735,12 @@ func (ec *executionContext) ___Field_isDeprecated(ctx context.Context, field gra
 }
 
 func (ec *executionContext) ___Field_deprecationReason(ctx context.Context, field graphql.CollectedField, obj *introspection.Field) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__Field",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Field"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.DeprecationReason, nil
 	})
@@ -7267,7 +6758,6 @@ func (ec *executionContext) ___InputValue(ctx context.Context, sel ast.Selection
 	fields := graphql.CollectFields(ctx, sel, __InputValueImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -7276,16 +6766,10 @@ func (ec *executionContext) ___InputValue(ctx context.Context, sel ast.Selection
 			out.Values[i] = graphql.MarshalString("__InputValue")
 		case "name":
 			out.Values[i] = ec.___InputValue_name(ctx, field, obj)
-			if out.Values[i] == graphql.Null {
-				invalid = true
-			}
 		case "description":
 			out.Values[i] = ec.___InputValue_description(ctx, field, obj)
 		case "type":
 			out.Values[i] = ec.___InputValue_type(ctx, field, obj)
-			if out.Values[i] == graphql.Null {
-				invalid = true
-			}
 		case "defaultValue":
 			out.Values[i] = ec.___InputValue_defaultValue(ctx, field, obj)
 		default:
@@ -7293,26 +6777,20 @@ func (ec *executionContext) ___InputValue(ctx context.Context, sel ast.Selection
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) ___InputValue_name(ctx context.Context, field graphql.CollectedField, obj *introspection.InputValue) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__InputValue",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__InputValue"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Name, nil
 	})
 	if resTmp == nil {
-		if !ec.HasError(rctx) {
-			ec.Errorf(ctx, "must not be null")
-		}
 		return graphql.Null
 	}
 	res := resTmp.(string)
@@ -7320,12 +6798,12 @@ func (ec *executionContext) ___InputValue_name(ctx context.Context, field graphq
 }
 
 func (ec *executionContext) ___InputValue_description(ctx context.Context, field graphql.CollectedField, obj *introspection.InputValue) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__InputValue",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__InputValue"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Description, nil
 	})
@@ -7337,39 +6815,32 @@ func (ec *executionContext) ___InputValue_description(ctx context.Context, field
 }
 
 func (ec *executionContext) ___InputValue_type(ctx context.Context, field graphql.CollectedField, obj *introspection.InputValue) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__InputValue",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__InputValue"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Type, nil
 	})
 	if resTmp == nil {
-		if !ec.HasError(rctx) {
-			ec.Errorf(ctx, "must not be null")
-		}
 		return graphql.Null
 	}
 	res := resTmp.(*introspection.Type)
-
 	if res == nil {
-		if !ec.HasError(rctx) {
-			ec.Errorf(ctx, "must not be null")
-		}
 		return graphql.Null
 	}
 	return ec.___Type(ctx, field.Selections, res)
 }
 
 func (ec *executionContext) ___InputValue_defaultValue(ctx context.Context, field graphql.CollectedField, obj *introspection.InputValue) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__InputValue",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__InputValue"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.DefaultValue, nil
 	})
@@ -7377,7 +6848,6 @@ func (ec *executionContext) ___InputValue_defaultValue(ctx context.Context, fiel
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -7391,7 +6861,6 @@ func (ec *executionContext) ___Schema(ctx context.Context, sel ast.SelectionSet,
 	fields := graphql.CollectFields(ctx, sel, __SchemaImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -7400,48 +6869,33 @@ func (ec *executionContext) ___Schema(ctx context.Context, sel ast.SelectionSet,
 			out.Values[i] = graphql.MarshalString("__Schema")
 		case "types":
 			out.Values[i] = ec.___Schema_types(ctx, field, obj)
-			if out.Values[i] == graphql.Null {
-				invalid = true
-			}
 		case "queryType":
 			out.Values[i] = ec.___Schema_queryType(ctx, field, obj)
-			if out.Values[i] == graphql.Null {
-				invalid = true
-			}
 		case "mutationType":
 			out.Values[i] = ec.___Schema_mutationType(ctx, field, obj)
 		case "subscriptionType":
 			out.Values[i] = ec.___Schema_subscriptionType(ctx, field, obj)
 		case "directives":
 			out.Values[i] = ec.___Schema_directives(ctx, field, obj)
-			if out.Values[i] == graphql.Null {
-				invalid = true
-			}
 		default:
 			panic("unknown field " + strconv.Quote(field.Name))
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) ___Schema_types(ctx context.Context, field graphql.CollectedField, obj *introspection.Schema) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__Schema",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Schema"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Types(), nil
 	})
 	if resTmp == nil {
-		if !ec.HasError(rctx) {
-			ec.Errorf(ctx, "must not be null")
-		}
 		return graphql.Null
 	}
 	res := resTmp.([]introspection.Type)
@@ -7458,39 +6912,32 @@ func (ec *executionContext) ___Schema_types(ctx context.Context, field graphql.C
 }
 
 func (ec *executionContext) ___Schema_queryType(ctx context.Context, field graphql.CollectedField, obj *introspection.Schema) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__Schema",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Schema"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.QueryType(), nil
 	})
 	if resTmp == nil {
-		if !ec.HasError(rctx) {
-			ec.Errorf(ctx, "must not be null")
-		}
 		return graphql.Null
 	}
 	res := resTmp.(*introspection.Type)
-
 	if res == nil {
-		if !ec.HasError(rctx) {
-			ec.Errorf(ctx, "must not be null")
-		}
 		return graphql.Null
 	}
 	return ec.___Type(ctx, field.Selections, res)
 }
 
 func (ec *executionContext) ___Schema_mutationType(ctx context.Context, field graphql.CollectedField, obj *introspection.Schema) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__Schema",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Schema"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.MutationType(), nil
 	})
@@ -7498,7 +6945,6 @@ func (ec *executionContext) ___Schema_mutationType(ctx context.Context, field gr
 		return graphql.Null
 	}
 	res := resTmp.(*introspection.Type)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -7506,12 +6952,12 @@ func (ec *executionContext) ___Schema_mutationType(ctx context.Context, field gr
 }
 
 func (ec *executionContext) ___Schema_subscriptionType(ctx context.Context, field graphql.CollectedField, obj *introspection.Schema) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__Schema",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Schema"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.SubscriptionType(), nil
 	})
@@ -7519,7 +6965,6 @@ func (ec *executionContext) ___Schema_subscriptionType(ctx context.Context, fiel
 		return graphql.Null
 	}
 	res := resTmp.(*introspection.Type)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -7527,19 +6972,16 @@ func (ec *executionContext) ___Schema_subscriptionType(ctx context.Context, fiel
 }
 
 func (ec *executionContext) ___Schema_directives(ctx context.Context, field graphql.CollectedField, obj *introspection.Schema) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__Schema",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Schema"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Directives(), nil
 	})
 	if resTmp == nil {
-		if !ec.HasError(rctx) {
-			ec.Errorf(ctx, "must not be null")
-		}
 		return graphql.Null
 	}
 	res := resTmp.([]introspection.Directive)
@@ -7562,7 +7004,6 @@ func (ec *executionContext) ___Type(ctx context.Context, sel ast.SelectionSet, o
 	fields := graphql.CollectFields(ctx, sel, __TypeImplementors)
 
 	out := graphql.NewOrderedMap(len(fields))
-	invalid := false
 	for i, field := range fields {
 		out.Keys[i] = field.Alias
 
@@ -7571,9 +7012,6 @@ func (ec *executionContext) ___Type(ctx context.Context, sel ast.SelectionSet, o
 			out.Values[i] = graphql.MarshalString("__Type")
 		case "kind":
 			out.Values[i] = ec.___Type_kind(ctx, field, obj)
-			if out.Values[i] == graphql.Null {
-				invalid = true
-			}
 		case "name":
 			out.Values[i] = ec.___Type_name(ctx, field, obj)
 		case "description":
@@ -7595,26 +7033,20 @@ func (ec *executionContext) ___Type(ctx context.Context, sel ast.SelectionSet, o
 		}
 	}
 
-	if invalid {
-		return graphql.Null
-	}
 	return out
 }
 
 func (ec *executionContext) ___Type_kind(ctx context.Context, field graphql.CollectedField, obj *introspection.Type) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__Type",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Type"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Kind(), nil
 	})
 	if resTmp == nil {
-		if !ec.HasError(rctx) {
-			ec.Errorf(ctx, "must not be null")
-		}
 		return graphql.Null
 	}
 	res := resTmp.(string)
@@ -7622,12 +7054,12 @@ func (ec *executionContext) ___Type_kind(ctx context.Context, field graphql.Coll
 }
 
 func (ec *executionContext) ___Type_name(ctx context.Context, field graphql.CollectedField, obj *introspection.Type) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__Type",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Type"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Name(), nil
 	})
@@ -7635,7 +7067,6 @@ func (ec *executionContext) ___Type_name(ctx context.Context, field graphql.Coll
 		return graphql.Null
 	}
 	res := resTmp.(*string)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -7643,12 +7074,12 @@ func (ec *executionContext) ___Type_name(ctx context.Context, field graphql.Coll
 }
 
 func (ec *executionContext) ___Type_description(ctx context.Context, field graphql.CollectedField, obj *introspection.Type) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__Type",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Type"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Description(), nil
 	})
@@ -7672,12 +7103,12 @@ func (ec *executionContext) ___Type_fields(ctx context.Context, field graphql.Co
 		}
 	}
 	args["includeDeprecated"] = arg0
-	rctx := &graphql.ResolverContext{
-		Object: "__Type",
-		Args:   args,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Type"
+	rctx.Args = args
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Fields(args["includeDeprecated"].(bool)), nil
 	})
@@ -7698,12 +7129,12 @@ func (ec *executionContext) ___Type_fields(ctx context.Context, field graphql.Co
 }
 
 func (ec *executionContext) ___Type_interfaces(ctx context.Context, field graphql.CollectedField, obj *introspection.Type) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__Type",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Type"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.Interfaces(), nil
 	})
@@ -7724,12 +7155,12 @@ func (ec *executionContext) ___Type_interfaces(ctx context.Context, field graphq
 }
 
 func (ec *executionContext) ___Type_possibleTypes(ctx context.Context, field graphql.CollectedField, obj *introspection.Type) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__Type",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Type"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.PossibleTypes(), nil
 	})
@@ -7762,12 +7193,12 @@ func (ec *executionContext) ___Type_enumValues(ctx context.Context, field graphq
 		}
 	}
 	args["includeDeprecated"] = arg0
-	rctx := &graphql.ResolverContext{
-		Object: "__Type",
-		Args:   args,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Type"
+	rctx.Args = args
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.EnumValues(args["includeDeprecated"].(bool)), nil
 	})
@@ -7788,12 +7219,12 @@ func (ec *executionContext) ___Type_enumValues(ctx context.Context, field graphq
 }
 
 func (ec *executionContext) ___Type_inputFields(ctx context.Context, field graphql.CollectedField, obj *introspection.Type) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__Type",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Type"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.InputFields(), nil
 	})
@@ -7814,12 +7245,12 @@ func (ec *executionContext) ___Type_inputFields(ctx context.Context, field graph
 }
 
 func (ec *executionContext) ___Type_ofType(ctx context.Context, field graphql.CollectedField, obj *introspection.Type) graphql.Marshaler {
-	rctx := &graphql.ResolverContext{
-		Object: "__Type",
-		Args:   nil,
-		Field:  field,
-	}
-	ctx = graphql.WithResolverContext(ctx, rctx)
+	rctx := graphql.GetResolverContext(ctx)
+	rctx.Object = "__Type"
+	rctx.Args = nil
+	rctx.Field = field
+	rctx.PushField(field.Alias)
+	defer rctx.Pop()
 	resTmp := ec.FieldMiddleware(ctx, func(ctx context.Context) (interface{}, error) {
 		return obj.OfType(), nil
 	})
@@ -7827,7 +7258,6 @@ func (ec *executionContext) ___Type_ofType(ctx context.Context, field graphql.Co
 		return graphql.Null
 	}
 	res := resTmp.(*introspection.Type)
-
 	if res == nil {
 		return graphql.Null
 	}
@@ -7843,13 +7273,7 @@ func (ec *executionContext) _Node(ctx context.Context, sel ast.SelectionSet, obj
 	}
 }
 
-func (ec *executionContext) FieldMiddleware(ctx context.Context, next graphql.Resolver) (ret interface{}) {
-	defer func() {
-		if r := recover(); r != nil {
-			ec.Error(ctx, ec.Recover(ctx, r))
-			ret = nil
-		}
-	}()
+func (ec *executionContext) FieldMiddleware(ctx context.Context, next graphql.Resolver) interface{} {
 	res, err := ec.ResolverMiddleware(ctx, next)
 	if err != nil {
 		ec.Error(ctx, err)
@@ -8010,8 +7434,6 @@ type GoogleProtobufFileOptions {
   swiftPrefix: String
   phpClassPrefix: String
   phpNamespace: String
-  phpMetadataNamespace: String
-  rubyPackage: String
   uninterpretedOption: [GoogleProtobufUninterpretedOption]
 }
 enum GoogleProtobufFileOptionsOptimizeMode {
diff --git a/core/api/node/graphql/model/model.gen.go b/core/api/node/graphql/model/model.gen.go
index ff2b8792bb..ec2efd3f50 100644
--- a/core/api/node/graphql/model/model.gen.go
+++ b/core/api/node/graphql/model/model.gen.go
@@ -226,8 +226,6 @@ type GoogleProtobufFileOptions struct {
 	SwiftPrefix               *string                                `json:"swiftPrefix"`
 	PhpClassPrefix            *string                                `json:"phpClassPrefix"`
 	PhpNamespace              *string                                `json:"phpNamespace"`
-	PhpMetadataNamespace      *string                                `json:"phpMetadataNamespace"`
-	RubyPackage               *string                                `json:"rubyPackage"`
 	UninterpretedOption       []*GoogleProtobufUninterpretedOption   `json:"uninterpretedOption"`
 }
 type GoogleProtobufGeneratedCodeInfo struct {
diff --git a/core/api/node/graphql/service.gen.graphql b/core/api/node/graphql/service.gen.graphql
index 364c23ead9..342d6e7ee7 100644
--- a/core/api/node/graphql/service.gen.graphql
+++ b/core/api/node/graphql/service.gen.graphql
@@ -141,8 +141,6 @@ type GoogleProtobufFileOptions {
   swiftPrefix: String
   phpClassPrefix: String
   phpNamespace: String
-  phpMetadataNamespace: String
-  rubyPackage: String
   uninterpretedOption: [GoogleProtobufUninterpretedOption]
 }
 enum GoogleProtobufFileOptionsOptimizeMode {
diff --git a/core/api/node/service.pb.go b/core/api/node/service.pb.go
index 13603ef8b1..93c93adb55 100644
--- a/core/api/node/service.pb.go
+++ b/core/api/node/service.pb.go
@@ -40,7 +40,7 @@ func (m *ContactRequestInput) Reset()         { *m = ContactRequestInput{} }
 func (m *ContactRequestInput) String() string { return proto.CompactTextString(m) }
 func (*ContactRequestInput) ProtoMessage()    {}
 func (*ContactRequestInput) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_8d450ea5586e1555, []int{0}
+	return fileDescriptor_service_69cae59375ea7ee1, []int{0}
 }
 func (m *ContactRequestInput) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -95,7 +95,7 @@ func (m *ConversationAddMessageInput) Reset()         { *m = ConversationAddMess
 func (m *ConversationAddMessageInput) String() string { return proto.CompactTextString(m) }
 func (*ConversationAddMessageInput) ProtoMessage()    {}
 func (*ConversationAddMessageInput) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_8d450ea5586e1555, []int{1}
+	return fileDescriptor_service_69cae59375ea7ee1, []int{1}
 }
 func (m *ConversationAddMessageInput) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -150,7 +150,7 @@ func (m *EventListInput) Reset()         { *m = EventListInput{} }
 func (m *EventListInput) String() string { return proto.CompactTextString(m) }
 func (*EventListInput) ProtoMessage()    {}
 func (*EventListInput) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_8d450ea5586e1555, []int{2}
+	return fileDescriptor_service_69cae59375ea7ee1, []int{2}
 }
 func (m *EventListInput) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -205,7 +205,7 @@ func (m *ConversationManageMembersInput) Reset()         { *m = ConversationMana
 func (m *ConversationManageMembersInput) String() string { return proto.CompactTextString(m) }
 func (*ConversationManageMembersInput) ProtoMessage()    {}
 func (*ConversationManageMembersInput) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_8d450ea5586e1555, []int{3}
+	return fileDescriptor_service_69cae59375ea7ee1, []int{3}
 }
 func (m *ConversationManageMembersInput) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -258,7 +258,7 @@ func (m *Void) Reset()         { *m = Void{} }
 func (m *Void) String() string { return proto.CompactTextString(m) }
 func (*Void) ProtoMessage()    {}
 func (*Void) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_8d450ea5586e1555, []int{4}
+	return fileDescriptor_service_69cae59375ea7ee1, []int{4}
 }
 func (m *Void) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1792,9 +1792,9 @@ var (
 	ErrIntOverflowService   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("api/node/service.proto", fileDescriptor_service_8d450ea5586e1555) }
+func init() { proto.RegisterFile("api/node/service.proto", fileDescriptor_service_69cae59375ea7ee1) }
 
-var fileDescriptor_service_8d450ea5586e1555 = []byte{
+var fileDescriptor_service_69cae59375ea7ee1 = []byte{
 	// 815 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x4f, 0x6f, 0xd3, 0x48,
 	0x14, 0xaf, 0xdb, 0x6d, 0xbb, 0x99, 0xb4, 0x55, 0x35, 0xed, 0x76, 0x63, 0xaf, 0x36, 0xeb, 0xb5,
diff --git a/core/api/p2p/envelope.pb.go b/core/api/p2p/envelope.pb.go
index bffbdb2382..c9bd7338bf 100644
--- a/core/api/p2p/envelope.pb.go
+++ b/core/api/p2p/envelope.pb.go
@@ -34,7 +34,7 @@ func (m *Envelope) Reset()         { *m = Envelope{} }
 func (m *Envelope) String() string { return proto.CompactTextString(m) }
 func (*Envelope) ProtoMessage()    {}
 func (*Envelope) Descriptor() ([]byte, []int) {
-	return fileDescriptor_envelope_b4e7f3ada4734854, []int{0}
+	return fileDescriptor_envelope_011a2c456f5a558d, []int{0}
 }
 func (m *Envelope) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -416,9 +416,9 @@ var (
 	ErrIntOverflowEnvelope   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("api/p2p/envelope.proto", fileDescriptor_envelope_b4e7f3ada4734854) }
+func init() { proto.RegisterFile("api/p2p/envelope.proto", fileDescriptor_envelope_011a2c456f5a558d) }
 
-var fileDescriptor_envelope_b4e7f3ada4734854 = []byte{
+var fileDescriptor_envelope_011a2c456f5a558d = []byte{
 	// 223 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4b, 0x2c, 0xc8, 0xd4,
 	0x2f, 0x30, 0x2a, 0xd0, 0x4f, 0xcd, 0x2b, 0x4b, 0xcd, 0xc9, 0x2f, 0x48, 0xd5, 0x2b, 0x28, 0xca,
diff --git a/core/api/p2p/event.pb.go b/core/api/p2p/event.pb.go
index e6135be5eb..93ea5f729e 100644
--- a/core/api/p2p/event.pb.go
+++ b/core/api/p2p/event.pb.go
@@ -55,7 +55,7 @@ func (x Event_Direction) String() string {
 	return proto.EnumName(Event_Direction_name, int32(x))
 }
 func (Event_Direction) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_event_52523626a99db47b, []int{0, 0}
+	return fileDescriptor_event_83ec8620eb2e71d1, []int{0, 0}
 }
 
 type Event struct {
@@ -103,7 +103,7 @@ func (m *Event) Reset()         { *m = Event{} }
 func (m *Event) String() string { return proto.CompactTextString(m) }
 func (*Event) ProtoMessage()    {}
 func (*Event) Descriptor() ([]byte, []int) {
-	return fileDescriptor_event_52523626a99db47b, []int{0}
+	return fileDescriptor_event_83ec8620eb2e71d1, []int{0}
 }
 func (m *Event) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1022,9 +1022,9 @@ var (
 	ErrIntOverflowEvent   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("api/p2p/event.proto", fileDescriptor_event_52523626a99db47b) }
+func init() { proto.RegisterFile("api/p2p/event.proto", fileDescriptor_event_83ec8620eb2e71d1) }
 
-var fileDescriptor_event_52523626a99db47b = []byte{
+var fileDescriptor_event_83ec8620eb2e71d1 = []byte{
 	// 577 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x4d, 0x6e, 0xd3, 0x40,
 	0x14, 0xc7, 0xeb, 0xd0, 0x36, 0xf6, 0x6b, 0x9b, 0x44, 0x43, 0x04, 0x56, 0x84, 0xe2, 0x28, 0x6c,
diff --git a/core/api/p2p/kind.pb.go b/core/api/p2p/kind.pb.go
index f328644779..2cae4957fe 100644
--- a/core/api/p2p/kind.pb.go
+++ b/core/api/p2p/kind.pb.go
@@ -69,7 +69,7 @@ func (x Kind) String() string {
 	return proto.EnumName(Kind_name, int32(x))
 }
 func (Kind) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_kind_2fb5fcd6d5779d1e, []int{0}
+	return fileDescriptor_kind_241f5d52a928d5de, []int{0}
 }
 
 type SentAttrs struct {
@@ -83,7 +83,7 @@ func (m *SentAttrs) Reset()         { *m = SentAttrs{} }
 func (m *SentAttrs) String() string { return proto.CompactTextString(m) }
 func (*SentAttrs) ProtoMessage()    {}
 func (*SentAttrs) Descriptor() ([]byte, []int) {
-	return fileDescriptor_kind_2fb5fcd6d5779d1e, []int{0}
+	return fileDescriptor_kind_241f5d52a928d5de, []int{0}
 }
 func (m *SentAttrs) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -131,7 +131,7 @@ func (m *AckAttrs) Reset()         { *m = AckAttrs{} }
 func (m *AckAttrs) String() string { return proto.CompactTextString(m) }
 func (*AckAttrs) ProtoMessage()    {}
 func (*AckAttrs) Descriptor() ([]byte, []int) {
-	return fileDescriptor_kind_2fb5fcd6d5779d1e, []int{1}
+	return fileDescriptor_kind_241f5d52a928d5de, []int{1}
 }
 func (m *AckAttrs) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -184,7 +184,7 @@ func (m *PingAttrs) Reset()         { *m = PingAttrs{} }
 func (m *PingAttrs) String() string { return proto.CompactTextString(m) }
 func (*PingAttrs) ProtoMessage()    {}
 func (*PingAttrs) Descriptor() ([]byte, []int) {
-	return fileDescriptor_kind_2fb5fcd6d5779d1e, []int{2}
+	return fileDescriptor_kind_241f5d52a928d5de, []int{2}
 }
 func (m *PingAttrs) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -225,7 +225,7 @@ func (m *ContactRequestAttrs) Reset()         { *m = ContactRequestAttrs{} }
 func (m *ContactRequestAttrs) String() string { return proto.CompactTextString(m) }
 func (*ContactRequestAttrs) ProtoMessage()    {}
 func (*ContactRequestAttrs) Descriptor() ([]byte, []int) {
-	return fileDescriptor_kind_2fb5fcd6d5779d1e, []int{3}
+	return fileDescriptor_kind_241f5d52a928d5de, []int{3}
 }
 func (m *ContactRequestAttrs) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -278,7 +278,7 @@ func (m *ContactRequestAcceptedAttrs) Reset()         { *m = ContactRequestAccep
 func (m *ContactRequestAcceptedAttrs) String() string { return proto.CompactTextString(m) }
 func (*ContactRequestAcceptedAttrs) ProtoMessage()    {}
 func (*ContactRequestAcceptedAttrs) Descriptor() ([]byte, []int) {
-	return fileDescriptor_kind_2fb5fcd6d5779d1e, []int{4}
+	return fileDescriptor_kind_241f5d52a928d5de, []int{4}
 }
 func (m *ContactRequestAcceptedAttrs) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -318,7 +318,7 @@ func (m *ContactShareMeAttrs) Reset()         { *m = ContactShareMeAttrs{} }
 func (m *ContactShareMeAttrs) String() string { return proto.CompactTextString(m) }
 func (*ContactShareMeAttrs) ProtoMessage()    {}
 func (*ContactShareMeAttrs) Descriptor() ([]byte, []int) {
-	return fileDescriptor_kind_2fb5fcd6d5779d1e, []int{5}
+	return fileDescriptor_kind_241f5d52a928d5de, []int{5}
 }
 func (m *ContactShareMeAttrs) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -365,7 +365,7 @@ func (m *ContactShareAttrs) Reset()         { *m = ContactShareAttrs{} }
 func (m *ContactShareAttrs) String() string { return proto.CompactTextString(m) }
 func (*ContactShareAttrs) ProtoMessage()    {}
 func (*ContactShareAttrs) Descriptor() ([]byte, []int) {
-	return fileDescriptor_kind_2fb5fcd6d5779d1e, []int{6}
+	return fileDescriptor_kind_241f5d52a928d5de, []int{6}
 }
 func (m *ContactShareAttrs) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -412,7 +412,7 @@ func (m *ConversationInviteAttrs) Reset()         { *m = ConversationInviteAttrs
 func (m *ConversationInviteAttrs) String() string { return proto.CompactTextString(m) }
 func (*ConversationInviteAttrs) ProtoMessage()    {}
 func (*ConversationInviteAttrs) Descriptor() ([]byte, []int) {
-	return fileDescriptor_kind_2fb5fcd6d5779d1e, []int{7}
+	return fileDescriptor_kind_241f5d52a928d5de, []int{7}
 }
 func (m *ConversationInviteAttrs) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -459,7 +459,7 @@ func (m *ConversationNewMessageAttrs) Reset()         { *m = ConversationNewMess
 func (m *ConversationNewMessageAttrs) String() string { return proto.CompactTextString(m) }
 func (*ConversationNewMessageAttrs) ProtoMessage()    {}
 func (*ConversationNewMessageAttrs) Descriptor() ([]byte, []int) {
-	return fileDescriptor_kind_2fb5fcd6d5779d1e, []int{8}
+	return fileDescriptor_kind_241f5d52a928d5de, []int{8}
 }
 func (m *ConversationNewMessageAttrs) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1776,9 +1776,9 @@ var (
 	ErrIntOverflowKind   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("api/p2p/kind.proto", fileDescriptor_kind_2fb5fcd6d5779d1e) }
+func init() { proto.RegisterFile("api/p2p/kind.proto", fileDescriptor_kind_241f5d52a928d5de) }
 
-var fileDescriptor_kind_2fb5fcd6d5779d1e = []byte{
+var fileDescriptor_kind_241f5d52a928d5de = []byte{
 	// 473 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0xdd, 0x6e, 0xd3, 0x30,
 	0x18, 0x9d, 0xd3, 0x69, 0x5d, 0xbe, 0x4e, 0xc8, 0xf3, 0x60, 0xed, 0x3a, 0xad, 0x54, 0x91, 0x40,
diff --git a/core/api/p2p/service.pb.go b/core/api/p2p/service.pb.go
index e163b059e9..212bac54c1 100644
--- a/core/api/p2p/service.pb.go
+++ b/core/api/p2p/service.pb.go
@@ -35,7 +35,7 @@ func (m *Void) Reset()         { *m = Void{} }
 func (m *Void) String() string { return proto.CompactTextString(m) }
 func (*Void) ProtoMessage()    {}
 func (*Void) Descriptor() ([]byte, []int) {
-	return fileDescriptor_service_00d2d8031aa7cb50, []int{0}
+	return fileDescriptor_service_3f6feed4c215a655, []int{0}
 }
 func (m *Void) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -350,9 +350,9 @@ var (
 	ErrIntOverflowService   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("api/p2p/service.proto", fileDescriptor_service_00d2d8031aa7cb50) }
+func init() { proto.RegisterFile("api/p2p/service.proto", fileDescriptor_service_3f6feed4c215a655) }
 
-var fileDescriptor_service_00d2d8031aa7cb50 = []byte{
+var fileDescriptor_service_3f6feed4c215a655 = []byte{
 	// 165 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4d, 0x2c, 0xc8, 0xd4,
 	0x2f, 0x30, 0x2a, 0xd0, 0x2f, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f,
diff --git a/core/crypto/keypair/keypair.pb.go b/core/crypto/keypair/keypair.pb.go
index 82c98779d0..1c5c8dea06 100644
--- a/core/crypto/keypair/keypair.pb.go
+++ b/core/crypto/keypair/keypair.pb.go
@@ -47,7 +47,7 @@ func (x CertRevocationVersions) String() string {
 	return proto.EnumName(CertRevocationVersions_name, int32(x))
 }
 func (CertRevocationVersions) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_keypair_28fc56e1330d6329, []int{0}
+	return fileDescriptor_keypair_a49900af019723cd, []int{0}
 }
 
 type PublicKeyAlgorithm int32
@@ -76,7 +76,7 @@ func (x PublicKeyAlgorithm) String() string {
 	return proto.EnumName(PublicKeyAlgorithm_name, int32(x))
 }
 func (PublicKeyAlgorithm) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_keypair_28fc56e1330d6329, []int{1}
+	return fileDescriptor_keypair_a49900af019723cd, []int{1}
 }
 
 // https://golang.org/pkg/crypto/x509/#SignatureAlgorithm
@@ -142,7 +142,7 @@ func (x SignatureAlgorithm) String() string {
 	return proto.EnumName(SignatureAlgorithm_name, int32(x))
 }
 func (SignatureAlgorithm) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_keypair_28fc56e1330d6329, []int{2}
+	return fileDescriptor_keypair_a49900af019723cd, []int{2}
 }
 
 type Signature struct {
@@ -157,7 +157,7 @@ func (m *Signature) Reset()         { *m = Signature{} }
 func (m *Signature) String() string { return proto.CompactTextString(m) }
 func (*Signature) ProtoMessage()    {}
 func (*Signature) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keypair_28fc56e1330d6329, []int{0}
+	return fileDescriptor_keypair_a49900af019723cd, []int{0}
 }
 func (m *Signature) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -214,7 +214,7 @@ func (m *EcdsaSignature) Reset()         { *m = EcdsaSignature{} }
 func (m *EcdsaSignature) String() string { return proto.CompactTextString(m) }
 func (*EcdsaSignature) ProtoMessage()    {}
 func (*EcdsaSignature) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keypair_28fc56e1330d6329, []int{1}
+	return fileDescriptor_keypair_a49900af019723cd, []int{1}
 }
 func (m *EcdsaSignature) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -289,7 +289,7 @@ func (m *CertificateContent) Reset()         { *m = CertificateContent{} }
 func (m *CertificateContent) String() string { return proto.CompactTextString(m) }
 func (*CertificateContent) ProtoMessage()    {}
 func (*CertificateContent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keypair_28fc56e1330d6329, []int{2}
+	return fileDescriptor_keypair_a49900af019723cd, []int{2}
 }
 func (m *CertificateContent) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -386,7 +386,7 @@ func (m *Certificate) Reset()         { *m = Certificate{} }
 func (m *Certificate) String() string { return proto.CompactTextString(m) }
 func (*Certificate) ProtoMessage()    {}
 func (*Certificate) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keypair_28fc56e1330d6329, []int{3}
+	return fileDescriptor_keypair_a49900af019723cd, []int{3}
 }
 func (m *Certificate) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -444,7 +444,7 @@ func (m *RevocationContent) Reset()         { *m = RevocationContent{} }
 func (m *RevocationContent) String() string { return proto.CompactTextString(m) }
 func (*RevocationContent) ProtoMessage()    {}
 func (*RevocationContent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keypair_28fc56e1330d6329, []int{4}
+	return fileDescriptor_keypair_a49900af019723cd, []int{4}
 }
 func (m *RevocationContent) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -520,7 +520,7 @@ func (m *Revocation) Reset()         { *m = Revocation{} }
 func (m *Revocation) String() string { return proto.CompactTextString(m) }
 func (*Revocation) ProtoMessage()    {}
 func (*Revocation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_keypair_28fc56e1330d6329, []int{5}
+	return fileDescriptor_keypair_a49900af019723cd, []int{5}
 }
 func (m *Revocation) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -2072,10 +2072,10 @@ var (
 )
 
 func init() {
-	proto.RegisterFile("crypto/keypair/keypair.proto", fileDescriptor_keypair_28fc56e1330d6329)
+	proto.RegisterFile("crypto/keypair/keypair.proto", fileDescriptor_keypair_a49900af019723cd)
 }
 
-var fileDescriptor_keypair_28fc56e1330d6329 = []byte{
+var fileDescriptor_keypair_a49900af019723cd = []byte{
 	// 771 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x5f, 0x53, 0xea, 0x46,
 	0x18, 0xc6, 0x09, 0xc8, 0x9f, 0xbc, 0x20, 0xc6, 0xd5, 0x3a, 0x0c, 0x5a, 0x60, 0xb8, 0x72, 0xbc,
diff --git a/core/crypto/sigchain/sigchain.pb.go b/core/crypto/sigchain/sigchain.pb.go
index 91d0ecb147..9375506cdd 100644
--- a/core/crypto/sigchain/sigchain.pb.go
+++ b/core/crypto/sigchain/sigchain.pb.go
@@ -47,7 +47,7 @@ func (x EventExtensionVersions) String() string {
 	return proto.EnumName(EventExtensionVersions_name, int32(x))
 }
 func (EventExtensionVersions) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_sigchain_c1ab87ab2cd85e21, []int{0}
+	return fileDescriptor_sigchain_20b29b89cc0bced7, []int{0}
 }
 
 type SigEvent_SigEventType int32
@@ -73,7 +73,7 @@ func (x SigEvent_SigEventType) String() string {
 	return proto.EnumName(SigEvent_SigEventType_name, int32(x))
 }
 func (SigEvent_SigEventType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_sigchain_c1ab87ab2cd85e21, []int{0, 0}
+	return fileDescriptor_sigchain_20b29b89cc0bced7, []int{0, 0}
 }
 
 type SigEvent struct {
@@ -94,7 +94,7 @@ func (m *SigEvent) Reset()         { *m = SigEvent{} }
 func (m *SigEvent) String() string { return proto.CompactTextString(m) }
 func (*SigEvent) ProtoMessage()    {}
 func (*SigEvent) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sigchain_c1ab87ab2cd85e21, []int{0}
+	return fileDescriptor_sigchain_20b29b89cc0bced7, []int{0}
 }
 func (m *SigEvent) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -191,7 +191,7 @@ func (m *SigChain) Reset()         { *m = SigChain{} }
 func (m *SigChain) String() string { return proto.CompactTextString(m) }
 func (*SigChain) ProtoMessage()    {}
 func (*SigChain) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sigchain_c1ab87ab2cd85e21, []int{1}
+	return fileDescriptor_sigchain_20b29b89cc0bced7, []int{1}
 }
 func (m *SigChain) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -246,7 +246,7 @@ func (m *EventExtension) Reset()         { *m = EventExtension{} }
 func (m *EventExtension) String() string { return proto.CompactTextString(m) }
 func (*EventExtension) ProtoMessage()    {}
 func (*EventExtension) Descriptor() ([]byte, []int) {
-	return fileDescriptor_sigchain_c1ab87ab2cd85e21, []int{2}
+	return fileDescriptor_sigchain_20b29b89cc0bced7, []int{2}
 }
 func (m *EventExtension) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1132,10 +1132,10 @@ var (
 )
 
 func init() {
-	proto.RegisterFile("crypto/sigchain/sigchain.proto", fileDescriptor_sigchain_c1ab87ab2cd85e21)
+	proto.RegisterFile("crypto/sigchain/sigchain.proto", fileDescriptor_sigchain_20b29b89cc0bced7)
 }
 
-var fileDescriptor_sigchain_c1ab87ab2cd85e21 = []byte{
+var fileDescriptor_sigchain_20b29b89cc0bced7 = []byte{
 	// 503 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0xcd, 0x6e, 0xd3, 0x40,
 	0x10, 0xce, 0xa6, 0x25, 0x89, 0x27, 0x6d, 0x9a, 0x2e, 0xa8, 0x58, 0x91, 0x88, 0xad, 0x9c, 0xa2,
diff --git a/core/entity/config.pb.go b/core/entity/config.pb.go
index de8488dd43..d17bb310e3 100644
--- a/core/entity/config.pb.go
+++ b/core/entity/config.pb.go
@@ -45,7 +45,7 @@ func (m *Config) Reset()         { *m = Config{} }
 func (m *Config) String() string { return proto.CompactTextString(m) }
 func (*Config) ProtoMessage()    {}
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_config_ec07bf335fc04f68, []int{0}
+	return fileDescriptor_config_9f22e433c99c253a, []int{0}
 }
 func (m *Config) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -679,9 +679,9 @@ var (
 	ErrIntOverflowConfig   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("entity/config.proto", fileDescriptor_config_ec07bf335fc04f68) }
+func init() { proto.RegisterFile("entity/config.proto", fileDescriptor_config_9f22e433c99c253a) }
 
-var fileDescriptor_config_ec07bf335fc04f68 = []byte{
+var fileDescriptor_config_9f22e433c99c253a = []byte{
 	// 392 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x51, 0xbf, 0x6e, 0xda, 0x40,
 	0x18, 0xc7, 0x86, 0xba, 0xe6, 0x4a, 0x8b, 0x7a, 0xd0, 0xca, 0x42, 0x95, 0x8d, 0x98, 0xa8, 0xd4,
diff --git a/core/entity/contact.pb.go b/core/entity/contact.pb.go
index 827bbe3ad0..9b0e4339cf 100644
--- a/core/entity/contact.pb.go
+++ b/core/entity/contact.pb.go
@@ -62,7 +62,7 @@ func (x Contact_Status) String() string {
 	return proto.EnumName(Contact_Status_name, int32(x))
 }
 func (Contact_Status) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_contact_0b5562614dad5493, []int{0, 0}
+	return fileDescriptor_contact_d975e55a379fe55e, []int{0, 0}
 }
 
 type Contact struct {
@@ -86,7 +86,7 @@ func (m *Contact) Reset()         { *m = Contact{} }
 func (m *Contact) String() string { return proto.CompactTextString(m) }
 func (*Contact) ProtoMessage()    {}
 func (*Contact) Descriptor() ([]byte, []int) {
-	return fileDescriptor_contact_0b5562614dad5493, []int{0}
+	return fileDescriptor_contact_d975e55a379fe55e, []int{0}
 }
 func (m *Contact) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -845,9 +845,9 @@ var (
 	ErrIntOverflowContact   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("entity/contact.proto", fileDescriptor_contact_0b5562614dad5493) }
+func init() { proto.RegisterFile("entity/contact.proto", fileDescriptor_contact_d975e55a379fe55e) }
 
-var fileDescriptor_contact_0b5562614dad5493 = []byte{
+var fileDescriptor_contact_d975e55a379fe55e = []byte{
 	// 512 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x91, 0xcd, 0x6e, 0xd3, 0x4e,
 	0x14, 0xc5, 0xe3, 0x24, 0xcd, 0xc7, 0x75, 0x3e, 0xac, 0x49, 0xfa, 0xff, 0x5b, 0x51, 0x95, 0x84,
diff --git a/core/entity/conversation.pb.go b/core/entity/conversation.pb.go
index 7ac15c6328..2be7da0056 100644
--- a/core/entity/conversation.pb.go
+++ b/core/entity/conversation.pb.go
@@ -53,7 +53,7 @@ func (x ConversationMember_Status) String() string {
 	return proto.EnumName(ConversationMember_Status_name, int32(x))
 }
 func (ConversationMember_Status) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_008f0571fff8b9fc, []int{1, 0}
+	return fileDescriptor_conversation_2945bb469f639ac6, []int{1, 0}
 }
 
 type Conversation struct {
@@ -73,7 +73,7 @@ func (m *Conversation) Reset()         { *m = Conversation{} }
 func (m *Conversation) String() string { return proto.CompactTextString(m) }
 func (*Conversation) ProtoMessage()    {}
 func (*Conversation) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_008f0571fff8b9fc, []int{0}
+	return fileDescriptor_conversation_2945bb469f639ac6, []int{0}
 }
 func (m *Conversation) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -169,7 +169,7 @@ func (m *ConversationMember) Reset()         { *m = ConversationMember{} }
 func (m *ConversationMember) String() string { return proto.CompactTextString(m) }
 func (*ConversationMember) ProtoMessage()    {}
 func (*ConversationMember) Descriptor() ([]byte, []int) {
-	return fileDescriptor_conversation_008f0571fff8b9fc, []int{1}
+	return fileDescriptor_conversation_2945bb469f639ac6, []int{1}
 }
 func (m *ConversationMember) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -1172,10 +1172,10 @@ var (
 )
 
 func init() {
-	proto.RegisterFile("entity/conversation.proto", fileDescriptor_conversation_008f0571fff8b9fc)
+	proto.RegisterFile("entity/conversation.proto", fileDescriptor_conversation_2945bb469f639ac6)
 }
 
-var fileDescriptor_conversation_008f0571fff8b9fc = []byte{
+var fileDescriptor_conversation_2945bb469f639ac6 = []byte{
 	// 487 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x93, 0xcf, 0x8e, 0x93, 0x50,
 	0x14, 0xc6, 0x0b, 0xed, 0xb4, 0xf6, 0x74, 0xac, 0xcd, 0x4d, 0xc7, 0x60, 0x63, 0x4a, 0xd3, 0x8d,
diff --git a/core/entity/device.pb.go b/core/entity/device.pb.go
index 5c41cf2387..5bc6dcc076 100644
--- a/core/entity/device.pb.go
+++ b/core/entity/device.pb.go
@@ -56,7 +56,7 @@ func (x Device_Status) String() string {
 	return proto.EnumName(Device_Status_name, int32(x))
 }
 func (Device_Status) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_device_53fed79deac09b39, []int{0, 0}
+	return fileDescriptor_device_64994f5cae8d1b31, []int{0, 0}
 }
 
 type Device struct {
@@ -77,7 +77,7 @@ func (m *Device) Reset()         { *m = Device{} }
 func (m *Device) String() string { return proto.CompactTextString(m) }
 func (*Device) ProtoMessage()    {}
 func (*Device) Descriptor() ([]byte, []int) {
-	return fileDescriptor_device_53fed79deac09b39, []int{0}
+	return fileDescriptor_device_64994f5cae8d1b31, []int{0}
 }
 func (m *Device) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -672,9 +672,9 @@ var (
 	ErrIntOverflowDevice   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("entity/device.proto", fileDescriptor_device_53fed79deac09b39) }
+func init() { proto.RegisterFile("entity/device.proto", fileDescriptor_device_64994f5cae8d1b31) }
 
-var fileDescriptor_device_53fed79deac09b39 = []byte{
+var fileDescriptor_device_64994f5cae8d1b31 = []byte{
 	// 423 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x90, 0xbf, 0x8e, 0xd3, 0x40,
 	0x10, 0x87, 0xb3, 0x49, 0x30, 0x64, 0x92, 0x20, 0x6b, 0x41, 0xc8, 0x0a, 0x28, 0x8e, 0x52, 0x59,
diff --git a/core/entity/message.pb.go b/core/entity/message.pb.go
index 48d6045efe..a33970bd1f 100644
--- a/core/entity/message.pb.go
+++ b/core/entity/message.pb.go
@@ -31,7 +31,7 @@ func (m *Message) Reset()         { *m = Message{} }
 func (m *Message) String() string { return proto.CompactTextString(m) }
 func (*Message) ProtoMessage()    {}
 func (*Message) Descriptor() ([]byte, []int) {
-	return fileDescriptor_message_b9faeb85ac18cec1, []int{0}
+	return fileDescriptor_message_b0bfb2e61be40475, []int{0}
 }
 func (m *Message) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -317,9 +317,9 @@ var (
 	ErrIntOverflowMessage   = fmt.Errorf("proto: integer overflow")
 )
 
-func init() { proto.RegisterFile("entity/message.proto", fileDescriptor_message_b9faeb85ac18cec1) }
+func init() { proto.RegisterFile("entity/message.proto", fileDescriptor_message_b0bfb2e61be40475) }
 
-var fileDescriptor_message_b9faeb85ac18cec1 = []byte{
+var fileDescriptor_message_b0bfb2e61be40475 = []byte{
 	// 120 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x49, 0xcd, 0x2b, 0xc9,
 	0x2c, 0xa9, 0xd4, 0xcf, 0x4d, 0x2d, 0x2e, 0x4e, 0x4c, 0x4f, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9,