diff --git a/Gopkg.lock b/Gopkg.lock
index 63e527f..f5b8c8a 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -245,7 +245,7 @@
     "googleapis/api/annotations",
     "googleapis/rpc/status"
   ]
-  revision = "2b5a72b8730b0b16380010cfe5286c42108d88e7"
+  revision = "2d9486acae19cf9bd0c093d7dc236a323726a9e4"
 
 [[projects]]
   name = "google.golang.org/grpc"
@@ -287,20 +287,20 @@
   revision = "3f83fa5005286a7fe593b055f0d7771a7dce4655"
 
 [[projects]]
-  branch = "v2"
   name = "gopkg.in/yaml.v2"
   packages = ["."]
-  revision = "d670f9405373e636a5a2765eea47fac0c9bc91a4"
+  revision = "7f97868eec74b32b0982dd158a51a446d1da7eb5"
+  version = "v2.1.1"
 
 [[projects]]
   name = "zvelo.io/zmage"
   packages = ["."]
-  revision = "86e17aad4ef99a18e0c0a3aacf02b5de4aea48ce"
-  version = "v3.0.1"
+  revision = "08a6854872f37a26ef1ef6c90b60d0ce16aaff2a"
+  version = "v3.2.0"
 
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "3e34fa2bb5e3ab127ad478ea5f6ae62dc37766a7c2bda541dc17cb3d354f2a60"
+  inputs-digest = "788d505173db928d7c02831d762f74dc0b86d61998c521a3f0a70aca9441985d"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 578ea02..fc72620 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -34,8 +34,8 @@
 
 [[constraint]]
   name = "google.golang.org/grpc"
-  version = "1.9.2"
+  version = "1.10.0"
 
 [[constraint]]
   name = "zvelo.io/zmage"
-  version = "3.0.1"
+  version = "3.2.0"
diff --git a/apiv1.protoset b/apiv1.protoset
new file mode 100644
index 0000000..83beb9a
Binary files /dev/null and b/apiv1.protoset differ
diff --git a/graphql_relay.go b/graphql_relay.go
index b5f65c6..9a28ad9 100644
--- a/graphql_relay.go
+++ b/graphql_relay.go
@@ -79,6 +79,7 @@ var incomingHeaders = map[string]string{
 
 var outgoingHeaders = map[string]string{
 	"zvelo-trace-id": "zvelo-trace-id",
+	"server-timing":  "server-timing",
 	"content-type":   "",
 	"trailer":        "",
 }
diff --git a/internal/static/static.go b/internal/static/static.go
index 508031c..5948a78 100644
--- a/internal/static/static.go
+++ b/internal/static/static.go
@@ -193,7 +193,7 @@ var _escData = map[string]*_escFile{
 	"/apiv1.swagger.json": {
 		local:   "apiv1.swagger.json",
 		size:    19737,
-		modtime: 1519752680,
+		modtime: 1519807758,
 		compressed: `
 H4sIAAAAAAAC/9xcX5PbNpJ/z6dA6e5ht8qZiZ2rXJXv5UAQJGGRBAOA0sjrlENLmBE3GlIhKXsnrvnu
 VyA1M1I3558T723WT54m/jS6G92/bgD6/A0hk2VdtbtL205ek799Qwghk2K73ZTLoivr6vTvbV1NviHk
@@ -276,7 +276,7 @@ m+v/CwAA///fHrF8GU0AAA==
 	"/schema.graphql": {
 		local:   "schema.graphql",
 		size:    7156,
-		modtime: 1519752423,
+		modtime: 1519807720,
 		compressed: `
 H4sIAAAAAAAC/5RY3W/cNhJ/379CeWuBvrQ99AC/jciRNF6KZPih9booij13LwnOsVN7XSBX9H8/SJyh
 lDS9wz2JnzPD+frN6Pnu7fn9qfl91zS/vpyfPl414Om3b3d/7HaXjx/OZbZu56f7r16e7q+aeHl69/Dm
diff --git a/magefile.go b/magefile.go
index dd0f827..edbb152 100644
--- a/magefile.go
+++ b/magefile.go
@@ -36,6 +36,12 @@ func ProtoGRPCGateway(ctx context.Context) error {
 	return err
 }
 
+// Protoset generates .protoset files from .proto files
+func Protoset(ctx context.Context) error {
+	_, err := zmage.Protoset("apiv1.proto")
+	return err
+}
+
 // Swagger generates .swagger.json files from .proto files
 func ProtoSwagger(ctx context.Context) error {
 	files, err := zmage.ProtoSwagger()
@@ -79,7 +85,7 @@ func Static(ctx context.Context) error {
 
 // Generate all necessary files
 func Generate(ctx context.Context) error {
-	mg.CtxDeps(ctx, CheckImports, ProtoGo, ProtoPython, ProtoGRPCGateway, ProtoSwagger, Static)
+	mg.CtxDeps(ctx, CheckImports, ProtoGo, ProtoPython, ProtoGRPCGateway, ProtoSwagger, Protoset, Static)
 	return nil
 }
 
diff --git a/mock/request.go b/mock/request.go
index 9ef4ee4..1ec4fb7 100644
--- a/mock/request.go
+++ b/mock/request.go
@@ -185,7 +185,7 @@ func parseOpts(ctx context.Context, url string, content bool, ds []msg.DataSetTy
 	}
 
 	for _, t := range ds {
-		switch msg.DataSetType(t) {
+		switch t {
 		case msg.CATEGORIZATION:
 			if r.ResponseDataset == nil {
 				r.ResponseDataset = &msg.DataSet{}
diff --git a/status/status.go b/status/status.go
index 3e9da48..e47b404 100644
--- a/status/status.go
+++ b/status/status.go
@@ -87,3 +87,10 @@ func FromError(err error) (s *Status, ok bool) {
 
 	return New(st.Code(), st.Message()), true
 }
+
+// Convert is a convenience function which removes the need to handle the
+// boolean return value from FromError.
+func Convert(err error) *Status {
+	s, _ := FromError(err)
+	return s
+}