diff --git a/api/grpc/server/server.go b/api/grpc/server/server.go
index 2d50667..debaaf8 100644
--- a/api/grpc/server/server.go
+++ b/api/grpc/server/server.go
@@ -172,6 +172,7 @@ func (s *apiServer) ListCheckpoint(ctx context.Context, r *types.ListCheckpointR
 
 func (s *apiServer) State(ctx context.Context, r *types.StateRequest) (*types.StateResponse, error) {
 	e := supervisor.NewEvent(supervisor.GetContainerEventType)
+	e.ID = r.Id
 	s.sv.SendEvent(e)
 	if err := <-e.Err; err != nil {
 		return nil, err
diff --git a/api/grpc/types/api.pb.go b/api/grpc/types/api.pb.go
index 1775291..96d2fd5 100644
--- a/api/grpc/types/api.pb.go
+++ b/api/grpc/types/api.pb.go
@@ -260,6 +260,7 @@ func (m *ListCheckpointResponse) GetCheckpoints() []*Checkpoint {
 }
 
 type StateRequest struct {
+	Id string `protobuf:"bytes,1,opt,name=id" json:"id,omitempty"`
 }
 
 func (m *StateRequest) Reset()                    { *m = StateRequest{} }
@@ -1147,7 +1148,7 @@ var _API_serviceDesc = grpc.ServiceDesc{
 }
 
 var fileDescriptor0 = []byte{
-	// 1526 bytes of a gzipped FileDescriptorProto
+	// 1524 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,
@@ -1179,69 +1180,69 @@ var fileDescriptor0 = []byte{
 	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,
+	0xaf, 0x0a, 0xf9, 0x1d, 0x68, 0x4f, 0xd9, 0x4a, 0xd0, 0x5b, 0x6d, 0x11, 0x5d, 0x9d, 0x63, 0x86,
+	0x6c, 0xcd, 0x03, 0x7e, 0x13, 0x7a, 0xba, 0xe8, 0x85, 0x90, 0x2c, 0x05, 0x9b, 0xa5, 0x89, 0x92,
+	0xf8, 0xad, 0x02, 0xab, 0x2a, 0x9d, 0x59, 0x49, 0xfd, 0x87, 0x45, 0xbb, 0x01, 0xad, 0x64, 0x92,
+	0x30, 0xe2, 0x1f, 0xa9, 0xd2, 0xed, 0xbe, 0x69, 0xe9, 0x7a, 0xd0, 0xd2, 0x11, 0x2d, 0x4e, 0x79,
+	0x69, 0xee, 0xc8, 0x19, 0xf3, 0x16, 0xb4, 0x22, 0x19, 0x29, 0x91, 0x48, 0xdb, 0x07, 0x3d, 0x15,
+	0x44, 0xc6, 0xc0, 0x94, 0x1d, 0x31, 0x77, 0xac, 0x3b, 0xb0, 0xfa, 0xd2, 0x76, 0xc6, 0xe8, 0x8c,
+	0xdb, 0x77, 0x22, 0x45, 0x9b, 0x18, 0x93, 0x3e, 0xf1, 0xc3, 0x78, 0x22, 0xfc, 0x19, 0xd6, 0xb7,
+	0x38, 0x50, 0x64, 0x12, 0x54, 0xf6, 0x6e, 0x63, 0xad, 0x67, 0x38, 0xb3, 0xe4, 0xcd, 0xcc, 0x21,
+	0xf3, 0x06, 0xac, 0xfa, 0xd2, 0xbe, 0x6a, 0x87, 0x0c, 0x90, 0xf2, 0x6a, 0x3d, 0x86, 0x1d, 0x39,
+	0x7e, 0x97, 0x4e, 0xd9, 0x99, 0x89, 0x25, 0x63, 0x10, 0x61, 0x5b, 0x7b, 0xb0, 0x3b, 0x63, 0x42,
+	0x15, 0xff, 0x1a, 0x74, 0x9f, 0x5e, 0x10, 0xac, 0x2e, 0x65, 0xd4, 0xfa, 0xab, 0x02, 0x75, 0xb1,
+	0xc3, 0xc3, 0xe5, 0x48, 0x94, 0x03, 0xe9, 0x6c, 0x9e, 0xfd, 0x6e, 0x89, 0x6a, 0x23, 0x0f, 0xa8,
+	0x5e, 0x1a, 0xa1, 0x32, 0xe3, 0x18, 0xb4, 0xca, 0x83, 0xc8, 0xf9, 0x6c, 0x16, 0x8a, 0xdc, 0xb5,
+	0x16, 0x70, 0x57, 0x9c, 0x26, 0xb0, 0x68, 0x9a, 0xfc, 0x51, 0x81, 0xce, 0xd7, 0x84, 0x5d, 0x86,
+	0xf1, 0x39, 0xcf, 0x50, 0x52, 0x6a, 0x5f, 0x2c, 0xf3, 0xf8, 0x6a, 0x78, 0x36, 0x61, 0x58, 0x13,
+	0x22, 0x95, 0x3c, 0x1e, 0xdc, 0x39, 0xb2, 0x65, 0xd3, 0xd6, 0xc4, 0x1e, 0xd6, 0xed, 0xab, 0xab,
+	0x21, 0x56, 0x61, 0x18, 0xcb, 0x3e, 0x16, 0x62, 0xb8, 0xe5, 0xc6, 0x61, 0x14, 0x11, 0x19, 0xa9,
+	0xc1, 0x8d, 0x9d, 0x64, 0xc6, 0x1a, 0x99, 0x14, 0xee, 0x44, 0xca, 0xd8, 0x6a, 0x66, 0xec, 0x44,
+	0x1b, 0x6b, 0xe6, 0xc4, 0x32, 0x63, 0x2d, 0x51, 0x52, 0x3e, 0x34, 0x0f, 0xa3, 0xf4, 0x34, 0xb1,
+	0x47, 0x84, 0x4f, 0x12, 0x16, 0x32, 0xdb, 0x1b, 0xa6, 0x7c, 0x29, 0xa0, 0x1b, 0xe6, 0x16, 0x74,
+	0x22, 0x12, 0x63, 0x51, 0xaa, 0xdd, 0x2a, 0x12, 0x65, 0x98, 0xd7, 0x60, 0x53, 0x2c, 0x87, 0x34,
+	0x18, 0x9e, 0x93, 0x38, 0x20, 0x9e, 0x1f, 0xba, 0x44, 0xc5, 0xb1, 0x07, 0x1b, 0xfa, 0x90, 0xf7,
+	0xb2, 0x38, 0x12, 0xf1, 0x58, 0x27, 0xd0, 0x3b, 0x19, 0xe3, 0xed, 0x82, 0x79, 0x34, 0x18, 0x3d,
+	0xb1, 0x99, 0x6d, 0xae, 0x61, 0x9e, 0x48, 0x4c, 0x43, 0x37, 0x51, 0x0e, 0x51, 0x9b, 0x49, 0x11,
+	0xe2, 0x0e, 0xb3, 0x23, 0x49, 0x1a, 0x7e, 0x2f, 0xa6, 0x47, 0x8c, 0xfa, 0xca, 0xa1, 0xf5, 0xbd,
+	0x08, 0x42, 0x12, 0x6f, 0xe1, 0x97, 0x59, 0x83, 0x95, 0x5f, 0xe6, 0xb5, 0x2c, 0x5f, 0x59, 0xa0,
+	0xfb, 0xb0, 0xc6, 0x34, 0x8a, 0x21, 0x56, 0xad, 0xad, 0x1a, 0x63, 0x5b, 0x49, 0x16, 0x31, 0x5a,
+	0x9f, 0x01, 0xbc, 0x14, 0x7d, 0x28, 0x10, 0xe3, 0x2c, 0xc9, 0x13, 0x84, 0x44, 0xfb, 0xf6, 0x95,
+	0x66, 0x87, 0x6f, 0x61, 0x4c, 0x3f, 0xd8, 0xd4, 0x73, 0xd4, 0xc5, 0xc3, 0xb0, 0xfe, 0xae, 0x40,
+	0x5b, 0x5a, 0x90, 0x20, 0xd1, 0x84, 0x83, 0xbd, 0x97, 0x99, 0xb8, 0x99, 0x59, 0x2c, 0x7e, 0xad,
+	0x72, 0x3e, 0xb1, 0x0c, 0x93, 0x4b, 0x3b, 0x52, 0x5e, 0x6a, 0x8b, 0xc4, 0xee, 0x40, 0x47, 0x66,
+	0x43, 0x09, 0x1a, 0x8b, 0x04, 0xef, 0xf1, 0x79, 0x88, 0x48, 0xc4, 0xf8, 0x6c, 0x1f, 0x5c, 0x2f,
+	0x48, 0x08, 0x8c, 0xfb, 0xe2, 0xf7, 0x69, 0xc0, 0xe2, 0xc9, 0xe0, 0x1e, 0xc0, 0x74, 0xc5, 0xdb,
+	0xee, 0x9c, 0x4c, 0x54, 0x65, 0x63, 0x24, 0x17, 0xb6, 0x97, 0xaa, 0xc8, 0x1f, 0x55, 0x1f, 0x56,
+	0xac, 0xaf, 0x60, 0xed, 0x0b, 0xef, 0x9c, 0x86, 0x39, 0x15, 0x94, 0xf2, 0xed, 0x1f, 0xc3, 0x58,
+	0xc5, 0xcb, 0x97, 0x34, 0xc0, 0xa5, 0xa4, 0x0b, 0xfb, 0x3e, 0x8c, 0xa6, 0x57, 0x34, 0x69, 0x4f,
+	0xd6, 0xcb, 0x9f, 0x35, 0x80, 0xa9, 0x31, 0xf3, 0x11, 0x0c, 0x68, 0x38, 0xc4, 0x92, 0xba, 0xa0,
+	0x0e, 0x91, 0x2d, 0x30, 0x8c, 0x89, 0x93, 0xc6, 0x09, 0xbd, 0x20, 0x6a, 0xfe, 0xed, 0xa8, 0x58,
+	0xca, 0x18, 0x3e, 0x80, 0xed, 0xa9, 0xae, 0x9b, 0x53, 0xab, 0x2e, 0x55, 0x7b, 0x00, 0x9b, 0xa8,
+	0x86, 0x83, 0x2b, 0x2d, 0x28, 0xd5, 0x96, 0x2a, 0x7d, 0x0c, 0x7b, 0x39, 0x9c, 0xbc, 0x52, 0x73,
+	0xaa, 0xc6, 0x52, 0xd5, 0x0f, 0x61, 0x07, 0x55, 0x2f, 0x6d, 0xca, 0xca, 0x7a, 0xf5, 0x7f, 0x81,
+	0xd3, 0x27, 0xf1, 0xa8, 0x80, 0xb3, 0xb1, 0x54, 0xe9, 0x3d, 0xd8, 0x40, 0xa5, 0x92, 0x9f, 0xd5,
+	0xd7, 0xa9, 0x24, 0xc4, 0x61, 0x38, 0x55, 0x72, 0x2a, 0xcd, 0x65, 0x2a, 0xf8, 0x79, 0xe9, 0x3c,
+	0x4f, 0x47, 0x84, 0x79, 0x67, 0xba, 0xfa, 0xdf, 0xb4, 0x81, 0x7e, 0xa9, 0x42, 0xfb, 0x70, 0x14,
+	0x87, 0x69, 0x54, 0xe8, 0x72, 0x59, 0xc3, 0x33, 0x5d, 0x2e, 0x65, 0xee, 0x42, 0x47, 0x7e, 0x3d,
+	0x95, 0x98, 0x6c, 0x2e, 0x73, 0xb6, 0xd4, 0xf9, 0x25, 0xe8, 0x8c, 0x63, 0x56, 0x82, 0xc5, 0xf6,
+	0xca, 0x95, 0xdf, 0x27, 0xd0, 0x1d, 0xcb, 0x40, 0x94, 0xa4, 0x4c, 0xe5, 0xed, 0xcc, 0xf3, 0x14,
+	0xe0, 0x7e, 0x3e, 0x60, 0xd9, 0x44, 0xcf, 0x61, 0x63, 0x66, 0xb3, 0xd8, 0x4b, 0x56, 0xbe, 0x97,
+	0xda, 0x07, 0x9b, 0xca, 0x6c, 0x5e, 0x4b, 0x34, 0x58, 0x04, 0x75, 0x89, 0xe7, 0x5d, 0xe8, 0x06,
+	0xf2, 0xa3, 0xa3, 0x99, 0xa8, 0xe5, 0x14, 0x0b, 0x1f, 0x24, 0x64, 0xc3, 0x11, 0xf8, 0xe6, 0xb2,
+	0x91, 0xe7, 0x16, 0xf3, 0xc1, 0x2b, 0x02, 0xc5, 0xfc, 0x48, 0xd1, 0xaf, 0x6e, 0x7f, 0xf3, 0xde,
+	0x1d, 0x07, 0xbf, 0x36, 0xa0, 0xf6, 0xf8, 0xe8, 0x4b, 0xf3, 0x15, 0xac, 0x95, 0x5e, 0x4b, 0x66,
+	0x36, 0x56, 0xe6, 0x3f, 0xe1, 0x06, 0xff, 0x5f, 0x74, 0xac, 0x2e, 0x0e, 0x2b, 0xdc, 0x66, 0xe9,
+	0x56, 0xa1, 0x6d, 0xce, 0xbf, 0xb0, 0x68, 0x9b, 0x8b, 0x2e, 0x23, 0x2b, 0xe6, 0x47, 0xd0, 0x90,
+	0x6f, 0x2b, 0x73, 0x4b, 0xc9, 0x16, 0x1e, 0x69, 0x83, 0xed, 0xd2, 0xae, 0x56, 0x7c, 0x01, 0xdd,
+	0xc2, 0x23, 0xd5, 0xbc, 0x56, 0xf0, 0x55, 0x7c, 0x9a, 0x0d, 0xfe, 0x37, 0xff, 0x50, 0x5b, 0x3b,
+	0x04, 0x98, 0xbe, 0x71, 0xcc, 0xbe, 0x92, 0x9e, 0x79, 0xe2, 0x0d, 0xf6, 0xe6, 0x9c, 0x68, 0x23,
+	0xa7, 0xb0, 0x5e, 0x7e, 0xc4, 0x98, 0x25, 0x56, 0xcb, 0x4f, 0x8e, 0xc1, 0x8d, 0x85, 0xe7, 0x79,
+	0xb3, 0xe5, 0xa7, 0x8c, 0x36, 0xbb, 0xe0, 0x61, 0xa4, 0xcd, 0x2e, 0x7c, 0x03, 0xad, 0x98, 0xdf,
+	0x40, 0xaf, 0xf8, 0x0a, 0x31, 0x33, 0x92, 0xe6, 0x3e, 0x8e, 0x06, 0xd7, 0x17, 0x9c, 0x6a, 0x83,
+	0xef, 0xcb, 0x46, 0xc0, 0x9b, 0x4b, 0x96, 0xb3, 0xdc, 0x13, 0x65, 0xb0, 0x55, 0xdc, 0xd4, 0x5a,
+	0xf7, 0xa1, 0x21, 0xef, 0xa3, 0xba, 0x00, 0x0a, 0xd7, 0xd3, 0x41, 0x27, 0xbf, 0x6b, 0xad, 0xdc,
+	0xaf, 0xe0, 0xcc, 0x6b, 0x3e, 0x23, 0x4c, 0x76, 0x47, 0xde, 0xd5, 0x8c, 0x8a, 0xd8, 0xe4, 0x2a,
+	0x67, 0x0d, 0xf1, 0x1f, 0xca, 0x83, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x06, 0x77, 0x88, 0xa2,
+	0x50, 0x11, 0x00, 0x00,
 }
diff --git a/api/grpc/types/api.proto b/api/grpc/types/api.proto
index e26ac7f..fc559fb 100644
--- a/api/grpc/types/api.proto
+++ b/api/grpc/types/api.proto
@@ -104,6 +104,7 @@ message ListCheckpointResponse {
 }
 
 message StateRequest {
+    string id = 1; // container id for a single container
 }
 
 message ContainerState {
diff --git a/ctr/container.go b/ctr/container.go
index 16df91f..78f02b9 100644
--- a/ctr/container.go
+++ b/ctr/container.go
@@ -59,7 +59,9 @@ var stateCommand = cli.Command{
 	Usage: "get a raw dump of the containerd state",
 	Action: func(context *cli.Context) {
 		c := getClient(context)
-		resp, err := c.State(netcontext.Background(), &types.StateRequest{})
+		resp, err := c.State(netcontext.Background(), &types.StateRequest{
+			Id: context.Args().First(),
+		})
 		if err != nil {
 			fatal(err.Error(), 1)
 		}
@@ -79,7 +81,9 @@ var listCommand = cli.Command{
 
 func listContainers(context *cli.Context) {
 	c := getClient(context)
-	resp, err := c.State(netcontext.Background(), &types.StateRequest{})
+	resp, err := c.State(netcontext.Background(), &types.StateRequest{
+		Id: context.Args().First(),
+	})
 	if err != nil {
 		fatal(err.Error(), 1)
 	}
diff --git a/runtime/container.go b/runtime/container.go
index 081fe22..67e0980 100644
--- a/runtime/container.go
+++ b/runtime/container.go
@@ -51,6 +51,21 @@ type Stdio struct {
 	Stderr string
 }
 
+func NewStdio(stdin, stdout, stderr string) Stdio {
+	for _, s := range []*string{
+		&stdin, &stdout, &stderr,
+	} {
+		if *s == "" {
+			*s = "/dev/null"
+		}
+	}
+	return Stdio{
+		Stdin:  stdin,
+		Stdout: stdout,
+		Stderr: stderr,
+	}
+}
+
 // New returns a new container
 func New(root, id, bundle string) (Container, error) {
 	c := &container{
diff --git a/supervisor/add_process.go b/supervisor/add_process.go
index 3f6d34d..2a7951b 100644
--- a/supervisor/add_process.go
+++ b/supervisor/add_process.go
@@ -18,11 +18,7 @@ func (h *AddProcessEvent) Handle(e *Event) error {
 	if !ok {
 		return ErrContainerNotFound
 	}
-	process, err := ci.container.Exec(e.Pid, *e.ProcessSpec, runtime.Stdio{
-		Stdin:  e.Stdin,
-		Stdout: e.Stdout,
-		Stderr: e.Stderr,
-	})
+	process, err := ci.container.Exec(e.Pid, *e.ProcessSpec, runtime.NewStdio(e.Stdin, e.Stdout, e.Stderr))
 	if err != nil {
 		return err
 	}
diff --git a/supervisor/get_containers.go b/supervisor/get_containers.go
index 0b21e36..aba3400 100644
--- a/supervisor/get_containers.go
+++ b/supervisor/get_containers.go
@@ -5,6 +5,14 @@ type GetContainersEvent struct {
 }
 
 func (h *GetContainersEvent) Handle(e *Event) error {
+	if e.ID != "" {
+		ci := h.s.containers[e.ID]
+		if ci == nil {
+			return ErrContainerNotFound
+		}
+		e.Containers = append(e.Containers, ci.container)
+		return nil
+	}
 	for _, i := range h.s.containers {
 		e.Containers = append(e.Containers, i.container)
 	}
diff --git a/supervisor/worker.go b/supervisor/worker.go
index bc524ef..4eba0ab 100644
--- a/supervisor/worker.go
+++ b/supervisor/worker.go
@@ -38,11 +38,7 @@ func (w *worker) Start() {
 	defer w.wg.Done()
 	for t := range w.s.tasks {
 		started := time.Now()
-		process, err := t.Container.Start(t.Checkpoint, runtime.Stdio{
-			Stdin:  t.Stdin,
-			Stdout: t.Stdout,
-			Stderr: t.Stderr,
-		})
+		process, err := t.Container.Start(t.Checkpoint, runtime.NewStdio(t.Stdin, t.Stdout, t.Stderr))
 		if err != nil {
 			evt := NewEvent(DeleteEventType)
 			evt.ID = t.Container.ID()