diff --git a/api/grpc/server/server.go b/api/grpc/server/server.go
index 32393e5..2d50667 100644
--- a/api/grpc/server/server.go
+++ b/api/grpc/server/server.go
@@ -47,8 +47,14 @@ func (s *apiServer) CreateContainer(ctx context.Context, c *types.CreateContaine
 	if err := <-e.Err; err != nil {
 		return nil, err
 	}
-	<-e.StartResponse
-	return &types.CreateContainerResponse{}, nil
+	r := <-e.StartResponse
+	apiC, err := createAPIContainer(r.Container)
+	if err != nil {
+		return nil, err
+	}
+	return &types.CreateContainerResponse{
+		Container: apiC,
+	}, nil
 }
 
 func (s *apiServer) Signal(ctx context.Context, r *types.SignalRequest) (*types.SignalResponse, error) {
@@ -178,41 +184,49 @@ func (s *apiServer) State(ctx context.Context, r *types.StateRequest) (*types.St
 		},
 	}
 	for _, c := range e.Containers {
-		processes, err := c.Processes()
+		apiC, err := createAPIContainer(c)
 		if err != nil {
-			return nil, grpc.Errorf(codes.Internal, "get processes for container")
+			return nil, err
 		}
-		var procs []*types.Process
-		for _, p := range processes {
-			oldProc := p.Spec()
-			stdio := p.Stdio()
-			procs = append(procs, &types.Process{
-				Pid:       p.ID(),
-				SystemPid: uint32(p.SystemPid()),
-				Terminal:  oldProc.Terminal,
-				Args:      oldProc.Args,
-				Env:       oldProc.Env,
-				Cwd:       oldProc.Cwd,
-				Stdin:     stdio.Stdin,
-				Stdout:    stdio.Stdout,
-				Stderr:    stdio.Stderr,
-				User: &types.User{
-					Uid:            oldProc.User.UID,
-					Gid:            oldProc.User.GID,
-					AdditionalGids: oldProc.User.AdditionalGids,
-				},
-			})
-		}
-		state.Containers = append(state.Containers, &types.Container{
-			Id:         c.ID(),
-			BundlePath: c.Path(),
-			Processes:  procs,
-			Status:     string(c.State()),
-		})
+		state.Containers = append(state.Containers, apiC)
 	}
 	return state, nil
 }
 
+func createAPIContainer(c runtime.Container) (*types.Container, error) {
+	processes, err := c.Processes()
+	if err != nil {
+		return nil, grpc.Errorf(codes.Internal, "get processes for container")
+	}
+	var procs []*types.Process
+	for _, p := range processes {
+		oldProc := p.Spec()
+		stdio := p.Stdio()
+		procs = append(procs, &types.Process{
+			Pid:       p.ID(),
+			SystemPid: uint32(p.SystemPid()),
+			Terminal:  oldProc.Terminal,
+			Args:      oldProc.Args,
+			Env:       oldProc.Env,
+			Cwd:       oldProc.Cwd,
+			Stdin:     stdio.Stdin,
+			Stdout:    stdio.Stdout,
+			Stderr:    stdio.Stderr,
+			User: &types.User{
+				Uid:            oldProc.User.UID,
+				Gid:            oldProc.User.GID,
+				AdditionalGids: oldProc.User.AdditionalGids,
+			},
+		})
+	}
+	return &types.Container{
+		Id:         c.ID(),
+		BundlePath: c.Path(),
+		Processes:  procs,
+		Status:     string(c.State()),
+	}, nil
+}
+
 func (s *apiServer) UpdateContainer(ctx context.Context, r *types.UpdateContainerRequest) (*types.UpdateContainerResponse, error) {
 	e := supervisor.NewEvent(supervisor.UpdateContainerEventType)
 	e.ID = r.Id
diff --git a/api/grpc/types/api.pb.go b/api/grpc/types/api.pb.go
index 2e81e76..1775291 100644
--- a/api/grpc/types/api.pb.go
+++ b/api/grpc/types/api.pb.go
@@ -100,6 +100,7 @@ func (*CreateContainerRequest) ProtoMessage()               {}
 func (*CreateContainerRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
 
 type CreateContainerResponse struct {
+	Container *Container `protobuf:"bytes,1,opt,name=container" json:"container,omitempty"`
 }
 
 func (m *CreateContainerResponse) Reset()                    { *m = CreateContainerResponse{} }
@@ -107,6 +108,13 @@ func (m *CreateContainerResponse) String() string            { return proto.Comp
 func (*CreateContainerResponse) ProtoMessage()               {}
 func (*CreateContainerResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
 
+func (m *CreateContainerResponse) GetContainer() *Container {
+	if m != nil {
+		return m.Container
+	}
+	return nil
+}
+
 type SignalRequest struct {
 	Id     string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
 	Pid    string `protobuf:"bytes,2,opt,name=pid" json:"pid,omitempty"`
@@ -1139,100 +1147,101 @@ var _API_serviceDesc = grpc.ServiceDesc{
 }
 
 var fileDescriptor0 = []byte{
-	// 1509 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x58, 0xd9, 0x72, 0x1b, 0x45,
-	0x17, 0xb6, 0xa4, 0x91, 0x2c, 0x1d, 0x2d, 0xb6, 0xc7, 0x4b, 0x64, 0xe5, 0xcf, 0x9f, 0x30, 0x04,
-	0x92, 0xa2, 0x52, 0xae, 0xe0, 0xb0, 0x84, 0x70, 0x01, 0xc1, 0x49, 0x25, 0x50, 0x09, 0xb8, 0x62,
-	0x9b, 0x2a, 0x6e, 0x50, 0x8d, 0x67, 0x1a, 0xa9, 0xf1, 0x6c, 0xcc, 0xf4, 0x78, 0x29, 0xde, 0x80,
-	0x5b, 0x9e, 0x83, 0x2a, 0xae, 0x78, 0x00, 0x9e, 0x80, 0xe7, 0xe0, 0x29, 0x38, 0xbd, 0xcd, 0xa6,
-	0x25, 0xe4, 0x82, 0x1b, 0x55, 0x75, 0xf7, 0x59, 0xbe, 0xf3, 0x9d, 0x65, 0xba, 0x05, 0x1d, 0x3b,
-	0xa2, 0x7b, 0x51, 0x1c, 0xb2, 0xd0, 0x6c, 0xb2, 0xab, 0x88, 0x24, 0xd6, 0x29, 0x6c, 0x9d, 0x44,
-	0xae, 0xcd, 0xc8, 0x61, 0x1c, 0x3a, 0x24, 0x49, 0x5e, 0x91, 0x9f, 0x52, 0x92, 0x30, 0x13, 0xa0,
-	0x4e, 0xdd, 0x61, 0xed, 0x56, 0xed, 0x6e, 0xc7, 0xec, 0x42, 0x23, 0xc2, 0x45, 0x5d, 0x2c, 0xf0,
-	0xc4, 0xf1, 0xc2, 0x84, 0x1c, 0x31, 0x97, 0x06, 0xc3, 0x06, 0xee, 0xb5, 0xcd, 0x3e, 0x34, 0x2f,
-	0xa8, 0xcb, 0xa6, 0x43, 0x03, 0x97, 0x7d, 0x73, 0x00, 0xad, 0x29, 0xa1, 0x93, 0x29, 0x1b, 0x36,
-	0xf9, 0xda, 0xba, 0x06, 0xdb, 0x15, 0x1f, 0x49, 0x14, 0x06, 0x09, 0xb1, 0x7e, 0x86, 0x9d, 0x83,
-	0x98, 0xe0, 0xc1, 0x41, 0x18, 0x30, 0x9b, 0x06, 0x24, 0x9e, 0xe7, 0x1e, 0x17, 0xa7, 0x69, 0xe0,
-	0x7a, 0xe4, 0xd0, 0x46, 0x17, 0x39, 0x8a, 0x29, 0x71, 0xce, 0xa2, 0x90, 0x06, 0x4c, 0xa0, 0xe8,
-	0x70, 0x14, 0x89, 0x00, 0x65, 0x88, 0x25, 0xa2, 0xc0, 0x65, 0x98, 0x4a, 0x14, 0x7a, 0x4d, 0xe2,
-	0x78, 0xd8, 0xe2, 0x6b, 0x6b, 0x17, 0xae, 0xcd, 0x38, 0x57, 0xb8, 0x1e, 0x42, 0xff, 0x88, 0x4e,
-	0x02, 0xdb, 0x7b, 0x2d, 0x1b, 0xdc, 0xa8, 0x90, 0x14, 0x18, 0xfa, 0xd6, 0x3a, 0x0c, 0xb4, 0xa6,
-	0xb2, 0xf5, 0x7b, 0x0d, 0x36, 0x1e, 0xbb, 0xee, 0x12, 0x7a, 0xd7, 0xa1, 0xcd, 0x48, 0xec, 0x53,
-	0x6e, 0xa5, 0x2e, 0xf8, 0xdc, 0x05, 0x23, 0x4d, 0x48, 0x2c, 0x6c, 0x76, 0xf7, 0xbb, 0x7b, 0x22,
-	0x55, 0x7b, 0x27, 0xb8, 0x65, 0xf6, 0xc0, 0xb0, 0xe3, 0x49, 0x82, 0x31, 0x36, 0x24, 0x16, 0x12,
-	0x9c, 0x63, 0x80, 0x6a, 0xe1, 0x5c, 0xb8, 0x32, 0x3a, 0x8d, 0x72, 0xb5, 0xcc, 0x4c, 0xbb, 0xc2,
-	0x4c, 0xa7, 0xc2, 0x0c, 0x08, 0x66, 0x1e, 0x82, 0x21, 0x7c, 0xa1, 0x8d, 0x54, 0xa1, 0xec, 0xf3,
-	0xc5, 0x44, 0x85, 0xdd, 0x37, 0x77, 0x60, 0x60, 0xbb, 0x2e, 0x65, 0x34, 0x44, 0xd0, 0xcf, 0xa8,
-	0x9b, 0x20, 0xd4, 0x06, 0x86, 0xbf, 0x05, 0x66, 0x31, 0x56, 0x45, 0xc1, 0x8b, 0x8c, 0xe9, 0x2c,
-	0x65, 0xf3, 0x78, 0x78, 0xa7, 0x94, 0xd3, 0xba, 0x88, 0x7d, 0x43, 0xc5, 0x9e, 0x6b, 0x5a, 0x23,
-	0x18, 0xce, 0x5a, 0x53, 0x9e, 0x1e, 0xc0, 0xb5, 0x27, 0xc4, 0x23, 0xaf, 0xf3, 0x84, 0x24, 0x06,
-	0xb6, 0x4f, 0x64, 0x0e, 0xb9, 0xc1, 0x59, 0x25, 0x65, 0xf0, 0x6d, 0xd8, 0x7e, 0x41, 0x13, 0xb6,
-	0xd4, 0x9c, 0xf5, 0x1d, 0x40, 0x2e, 0x90, 0x19, 0xcf, 0x5c, 0x91, 0x4b, 0xca, 0x54, 0x62, 0x91,
-	0x44, 0xe6, 0x44, 0xaa, 0x6b, 0x36, 0xa1, 0x9b, 0x06, 0xf4, 0xf2, 0x28, 0x74, 0xce, 0x08, 0x4b,
-	0x44, 0xd5, 0x8a, 0x56, 0x4a, 0xa6, 0xc4, 0xf3, 0x44, 0xd1, 0xb6, 0xad, 0xcf, 0x61, 0xa7, 0xea,
-	0x5f, 0x22, 0x33, 0xdf, 0x85, 0x6e, 0xce, 0x56, 0x82, 0xde, 0x1a, 0xf3, 0xe9, 0x1a, 0x40, 0xef,
-	0x88, 0x21, 0x5b, 0x0a, 0xb8, 0x75, 0x0b, 0x06, 0x59, 0xc1, 0x8b, 0x03, 0x99, 0x7e, 0x9b, 0xa5,
-	0x89, 0x0a, 0xe7, 0xb7, 0x1a, 0xac, 0xaa, 0x14, 0xea, 0x32, 0xfa, 0x0f, 0x0b, 0x75, 0x03, 0x3a,
-	0xc9, 0x55, 0xc2, 0x88, 0x7f, 0xa8, 0xca, 0xb5, 0xff, 0xa6, 0xe5, 0xea, 0x41, 0x27, 0x8b, 0x68,
-	0x71, 0x9a, 0x2b, 0x63, 0x44, 0x8e, 0x8c, 0xb7, 0xa0, 0x13, 0xc9, 0x48, 0x89, 0x44, 0xda, 0xdd,
-	0x1f, 0xa8, 0x20, 0x34, 0x03, 0x39, 0x3b, 0x62, 0x8c, 0x58, 0x77, 0x60, 0xf5, 0xa5, 0xed, 0x4c,
-	0xd1, 0x19, 0xb7, 0xef, 0x44, 0x8a, 0x36, 0x31, 0xf5, 0x7c, 0xe2, 0x87, 0xf1, 0x95, 0xf0, 0x67,
-	0x58, 0xdf, 0xe2, 0x10, 0x91, 0xc4, 0xab, 0x8c, 0xdd, 0xc6, 0xfa, 0xd6, 0x38, 0x75, 0xc2, 0xd6,
-	0x75, 0xc2, 0xb2, 0x00, 0x6e, 0xc2, 0xaa, 0x2f, 0xed, 0xab, 0x16, 0xd0, 0x80, 0x94, 0x57, 0xeb,
-	0x31, 0xec, 0xc8, 0x69, 0xba, 0x74, 0x68, 0xce, 0x4c, 0x29, 0x19, 0x43, 0x43, 0x8f, 0xbe, 0x19,
-	0x13, 0xaa, 0xe0, 0xd7, 0xa0, 0xff, 0xf4, 0x9c, 0x60, 0x45, 0xe9, 0x7a, 0xf9, 0xab, 0x06, 0x4d,
-	0xb1, 0xc3, 0xc3, 0xe5, 0x48, 0x94, 0x03, 0xe9, 0x6c, 0x9e, 0xfd, 0x7e, 0x85, 0x6a, 0xa3, 0x08,
-	0xa8, 0x59, 0x19, 0x9b, 0x32, 0xe3, 0x18, 0xb4, 0xca, 0x83, 0xc8, 0xf9, 0x6c, 0x16, 0xca, 0xdc,
-	0x75, 0x16, 0x70, 0x57, 0x9e, 0x20, 0xb0, 0x68, 0x82, 0xfc, 0x51, 0x83, 0xde, 0xd7, 0x84, 0x5d,
-	0x84, 0xf1, 0x19, 0xcf, 0x50, 0x52, 0x69, 0x59, 0x2c, 0xf3, 0xf8, 0x72, 0x7c, 0x7a, 0xc5, 0xb0,
-	0x26, 0x44, 0x2a, 0x79, 0x3c, 0xb8, 0x73, 0x68, 0xcb, 0x46, 0x6d, 0x88, 0x3d, 0xac, 0xdb, 0x57,
-	0x97, 0x63, 0xac, 0xc2, 0x30, 0x96, 0xbd, 0x2b, 0xc4, 0x70, 0xcb, 0x8d, 0xc3, 0x28, 0x22, 0x32,
-	0x52, 0x83, 0x1b, 0x3b, 0xd6, 0xc6, 0x5a, 0x5a, 0x0a, 0x77, 0x22, 0x65, 0x6c, 0x55, 0x1b, 0x3b,
-	0xce, 0x8c, 0xb5, 0x0b, 0x62, 0xda, 0x58, 0x47, 0x94, 0x94, 0x0f, 0xed, 0x83, 0x28, 0x3d, 0x49,
-	0xec, 0x09, 0xe1, 0xd3, 0x83, 0x85, 0xcc, 0xf6, 0xc6, 0x29, 0x5f, 0x0a, 0xe8, 0x86, 0xb9, 0x05,
-	0xbd, 0x88, 0xc4, 0x58, 0x94, 0x6a, 0xb7, 0x8e, 0x44, 0x19, 0xe6, 0x75, 0xd8, 0x14, 0xcb, 0x31,
-	0x0d, 0xc6, 0x67, 0x24, 0x0e, 0x88, 0xe7, 0x87, 0x2e, 0x51, 0x71, 0xec, 0xc2, 0x46, 0x76, 0xc8,
-	0x7b, 0x59, 0x1c, 0x89, 0x78, 0xac, 0x63, 0x18, 0x1c, 0x4f, 0xf1, 0xb2, 0xc0, 0x3c, 0x1a, 0x4c,
-	0x9e, 0xd8, 0xcc, 0x36, 0xd7, 0x30, 0x4f, 0x24, 0xa6, 0xa1, 0x9b, 0x28, 0x87, 0xa8, 0xcd, 0xa4,
-	0x08, 0x71, 0xc7, 0xfa, 0x48, 0x92, 0x86, 0xdf, 0x88, 0xfc, 0x88, 0x51, 0x5f, 0x39, 0xb4, 0xbe,
-	0x17, 0x41, 0x48, 0xe2, 0x2d, 0xe8, 0xe4, 0x60, 0x6b, 0x22, 0x5f, 0x6b, 0x3a, 0x5f, 0x3a, 0xd0,
-	0x3d, 0x58, 0x63, 0x19, 0x8a, 0x31, 0x56, 0xad, 0xad, 0x1a, 0x63, 0x5b, 0x49, 0x96, 0x31, 0x5a,
-	0x9f, 0x01, 0xbc, 0x14, 0x7d, 0x28, 0x10, 0xe3, 0x2c, 0x29, 0x12, 0x84, 0x44, 0xfb, 0xf6, 0x65,
-	0xc6, 0x0e, 0xdf, 0xc2, 0x98, 0x7e, 0xb0, 0xa9, 0xe7, 0xa8, 0x7b, 0x84, 0x61, 0xfd, 0x5d, 0x83,
-	0xae, 0xb4, 0x20, 0x41, 0xa2, 0x09, 0x07, 0x7b, 0x4f, 0x9b, 0xb8, 0xa5, 0x2d, 0x96, 0xbf, 0x50,
-	0x05, 0x9f, 0x58, 0x86, 0xc9, 0x85, 0x1d, 0x29, 0x2f, 0x8d, 0x45, 0x62, 0x77, 0xa0, 0x27, 0xb3,
-	0xa1, 0x04, 0x8d, 0x45, 0x82, 0xf7, 0xf8, 0x3c, 0x44, 0x24, 0x62, 0x7c, 0x76, 0xf7, 0x6f, 0x94,
-	0x24, 0x04, 0xc6, 0x3d, 0xf1, 0xfb, 0x34, 0x60, 0xf1, 0xd5, 0xe8, 0x1e, 0x40, 0xbe, 0xe2, 0x6d,
-	0x77, 0x46, 0xae, 0x54, 0x65, 0x63, 0x24, 0xe7, 0xb6, 0x97, 0xaa, 0xc8, 0x1f, 0xd5, 0x1f, 0xd6,
-	0xac, 0xaf, 0x60, 0xed, 0x0b, 0xef, 0x8c, 0x86, 0x05, 0x15, 0x94, 0xf2, 0xed, 0x1f, 0xc3, 0x58,
-	0xc5, 0xcb, 0x97, 0x34, 0xc0, 0xa5, 0xa4, 0x0b, 0xfb, 0x3e, 0x8c, 0xf2, 0x1b, 0x97, 0xb4, 0x27,
-	0xeb, 0xe5, 0xcf, 0x06, 0x40, 0x6e, 0xcc, 0x7c, 0x04, 0x23, 0x1a, 0x8e, 0xb1, 0xa4, 0xce, 0xa9,
-	0x43, 0x64, 0x0b, 0x8c, 0x63, 0xe2, 0xa4, 0x71, 0x42, 0xcf, 0x89, 0x9a, 0x7f, 0x3b, 0x2a, 0x96,
-	0x2a, 0x86, 0x0f, 0x61, 0x3b, 0xd7, 0x75, 0x0b, 0x6a, 0xf5, 0xa5, 0x6a, 0x0f, 0x60, 0x13, 0xd5,
-	0x70, 0x70, 0xa5, 0x25, 0xa5, 0xc6, 0x52, 0xa5, 0x4f, 0x60, 0xb7, 0x80, 0x93, 0x57, 0x6a, 0x41,
-	0xd5, 0x58, 0xaa, 0xfa, 0x11, 0xec, 0xa0, 0xea, 0x85, 0x4d, 0x59, 0x55, 0xaf, 0xf9, 0x2f, 0x70,
-	0xfa, 0x24, 0x9e, 0x94, 0x70, 0xb6, 0x96, 0x2a, 0xbd, 0x0f, 0x1b, 0xa8, 0x54, 0xf1, 0xb3, 0xfa,
-	0x3a, 0x95, 0x84, 0x38, 0x0c, 0xa7, 0x4a, 0x41, 0xa5, 0xbd, 0x4c, 0x05, 0x3f, 0x2f, 0xbd, 0xe7,
-	0xe9, 0x84, 0x30, 0xef, 0x34, 0xab, 0xfe, 0x37, 0x6d, 0xa0, 0x5f, 0xea, 0xd0, 0x3d, 0x98, 0xc4,
-	0x61, 0x1a, 0x95, 0xba, 0x5c, 0xd6, 0xf0, 0x4c, 0x97, 0x4b, 0x99, 0xbb, 0xd0, 0x93, 0x5f, 0x4f,
-	0x25, 0x26, 0x9b, 0xcb, 0x9c, 0x2d, 0x75, 0x7e, 0xf1, 0x39, 0xe5, 0x98, 0x95, 0x60, 0xb9, 0xbd,
-	0x0a, 0xe5, 0xf7, 0x29, 0xf4, 0xa7, 0x32, 0x10, 0x25, 0x29, 0x53, 0x79, 0x5b, 0x7b, 0xce, 0x01,
-	0xee, 0x15, 0x03, 0x96, 0x4d, 0xf4, 0x1c, 0x36, 0x66, 0x36, 0xcb, 0xbd, 0x64, 0x15, 0x7b, 0xa9,
-	0xbb, 0xbf, 0xa9, 0xcc, 0x16, 0xb5, 0x44, 0x83, 0x45, 0xd0, 0x94, 0x78, 0xde, 0x83, 0x7e, 0x20,
-	0x3f, 0x3a, 0x19, 0x13, 0x8d, 0x82, 0x62, 0xe9, 0x83, 0x84, 0x6c, 0x38, 0x02, 0xdf, 0x5c, 0x36,
-	0x8a, 0xdc, 0x62, 0x3e, 0x78, 0x45, 0xa0, 0x98, 0x1f, 0x29, 0xfa, 0x47, 0xf2, 0xc6, 0x37, 0xef,
-	0xad, 0xb1, 0xff, 0x6b, 0x0b, 0x1a, 0x8f, 0x0f, 0xbf, 0x34, 0x5f, 0xc1, 0x5a, 0xe5, 0xf1, 0x63,
-	0xea, 0xb1, 0x32, 0xff, 0x45, 0x36, 0xfa, 0xff, 0xa2, 0x63, 0x75, 0x71, 0x58, 0xe1, 0x36, 0x2b,
-	0xb7, 0x8a, 0xcc, 0xe6, 0xfc, 0x0b, 0x4b, 0x66, 0x73, 0xd1, 0x65, 0x64, 0xc5, 0xfc, 0x18, 0x5a,
-	0xf2, 0x3d, 0x65, 0x6e, 0x29, 0xd9, 0xd2, 0xc3, 0x6c, 0xb4, 0x5d, 0xd9, 0xcd, 0x14, 0x5f, 0x40,
-	0xbf, 0xf4, 0xe6, 0x34, 0xaf, 0x97, 0x7c, 0x95, 0x9f, 0x63, 0xa3, 0xff, 0xcd, 0x3f, 0xcc, 0xac,
-	0x1d, 0x00, 0xe4, 0xef, 0x1a, 0x73, 0xa8, 0xa4, 0x67, 0x9e, 0x75, 0xa3, 0xdd, 0x39, 0x27, 0x99,
-	0x91, 0x13, 0x58, 0xaf, 0x3e, 0x5c, 0xcc, 0x0a, 0xab, 0xd5, 0x67, 0xc6, 0xe8, 0xe6, 0xc2, 0xf3,
-	0xa2, 0xd9, 0xea, 0xf3, 0x25, 0x33, 0xbb, 0xe0, 0x31, 0x94, 0x99, 0x5d, 0xf8, 0xee, 0x59, 0x31,
-	0xbf, 0x81, 0x41, 0xf9, 0xe5, 0x61, 0x6a, 0x92, 0xe6, 0x3e, 0x88, 0x46, 0x37, 0x16, 0x9c, 0x66,
-	0x06, 0x3f, 0x90, 0x8d, 0x80, 0x37, 0x17, 0x9d, 0xb3, 0xc2, 0xb3, 0x64, 0xb4, 0x55, 0xde, 0xcc,
-	0xb4, 0xee, 0x43, 0x4b, 0xde, 0x47, 0xb3, 0x02, 0x28, 0x5d, 0x4f, 0x47, 0xbd, 0xe2, 0xae, 0xb5,
-	0x72, 0xbf, 0x86, 0x33, 0xaf, 0xfd, 0x8c, 0x30, 0xd9, 0x1d, 0x45, 0x57, 0x33, 0x2a, 0x62, 0x93,
-	0xab, 0x9c, 0xb6, 0xc4, 0x5f, 0x22, 0x0f, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, 0x20, 0x9e, 0x7a,
-	0x04, 0x1f, 0x11, 0x00, 0x00,
+	// 1526 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x58, 0xdb, 0x6e, 0x1b, 0xc5,
+	0x1b, 0x8f, 0xed, 0xb5, 0x63, 0x7f, 0x3e, 0x24, 0xd9, 0x9c, 0x1c, 0xf7, 0xdf, 0x7f, 0xcb, 0xb6,
+	0xd0, 0x0a, 0x55, 0x51, 0x49, 0x39, 0x94, 0x22, 0x01, 0x25, 0xad, 0x5a, 0x50, 0x0b, 0x51, 0x93,
+	0x20, 0x71, 0x83, 0xb5, 0xd9, 0x1d, 0xec, 0x21, 0x7b, 0x62, 0x77, 0x36, 0x89, 0xc5, 0x1b, 0x70,
+	0xcb, 0x73, 0x20, 0x71, 0xc5, 0x03, 0xf0, 0x04, 0x3c, 0x07, 0x4f, 0xc1, 0x37, 0x87, 0x1d, 0xef,
+	0xae, 0x0f, 0xa5, 0x17, 0xdc, 0x58, 0x9a, 0x99, 0xef, 0xf0, 0xfb, 0x7e, 0xdf, 0x61, 0x67, 0x0c,
+	0x2d, 0x3b, 0xa2, 0xfb, 0x51, 0x1c, 0xb2, 0xd0, 0xac, 0xb3, 0x49, 0x44, 0x12, 0xeb, 0x0c, 0xb6,
+	0x4e, 0x23, 0xd7, 0x66, 0xe4, 0x28, 0x0e, 0x1d, 0x92, 0x24, 0xaf, 0xc8, 0x4f, 0x29, 0x49, 0x98,
+	0x09, 0x50, 0xa5, 0x6e, 0xbf, 0x72, 0xb3, 0x72, 0xb7, 0x65, 0xb6, 0xa1, 0x16, 0xe1, 0xa2, 0x2a,
+	0x16, 0x78, 0xe2, 0x78, 0x61, 0x42, 0x8e, 0x99, 0x4b, 0x83, 0x7e, 0x0d, 0xf7, 0x9a, 0x66, 0x17,
+	0xea, 0x97, 0xd4, 0x65, 0xe3, 0xbe, 0x81, 0xcb, 0xae, 0xd9, 0x83, 0xc6, 0x98, 0xd0, 0xd1, 0x98,
+	0xf5, 0xeb, 0x7c, 0x6d, 0xed, 0xc2, 0x76, 0xc9, 0x47, 0x12, 0x85, 0x41, 0x42, 0xac, 0x9f, 0x61,
+	0xe7, 0x30, 0x26, 0x78, 0x70, 0x18, 0x06, 0xcc, 0xa6, 0x01, 0x89, 0xe7, 0xb9, 0xc7, 0xc5, 0x59,
+	0x1a, 0xb8, 0x1e, 0x39, 0xb2, 0xd1, 0xc5, 0x14, 0xc5, 0x98, 0x38, 0xe7, 0x51, 0x48, 0x03, 0x26,
+	0x50, 0xb4, 0x38, 0x8a, 0x44, 0x80, 0x32, 0xc4, 0x12, 0x51, 0xe0, 0x32, 0x4c, 0x25, 0x8a, 0x6c,
+	0x4d, 0xe2, 0xb8, 0xdf, 0xe0, 0x6b, 0xeb, 0x53, 0xd8, 0x9d, 0x71, 0x2e, 0x71, 0x99, 0xb7, 0xa0,
+	0xe5, 0x64, 0x9b, 0x02, 0x44, 0xfb, 0x60, 0x7d, 0x5f, 0xf0, 0xb5, 0xaf, 0x85, 0xad, 0x87, 0xd0,
+	0x3d, 0xa6, 0xa3, 0xc0, 0xf6, 0x5e, 0x4b, 0x19, 0xf7, 0x2c, 0x24, 0x05, 0xd0, 0xae, 0xb5, 0x0e,
+	0xbd, 0x4c, 0x53, 0x11, 0xf1, 0x7b, 0x05, 0x36, 0x1e, 0xbb, 0xee, 0x92, 0x1c, 0xac, 0x43, 0x93,
+	0x91, 0xd8, 0xa7, 0xdc, 0x4a, 0x55, 0x90, 0xbe, 0x07, 0x46, 0x9a, 0x20, 0xbe, 0x9a, 0xc0, 0xd7,
+	0x56, 0xf8, 0x4e, 0x71, 0xcb, 0xec, 0x80, 0x61, 0xc7, 0xa3, 0x04, 0x89, 0xa8, 0x49, 0x2c, 0x24,
+	0xb8, 0x40, 0x16, 0xd4, 0xc2, 0xb9, 0x74, 0x25, 0x05, 0x19, 0xca, 0xd5, 0x22, 0x7d, 0xcd, 0x12,
+	0x7d, 0xad, 0x12, 0x7d, 0x20, 0xe8, 0x7b, 0x08, 0x86, 0xf0, 0x85, 0x36, 0x52, 0x85, 0xb2, 0xcb,
+	0x17, 0x23, 0x15, 0x76, 0xd7, 0xdc, 0x81, 0x9e, 0xed, 0xba, 0x94, 0xd1, 0x10, 0x41, 0x3f, 0xa3,
+	0x6e, 0x82, 0x50, 0x6b, 0x18, 0xfe, 0x16, 0x98, 0xf9, 0x58, 0x15, 0x05, 0x2f, 0x74, 0x3a, 0x74,
+	0x5e, 0xe7, 0xf1, 0xf0, 0x76, 0x21, 0xf1, 0x55, 0x11, 0xfb, 0x46, 0x96, 0x1b, 0x7d, 0x60, 0x0d,
+	0xa0, 0x3f, 0x6b, 0x4d, 0x79, 0x7a, 0x00, 0xbb, 0x4f, 0x88, 0x47, 0x5e, 0xe7, 0x09, 0x49, 0x0c,
+	0x6c, 0x9f, 0xc8, 0x1c, 0x72, 0x83, 0xb3, 0x4a, 0xca, 0xe0, 0x2d, 0xd8, 0x7e, 0x41, 0x13, 0xb6,
+	0xd4, 0x9c, 0xf5, 0x1d, 0xc0, 0x54, 0x40, 0x1b, 0xd7, 0xae, 0xc8, 0x15, 0x65, 0x2a, 0xb1, 0x48,
+	0x22, 0x73, 0x22, 0xd5, 0x5a, 0x9b, 0xd0, 0x4e, 0x03, 0x7a, 0x75, 0x1c, 0x3a, 0xe7, 0x84, 0x25,
+	0xa2, 0xb4, 0x45, 0xbf, 0x25, 0x63, 0xe2, 0x79, 0xa2, 0xb2, 0x9b, 0xd6, 0xe7, 0xb0, 0x53, 0xf6,
+	0xaf, 0x0a, 0xf9, 0x1d, 0x68, 0x4f, 0xd9, 0x4a, 0xd0, 0x5b, 0x6d, 0x3e, 0x5d, 0x3d, 0xe8, 0x1c,
+	0x33, 0x64, 0x4b, 0x01, 0xb7, 0x6e, 0x42, 0x4f, 0x17, 0xba, 0x38, 0x90, 0xe9, 0xb7, 0x59, 0x9a,
+	0xa8, 0x70, 0x7e, 0xab, 0xc0, 0xaa, 0x4a, 0x61, 0x56, 0x46, 0xff, 0x61, 0xa1, 0x6e, 0x40, 0x2b,
+	0x99, 0x24, 0x8c, 0xf8, 0x47, 0xaa, 0x5c, 0xbb, 0x6f, 0x5a, 0xae, 0x1e, 0xb4, 0x74, 0x44, 0x8b,
+	0xd3, 0x5c, 0x9a, 0x35, 0x72, 0xae, 0xbc, 0x05, 0xad, 0x48, 0x46, 0x4a, 0x24, 0xd2, 0xf6, 0x41,
+	0x4f, 0x05, 0x91, 0x31, 0x30, 0x65, 0x47, 0xcc, 0x1a, 0xeb, 0x0e, 0xac, 0xbe, 0xb4, 0x9d, 0x31,
+	0x3a, 0xe3, 0xf6, 0x9d, 0x48, 0xd1, 0x26, 0x46, 0xa3, 0x4f, 0xfc, 0x30, 0x9e, 0x08, 0x7f, 0x86,
+	0xf5, 0x2d, 0x0e, 0x11, 0x49, 0xbc, 0xca, 0xd8, 0x6d, 0xac, 0xef, 0x0c, 0x67, 0x96, 0xb0, 0x99,
+	0xd9, 0x63, 0xde, 0x80, 0x55, 0x5f, 0xda, 0x57, 0x2d, 0x90, 0x01, 0x52, 0x5e, 0xad, 0xc7, 0xb0,
+	0x23, 0x47, 0xee, 0xd2, 0xc9, 0x3a, 0x33, 0xa5, 0x64, 0x0c, 0x22, 0x6c, 0x6b, 0x0f, 0x76, 0x67,
+	0x4c, 0xa8, 0x82, 0x5f, 0x83, 0xee, 0xd3, 0x0b, 0x82, 0x15, 0x95, 0xd5, 0xcb, 0x5f, 0x15, 0xa8,
+	0x8b, 0x1d, 0x1e, 0x2e, 0x47, 0xa2, 0x1c, 0x48, 0x67, 0xf3, 0xec, 0x77, 0x4b, 0x54, 0x1b, 0x79,
+	0x40, 0xf5, 0xd2, 0xd8, 0x94, 0x19, 0xc7, 0xa0, 0x55, 0x1e, 0x44, 0xce, 0x67, 0xb3, 0x50, 0xe4,
+	0xae, 0xb5, 0x80, 0xbb, 0xe2, 0x04, 0x81, 0x45, 0x13, 0xe4, 0x8f, 0x0a, 0x74, 0xbe, 0x26, 0xec,
+	0x32, 0x8c, 0xcf, 0x79, 0x86, 0x92, 0x52, 0xcb, 0x62, 0x99, 0xc7, 0x57, 0xc3, 0xb3, 0x09, 0xc3,
+	0x9a, 0x10, 0xa9, 0xe4, 0xf1, 0xe0, 0xce, 0x91, 0x2d, 0x1b, 0xb5, 0x26, 0xf6, 0xb0, 0x6e, 0x5f,
+	0x5d, 0x0d, 0xb1, 0x0a, 0xc3, 0x58, 0xf6, 0xae, 0x10, 0xc3, 0x2d, 0x37, 0x0e, 0xa3, 0x88, 0xc8,
+	0x48, 0x0d, 0x6e, 0xec, 0x24, 0x33, 0xd6, 0xc8, 0xa4, 0x70, 0x27, 0x52, 0xc6, 0x56, 0x33, 0x63,
+	0x27, 0xda, 0x58, 0x33, 0x27, 0x96, 0x19, 0x6b, 0x89, 0x92, 0xf2, 0xa1, 0x79, 0x18, 0xa5, 0xa7,
+	0x89, 0x3d, 0x22, 0x7c, 0x7a, 0xb0, 0x90, 0xd9, 0xde, 0x30, 0xe5, 0x4b, 0x01, 0xdd, 0x30, 0xb7,
+	0xa0, 0x13, 0x91, 0x18, 0x8b, 0x52, 0xed, 0x56, 0x91, 0x28, 0xc3, 0xbc, 0x06, 0x9b, 0x62, 0x39,
+	0xa4, 0xc1, 0xf0, 0x9c, 0xc4, 0x01, 0xf1, 0xfc, 0xd0, 0x25, 0x2a, 0x8e, 0x3d, 0xd8, 0xd0, 0x87,
+	0xbc, 0x97, 0xc5, 0x91, 0x88, 0xc7, 0x3a, 0x81, 0xde, 0xc9, 0x18, 0x6f, 0x14, 0xcc, 0xa3, 0xc1,
+	0xe8, 0x89, 0xcd, 0x6c, 0x73, 0x0d, 0xf3, 0x44, 0x62, 0x1a, 0xba, 0x89, 0x72, 0x88, 0xda, 0x4c,
+	0x8a, 0x10, 0x77, 0x98, 0x1d, 0x49, 0xd2, 0xf0, 0x1b, 0x31, 0x3d, 0x62, 0xd4, 0x57, 0x0e, 0xad,
+	0xef, 0x45, 0x10, 0x92, 0x78, 0x0b, 0xbf, 0xc6, 0x1a, 0xac, 0xfc, 0x1a, 0xaf, 0x65, 0xf9, 0xca,
+	0x02, 0xdd, 0x87, 0x35, 0xa6, 0x51, 0x0c, 0xb1, 0x6a, 0x6d, 0xd5, 0x18, 0xdb, 0x4a, 0xb2, 0x88,
+	0xd1, 0xfa, 0x0c, 0xe0, 0xa5, 0xe8, 0x43, 0x81, 0x18, 0x67, 0x49, 0x9e, 0x20, 0x24, 0xda, 0xb7,
+	0xaf, 0x34, 0x3b, 0x7c, 0x0b, 0x63, 0xfa, 0xc1, 0xa6, 0x9e, 0xa3, 0x2e, 0x1b, 0x86, 0xf5, 0x77,
+	0x05, 0xda, 0xd2, 0x82, 0x04, 0x89, 0x26, 0x1c, 0xec, 0xbd, 0xcc, 0xc4, 0xcd, 0xcc, 0x62, 0xf1,
+	0x0b, 0x95, 0xf3, 0x89, 0x65, 0x98, 0x5c, 0xda, 0x91, 0xf2, 0x52, 0x5b, 0x24, 0x76, 0x07, 0x3a,
+	0x32, 0x1b, 0x4a, 0xd0, 0x58, 0x24, 0x78, 0x8f, 0xcf, 0x43, 0x44, 0x22, 0xc6, 0x67, 0xfb, 0xe0,
+	0x7a, 0x41, 0x42, 0x60, 0xdc, 0x17, 0xbf, 0x4f, 0x03, 0x16, 0x4f, 0x06, 0xf7, 0x00, 0xa6, 0x2b,
+	0xde, 0x76, 0xe7, 0x64, 0xa2, 0x2a, 0x1b, 0x23, 0xb9, 0xb0, 0xbd, 0x54, 0x45, 0xfe, 0xa8, 0xfa,
+	0xb0, 0x62, 0x7d, 0x05, 0x6b, 0x5f, 0x78, 0xe7, 0x34, 0xcc, 0xa9, 0xa0, 0x94, 0x6f, 0xff, 0x18,
+	0xc6, 0x2a, 0x5e, 0xbe, 0xa4, 0x01, 0x2e, 0x25, 0x5d, 0xd8, 0xf7, 0x61, 0x34, 0xbd, 0x96, 0x49,
+	0x7b, 0xb2, 0x5e, 0xfe, 0xac, 0x01, 0x4c, 0x8d, 0x99, 0x8f, 0x60, 0x40, 0xc3, 0x21, 0x96, 0xd4,
+	0x05, 0x75, 0x88, 0x6c, 0x81, 0x61, 0x4c, 0x9c, 0x34, 0x4e, 0xe8, 0x05, 0x51, 0xf3, 0x6f, 0x47,
+	0xc5, 0x52, 0xc6, 0xf0, 0x01, 0x6c, 0x4f, 0x75, 0xdd, 0x9c, 0x5a, 0x75, 0xa9, 0xda, 0x03, 0xd8,
+	0x44, 0x35, 0x1c, 0x5c, 0x69, 0x41, 0xa9, 0xb6, 0x54, 0xe9, 0x63, 0xd8, 0xcb, 0xe1, 0xe4, 0x95,
+	0x9a, 0x53, 0x35, 0x96, 0xaa, 0x7e, 0x08, 0x3b, 0xa8, 0x7a, 0x69, 0x53, 0x56, 0xd6, 0xab, 0xff,
+	0x0b, 0x9c, 0x3e, 0x89, 0x47, 0x05, 0x9c, 0x8d, 0xa5, 0x4a, 0xef, 0xc1, 0x06, 0x2a, 0x95, 0xfc,
+	0xac, 0xbe, 0x4e, 0x25, 0x21, 0x0e, 0xc3, 0xa9, 0x92, 0x53, 0x69, 0x2e, 0x53, 0xc1, 0xcf, 0x4b,
+	0xe7, 0x79, 0x3a, 0x22, 0xcc, 0x3b, 0xd3, 0xd5, 0xff, 0xa6, 0x0d, 0xf4, 0x4b, 0x15, 0xda, 0x87,
+	0xa3, 0x38, 0x4c, 0xa3, 0x42, 0x97, 0xcb, 0x1a, 0x9e, 0xe9, 0x72, 0x29, 0x73, 0x17, 0x3a, 0xf2,
+	0xeb, 0xa9, 0xc4, 0x64, 0x73, 0x99, 0xb3, 0xa5, 0xce, 0x2f, 0x3e, 0x67, 0x1c, 0xb3, 0x12, 0x2c,
+	0xb6, 0x57, 0xae, 0xfc, 0x3e, 0x81, 0xee, 0x58, 0x06, 0xa2, 0x24, 0x65, 0x2a, 0x6f, 0x67, 0x9e,
+	0xa7, 0x00, 0xf7, 0xf3, 0x01, 0xcb, 0x26, 0x7a, 0x0e, 0x1b, 0x33, 0x9b, 0xc5, 0x5e, 0xb2, 0xf2,
+	0xbd, 0xd4, 0x3e, 0xd8, 0x54, 0x66, 0xf3, 0x5a, 0xa2, 0xc1, 0x22, 0xa8, 0x4b, 0x3c, 0xef, 0x42,
+	0x37, 0x90, 0x1f, 0x1d, 0xcd, 0x44, 0x2d, 0xa7, 0x58, 0xf8, 0x20, 0x21, 0x1b, 0x8e, 0xc0, 0x37,
+	0x97, 0x8d, 0x3c, 0xb7, 0x98, 0x0f, 0x5e, 0x11, 0x28, 0xe6, 0x47, 0x8a, 0xfe, 0x81, 0xbc, 0xf1,
+	0xcd, 0x7b, 0x6b, 0x1c, 0xfc, 0xda, 0x80, 0xda, 0xe3, 0xa3, 0x2f, 0xcd, 0x57, 0xb0, 0x56, 0x7a,
+	0x21, 0x99, 0xd9, 0x58, 0x99, 0xff, 0x6c, 0x1b, 0xfc, 0x7f, 0xd1, 0xb1, 0xba, 0x38, 0xac, 0x70,
+	0x9b, 0xa5, 0x5b, 0x85, 0xb6, 0x39, 0xff, 0xc2, 0xa2, 0x6d, 0x2e, 0xba, 0x8c, 0xac, 0x98, 0x1f,
+	0x41, 0x43, 0xbe, 0xa7, 0xcc, 0x2d, 0x25, 0x5b, 0x78, 0x98, 0x0d, 0xb6, 0x4b, 0xbb, 0x5a, 0xf1,
+	0x05, 0x74, 0x0b, 0x0f, 0x53, 0xf3, 0x5a, 0xc1, 0x57, 0xf1, 0x39, 0x36, 0xf8, 0xdf, 0xfc, 0x43,
+	0x6d, 0xed, 0x10, 0x60, 0xfa, 0xae, 0x31, 0xfb, 0x4a, 0x7a, 0xe6, 0x59, 0x37, 0xd8, 0x9b, 0x73,
+	0xa2, 0x8d, 0x9c, 0xc2, 0x7a, 0xf9, 0xe1, 0x62, 0x96, 0x58, 0x2d, 0x3f, 0x33, 0x06, 0x37, 0x16,
+	0x9e, 0xe7, 0xcd, 0x96, 0x9f, 0x2f, 0xda, 0xec, 0x82, 0xc7, 0x90, 0x36, 0xbb, 0xf0, 0xdd, 0xb3,
+	0x62, 0x7e, 0x03, 0xbd, 0xe2, 0xcb, 0xc3, 0xcc, 0x48, 0x9a, 0xfb, 0x20, 0x1a, 0x5c, 0x5f, 0x70,
+	0xaa, 0x0d, 0xbe, 0x2f, 0x1b, 0x01, 0x6f, 0x2e, 0x59, 0xce, 0x72, 0xcf, 0x92, 0xc1, 0x56, 0x71,
+	0x53, 0x6b, 0xdd, 0x87, 0x86, 0xbc, 0x8f, 0xea, 0x02, 0x28, 0x5c, 0x4f, 0x07, 0x9d, 0xfc, 0xae,
+	0xb5, 0x72, 0xbf, 0x82, 0x33, 0xaf, 0xf9, 0x8c, 0x30, 0xd9, 0x1d, 0x79, 0x57, 0x33, 0x2a, 0x62,
+	0x93, 0xab, 0x9c, 0x35, 0xc4, 0xff, 0x26, 0x0f, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, 0x74, 0x42,
+	0xdf, 0x97, 0x44, 0x11, 0x00, 0x00,
 }
diff --git a/api/grpc/types/api.proto b/api/grpc/types/api.proto
index f886d8f..e26ac7f 100644
--- a/api/grpc/types/api.proto
+++ b/api/grpc/types/api.proto
@@ -37,6 +37,7 @@ message CreateContainerRequest {
 }
 
 message CreateContainerResponse {
+    Container container = 1;
 }
 
 message SignalRequest {
diff --git a/supervisor/event.go b/supervisor/event.go
index 2704dc5..9a01a9c 100644
--- a/supervisor/event.go
+++ b/supervisor/event.go
@@ -37,6 +37,7 @@ func NewEvent(t EventType) *Event {
 }
 
 type StartResponse struct {
+	Container runtime.Container
 }
 
 type Event struct {
diff --git a/supervisor/worker.go b/supervisor/worker.go
index 30ab65d..bc524ef 100644
--- a/supervisor/worker.go
+++ b/supervisor/worker.go
@@ -65,6 +65,8 @@ func (w *worker) Start() {
 		}
 		ContainerStartTimer.UpdateSince(started)
 		t.Err <- nil
-		t.StartResponse <- StartResponse{}
+		t.StartResponse <- StartResponse{
+			Container: t.Container,
+		}
 	}
 }