diff --git a/api/services/execution/execution.pb.go b/api/services/execution/execution.pb.go
index be1f4c4..0a66d1e 100644
--- a/api/services/execution/execution.pb.go
+++ b/api/services/execution/execution.pb.go
@@ -39,17 +39,14 @@ import _ "github.com/gogo/protobuf/gogoproto"
 import containerd_v1_types1 "github.com/docker/containerd/api/types/container"
 import containerd_v1_types3 "github.com/docker/containerd/api/types/process"
 
-import strings "strings"
-import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
-import sort "sort"
-import strconv "strconv"
-import reflect "reflect"
-
 import (
 	context "golang.org/x/net/context"
 	grpc "google.golang.org/grpc"
 )
 
+import strings "strings"
+import reflect "reflect"
+
 import io "io"
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -252,254 +249,6 @@ func init() {
 	proto.RegisterType((*ListProcessesRequest)(nil), "containerd.v1.services.ListProcessesRequest")
 	proto.RegisterType((*ListProcessesResponse)(nil), "containerd.v1.services.ListProcessesResponse")
 }
-func (this *StartContainerRequest) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 5)
-	s = append(s, "&execution.StartContainerRequest{")
-	s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *CreateContainerRequest) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 10)
-	s = append(s, "&execution.CreateContainerRequest{")
-	s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n")
-	s = append(s, "BundlePath: "+fmt.Sprintf("%#v", this.BundlePath)+",\n")
-	s = append(s, "Console: "+fmt.Sprintf("%#v", this.Console)+",\n")
-	s = append(s, "Stdin: "+fmt.Sprintf("%#v", this.Stdin)+",\n")
-	s = append(s, "Stdout: "+fmt.Sprintf("%#v", this.Stdout)+",\n")
-	s = append(s, "Stderr: "+fmt.Sprintf("%#v", this.Stderr)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *CreateContainerResponse) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 6)
-	s = append(s, "&execution.CreateContainerResponse{")
-	if this.Container != nil {
-		s = append(s, "Container: "+fmt.Sprintf("%#v", this.Container)+",\n")
-	}
-	if this.InitProcess != nil {
-		s = append(s, "InitProcess: "+fmt.Sprintf("%#v", this.InitProcess)+",\n")
-	}
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *DeleteContainerRequest) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 5)
-	s = append(s, "&execution.DeleteContainerRequest{")
-	s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *ListContainersRequest) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 5)
-	s = append(s, "&execution.ListContainersRequest{")
-	s = append(s, "Owner: "+fmt.Sprintf("%#v", this.Owner)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *ListContainersResponse) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 5)
-	s = append(s, "&execution.ListContainersResponse{")
-	if this.Containers != nil {
-		s = append(s, "Containers: "+fmt.Sprintf("%#v", this.Containers)+",\n")
-	}
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *StartProcessRequest) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 10)
-	s = append(s, "&execution.StartProcessRequest{")
-	s = append(s, "ContainerID: "+fmt.Sprintf("%#v", this.ContainerID)+",\n")
-	if this.Process != nil {
-		s = append(s, "Process: "+fmt.Sprintf("%#v", this.Process)+",\n")
-	}
-	s = append(s, "Console: "+fmt.Sprintf("%#v", this.Console)+",\n")
-	s = append(s, "Stdin: "+fmt.Sprintf("%#v", this.Stdin)+",\n")
-	s = append(s, "Stdout: "+fmt.Sprintf("%#v", this.Stdout)+",\n")
-	s = append(s, "Stderr: "+fmt.Sprintf("%#v", this.Stderr)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *StartProcessResponse) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 5)
-	s = append(s, "&execution.StartProcessResponse{")
-	if this.Process != nil {
-		s = append(s, "Process: "+fmt.Sprintf("%#v", this.Process)+",\n")
-	}
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *GetContainerRequest) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 5)
-	s = append(s, "&execution.GetContainerRequest{")
-	s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *GetContainerResponse) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 5)
-	s = append(s, "&execution.GetContainerResponse{")
-	if this.Container != nil {
-		s = append(s, "Container: "+fmt.Sprintf("%#v", this.Container)+",\n")
-	}
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *UpdateContainerRequest) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 6)
-	s = append(s, "&execution.UpdateContainerRequest{")
-	s = append(s, "ContainerID: "+fmt.Sprintf("%#v", this.ContainerID)+",\n")
-	s = append(s, "BundlePath: "+fmt.Sprintf("%#v", this.BundlePath)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *PauseContainerRequest) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 5)
-	s = append(s, "&execution.PauseContainerRequest{")
-	s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *ResumeContainerRequest) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 5)
-	s = append(s, "&execution.ResumeContainerRequest{")
-	s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *GetProcessRequest) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 6)
-	s = append(s, "&execution.GetProcessRequest{")
-	s = append(s, "ContainerID: "+fmt.Sprintf("%#v", this.ContainerID)+",\n")
-	s = append(s, "Pid: "+fmt.Sprintf("%#v", this.Pid)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *GetProcessResponse) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 5)
-	s = append(s, "&execution.GetProcessResponse{")
-	if this.Process != nil {
-		s = append(s, "Process: "+fmt.Sprintf("%#v", this.Process)+",\n")
-	}
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *SignalProcessRequest) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 7)
-	s = append(s, "&execution.SignalProcessRequest{")
-	s = append(s, "ContainerID: "+fmt.Sprintf("%#v", this.ContainerID)+",\n")
-	s = append(s, "Pid: "+fmt.Sprintf("%#v", this.Pid)+",\n")
-	s = append(s, "Signal: "+fmt.Sprintf("%#v", this.Signal)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *DeleteProcessRequest) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 6)
-	s = append(s, "&execution.DeleteProcessRequest{")
-	s = append(s, "ContainerID: "+fmt.Sprintf("%#v", this.ContainerID)+",\n")
-	s = append(s, "Pid: "+fmt.Sprintf("%#v", this.Pid)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *ListProcessesRequest) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 5)
-	s = append(s, "&execution.ListProcessesRequest{")
-	s = append(s, "ContainerID: "+fmt.Sprintf("%#v", this.ContainerID)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *ListProcessesResponse) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 5)
-	s = append(s, "&execution.ListProcessesResponse{")
-	if this.Processes != nil {
-		s = append(s, "Processes: "+fmt.Sprintf("%#v", this.Processes)+",\n")
-	}
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func valueToGoStringExecution(v interface{}, typ string) string {
-	rv := reflect.ValueOf(v)
-	if rv.IsNil() {
-		return "nil"
-	}
-	pv := reflect.Indirect(rv).Interface()
-	return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
-}
-func extensionToGoStringExecution(m github_com_gogo_protobuf_proto.Message) string {
-	e := github_com_gogo_protobuf_proto.GetUnsafeExtensionsMap(m)
-	if e == nil {
-		return "nil"
-	}
-	s := "proto.NewUnsafeXXX_InternalExtensions(map[int32]proto.Extension{"
-	keys := make([]int, 0, len(e))
-	for k := range e {
-		keys = append(keys, int(k))
-	}
-	sort.Ints(keys)
-	ss := []string{}
-	for _, k := range keys {
-		ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString())
-	}
-	s += strings.Join(ss, ",") + "})"
-	return s
-}
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
@@ -4123,58 +3872,58 @@ func init() {
 }
 
 var fileDescriptorExecution = []byte{
-	// 839 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x4e, 0xeb, 0x46,
-	0x14, 0xc6, 0xa1, 0x84, 0x72, 0x42, 0x80, 0x0e, 0xc6, 0x8d, 0x52, 0x64, 0x90, 0x57, 0xf4, 0x27,
-	0x36, 0x4d, 0xa5, 0x2e, 0x2a, 0x84, 0x2a, 0x7e, 0x84, 0xa8, 0x50, 0x85, 0x9c, 0x22, 0x8a, 0x54,
-	0x09, 0x39, 0xf6, 0x34, 0x58, 0x4d, 0x3c, 0xae, 0x3d, 0xa6, 0x65, 0xd7, 0x57, 0xe8, 0xaa, 0xcf,
-	0xd1, 0xb7, 0x60, 0xd9, 0x65, 0x57, 0xe8, 0x26, 0x4f, 0x70, 0x1f, 0xe1, 0x2a, 0xf6, 0xd8, 0x8e,
-	0x73, 0x67, 0x82, 0xb9, 0xc0, 0xca, 0x33, 0xa3, 0xf3, 0x7d, 0x3e, 0xe7, 0xcc, 0x39, 0xdf, 0x19,
-	0x38, 0xec, 0xb9, 0xf4, 0x26, 0xea, 0xea, 0x36, 0x19, 0x18, 0x0e, 0xb1, 0x7f, 0xc3, 0x81, 0x61,
-	0x13, 0x8f, 0x5a, 0xae, 0x87, 0x03, 0xc7, 0xb0, 0x7c, 0xd7, 0x08, 0x71, 0x70, 0xeb, 0xda, 0x38,
-	0x34, 0xf0, 0x9f, 0xd8, 0x8e, 0xa8, 0x4b, 0xbc, 0x7c, 0xa5, 0xfb, 0x01, 0xa1, 0x04, 0x29, 0x39,
-	0x44, 0xbf, 0xfd, 0x5a, 0x4f, 0x11, 0xcd, 0xcf, 0x7a, 0x84, 0xf4, 0xfa, 0xd8, 0x88, 0xad, 0xba,
-	0xd1, 0xaf, 0x06, 0x1e, 0xf8, 0xf4, 0x2e, 0x01, 0x35, 0xe5, 0x1e, 0xe9, 0x91, 0x78, 0x69, 0x8c,
-	0x57, 0xec, 0xf4, 0xfb, 0x47, 0xfd, 0xa1, 0x77, 0x3e, 0x0e, 0xf3, 0xc3, 0x7c, 0xc5, 0x18, 0xf6,
-	0x4a, 0x32, 0xf8, 0x01, 0xb1, 0x71, 0x98, 0x7d, 0x13, 0xb4, 0x66, 0xc0, 0x46, 0x87, 0x5a, 0x01,
-	0x3d, 0x4c, 0x21, 0x26, 0xfe, 0x3d, 0xc2, 0x21, 0x45, 0x0a, 0x54, 0x5c, 0xa7, 0x21, 0x6d, 0x4b,
-	0x3b, 0x4b, 0x07, 0xd5, 0xd1, 0xc3, 0x56, 0xe5, 0xf4, 0xc8, 0xac, 0xb8, 0x8e, 0xf6, 0xaf, 0x04,
-	0xca, 0x61, 0x80, 0x2d, 0x8a, 0xcb, 0x42, 0xd0, 0x16, 0xd4, 0xba, 0x91, 0xe7, 0xf4, 0xf1, 0xb5,
-	0x6f, 0xd1, 0x9b, 0x46, 0x65, 0x6c, 0x60, 0x42, 0x72, 0x74, 0x6e, 0xd1, 0x1b, 0xd4, 0x80, 0x45,
-	0x9b, 0x78, 0x21, 0xe9, 0xe3, 0xc6, 0xfc, 0xb6, 0xb4, 0xf3, 0xb1, 0x99, 0x6e, 0x91, 0x0c, 0x0b,
-	0x21, 0x75, 0x5c, 0xaf, 0xf1, 0x51, 0x0c, 0x4a, 0x36, 0x48, 0x81, 0x6a, 0x48, 0x1d, 0x12, 0xd1,
-	0xc6, 0x42, 0x7c, 0xcc, 0x76, 0xec, 0x1c, 0x07, 0x41, 0xa3, 0x9a, 0x9d, 0xe3, 0x20, 0xd0, 0xfe,
-	0x91, 0xe0, 0xd3, 0xf7, 0x7c, 0x0e, 0x7d, 0xe2, 0x85, 0x18, 0xed, 0xc1, 0x52, 0x96, 0xae, 0xd8,
-	0xf7, 0x5a, 0x5b, 0xd5, 0x8b, 0xf7, 0x1b, 0xe7, 0x4f, 0xcf, 0xa1, 0x39, 0x00, 0xed, 0x43, 0xcd,
-	0xf5, 0x5c, 0x7a, 0x9e, 0xe4, 0x34, 0x0e, 0xad, 0xd6, 0xde, 0xe4, 0xe2, 0x99, 0x8d, 0x39, 0x09,
-	0xd0, 0x76, 0x41, 0x39, 0xc2, 0x7d, 0x5c, 0x3e, 0x99, 0x5a, 0x0b, 0x36, 0xce, 0xdc, 0x30, 0xbf,
-	0xaf, 0x30, 0x05, 0xc8, 0xb0, 0x40, 0xfe, 0x48, 0x82, 0x98, 0x1f, 0xa7, 0x2a, 0xde, 0x68, 0x3f,
-	0x83, 0x32, 0x6d, 0xce, 0x02, 0xdf, 0x07, 0xc8, 0xdc, 0x0c, 0x63, 0xd0, 0xe3, 0x91, 0x4f, 0x20,
-	0xb4, 0xa1, 0x04, 0xeb, 0x71, 0xe9, 0xa4, 0x81, 0x31, 0x3f, 0xda, 0xb0, 0x9c, 0x59, 0x5d, 0x67,
-	0x21, 0xac, 0x8e, 0x1e, 0xb6, 0x6a, 0x19, 0xd1, 0xe9, 0x91, 0x59, 0xcb, 0x8c, 0x4e, 0x1d, 0xf4,
-	0x2d, 0x2c, 0xfa, 0x4f, 0x48, 0x61, 0x6a, 0xfc, 0xea, 0x85, 0xf3, 0x23, 0xc8, 0xc5, 0x10, 0x59,
-	0xee, 0x26, 0xfc, 0x95, 0x9e, 0xe0, 0xaf, 0xd6, 0x82, 0xf5, 0x13, 0x5c, 0xbe, 0xd7, 0x7e, 0x02,
-	0xb9, 0x68, 0xfe, 0x12, 0x35, 0xab, 0x0d, 0x40, 0xb9, 0xf0, 0x1d, 0x5e, 0x03, 0x7f, 0xc8, 0xd5,
-	0x3d, 0xd6, 0xdc, 0x63, 0x85, 0x39, 0xb7, 0xa2, 0xb0, 0x7c, 0x85, 0xef, 0x82, 0x62, 0xe2, 0x30,
-	0x1a, 0x94, 0x47, 0x5c, 0xc1, 0x27, 0x27, 0xf8, 0x25, 0xea, 0x70, 0x0d, 0xe6, 0x7d, 0xd7, 0x89,
-	0x83, 0xa8, 0x9b, 0xe3, 0xa5, 0x76, 0x06, 0x68, 0x92, 0xfa, 0x99, 0xf7, 0x4f, 0x41, 0xee, 0xb8,
-	0x3d, 0xcf, 0xea, 0xbf, 0x86, 0xaf, 0x71, 0x15, 0xc7, 0xec, 0x71, 0x33, 0xd4, 0x4d, 0xb6, 0xd3,
-	0x7e, 0x01, 0x39, 0x11, 0x99, 0x57, 0xc9, 0xd0, 0x0f, 0x20, 0x8f, 0x15, 0x86, 0x71, 0xe3, 0xe7,
-	0xb0, 0x6b, 0x9d, 0x44, 0xdc, 0x26, 0xb8, 0x58, 0xc2, 0xbf, 0x83, 0x25, 0x3f, 0x3d, 0x64, 0x5a,
-	0x35, 0x3b, 0xe5, 0xb9, 0x79, 0xfb, 0x6f, 0x80, 0xb5, 0xe3, 0x74, 0x82, 0x77, 0x92, 0x59, 0x8d,
-	0x02, 0x58, 0x9d, 0x9a, 0x08, 0x48, 0xd7, 0xf9, 0x63, 0x5d, 0xe7, 0x8f, 0xbb, 0xa6, 0x51, 0xda,
-	0x9e, 0x05, 0x71, 0x09, 0x2b, 0xc5, 0x59, 0x8b, 0x5a, 0x22, 0x0a, 0xee, 0x4c, 0x6e, 0x2a, 0x7a,
-	0xf2, 0xc0, 0xd0, 0xd3, 0x07, 0x86, 0x7e, 0x3c, 0x7e, 0x60, 0xa0, 0x2b, 0x58, 0x9d, 0xea, 0x68,
-	0x71, 0x30, 0xfc, 0xd6, 0x17, 0x52, 0x5f, 0xc2, 0x4a, 0xb1, 0x7b, 0xc5, 0x3e, 0x73, 0xbb, 0x7c,
-	0x96, 0xcf, 0x53, 0x5d, 0x2e, 0xf6, 0x99, 0x2f, 0x07, 0xb3, 0xa8, 0xa7, 0x86, 0xaa, 0x98, 0x9a,
-	0x3f, 0x7d, 0x85, 0xd4, 0x2e, 0x2c, 0x4f, 0x2a, 0x32, 0xfa, 0x52, 0xc4, 0xcb, 0x91, 0xf9, 0xe6,
-	0x57, 0xe5, 0x8c, 0x59, 0xb5, 0x10, 0x58, 0x29, 0x4e, 0x6e, 0x71, 0xe6, 0xb9, 0x0f, 0x82, 0xa6,
-	0x5e, 0xd6, 0x9c, 0xfd, 0xd0, 0x85, 0xe5, 0xc9, 0x61, 0x27, 0x8e, 0x8d, 0x33, 0xf5, 0xc5, 0xb1,
-	0x71, 0xe7, 0xa7, 0x0d, 0x90, 0xab, 0x2a, 0xfa, 0x7c, 0x46, 0x5e, 0xa6, 0x7e, 0xf3, 0x45, 0x19,
-	0x53, 0xf6, 0x93, 0x0b, 0xa8, 0x17, 0xc4, 0x16, 0x89, 0x7d, 0xe4, 0x68, 0xb2, 0xb0, 0x04, 0x2e,
-	0xa0, 0x5e, 0x50, 0x53, 0x31, 0x2d, 0x4f, 0x74, 0x85, 0xb4, 0x7d, 0xa8, 0x17, 0xa4, 0x4f, 0x4c,
-	0xcb, 0x53, 0xdb, 0x66, 0xab, 0xa4, 0x75, 0x92, 0x9b, 0x83, 0xcd, 0xfb, 0xa1, 0x3a, 0xf7, 0xff,
-	0x50, 0x9d, 0x7b, 0x3b, 0x54, 0xa5, 0xbf, 0x46, 0xaa, 0x74, 0x3f, 0x52, 0xa5, 0xff, 0x46, 0xaa,
-	0xf4, 0x66, 0xa4, 0x4a, 0xdd, 0x6a, 0xec, 0xdb, 0x37, 0xef, 0x02, 0x00, 0x00, 0xff, 0xff, 0xb3,
-	0xca, 0xfb, 0x2c, 0x2d, 0x0d, 0x00, 0x00,
+	// 834 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x56, 0xdd, 0x4e, 0xe3, 0x46,
+	0x14, 0xc6, 0xa1, 0x84, 0x72, 0x42, 0x80, 0x0e, 0xc6, 0xb5, 0xd2, 0x2a, 0x20, 0x5f, 0xd1, 0x9f,
+	0xd8, 0x34, 0x95, 0x7a, 0x51, 0x21, 0x54, 0xf1, 0x23, 0x44, 0x85, 0x2a, 0xe4, 0x14, 0x51, 0xa4,
+	0x4a, 0xc8, 0xb1, 0xa7, 0xc1, 0x6a, 0xe2, 0xf1, 0xda, 0x63, 0x76, 0xb9, 0xdb, 0x57, 0xd8, 0xab,
+	0x7d, 0x8e, 0x7d, 0x0b, 0x2e, 0xf7, 0x72, 0xaf, 0xd0, 0x92, 0x27, 0x59, 0xc5, 0x1e, 0xdb, 0x71,
+	0x76, 0x26, 0x98, 0x05, 0xae, 0x3c, 0x33, 0x3a, 0xdf, 0xe7, 0x73, 0xce, 0x9c, 0xf3, 0x9d, 0x81,
+	0xbd, 0x9e, 0x4b, 0x2f, 0xa3, 0xae, 0x6e, 0x93, 0x81, 0xe1, 0x10, 0xfb, 0x7f, 0x1c, 0x18, 0x36,
+	0xf1, 0xa8, 0xe5, 0x7a, 0x38, 0x70, 0x0c, 0xcb, 0x77, 0x8d, 0x10, 0x07, 0x57, 0xae, 0x8d, 0x43,
+	0x03, 0xbf, 0xc2, 0x76, 0x44, 0x5d, 0xe2, 0xe5, 0x2b, 0xdd, 0x0f, 0x08, 0x25, 0x48, 0xc9, 0x21,
+	0xfa, 0xd5, 0x2f, 0x7a, 0x8a, 0x68, 0x7c, 0xd7, 0x23, 0xa4, 0xd7, 0xc7, 0x46, 0x6c, 0xd5, 0x8d,
+	0xfe, 0x33, 0xf0, 0xc0, 0xa7, 0xd7, 0x09, 0xa8, 0x21, 0xf7, 0x48, 0x8f, 0xc4, 0x4b, 0x63, 0xb4,
+	0x62, 0xa7, 0x7f, 0xdc, 0xeb, 0x0f, 0xbd, 0xf6, 0x71, 0x98, 0x1f, 0xe6, 0x2b, 0xc6, 0xb0, 0x5d,
+	0x92, 0xc1, 0x0f, 0x88, 0x8d, 0xc3, 0xec, 0x9b, 0xa0, 0x35, 0x03, 0xd6, 0x3a, 0xd4, 0x0a, 0xe8,
+	0x5e, 0x0a, 0x31, 0xf1, 0x8b, 0x08, 0x87, 0x14, 0x29, 0x50, 0x71, 0x1d, 0x55, 0xda, 0x90, 0x36,
+	0x17, 0x76, 0xab, 0xc3, 0xdb, 0xf5, 0xca, 0xd1, 0xbe, 0x59, 0x71, 0x1d, 0xed, 0x9d, 0x04, 0xca,
+	0x5e, 0x80, 0x2d, 0x8a, 0xcb, 0x42, 0xd0, 0x3a, 0xd4, 0xba, 0x91, 0xe7, 0xf4, 0xf1, 0x85, 0x6f,
+	0xd1, 0x4b, 0xb5, 0x32, 0x32, 0x30, 0x21, 0x39, 0x3a, 0xb1, 0xe8, 0x25, 0x52, 0x61, 0xde, 0x26,
+	0x5e, 0x48, 0xfa, 0x58, 0x9d, 0xdd, 0x90, 0x36, 0xbf, 0x36, 0xd3, 0x2d, 0x92, 0x61, 0x2e, 0xa4,
+	0x8e, 0xeb, 0xa9, 0x5f, 0xc5, 0xa0, 0x64, 0x83, 0x14, 0xa8, 0x86, 0xd4, 0x21, 0x11, 0x55, 0xe7,
+	0xe2, 0x63, 0xb6, 0x63, 0xe7, 0x38, 0x08, 0xd4, 0x6a, 0x76, 0x8e, 0x83, 0x40, 0x7b, 0x2b, 0xc1,
+	0xb7, 0x9f, 0xf9, 0x1c, 0xfa, 0xc4, 0x0b, 0x31, 0xda, 0x86, 0x85, 0x2c, 0x5d, 0xb1, 0xef, 0xb5,
+	0x76, 0x53, 0x2f, 0xde, 0x6f, 0x9c, 0x3f, 0x3d, 0x87, 0xe6, 0x00, 0xb4, 0x03, 0x35, 0xd7, 0x73,
+	0xe9, 0x49, 0x92, 0xd3, 0x38, 0xb4, 0x5a, 0xfb, 0x7b, 0x2e, 0x9e, 0xd9, 0x98, 0xe3, 0x00, 0x6d,
+	0x0b, 0x94, 0x7d, 0xdc, 0xc7, 0xe5, 0x93, 0xa9, 0xb5, 0x60, 0xed, 0xd8, 0x0d, 0xf3, 0xfb, 0x0a,
+	0x53, 0x80, 0x0c, 0x73, 0xe4, 0x65, 0x12, 0xc4, 0xec, 0x28, 0x55, 0xf1, 0x46, 0xfb, 0x07, 0x94,
+	0x49, 0x73, 0x16, 0xf8, 0x0e, 0x40, 0xe6, 0x66, 0x18, 0x83, 0xee, 0x8f, 0x7c, 0x0c, 0xa1, 0xdd,
+	0x49, 0xb0, 0x1a, 0x97, 0x4e, 0x1a, 0x18, 0xf3, 0xa3, 0x0d, 0x8b, 0x99, 0xd5, 0x45, 0x16, 0xc2,
+	0xf2, 0xf0, 0x76, 0xbd, 0x96, 0x11, 0x1d, 0xed, 0x9b, 0xb5, 0xcc, 0xe8, 0xc8, 0x41, 0xbf, 0xc1,
+	0xbc, 0xff, 0x80, 0x14, 0xa6, 0xc6, 0xcf, 0x5e, 0x38, 0x7f, 0x81, 0x5c, 0x0c, 0x91, 0xe5, 0x6e,
+	0xcc, 0x5f, 0xe9, 0x01, 0xfe, 0x6a, 0x2d, 0x58, 0x3d, 0xc4, 0xe5, 0x7b, 0xed, 0x6f, 0x90, 0x8b,
+	0xe6, 0x4f, 0x51, 0xb3, 0xda, 0x00, 0x94, 0x53, 0xdf, 0xe1, 0x35, 0xf0, 0x97, 0x5c, 0xdd, 0x7d,
+	0xcd, 0x3d, 0x52, 0x98, 0x13, 0x2b, 0x0a, 0xcb, 0x57, 0xf8, 0x16, 0x28, 0x26, 0x0e, 0xa3, 0x41,
+	0x79, 0xc4, 0x39, 0x7c, 0x73, 0x88, 0x9f, 0xa2, 0x0e, 0x57, 0x60, 0xd6, 0x77, 0x9d, 0x38, 0x88,
+	0xba, 0x39, 0x5a, 0x6a, 0xc7, 0x80, 0xc6, 0xa9, 0x1f, 0x79, 0xff, 0x14, 0xe4, 0x8e, 0xdb, 0xf3,
+	0xac, 0xfe, 0x73, 0xf8, 0x1a, 0x57, 0x71, 0xcc, 0x1e, 0x37, 0x43, 0xdd, 0x64, 0x3b, 0xed, 0x5f,
+	0x90, 0x13, 0x91, 0x79, 0x96, 0x0c, 0xfd, 0x09, 0xf2, 0x48, 0x61, 0x18, 0x37, 0x7e, 0x0c, 0xbb,
+	0xd6, 0x49, 0xc4, 0x6d, 0x8c, 0x8b, 0x25, 0xfc, 0x77, 0x58, 0xf0, 0xd3, 0x43, 0xa6, 0x55, 0xd3,
+	0x53, 0x9e, 0x9b, 0xb7, 0xdf, 0x00, 0xac, 0x1c, 0xa4, 0x13, 0xbc, 0x93, 0xcc, 0x6a, 0x14, 0xc0,
+	0xf2, 0xc4, 0x44, 0x40, 0xba, 0xce, 0x1f, 0xeb, 0x3a, 0x7f, 0xdc, 0x35, 0x8c, 0xd2, 0xf6, 0x2c,
+	0x88, 0x33, 0x58, 0x2a, 0xce, 0x5a, 0xd4, 0x12, 0x51, 0x70, 0x67, 0x72, 0x43, 0xd1, 0x93, 0x07,
+	0x86, 0x9e, 0x3e, 0x30, 0xf4, 0x83, 0xd1, 0x03, 0x03, 0x9d, 0xc3, 0xf2, 0x44, 0x47, 0x8b, 0x83,
+	0xe1, 0xb7, 0xbe, 0x90, 0xfa, 0x0c, 0x96, 0x8a, 0xdd, 0x2b, 0xf6, 0x99, 0xdb, 0xe5, 0xd3, 0x7c,
+	0x9e, 0xe8, 0x72, 0xb1, 0xcf, 0x7c, 0x39, 0x98, 0x46, 0x3d, 0x31, 0x54, 0xc5, 0xd4, 0xfc, 0xe9,
+	0x2b, 0xa4, 0x76, 0x61, 0x71, 0x5c, 0x91, 0xd1, 0x4f, 0x22, 0x5e, 0x8e, 0xcc, 0x37, 0x7e, 0x2e,
+	0x67, 0xcc, 0xaa, 0x85, 0xc0, 0x52, 0x71, 0x72, 0x8b, 0x33, 0xcf, 0x7d, 0x10, 0x34, 0xf4, 0xb2,
+	0xe6, 0xec, 0x87, 0x2e, 0x2c, 0x8e, 0x0f, 0x3b, 0x71, 0x6c, 0x9c, 0xa9, 0x2f, 0x8e, 0x8d, 0x3b,
+	0x3f, 0x6d, 0x80, 0x5c, 0x55, 0xd1, 0x0f, 0x53, 0xf2, 0x32, 0xf1, 0x9b, 0x1f, 0xcb, 0x98, 0xb2,
+	0x9f, 0x9c, 0x42, 0xbd, 0x20, 0xb6, 0x48, 0xec, 0x23, 0x47, 0x93, 0x85, 0x25, 0x70, 0x0a, 0xf5,
+	0x82, 0x9a, 0x8a, 0x69, 0x79, 0xa2, 0x2b, 0xa4, 0xed, 0x43, 0xbd, 0x20, 0x7d, 0x62, 0x5a, 0x9e,
+	0xda, 0x36, 0x5a, 0x25, 0xad, 0x93, 0xdc, 0xec, 0xaa, 0x37, 0x77, 0xcd, 0x99, 0x0f, 0x77, 0xcd,
+	0x99, 0xd7, 0xc3, 0xa6, 0x74, 0x33, 0x6c, 0x4a, 0xef, 0x87, 0x4d, 0xe9, 0xe3, 0xb0, 0x29, 0x75,
+	0xab, 0xb1, 0x5f, 0xbf, 0x7e, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xe8, 0xeb, 0xc7, 0x6f, 0x29, 0x0d,
+	0x00, 0x00,
 }
diff --git a/api/services/shim/shim.pb.go b/api/services/shim/shim.pb.go
index 21db9bd..e89f499 100644
--- a/api/services/shim/shim.pb.go
+++ b/api/services/shim/shim.pb.go
@@ -35,17 +35,14 @@ import _ "github.com/gogo/protobuf/gogoproto"
 import containerd_v1_types2 "github.com/docker/containerd/api/types/process"
 import containerd_v1_types "github.com/docker/containerd/api/types/user"
 
-import strings "strings"
-import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
-import sort "sort"
-import strconv "strconv"
-import reflect "reflect"
-
 import (
 	context "golang.org/x/net/context"
 	grpc "google.golang.org/grpc"
 )
 
+import strings "strings"
+import reflect "reflect"
+
 import io "io"
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -252,212 +249,6 @@ func init() {
 	proto.RegisterType((*ResumeRequest)(nil), "containerd.v1.services.ResumeRequest")
 	proto.RegisterEnum("containerd.v1.services.EventType", EventType_name, EventType_value)
 }
-func (this *CreateRequest) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 12)
-	s = append(s, "&shim.CreateRequest{")
-	s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n")
-	s = append(s, "Bundle: "+fmt.Sprintf("%#v", this.Bundle)+",\n")
-	s = append(s, "Runtime: "+fmt.Sprintf("%#v", this.Runtime)+",\n")
-	s = append(s, "NoPivot: "+fmt.Sprintf("%#v", this.NoPivot)+",\n")
-	s = append(s, "Terminal: "+fmt.Sprintf("%#v", this.Terminal)+",\n")
-	s = append(s, "Stdin: "+fmt.Sprintf("%#v", this.Stdin)+",\n")
-	s = append(s, "Stdout: "+fmt.Sprintf("%#v", this.Stdout)+",\n")
-	s = append(s, "Stderr: "+fmt.Sprintf("%#v", this.Stderr)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *CreateResponse) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 5)
-	s = append(s, "&shim.CreateResponse{")
-	s = append(s, "Pid: "+fmt.Sprintf("%#v", this.Pid)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *StartRequest) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 4)
-	s = append(s, "&shim.StartRequest{")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *DeleteRequest) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 5)
-	s = append(s, "&shim.DeleteRequest{")
-	s = append(s, "Pid: "+fmt.Sprintf("%#v", this.Pid)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *DeleteResponse) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 5)
-	s = append(s, "&shim.DeleteResponse{")
-	s = append(s, "ExitStatus: "+fmt.Sprintf("%#v", this.ExitStatus)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *ExecRequest) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 17)
-	s = append(s, "&shim.ExecRequest{")
-	s = append(s, "Terminal: "+fmt.Sprintf("%#v", this.Terminal)+",\n")
-	s = append(s, "Stdin: "+fmt.Sprintf("%#v", this.Stdin)+",\n")
-	s = append(s, "Stdout: "+fmt.Sprintf("%#v", this.Stdout)+",\n")
-	s = append(s, "Stderr: "+fmt.Sprintf("%#v", this.Stderr)+",\n")
-	s = append(s, "SelinuxLabel: "+fmt.Sprintf("%#v", this.SelinuxLabel)+",\n")
-	if this.User != nil {
-		s = append(s, "User: "+fmt.Sprintf("%#v", this.User)+",\n")
-	}
-	s = append(s, "Args: "+fmt.Sprintf("%#v", this.Args)+",\n")
-	s = append(s, "Env: "+fmt.Sprintf("%#v", this.Env)+",\n")
-	s = append(s, "Cwd: "+fmt.Sprintf("%#v", this.Cwd)+",\n")
-	s = append(s, "Capabilities: "+fmt.Sprintf("%#v", this.Capabilities)+",\n")
-	if this.Rlimits != nil {
-		s = append(s, "Rlimits: "+fmt.Sprintf("%#v", this.Rlimits)+",\n")
-	}
-	s = append(s, "NoNewPrivileges: "+fmt.Sprintf("%#v", this.NoNewPrivileges)+",\n")
-	s = append(s, "ApparmorProfile: "+fmt.Sprintf("%#v", this.ApparmorProfile)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *Rlimit) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 7)
-	s = append(s, "&shim.Rlimit{")
-	s = append(s, "Type: "+fmt.Sprintf("%#v", this.Type)+",\n")
-	s = append(s, "Hard: "+fmt.Sprintf("%#v", this.Hard)+",\n")
-	s = append(s, "Soft: "+fmt.Sprintf("%#v", this.Soft)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *ExecResponse) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 5)
-	s = append(s, "&shim.ExecResponse{")
-	s = append(s, "Pid: "+fmt.Sprintf("%#v", this.Pid)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *PtyRequest) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 7)
-	s = append(s, "&shim.PtyRequest{")
-	s = append(s, "Pid: "+fmt.Sprintf("%#v", this.Pid)+",\n")
-	s = append(s, "Width: "+fmt.Sprintf("%#v", this.Width)+",\n")
-	s = append(s, "Height: "+fmt.Sprintf("%#v", this.Height)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *EventsRequest) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 4)
-	s = append(s, "&shim.EventsRequest{")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *Event) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 8)
-	s = append(s, "&shim.Event{")
-	s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n")
-	s = append(s, "Type: "+fmt.Sprintf("%#v", this.Type)+",\n")
-	s = append(s, "Pid: "+fmt.Sprintf("%#v", this.Pid)+",\n")
-	s = append(s, "ExitStatus: "+fmt.Sprintf("%#v", this.ExitStatus)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *StateRequest) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 4)
-	s = append(s, "&shim.StateRequest{")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *StateResponse) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 8)
-	s = append(s, "&shim.StateResponse{")
-	s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n")
-	s = append(s, "Bundle: "+fmt.Sprintf("%#v", this.Bundle)+",\n")
-	s = append(s, "InitPid: "+fmt.Sprintf("%#v", this.InitPid)+",\n")
-	if this.Processes != nil {
-		s = append(s, "Processes: "+fmt.Sprintf("%#v", this.Processes)+",\n")
-	}
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *PauseRequest) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 4)
-	s = append(s, "&shim.PauseRequest{")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func (this *ResumeRequest) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 4)
-	s = append(s, "&shim.ResumeRequest{")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func valueToGoStringShim(v interface{}, typ string) string {
-	rv := reflect.ValueOf(v)
-	if rv.IsNil() {
-		return "nil"
-	}
-	pv := reflect.Indirect(rv).Interface()
-	return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
-}
-func extensionToGoStringShim(m github_com_gogo_protobuf_proto.Message) string {
-	e := github_com_gogo_protobuf_proto.GetUnsafeExtensionsMap(m)
-	if e == nil {
-		return "nil"
-	}
-	s := "proto.NewUnsafeXXX_InternalExtensions(map[int32]proto.Extension{"
-	keys := make([]int, 0, len(e))
-	for k := range e {
-		keys = append(keys, int(k))
-	}
-	sort.Ints(keys)
-	ss := []string{}
-	for _, k := range keys {
-		ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString())
-	}
-	s += strings.Join(ss, ",") + "})"
-	return s
-}
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ context.Context
@@ -3667,67 +3458,66 @@ func init() {
 }
 
 var fileDescriptorShim = []byte{
-	// 982 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x55, 0xdd, 0x8e, 0xdb, 0x44,
-	0x14, 0x5e, 0xc7, 0xce, 0xdf, 0x49, 0x9c, 0x0d, 0xa3, 0x6a, 0xe5, 0x86, 0x92, 0xa6, 0x6e, 0x8b,
-	0x96, 0x4a, 0x38, 0x74, 0x11, 0x08, 0x10, 0x37, 0xdb, 0x8d, 0x85, 0x2a, 0x15, 0x1a, 0xbc, 0x41,
-	0xf4, 0x2e, 0x72, 0xe2, 0xd9, 0x64, 0x84, 0x63, 0x9b, 0x99, 0x71, 0x76, 0x73, 0xc7, 0x2d, 0x0f,
-	0xc0, 0x7b, 0xf0, 0x18, 0xbd, 0x41, 0xe2, 0x0a, 0x71, 0x85, 0xd8, 0x3c, 0x01, 0x8f, 0x80, 0x66,
-	0xc6, 0x4e, 0x36, 0xed, 0x7a, 0x17, 0x71, 0x93, 0x9c, 0xf3, 0xf9, 0x9b, 0x33, 0xe7, 0x7f, 0xe0,
-	0xf3, 0x19, 0xe1, 0xf3, 0x74, 0xe2, 0x4c, 0xe3, 0x45, 0x3f, 0x88, 0xa7, 0x3f, 0x60, 0xda, 0x9f,
-	0xc6, 0x11, 0xf7, 0x49, 0x84, 0x69, 0xd0, 0xf7, 0x13, 0xd2, 0x67, 0x98, 0x2e, 0xc9, 0x14, 0xb3,
-	0x3e, 0x9b, 0x93, 0x85, 0xfc, 0x71, 0x12, 0x1a, 0xf3, 0x18, 0x1d, 0x6c, 0x89, 0xce, 0xf2, 0xa9,
-	0x93, 0xf3, 0x3a, 0xef, 0xce, 0xe2, 0x78, 0x16, 0xe2, 0xbe, 0x64, 0x4d, 0xd2, 0xb3, 0x3e, 0x5e,
-	0x24, 0x7c, 0xa5, 0x0e, 0x75, 0xee, 0xcc, 0xe2, 0x59, 0x2c, 0xc5, 0xbe, 0x90, 0x32, 0xf4, 0xcb,
-	0x5b, 0xbd, 0xe0, 0xab, 0x04, 0x33, 0x61, 0x72, 0x8a, 0xd9, 0xe6, 0x3f, 0x3b, 0xfd, 0xe9, 0x7f,
-	0x3c, 0x9d, 0x32, 0x4c, 0xe5, 0x8f, 0x3a, 0x67, 0xff, 0xa1, 0x81, 0x79, 0x42, 0xb1, 0xcf, 0xb1,
-	0x87, 0x7f, 0x4c, 0x31, 0xe3, 0xe8, 0x00, 0x4a, 0x24, 0xb0, 0xb4, 0x9e, 0x76, 0x58, 0x7f, 0x56,
-	0x59, 0xff, 0x75, 0xbf, 0xf4, 0x7c, 0xe0, 0x95, 0x48, 0x80, 0x0e, 0xa0, 0x32, 0x49, 0xa3, 0x20,
-	0xc4, 0x56, 0x49, 0x7c, 0xf3, 0x32, 0x0d, 0x59, 0x50, 0xa5, 0x69, 0xc4, 0xc9, 0x02, 0x5b, 0xba,
-	0xfc, 0x90, 0xab, 0xe8, 0x2e, 0xd4, 0xa2, 0x78, 0x9c, 0x90, 0x65, 0xcc, 0x2d, 0xa3, 0xa7, 0x1d,
-	0xd6, 0xbc, 0x6a, 0x14, 0x0f, 0x85, 0x8a, 0x3a, 0x50, 0xe3, 0x98, 0x2e, 0x48, 0xe4, 0x87, 0x56,
-	0x59, 0x7e, 0xda, 0xe8, 0xe8, 0x0e, 0x94, 0x19, 0x0f, 0x48, 0x64, 0x55, 0xa4, 0x39, 0xa5, 0x88,
-	0xeb, 0x19, 0x0f, 0xe2, 0x94, 0x5b, 0x55, 0x75, 0xbd, 0xd2, 0x32, 0x1c, 0x53, 0x6a, 0xd5, 0x36,
-	0x38, 0xa6, 0xd4, 0xb6, 0xa1, 0x95, 0xc7, 0xc5, 0x92, 0x38, 0x62, 0x18, 0xb5, 0x41, 0x4f, 0xb2,
-	0xc8, 0x4c, 0x4f, 0x88, 0x76, 0x0b, 0x9a, 0xa7, 0xdc, 0xa7, 0x3c, 0x0b, 0xdd, 0x7e, 0x00, 0xe6,
-	0x00, 0x87, 0x78, 0x9b, 0x8b, 0xb7, 0x8f, 0x3c, 0x85, 0x56, 0x4e, 0xc9, 0xcc, 0xde, 0x87, 0x06,
-	0xbe, 0x20, 0x7c, 0xcc, 0xb8, 0xcf, 0x53, 0x96, 0x71, 0x41, 0x40, 0xa7, 0x12, 0xb1, 0x7f, 0xd5,
-	0xa1, 0xe1, 0x5e, 0xe0, 0x69, 0x6e, 0xf4, 0x6a, 0xec, 0x5a, 0x51, 0xec, 0xa5, 0xeb, 0x63, 0xd7,
-	0x0b, 0x62, 0x37, 0xae, 0xc6, 0x8e, 0x1e, 0x82, 0xc9, 0x70, 0x48, 0xa2, 0xf4, 0x62, 0x1c, 0xfa,
-	0x13, 0xac, 0x52, 0x5c, 0xf7, 0x9a, 0x19, 0xf8, 0x42, 0x60, 0xe8, 0x43, 0x30, 0x44, 0x1f, 0xc8,
-	0x2c, 0x37, 0x8e, 0xee, 0x3a, 0xbb, 0x9d, 0x2c, 0xbb, 0xc5, 0xf9, 0x8e, 0x61, 0xea, 0x49, 0x1a,
-	0x42, 0x60, 0xf8, 0x74, 0xc6, 0xac, 0x6a, 0x4f, 0x3f, 0xac, 0x7b, 0x52, 0x16, 0xe9, 0xc1, 0xd1,
-	0xd2, 0xaa, 0x49, 0x48, 0x88, 0x02, 0x99, 0x9e, 0x07, 0x56, 0x5d, 0xde, 0x27, 0x44, 0x64, 0x43,
-	0x73, 0xea, 0x27, 0xfe, 0x84, 0x84, 0x84, 0x13, 0xcc, 0x2c, 0x90, 0xe4, 0x1d, 0x0c, 0x7d, 0x06,
-	0x55, 0x1a, 0x92, 0x05, 0xe1, 0xcc, 0x6a, 0xf4, 0xf4, 0xc3, 0xc6, 0x51, 0xd7, 0xb9, 0x7e, 0xae,
-	0x1c, 0x4f, 0xd2, 0xbc, 0x9c, 0x8e, 0x9e, 0xc0, 0x3b, 0x51, 0x3c, 0x8e, 0xf0, 0xf9, 0x38, 0xa1,
-	0x64, 0x49, 0x42, 0x3c, 0xc3, 0xcc, 0x6a, 0xca, 0xa4, 0xee, 0x47, 0xf1, 0x37, 0xf8, 0x7c, 0xb8,
-	0x81, 0xd1, 0x07, 0xd0, 0xf6, 0x93, 0xc4, 0xa7, 0x8b, 0x98, 0x8e, 0x13, 0x1a, 0x9f, 0x91, 0x10,
-	0x5b, 0xa6, 0x74, 0x74, 0x3f, 0xc7, 0x87, 0x0a, 0xb6, 0x07, 0x50, 0x51, 0x37, 0x89, 0xb0, 0x45,
-	0x2a, 0xd4, 0x3c, 0x78, 0x52, 0x16, 0xd8, 0xdc, 0xa7, 0x81, 0xac, 0x91, 0xe1, 0x49, 0x59, 0x60,
-	0x2c, 0x3e, 0x53, 0x05, 0x32, 0x3c, 0x29, 0xdb, 0x3d, 0x68, 0xaa, 0xba, 0x17, 0x36, 0xe0, 0x0b,
-	0x80, 0x21, 0x5f, 0x15, 0x76, 0x9b, 0x68, 0x87, 0x73, 0x12, 0xf0, 0xb9, 0xbc, 0xca, 0xf4, 0x94,
-	0x22, 0xca, 0x3e, 0xc7, 0x64, 0x36, 0x57, 0xb7, 0x99, 0x5e, 0xa6, 0xd9, 0xfb, 0x60, 0xba, 0x4b,
-	0x1c, 0x71, 0x96, 0xf7, 0xf3, 0xcf, 0x1a, 0x94, 0x25, 0x52, 0x38, 0xd4, 0x9f, 0x64, 0xe1, 0x09,
-	0xfb, 0xad, 0xa3, 0x07, 0x45, 0x69, 0x97, 0x46, 0x46, 0xab, 0x04, 0x67, 0x19, 0xc8, 0x3c, 0xd5,
-	0xb7, 0x9e, 0xbe, 0x31, 0x05, 0xc6, 0x5b, 0x53, 0xa0, 0x66, 0x6d, 0x33, 0x5a, 0xf6, 0x2f, 0x1a,
-	0x98, 0x19, 0x90, 0xa5, 0xe7, 0x7f, 0x2c, 0x1e, 0x12, 0x11, 0x3e, 0xdc, 0x38, 0x92, 0xab, 0xe8,
-	0x0b, 0xa8, 0x67, 0xdb, 0x11, 0x0b, 0x57, 0x44, 0x47, 0xdd, 0xbb, 0xb6, 0xbf, 0x87, 0x8a, 0xe5,
-	0x6d, 0xe9, 0xc2, 0xcf, 0xa1, 0x9f, 0xb2, 0x8d, 0x9f, 0xfb, 0x60, 0x7a, 0x98, 0xa5, 0x8b, 0x1c,
-	0x78, 0xe2, 0x42, 0x7d, 0x93, 0x0e, 0x54, 0x03, 0xc3, 0x7d, 0xf5, 0x7c, 0xd4, 0xde, 0x43, 0x55,
-	0xd0, 0x5f, 0xbe, 0xfc, 0xba, 0xad, 0x21, 0x80, 0xca, 0x89, 0xe7, 0x1e, 0x8f, 0xdc, 0x76, 0x09,
-	0xd5, 0xa1, 0x7c, 0x3a, 0x3a, 0xf6, 0x46, 0x6d, 0x1d, 0xb5, 0x00, 0xdc, 0x57, 0xee, 0xc9, 0xf8,
-	0x78, 0x30, 0x70, 0x07, 0x6d, 0xe3, 0xe8, 0xb7, 0x32, 0x18, 0xa7, 0x73, 0xb2, 0x40, 0xdf, 0x43,
-	0x45, 0x2d, 0x2a, 0xf4, 0xb8, 0x28, 0xfd, 0x3b, 0x0b, 0xba, 0xf3, 0xfe, 0x6d, 0xb4, 0x2c, 0x9f,
-	0x2e, 0x94, 0xe5, 0x76, 0x43, 0x8f, 0x8a, 0x0e, 0x5c, 0x5d, 0x7e, 0x9d, 0x03, 0x47, 0xbd, 0x59,
-	0x4e, 0xfe, 0x66, 0x39, 0xae, 0x78, 0xb3, 0x84, 0x7f, 0x6a, 0xe3, 0x15, 0xfb, 0xb7, 0xb3, 0x34,
-	0x8b, 0xfd, 0x7b, 0x63, 0x71, 0x7e, 0x0b, 0x86, 0x18, 0x0f, 0xf4, 0xb0, 0xb0, 0xeb, 0xb6, 0x4b,
-	0xb3, 0xf3, 0xe8, 0x66, 0x52, 0x66, 0xf2, 0x18, 0xf4, 0x21, 0x5f, 0x21, 0xbb, 0x88, 0xbc, 0x1d,
-	0xb6, 0xc2, 0x70, 0x87, 0x50, 0x51, 0x43, 0x54, 0x1c, 0xee, 0xce, 0x90, 0x75, 0xde, 0xbb, 0x91,
-	0xf6, 0x91, 0x86, 0x46, 0xb2, 0x0e, 0x1c, 0xdf, 0x58, 0x87, 0x6d, 0xfa, 0x1e, 0xdf, 0xc2, 0xda,
-	0x56, 0x57, 0xf6, 0x69, 0xb1, 0xd5, 0xab, 0x6d, 0x5c, 0x18, 0xee, 0x57, 0x50, 0x51, 0xed, 0x5d,
-	0x1c, 0xee, 0x4e, 0xfb, 0x17, 0x19, 0x7a, 0x76, 0xef, 0xf5, 0x65, 0x77, 0xef, 0xcf, 0xcb, 0xee,
-	0xde, 0x3f, 0x97, 0x5d, 0xed, 0xa7, 0x75, 0x57, 0x7b, 0xbd, 0xee, 0x6a, 0xbf, 0xaf, 0xbb, 0xda,
-	0xdf, 0xeb, 0xae, 0x36, 0xa9, 0x48, 0xf6, 0xc7, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xcf, 0x48,
-	0x89, 0x64, 0x6b, 0x09, 0x00, 0x00,
+	// 976 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x55, 0x4f, 0x6f, 0xe3, 0x44,
+	0x14, 0xaf, 0x13, 0xe7, 0xdf, 0x6b, 0xdd, 0x86, 0xd1, 0xaa, 0xf2, 0x06, 0xc8, 0x76, 0xbd, 0xbb,
+	0xa8, 0xac, 0x84, 0xc3, 0x16, 0x81, 0x00, 0x71, 0xe9, 0x36, 0x16, 0x5a, 0x69, 0x61, 0x83, 0x1b,
+	0xc4, 0xde, 0x22, 0x27, 0x7e, 0x4d, 0x46, 0x38, 0xb6, 0x99, 0x19, 0xa7, 0xed, 0x8d, 0x2b, 0x1f,
+	0x80, 0xef, 0xc1, 0xc7, 0xd8, 0x0b, 0x12, 0x27, 0xc4, 0x09, 0xb1, 0xf9, 0x24, 0x68, 0x66, 0xec,
+	0xa4, 0xd9, 0xad, 0x5b, 0xc4, 0x25, 0x79, 0xef, 0xe7, 0xdf, 0xbc, 0x79, 0xff, 0x07, 0xbe, 0x98,
+	0x52, 0x31, 0xcb, 0xc6, 0xee, 0x24, 0x99, 0xf7, 0xc2, 0x64, 0xf2, 0x23, 0xb2, 0xde, 0x24, 0x89,
+	0x45, 0x40, 0x63, 0x64, 0x61, 0x2f, 0x48, 0x69, 0x8f, 0x23, 0x5b, 0xd0, 0x09, 0xf2, 0x1e, 0x9f,
+	0xd1, 0xb9, 0xfa, 0x71, 0x53, 0x96, 0x88, 0x84, 0xec, 0xaf, 0x89, 0xee, 0xe2, 0x89, 0x5b, 0xf0,
+	0x3a, 0xef, 0x4e, 0x93, 0x64, 0x1a, 0x61, 0x4f, 0xb1, 0xc6, 0xd9, 0x59, 0x0f, 0xe7, 0xa9, 0xb8,
+	0xd4, 0x87, 0x3a, 0x77, 0xa6, 0xc9, 0x34, 0x51, 0x62, 0x4f, 0x4a, 0x39, 0xfa, 0xd5, 0xad, 0x5e,
+	0x88, 0xcb, 0x14, 0xb9, 0x34, 0x39, 0x41, 0xbe, 0xfa, 0xcf, 0x4f, 0x7f, 0xf6, 0x1f, 0x4f, 0x67,
+	0x1c, 0x99, 0xfa, 0xd1, 0xe7, 0x9c, 0x3f, 0x0d, 0xb0, 0x4e, 0x18, 0x06, 0x02, 0x7d, 0xfc, 0x29,
+	0x43, 0x2e, 0xc8, 0x3e, 0x54, 0x68, 0x68, 0x1b, 0x07, 0xc6, 0x61, 0xeb, 0x69, 0x7d, 0xf9, 0xf7,
+	0xbd, 0xca, 0xb3, 0xbe, 0x5f, 0xa1, 0x21, 0xd9, 0x87, 0xfa, 0x38, 0x8b, 0xc3, 0x08, 0xed, 0x8a,
+	0xfc, 0xe6, 0xe7, 0x1a, 0xb1, 0xa1, 0xc1, 0xb2, 0x58, 0xd0, 0x39, 0xda, 0x55, 0xf5, 0xa1, 0x50,
+	0xc9, 0x5d, 0x68, 0xc6, 0xc9, 0x28, 0xa5, 0x8b, 0x44, 0xd8, 0xe6, 0x81, 0x71, 0xd8, 0xf4, 0x1b,
+	0x71, 0x32, 0x90, 0x2a, 0xe9, 0x40, 0x53, 0x20, 0x9b, 0xd3, 0x38, 0x88, 0xec, 0x9a, 0xfa, 0xb4,
+	0xd2, 0xc9, 0x1d, 0xa8, 0x71, 0x11, 0xd2, 0xd8, 0xae, 0x2b, 0x73, 0x5a, 0x91, 0xd7, 0x73, 0x11,
+	0x26, 0x99, 0xb0, 0x1b, 0xfa, 0x7a, 0xad, 0xe5, 0x38, 0x32, 0x66, 0x37, 0x57, 0x38, 0x32, 0xe6,
+	0x38, 0xb0, 0x5b, 0xc4, 0xc5, 0xd3, 0x24, 0xe6, 0x48, 0xda, 0x50, 0x4d, 0xf3, 0xc8, 0x2c, 0x5f,
+	0x8a, 0xce, 0x2e, 0xec, 0x9c, 0x8a, 0x80, 0x89, 0x3c, 0x74, 0xe7, 0x3e, 0x58, 0x7d, 0x8c, 0x70,
+	0x9d, 0x8b, 0xb7, 0x8f, 0x3c, 0x81, 0xdd, 0x82, 0x92, 0x9b, 0xbd, 0x07, 0xdb, 0x78, 0x41, 0xc5,
+	0x88, 0x8b, 0x40, 0x64, 0x3c, 0xe7, 0x82, 0x84, 0x4e, 0x15, 0xe2, 0xfc, 0x56, 0x85, 0x6d, 0xef,
+	0x02, 0x27, 0x85, 0xd1, 0xab, 0xb1, 0x1b, 0x65, 0xb1, 0x57, 0xae, 0x8f, 0xbd, 0x5a, 0x12, 0xbb,
+	0x79, 0x35, 0x76, 0xf2, 0x00, 0x2c, 0x8e, 0x11, 0x8d, 0xb3, 0x8b, 0x51, 0x14, 0x8c, 0x51, 0xa7,
+	0xb8, 0xe5, 0xef, 0xe4, 0xe0, 0x73, 0x89, 0x91, 0x8f, 0xc0, 0x94, 0x7d, 0xa0, 0xb2, 0xbc, 0x7d,
+	0x74, 0xd7, 0xdd, 0xec, 0x64, 0xd5, 0x2d, 0xee, 0xf7, 0x1c, 0x99, 0xaf, 0x68, 0x84, 0x80, 0x19,
+	0xb0, 0x29, 0xb7, 0x1b, 0x07, 0xd5, 0xc3, 0x96, 0xaf, 0x64, 0x99, 0x1e, 0x8c, 0x17, 0x76, 0x53,
+	0x41, 0x52, 0x94, 0xc8, 0xe4, 0x3c, 0xb4, 0x5b, 0xea, 0x3e, 0x29, 0x12, 0x07, 0x76, 0x26, 0x41,
+	0x1a, 0x8c, 0x69, 0x44, 0x05, 0x45, 0x6e, 0x83, 0x22, 0x6f, 0x60, 0xe4, 0x73, 0x68, 0xb0, 0x88,
+	0xce, 0xa9, 0xe0, 0xf6, 0xf6, 0x41, 0xf5, 0x70, 0xfb, 0xa8, 0xeb, 0x5e, 0x3f, 0x57, 0xae, 0xaf,
+	0x68, 0x7e, 0x41, 0x27, 0x8f, 0xe1, 0x9d, 0x38, 0x19, 0xc5, 0x78, 0x3e, 0x4a, 0x19, 0x5d, 0xd0,
+	0x08, 0xa7, 0xc8, 0xed, 0x1d, 0x95, 0xd4, 0xbd, 0x38, 0xf9, 0x16, 0xcf, 0x07, 0x2b, 0x98, 0x7c,
+	0x08, 0xed, 0x20, 0x4d, 0x03, 0x36, 0x4f, 0xd8, 0x28, 0x65, 0xc9, 0x19, 0x8d, 0xd0, 0xb6, 0x94,
+	0xa3, 0x7b, 0x05, 0x3e, 0xd0, 0xb0, 0xd3, 0x87, 0xba, 0xbe, 0x49, 0x86, 0x2d, 0x53, 0xa1, 0xe7,
+	0xc1, 0x57, 0xb2, 0xc4, 0x66, 0x01, 0x0b, 0x55, 0x8d, 0x4c, 0x5f, 0xc9, 0x12, 0xe3, 0xc9, 0x99,
+	0x2e, 0x90, 0xe9, 0x2b, 0xd9, 0x39, 0x80, 0x1d, 0x5d, 0xf7, 0xd2, 0x06, 0x7c, 0x0e, 0x30, 0x10,
+	0x97, 0xa5, 0xdd, 0x26, 0xdb, 0xe1, 0x9c, 0x86, 0x62, 0xa6, 0xae, 0xb2, 0x7c, 0xad, 0xc8, 0xb2,
+	0xcf, 0x90, 0x4e, 0x67, 0xfa, 0x36, 0xcb, 0xcf, 0x35, 0x67, 0x0f, 0x2c, 0x6f, 0x81, 0xb1, 0xe0,
+	0x45, 0x3f, 0xff, 0x62, 0x40, 0x4d, 0x21, 0xa5, 0x43, 0xfd, 0x69, 0x1e, 0x9e, 0xb4, 0xbf, 0x7b,
+	0x74, 0xbf, 0x2c, 0xed, 0xca, 0xc8, 0xf0, 0x32, 0xc5, 0x3c, 0x03, 0xb9, 0xa7, 0xd5, 0xb5, 0xa7,
+	0x6f, 0x4c, 0x81, 0xf9, 0xd6, 0x14, 0xe8, 0x59, 0x5b, 0x8d, 0x96, 0xf3, 0xab, 0x01, 0x56, 0x0e,
+	0xe4, 0xe9, 0xf9, 0x1f, 0x8b, 0x87, 0xc6, 0x54, 0x0c, 0x56, 0x8e, 0x14, 0x2a, 0xf9, 0x12, 0x5a,
+	0xf9, 0x76, 0x44, 0xe9, 0x8a, 0xec, 0xa8, 0xf7, 0xae, 0xed, 0xef, 0x81, 0x66, 0xf9, 0x6b, 0xba,
+	0xf4, 0x73, 0x10, 0x64, 0x7c, 0xe5, 0xe7, 0x1e, 0x58, 0x3e, 0xf2, 0x6c, 0x5e, 0x00, 0x8f, 0x3d,
+	0x68, 0xad, 0xd2, 0x41, 0x9a, 0x60, 0x7a, 0x2f, 0x9f, 0x0d, 0xdb, 0x5b, 0xa4, 0x01, 0xd5, 0x17,
+	0x2f, 0xbe, 0x69, 0x1b, 0x04, 0xa0, 0x7e, 0xe2, 0x7b, 0xc7, 0x43, 0xaf, 0x5d, 0x21, 0x2d, 0xa8,
+	0x9d, 0x0e, 0x8f, 0xfd, 0x61, 0xbb, 0x4a, 0x76, 0x01, 0xbc, 0x97, 0xde, 0xc9, 0xe8, 0xb8, 0xdf,
+	0xf7, 0xfa, 0x6d, 0xf3, 0xe8, 0xf7, 0x1a, 0x98, 0xa7, 0x33, 0x3a, 0x27, 0x3f, 0x40, 0x5d, 0x2f,
+	0x2a, 0xf2, 0xa8, 0x2c, 0xfd, 0x1b, 0x0b, 0xba, 0xf3, 0xc1, 0x6d, 0xb4, 0x3c, 0x9f, 0x1e, 0xd4,
+	0xd4, 0x76, 0x23, 0x0f, 0xcb, 0x0e, 0x5c, 0x5d, 0x7e, 0x9d, 0x7d, 0x57, 0xbf, 0x59, 0x6e, 0xf1,
+	0x66, 0xb9, 0x9e, 0x7c, 0xb3, 0xa4, 0x7f, 0x7a, 0xe3, 0x95, 0xfb, 0xb7, 0xb1, 0x34, 0xcb, 0xfd,
+	0x7b, 0x63, 0x71, 0x7e, 0x07, 0xa6, 0x1c, 0x0f, 0xf2, 0xa0, 0xb4, 0xeb, 0xd6, 0x4b, 0xb3, 0xf3,
+	0xf0, 0x66, 0x52, 0x6e, 0xf2, 0x18, 0xaa, 0x03, 0x71, 0x49, 0x9c, 0x32, 0xf2, 0x7a, 0xd8, 0x4a,
+	0xc3, 0x1d, 0x40, 0x5d, 0x0f, 0x51, 0x79, 0xb8, 0x1b, 0x43, 0xd6, 0x79, 0xff, 0x46, 0xda, 0xc7,
+	0x06, 0x19, 0xaa, 0x3a, 0x08, 0xbc, 0xb1, 0x0e, 0xeb, 0xf4, 0x3d, 0xba, 0x85, 0xb5, 0xae, 0xae,
+	0xea, 0xd3, 0x72, 0xab, 0x57, 0xdb, 0xb8, 0x34, 0xdc, 0xaf, 0xa1, 0xae, 0xdb, 0xbb, 0x3c, 0xdc,
+	0x8d, 0xf6, 0x2f, 0x33, 0xf4, 0xd4, 0x7e, 0xf5, 0xba, 0xbb, 0xf5, 0xd7, 0xeb, 0xee, 0xd6, 0xcf,
+	0xcb, 0xae, 0xf1, 0x6a, 0xd9, 0x35, 0xfe, 0x58, 0x76, 0x8d, 0x7f, 0x96, 0x5d, 0x63, 0x5c, 0x57,
+	0xcc, 0x4f, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x7d, 0x28, 0xed, 0x88, 0x67, 0x09, 0x00, 0x00,
 }
diff --git a/api/types/container/container.pb.go b/api/types/container/container.pb.go
index e5d082b..aa4323d 100644
--- a/api/types/container/container.pb.go
+++ b/api/types/container/container.pb.go
@@ -20,9 +20,6 @@ import _ "github.com/gogo/protobuf/gogoproto"
 import containerd_v1_types "github.com/docker/containerd/api/types/state"
 
 import strings "strings"
-import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
-import sort "sort"
-import strconv "strconv"
 import reflect "reflect"
 
 import io "io"
@@ -51,44 +48,6 @@ func (*Container) Descriptor() ([]byte, []int) { return fileDescriptorContainer,
 func init() {
 	proto.RegisterType((*Container)(nil), "containerd.v1.types.Container")
 }
-func (this *Container) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 7)
-	s = append(s, "&container.Container{")
-	s = append(s, "ID: "+fmt.Sprintf("%#v", this.ID)+",\n")
-	s = append(s, "Bundle: "+fmt.Sprintf("%#v", this.Bundle)+",\n")
-	s = append(s, "State: "+fmt.Sprintf("%#v", this.State)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func valueToGoStringContainer(v interface{}, typ string) string {
-	rv := reflect.ValueOf(v)
-	if rv.IsNil() {
-		return "nil"
-	}
-	pv := reflect.Indirect(rv).Interface()
-	return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
-}
-func extensionToGoStringContainer(m github_com_gogo_protobuf_proto.Message) string {
-	e := github_com_gogo_protobuf_proto.GetUnsafeExtensionsMap(m)
-	if e == nil {
-		return "nil"
-	}
-	s := "proto.NewUnsafeXXX_InternalExtensions(map[int32]proto.Extension{"
-	keys := make([]int, 0, len(e))
-	for k := range e {
-		keys = append(keys, int(k))
-	}
-	sort.Ints(keys)
-	ss := []string{}
-	for _, k := range keys {
-		ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString())
-	}
-	s += strings.Join(ss, ",") + "})"
-	return s
-}
 func (m *Container) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
@@ -438,7 +397,7 @@ func init() {
 }
 
 var fileDescriptorContainer = []byte{
-	// 219 bytes of a gzipped FileDescriptorProto
+	// 215 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x72, 0x48, 0xcf, 0x2c, 0xc9,
 	0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xc9, 0x4f, 0xce, 0x4e, 0x2d, 0xd2, 0x4f, 0xce,
 	0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d, 0x4a, 0xd1, 0x4f, 0x2c, 0xc8, 0xd4, 0x2f, 0xa9, 0x2c,
@@ -449,8 +408,8 @@ var fileDescriptorContainer = []byte{
 	0xa3, 0x06, 0xa7, 0x13, 0xdb, 0xa3, 0x7b, 0xf2, 0x4c, 0x9e, 0x2e, 0x41, 0x4c, 0x99, 0x29, 0x42,
 	0x62, 0x5c, 0x6c, 0x49, 0xa5, 0x79, 0x29, 0x39, 0xa9, 0x12, 0x4c, 0x20, 0xb9, 0x20, 0x28, 0x4f,
 	0xc8, 0x80, 0x8b, 0x15, 0x6c, 0x96, 0x04, 0x8b, 0x02, 0xa3, 0x06, 0x9f, 0x91, 0x94, 0x1e, 0x16,
-	0x17, 0xeb, 0x05, 0x83, 0x54, 0x04, 0x41, 0x14, 0x3a, 0xc9, 0x9c, 0x78, 0x28, 0xc7, 0x70, 0xe3,
-	0xa1, 0x1c, 0xc3, 0x87, 0x87, 0x72, 0x8c, 0x0d, 0x8f, 0xe4, 0x18, 0x4f, 0x3c, 0x92, 0x63, 0xbc,
-	0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x24, 0x36, 0xb0, 0x9b, 0x8c, 0x01, 0x01, 0x00,
-	0x00, 0xff, 0xff, 0x4c, 0xd0, 0x44, 0x85, 0x3c, 0x01, 0x00, 0x00,
+	0x17, 0xeb, 0x05, 0x83, 0x54, 0x04, 0x41, 0x14, 0x3a, 0x49, 0x9c, 0x78, 0x28, 0xc7, 0x70, 0xe3,
+	0xa1, 0x1c, 0x43, 0xc3, 0x23, 0x39, 0xc6, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c,
+	0xf0, 0x48, 0x8e, 0x31, 0x89, 0x0d, 0xec, 0x1e, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1f,
+	0x97, 0x28, 0xc5, 0x38, 0x01, 0x00, 0x00,
 }
diff --git a/api/types/mount/mount.pb.go b/api/types/mount/mount.pb.go
index b92e097..ef53fe3 100644
--- a/api/types/mount/mount.pb.go
+++ b/api/types/mount/mount.pb.go
@@ -19,9 +19,6 @@ import math "math"
 import _ "github.com/gogo/protobuf/gogoproto"
 
 import strings "strings"
-import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
-import sort "sort"
-import strconv "strconv"
 import reflect "reflect"
 
 import io "io"
@@ -63,45 +60,6 @@ func (*Mount) Descriptor() ([]byte, []int) { return fileDescriptorMount, []int{0
 func init() {
 	proto.RegisterType((*Mount)(nil), "containerd.v1.types.Mount")
 }
-func (this *Mount) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 8)
-	s = append(s, "&mount.Mount{")
-	s = append(s, "Type: "+fmt.Sprintf("%#v", this.Type)+",\n")
-	s = append(s, "Source: "+fmt.Sprintf("%#v", this.Source)+",\n")
-	s = append(s, "Target: "+fmt.Sprintf("%#v", this.Target)+",\n")
-	s = append(s, "Options: "+fmt.Sprintf("%#v", this.Options)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func valueToGoStringMount(v interface{}, typ string) string {
-	rv := reflect.ValueOf(v)
-	if rv.IsNil() {
-		return "nil"
-	}
-	pv := reflect.Indirect(rv).Interface()
-	return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
-}
-func extensionToGoStringMount(m github_com_gogo_protobuf_proto.Message) string {
-	e := github_com_gogo_protobuf_proto.GetUnsafeExtensionsMap(m)
-	if e == nil {
-		return "nil"
-	}
-	s := "proto.NewUnsafeXXX_InternalExtensions(map[int32]proto.Extension{"
-	keys := make([]int, 0, len(e))
-	for k := range e {
-		keys = append(keys, int(k))
-	}
-	sort.Ints(keys)
-	ss := []string{}
-	for _, k := range keys {
-		ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString())
-	}
-	s += strings.Join(ss, ",") + "})"
-	return s
-}
 func (m *Mount) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
@@ -514,19 +472,19 @@ func init() {
 }
 
 var fileDescriptorMount = []byte{
-	// 217 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xb2, 0x48, 0xcf, 0x2c, 0xc9,
-	0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xc9, 0x4f, 0xce, 0x4e, 0x2d, 0xd2, 0x4f, 0xce,
-	0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d, 0x4a, 0xd1, 0x4f, 0x2c, 0xc8, 0xd4, 0x2f, 0xa9, 0x2c,
-	0x48, 0x2d, 0xd6, 0xcf, 0xcd, 0x2f, 0xcd, 0x2b, 0x81, 0x90, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9,
-	0x42, 0xc2, 0x08, 0x75, 0x7a, 0x65, 0x86, 0x7a, 0x60, 0x65, 0x52, 0xba, 0x48, 0xc6, 0xa5, 0xe7,
-	0xa7, 0xe7, 0xeb, 0x83, 0xd5, 0x26, 0x95, 0xa6, 0x81, 0x79, 0x60, 0x0e, 0x98, 0x05, 0x31, 0x43,
-	0x29, 0x95, 0x8b, 0xd5, 0x17, 0x64, 0xa4, 0x90, 0x10, 0x17, 0x0b, 0xc8, 0x00, 0x09, 0x46, 0x05,
-	0x46, 0x0d, 0xce, 0x20, 0x30, 0x5b, 0x48, 0x8c, 0x8b, 0xad, 0x38, 0xbf, 0xb4, 0x28, 0x39, 0x55,
-	0x82, 0x09, 0x2c, 0x0a, 0xe5, 0x81, 0xc4, 0x4b, 0x12, 0x8b, 0xd2, 0x53, 0x4b, 0x24, 0x98, 0x21,
-	0xe2, 0x10, 0x9e, 0x90, 0x04, 0x17, 0x7b, 0x7e, 0x41, 0x49, 0x66, 0x7e, 0x5e, 0xb1, 0x04, 0x8b,
-	0x02, 0xb3, 0x06, 0x67, 0x10, 0x8c, 0xeb, 0x24, 0x73, 0xe2, 0xa1, 0x1c, 0xc3, 0x8d, 0x87, 0x72,
-	0x0c, 0x1f, 0x1e, 0xca, 0x31, 0x36, 0x3c, 0x92, 0x63, 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23,
-	0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x93, 0xd8, 0xc0, 0x6e, 0x31, 0x06, 0x04, 0x00, 0x00, 0xff,
-	0xff, 0x9f, 0x5a, 0xf3, 0x3d, 0x0b, 0x01, 0x00, 0x00,
+	// 212 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x4c, 0x8e, 0xb1, 0x4a, 0x43, 0x31,
+	0x14, 0x86, 0x1b, 0x5b, 0x2b, 0xcd, 0x18, 0x41, 0x82, 0x43, 0x28, 0x4e, 0x5d, 0x4c, 0x10, 0x17,
+	0x67, 0x77, 0x97, 0xbe, 0xc1, 0xbd, 0x69, 0x8c, 0x41, 0x9a, 0x13, 0x72, 0x4f, 0x04, 0x37, 0x1f,
+	0xef, 0x8e, 0x8e, 0x8e, 0xde, 0x3c, 0x89, 0xdc, 0x13, 0xc5, 0x2e, 0x87, 0xff, 0xfb, 0xf9, 0xf9,
+	0x38, 0xfc, 0xc1, 0x07, 0x7c, 0x29, 0xbd, 0xb6, 0x70, 0x34, 0x07, 0xb0, 0xaf, 0x2e, 0x1b, 0x0b,
+	0x11, 0xbb, 0x10, 0x5d, 0x3e, 0x98, 0x2e, 0x05, 0x83, 0xef, 0xc9, 0x0d, 0xe6, 0x08, 0x25, 0x62,
+	0xbb, 0x3a, 0x65, 0x40, 0x10, 0x97, 0xff, 0x3b, 0xfd, 0x76, 0xa7, 0x69, 0x76, 0x7d, 0x7b, 0xa2,
+	0xf3, 0xe0, 0xc1, 0xd0, 0xb6, 0x2f, 0xcf, 0x44, 0x04, 0x94, 0x9a, 0xe3, 0xc6, 0xf1, 0xf3, 0xa7,
+	0x59, 0x29, 0x04, 0x5f, 0xcd, 0x02, 0xc9, 0xb6, 0x6c, 0xb7, 0xd9, 0x53, 0x16, 0x57, 0x7c, 0x3d,
+	0x40, 0xc9, 0xd6, 0xc9, 0x33, 0x6a, 0x7f, 0x69, 0xee, 0xb1, 0xcb, 0xde, 0xa1, 0x5c, 0xb6, 0xbe,
+	0x91, 0x90, 0xfc, 0x02, 0x12, 0x06, 0x88, 0x83, 0x5c, 0x6d, 0x97, 0xbb, 0xcd, 0xfe, 0x0f, 0x1f,
+	0xe5, 0x38, 0xa9, 0xc5, 0xd7, 0xa4, 0x16, 0x1f, 0x55, 0xb1, 0xb1, 0x2a, 0xf6, 0x59, 0x15, 0xfb,
+	0xae, 0x8a, 0xf5, 0x6b, 0xfa, 0xe3, 0xfe, 0x27, 0x00, 0x00, 0xff, 0xff, 0x0f, 0xcf, 0x31, 0x1e,
+	0x07, 0x01, 0x00, 0x00,
 }
diff --git a/api/types/process/process.pb.go b/api/types/process/process.pb.go
index f31de4b..31ac9a5 100644
--- a/api/types/process/process.pb.go
+++ b/api/types/process/process.pb.go
@@ -20,9 +20,6 @@ import containerd_v1_types "github.com/docker/containerd/api/types/user"
 import containerd_v1_types1 "github.com/docker/containerd/api/types/state"
 
 import strings "strings"
-import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
-import sort "sort"
-import strconv "strconv"
 import reflect "reflect"
 
 import io "io"
@@ -56,51 +53,6 @@ func (*Process) Descriptor() ([]byte, []int) { return fileDescriptorProcess, []i
 func init() {
 	proto.RegisterType((*Process)(nil), "containerd.v1.types.Process")
 }
-func (this *Process) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 12)
-	s = append(s, "&process.Process{")
-	s = append(s, "Pid: "+fmt.Sprintf("%#v", this.Pid)+",\n")
-	s = append(s, "Args: "+fmt.Sprintf("%#v", this.Args)+",\n")
-	s = append(s, "Env: "+fmt.Sprintf("%#v", this.Env)+",\n")
-	if this.User != nil {
-		s = append(s, "User: "+fmt.Sprintf("%#v", this.User)+",\n")
-	}
-	s = append(s, "Cwd: "+fmt.Sprintf("%#v", this.Cwd)+",\n")
-	s = append(s, "Terminal: "+fmt.Sprintf("%#v", this.Terminal)+",\n")
-	s = append(s, "State: "+fmt.Sprintf("%#v", this.State)+",\n")
-	s = append(s, "ExitStatus: "+fmt.Sprintf("%#v", this.ExitStatus)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func valueToGoStringProcess(v interface{}, typ string) string {
-	rv := reflect.ValueOf(v)
-	if rv.IsNil() {
-		return "nil"
-	}
-	pv := reflect.Indirect(rv).Interface()
-	return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
-}
-func extensionToGoStringProcess(m github_com_gogo_protobuf_proto.Message) string {
-	e := github_com_gogo_protobuf_proto.GetUnsafeExtensionsMap(m)
-	if e == nil {
-		return "nil"
-	}
-	s := "proto.NewUnsafeXXX_InternalExtensions(map[int32]proto.Extension{"
-	keys := make([]int, 0, len(e))
-	for k := range e {
-		keys = append(keys, int(k))
-	}
-	sort.Ints(keys)
-	ss := []string{}
-	for _, k := range keys {
-		ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString())
-	}
-	s += strings.Join(ss, ",") + "})"
-	return s
-}
 func (m *Process) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
@@ -650,24 +602,24 @@ func init() {
 }
 
 var fileDescriptorProcess = []byte{
-	// 300 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x90, 0xbf, 0x4e, 0xc3, 0x30,
-	0x10, 0xc6, 0x7b, 0xf4, 0x2f, 0xae, 0x40, 0xc8, 0x2c, 0x26, 0x42, 0xc6, 0x62, 0xca, 0x82, 0x03,
-	0x45, 0x42, 0x0c, 0x4c, 0x3c, 0x01, 0x4a, 0xc5, 0x8c, 0x52, 0xc7, 0x2a, 0x16, 0x34, 0x8e, 0x6c,
-	0xa7, 0x85, 0x8d, 0xc7, 0xeb, 0xc8, 0xc8, 0x48, 0xf2, 0x04, 0xf0, 0x06, 0xc8, 0x8e, 0x54, 0x96,
-	0x0e, 0x5d, 0xce, 0x77, 0x9f, 0x7e, 0xf7, 0xe9, 0x3b, 0xa3, 0xbb, 0xb9, 0x72, 0xcf, 0xd5, 0x8c,
-	0x0b, 0xbd, 0x48, 0x72, 0x2d, 0x5e, 0xa4, 0x49, 0x84, 0x2e, 0x5c, 0xa6, 0x0a, 0x69, 0xf2, 0x24,
-	0x2b, 0x55, 0xe2, 0xde, 0x4b, 0x69, 0x93, 0xd2, 0x68, 0x21, 0xed, 0xe6, 0xe5, 0xa5, 0xd1, 0x4e,
-	0xe3, 0xe3, 0x7f, 0x96, 0x2f, 0xaf, 0x78, 0x40, 0xa3, 0x9b, 0x1d, 0x2d, 0x2b, 0x2b, 0x4d, 0x28,
-	0xad, 0x59, 0x74, 0xbb, 0xe3, 0x9e, 0x75, 0x99, 0x93, 0x6d, 0x6d, 0x37, 0xcf, 0x7f, 0x01, 0x0d,
-	0x1f, 0xda, 0x60, 0xf8, 0x08, 0x75, 0x4b, 0x95, 0x13, 0x60, 0x10, 0x1f, 0xa4, 0xbe, 0xc5, 0x18,
-	0xf5, 0x32, 0x33, 0xb7, 0x64, 0x8f, 0x75, 0xe3, 0xfd, 0x34, 0xf4, 0x9e, 0x92, 0xc5, 0x92, 0x74,
-	0x83, 0xe4, 0x5b, 0x7c, 0x81, 0x7a, 0x3e, 0x0b, 0xe9, 0x31, 0x88, 0xc7, 0x93, 0x13, 0xbe, 0xe5,
-	0x32, 0xfe, 0x68, 0xa5, 0x49, 0x03, 0xe6, 0x0d, 0xc4, 0x2a, 0x27, 0x7d, 0x06, 0xde, 0x40, 0xac,
-	0x72, 0x1c, 0xa1, 0x91, 0x93, 0x66, 0xa1, 0x8a, 0xec, 0x95, 0x0c, 0x18, 0xc4, 0xa3, 0x74, 0x33,
-	0xe3, 0x4b, 0xd4, 0x0f, 0x79, 0xc9, 0x90, 0x41, 0x7c, 0x38, 0x89, 0xb6, 0xba, 0x4f, 0x3d, 0x91,
-	0xb6, 0x20, 0x3e, 0x43, 0x63, 0xf9, 0xa6, 0xdc, 0x93, 0x9f, 0x2a, 0x4b, 0x46, 0xe1, 0x1c, 0xe4,
-	0xa5, 0x69, 0x50, 0xee, 0x4f, 0xd7, 0x35, 0xed, 0x7c, 0xd5, 0xb4, 0xf3, 0x53, 0x53, 0xf8, 0x68,
-	0x28, 0xac, 0x1b, 0x0a, 0x9f, 0x0d, 0x85, 0xef, 0x86, 0xc2, 0x6c, 0x10, 0x3e, 0xe6, 0xfa, 0x2f,
-	0x00, 0x00, 0xff, 0xff, 0xdc, 0xc2, 0xb3, 0x39, 0xdf, 0x01, 0x00, 0x00,
+	// 297 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x8c, 0x90, 0xb1, 0x4e, 0xc3, 0x30,
+	0x10, 0x86, 0x7b, 0x34, 0x6d, 0x83, 0x2b, 0x10, 0x32, 0x8b, 0xc9, 0x60, 0x2c, 0xa6, 0x2c, 0x38,
+	0x50, 0x24, 0xc4, 0xc0, 0xc4, 0x13, 0xa0, 0x54, 0xcc, 0x28, 0x75, 0xac, 0x62, 0x41, 0xe3, 0xc8,
+	0x76, 0x5a, 0xd8, 0x78, 0xbc, 0x8e, 0x8c, 0x8c, 0x34, 0x6f, 0xc0, 0x1b, 0x20, 0x3b, 0x52, 0x59,
+	0x3a, 0x74, 0x39, 0xdf, 0xfd, 0xfa, 0xee, 0xd7, 0x7f, 0x46, 0xf7, 0x73, 0xe5, 0x5e, 0x9a, 0x19,
+	0x17, 0x7a, 0x91, 0x95, 0x5a, 0xbc, 0x4a, 0x93, 0x09, 0x5d, 0xb9, 0x42, 0x55, 0xd2, 0x94, 0x59,
+	0x51, 0xab, 0xcc, 0x7d, 0xd4, 0xd2, 0x66, 0xb5, 0xd1, 0x42, 0xda, 0xed, 0xcb, 0x6b, 0xa3, 0x9d,
+	0xc6, 0xa7, 0xff, 0x2c, 0x5f, 0x5e, 0xf3, 0x80, 0x26, 0xb7, 0x7b, 0x5a, 0x36, 0x56, 0x9a, 0x50,
+	0x3a, 0xb3, 0xe4, 0x6e, 0xcf, 0x3d, 0xeb, 0x0a, 0x27, 0xbb, 0xda, 0x6d, 0x5e, 0xfc, 0x02, 0x1a,
+	0x3d, 0x76, 0xc1, 0xf0, 0x09, 0xea, 0xd7, 0xaa, 0x24, 0xc0, 0x20, 0x3d, 0xca, 0x7d, 0x8b, 0x31,
+	0x8a, 0x0a, 0x33, 0xb7, 0xe4, 0x80, 0xf5, 0xd3, 0xc3, 0x3c, 0xf4, 0x9e, 0x92, 0xd5, 0x92, 0xf4,
+	0x83, 0xe4, 0x5b, 0x7c, 0x89, 0x22, 0x9f, 0x85, 0x44, 0x0c, 0xd2, 0xf1, 0xe4, 0x8c, 0xef, 0xb8,
+	0x8c, 0x3f, 0x59, 0x69, 0xf2, 0x80, 0x79, 0x03, 0xb1, 0x2a, 0xc9, 0x80, 0x81, 0x37, 0x10, 0xab,
+	0x12, 0x27, 0x28, 0x76, 0xd2, 0x2c, 0x54, 0x55, 0xbc, 0x91, 0x21, 0x83, 0x34, 0xce, 0xb7, 0x33,
+	0xbe, 0x42, 0x83, 0x90, 0x97, 0x8c, 0x18, 0xa4, 0xc7, 0x93, 0x64, 0xa7, 0xfb, 0xd4, 0x13, 0x79,
+	0x07, 0xe2, 0x73, 0x34, 0x96, 0xef, 0xca, 0x3d, 0xfb, 0xa9, 0xb1, 0x24, 0x0e, 0xe7, 0x20, 0x2f,
+	0x4d, 0x83, 0xf2, 0x40, 0xd6, 0x1b, 0xda, 0xfb, 0xde, 0xd0, 0xde, 0x67, 0x4b, 0x61, 0xdd, 0x52,
+	0xf8, 0x6a, 0x29, 0xfc, 0xb4, 0x14, 0x66, 0xc3, 0xf0, 0x29, 0x37, 0x7f, 0x01, 0x00, 0x00, 0xff,
+	0xff, 0x19, 0xf5, 0x94, 0x44, 0xdb, 0x01, 0x00, 0x00,
 }
diff --git a/api/types/state/state.pb.go b/api/types/state/state.pb.go
index db371dd..4eaedd0 100644
--- a/api/types/state/state.pb.go
+++ b/api/types/state/state.pb.go
@@ -67,7 +67,7 @@ func init() {
 }
 
 var fileDescriptorState = []byte{
-	// 189 bytes of a gzipped FileDescriptorProto
+	// 184 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xb2, 0x48, 0xcf, 0x2c, 0xc9,
 	0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xc9, 0x4f, 0xce, 0x4e, 0x2d, 0xd2, 0x4f, 0xce,
 	0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d, 0x4a, 0xd1, 0x4f, 0x2c, 0xc8, 0xd4, 0x2f, 0xa9, 0x2c,
@@ -76,8 +76,8 @@ var fileDescriptorState = []byte{
 	0x35, 0x42, 0xdc, 0x5c, 0xec, 0xa1, 0x7e, 0xde, 0x7e, 0xfe, 0xe1, 0x7e, 0x02, 0x0c, 0x20, 0x8e,
 	0x73, 0x90, 0xab, 0x63, 0x88, 0xab, 0x8b, 0x00, 0x23, 0x88, 0x13, 0x14, 0xea, 0xe7, 0xe7, 0xe9,
 	0xe7, 0x2e, 0xc0, 0x04, 0xe2, 0x04, 0x87, 0xf8, 0x07, 0x04, 0xb8, 0xba, 0x08, 0x30, 0x0b, 0x71,
-	0x71, 0xb1, 0x05, 0x38, 0x86, 0x06, 0xbb, 0xba, 0x08, 0xb0, 0x38, 0xc9, 0x9c, 0x78, 0x28, 0xc7,
-	0x70, 0xe3, 0xa1, 0x1c, 0xc3, 0x87, 0x87, 0x72, 0x8c, 0x0d, 0x8f, 0xe4, 0x18, 0x4f, 0x3c, 0x92,
-	0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x24, 0x36, 0xb0, 0x13, 0x8c, 0x01,
-	0x01, 0x00, 0x00, 0xff, 0xff, 0x41, 0x75, 0xb8, 0xe9, 0xbe, 0x00, 0x00, 0x00,
+	0x71, 0xb1, 0x05, 0x38, 0x86, 0x06, 0xbb, 0xba, 0x08, 0xb0, 0x38, 0x49, 0x9c, 0x78, 0x28, 0xc7,
+	0x70, 0xe3, 0xa1, 0x1c, 0x43, 0xc3, 0x23, 0x39, 0xc6, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92,
+	0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x31, 0x89, 0x0d, 0x6c, 0xbd, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff,
+	0xcd, 0xc9, 0x58, 0x29, 0xba, 0x00, 0x00, 0x00,
 }
diff --git a/api/types/user/user.pb.go b/api/types/user/user.pb.go
index 1b9c01f..a5d9f51 100644
--- a/api/types/user/user.pb.go
+++ b/api/types/user/user.pb.go
@@ -18,9 +18,6 @@ import fmt "fmt"
 import math "math"
 
 import strings "strings"
-import github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
-import sort "sort"
-import strconv "strconv"
 import reflect "reflect"
 
 import io "io"
@@ -49,44 +46,6 @@ func (*User) Descriptor() ([]byte, []int) { return fileDescriptorUser, []int{0}
 func init() {
 	proto.RegisterType((*User)(nil), "containerd.v1.types.User")
 }
-func (this *User) GoString() string {
-	if this == nil {
-		return "nil"
-	}
-	s := make([]string, 0, 7)
-	s = append(s, "&user.User{")
-	s = append(s, "Uid: "+fmt.Sprintf("%#v", this.Uid)+",\n")
-	s = append(s, "Gid: "+fmt.Sprintf("%#v", this.Gid)+",\n")
-	s = append(s, "AdditionalGids: "+fmt.Sprintf("%#v", this.AdditionalGids)+",\n")
-	s = append(s, "}")
-	return strings.Join(s, "")
-}
-func valueToGoStringUser(v interface{}, typ string) string {
-	rv := reflect.ValueOf(v)
-	if rv.IsNil() {
-		return "nil"
-	}
-	pv := reflect.Indirect(rv).Interface()
-	return fmt.Sprintf("func(v %v) *%v { return &v } ( %#v )", typ, typ, pv)
-}
-func extensionToGoStringUser(m github_com_gogo_protobuf_proto.Message) string {
-	e := github_com_gogo_protobuf_proto.GetUnsafeExtensionsMap(m)
-	if e == nil {
-		return "nil"
-	}
-	s := "proto.NewUnsafeXXX_InternalExtensions(map[int32]proto.Extension{"
-	keys := make([]int, 0, len(e))
-	for k := range e {
-		keys = append(keys, int(k))
-	}
-	sort.Ints(keys)
-	ss := []string{}
-	for _, k := range keys {
-		ss = append(ss, strconv.Itoa(k)+": "+e[int32(k)].GoString())
-	}
-	s += strings.Join(ss, ",") + "})"
-	return s
-}
 func (m *User) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
@@ -471,7 +430,7 @@ func init() {
 }
 
 var fileDescriptorUser = []byte{
-	// 192 bytes of a gzipped FileDescriptorProto
+	// 188 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x32, 0x4b, 0xcf, 0x2c, 0xc9,
 	0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xc9, 0x4f, 0xce, 0x4e, 0x2d, 0xd2, 0x4f, 0xce,
 	0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d, 0x4a, 0xd1, 0x4f, 0x2c, 0xc8, 0xd4, 0x2f, 0xa9, 0x2c,
@@ -480,8 +439,8 @@ var fileDescriptorUser = []byte{
 	0x45, 0x42, 0x02, 0x5c, 0xcc, 0xa5, 0x99, 0x29, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0xbc, 0x41, 0x20,
 	0x26, 0x48, 0x24, 0x3d, 0x33, 0x45, 0x82, 0x09, 0x22, 0x92, 0x9e, 0x99, 0x22, 0xa4, 0xce, 0xc5,
 	0x9f, 0x98, 0x92, 0x92, 0x59, 0x92, 0x99, 0x9f, 0x97, 0x98, 0x13, 0x9f, 0x9e, 0x99, 0x52, 0x2c,
-	0xc1, 0xac, 0xc0, 0xac, 0xc1, 0x1b, 0xc4, 0x87, 0x10, 0x76, 0xcf, 0x4c, 0x29, 0x76, 0x92, 0x39,
-	0xf1, 0x50, 0x8e, 0xe1, 0xc6, 0x43, 0x39, 0x86, 0x0f, 0x0f, 0xe5, 0x18, 0x1b, 0x1e, 0xc9, 0x31,
-	0x9e, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x49, 0x6c, 0x60,
-	0xe7, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xee, 0x98, 0x21, 0x51, 0xc8, 0x00, 0x00, 0x00,
+	0xc1, 0xac, 0xc0, 0xac, 0xc1, 0x1b, 0xc4, 0x87, 0x10, 0x76, 0xcf, 0x4c, 0x29, 0x76, 0x92, 0x38,
+	0xf1, 0x50, 0x8e, 0xe1, 0xc6, 0x43, 0x39, 0x86, 0x86, 0x47, 0x72, 0x8c, 0x27, 0x1e, 0xc9, 0x31,
+	0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0x63, 0x12, 0x1b, 0xd8, 0x29, 0xc6, 0x80, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0x39, 0x97, 0xe1, 0xe0, 0xc4, 0x00, 0x00, 0x00,
 }
diff --git a/cmd/protoc-gen-gogoctrd/main.go b/cmd/protoc-gen-gogoctrd/main.go
index 370f6ac..cadf036 100644
--- a/cmd/protoc-gen-gogoctrd/main.go
+++ b/cmd/protoc-gen-gogoctrd/main.go
@@ -11,7 +11,6 @@ func main() {
 	files := req.GetProtoFile()
 	files = vanity.FilterFiles(files, vanity.NotGoogleProtobufDescriptorProto)
 	for _, opt := range []func(*descriptor.FileDescriptorProto){
-		vanity.TurnOnGoStringAll,
 		vanity.TurnOffGoGettersAll,
 		vanity.TurnOffGoStringerAll,
 		vanity.TurnOnMarshalerAll,