diff --git a/broadcast.go b/broadcast.go
index 95a6d58f5..491a48737 100644
--- a/broadcast.go
+++ b/broadcast.go
@@ -108,11 +108,13 @@ var NopBroadcastReceiver = &nopBroadcastReceiver{}
 
 // Broadcast message types.
 const (
-	MessageTypeCreateSlice = 1
-	MessageTypeCreateIndex = 2
-	MessageTypeDeleteIndex = 3
-	MessageTypeCreateFrame = 4
-	MessageTypeDeleteFrame = 5
+	MessageTypeCreateSlice           = 1
+	MessageTypeCreateIndex           = 2
+	MessageTypeDeleteIndex           = 3
+	MessageTypeCreateFrame           = 4
+	MessageTypeDeleteFrame           = 5
+	MessageTypeCreateInputDefinition = 6
+	MessageTypeDeleteInputDefinition = 7
 )
 
 // MarshalMessage encodes the protobuf message into a byte slice.
@@ -129,6 +131,8 @@ func MarshalMessage(m proto.Message) ([]byte, error) {
 		typ = MessageTypeCreateFrame
 	case *internal.DeleteFrameMessage:
 		typ = MessageTypeDeleteFrame
+	case *internal.CreateInputDefinitionMessage:
+		typ = MessageTypeCreateInputDefinition
 	default:
 		return nil, fmt.Errorf("message type not implemented for marshalling: %s", reflect.TypeOf(obj))
 	}
@@ -155,6 +159,8 @@ func UnmarshalMessage(buf []byte) (proto.Message, error) {
 		m = &internal.CreateFrameMessage{}
 	case MessageTypeDeleteFrame:
 		m = &internal.DeleteFrameMessage{}
+	case MessageTypeCreateInputDefinition:
+		m = &internal.CreateInputDefinitionMessage{}
 	default:
 		return nil, fmt.Errorf("invalid message type: %d", typ)
 	}
diff --git a/handler.go b/handler.go
index e3049f3df..4586755c2 100644
--- a/handler.go
+++ b/handler.go
@@ -1505,7 +1505,7 @@ func (h *Handler) handlePostDefinition(w http.ResponseWriter, r *http.Request) {
 	inputDefName := mux.Vars(r)["input-definition"]
 
 	// Decode request.
-	var req postInputDefinition
+	var req internal.InputDefinition
 	err := json.NewDecoder(r.Body).Decode(&req)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest)
@@ -1519,20 +1519,14 @@ func (h *Handler) handlePostDefinition(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// Create InputDefinition.
-	_, err = index.CreateInputDefinition(inputDefName, req.Frames, req.Fields)
-	if err == ErrInputDefinitionExists {
-		http.Error(w, err.Error(), http.StatusConflict)
-		return
-	} else if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
+	req.Name = inputDefName
+	fmt.Println(req.String())
 
 	err = h.Broadcaster.SendSync(
 		&internal.CreateInputDefinitionMessage{
-			Index:           indexName,
-			InputDefinition: inputDefName,
+			Index:      indexName,
+			Name:       inputDefName,
+			Definition: &req,
 		})
 	if err != nil {
 		h.logger().Printf("problem sending CreateInputDefinition message: %s", err)
@@ -1585,11 +1579,6 @@ func (h *Handler) handleDeleteDefinition(w http.ResponseWriter, r *http.Request)
 	}
 }
 
-type postInputDefinition struct {
-	Frames []InputFrame `json:"frames,omitempty"`
-	Fields []Field      `json:"fields,omitempty"`
-}
-
 type InputFrame struct {
 	Name    string       `json:"name,omitempty"`
 	Options FrameOptions `json:"options,omitempty"`
diff --git a/handler_test.go b/handler_test.go
index 8c7f3a7e2..dd1505036 100644
--- a/handler_test.go
+++ b/handler_test.go
@@ -1087,7 +1087,7 @@ func TestHandler_CreateInputDefinition(t *testing.T) {
 					"cacheType": "ranked"
 				}
 			}],
-			"fields": [
+			"inputdefinitionfields": [
 				{
 					"name": "id",
 					"primaryKey": true
diff --git a/internal/private.pb.go b/internal/private.pb.go
index 6ef948b59..a98f25f5b 100644
--- a/internal/private.pb.go
+++ b/internal/private.pb.go
@@ -309,8 +309,9 @@ func (m *Action) GetValueMap() map[string]uint64 {
 }
 
 type CreateInputDefinitionMessage struct {
-	Index           string `protobuf:"bytes,1,opt,name=Index,proto3" json:"Index,omitempty"`
-	InputDefinition string `protobuf:"bytes,2,opt,name=InputDefinition,proto3" json:"InputDefinition,omitempty"`
+	Index      string           `protobuf:"bytes,1,opt,name=Index,proto3" json:"Index,omitempty"`
+	Name       string           `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
+	Definition *InputDefinition `protobuf:"bytes,3,opt,name=Definition" json:"Definition,omitempty"`
 }
 
 func (m *CreateInputDefinitionMessage) Reset()         { *m = CreateInputDefinitionMessage{} }
@@ -320,6 +321,13 @@ func (*CreateInputDefinitionMessage) Descriptor() ([]byte, []int) {
 	return fileDescriptorPrivate, []int{17}
 }
 
+func (m *CreateInputDefinitionMessage) GetDefinition() *InputDefinition {
+	if m != nil {
+		return m.Definition
+	}
+	return nil
+}
+
 type NodeStatus struct {
 	Host    string   `protobuf:"bytes,1,opt,name=Host,proto3" json:"Host,omitempty"`
 	State   string   `protobuf:"bytes,2,opt,name=State,proto3" json:"State,omitempty"`
@@ -1095,11 +1103,21 @@ func (m *CreateInputDefinitionMessage) MarshalTo(dAtA []byte) (int, error) {
 		i = encodeVarintPrivate(dAtA, i, uint64(len(m.Index)))
 		i += copy(dAtA[i:], m.Index)
 	}
-	if len(m.InputDefinition) > 0 {
+	if len(m.Name) > 0 {
 		dAtA[i] = 0x12
 		i++
-		i = encodeVarintPrivate(dAtA, i, uint64(len(m.InputDefinition)))
-		i += copy(dAtA[i:], m.InputDefinition)
+		i = encodeVarintPrivate(dAtA, i, uint64(len(m.Name)))
+		i += copy(dAtA[i:], m.Name)
+	}
+	if m.Definition != nil {
+		dAtA[i] = 0x1a
+		i++
+		i = encodeVarintPrivate(dAtA, i, uint64(m.Definition.Size()))
+		n13, err := m.Definition.MarshalTo(dAtA[i:])
+		if err != nil {
+			return 0, err
+		}
+		i += n13
 	}
 	return i, nil
 }
@@ -1517,10 +1535,14 @@ func (m *CreateInputDefinitionMessage) Size() (n int) {
 	if l > 0 {
 		n += 1 + l + sovPrivate(uint64(l))
 	}
-	l = len(m.InputDefinition)
+	l = len(m.Name)
 	if l > 0 {
 		n += 1 + l + sovPrivate(uint64(l))
 	}
+	if m.Definition != nil {
+		l = m.Definition.Size()
+		n += 1 + l + sovPrivate(uint64(l))
+	}
 	return n
 }
 
@@ -4038,7 +4060,7 @@ func (m *CreateInputDefinitionMessage) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		case 2:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field InputDefinition", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType)
 			}
 			var stringLen uint64
 			for shift := uint(0); ; shift += 7 {
@@ -4063,7 +4085,40 @@ func (m *CreateInputDefinitionMessage) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.InputDefinition = string(dAtA[iNdEx:postIndex])
+			m.Name = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field Definition", wireType)
+			}
+			var msglen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowPrivate
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				msglen |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if msglen < 0 {
+				return ErrInvalidLengthPrivate
+			}
+			postIndex := iNdEx + msglen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			if m.Definition == nil {
+				m.Definition = &InputDefinition{}
+			}
+			if err := m.Definition.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+				return err
+			}
 			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
@@ -4414,57 +4469,58 @@ var (
 func init() { proto.RegisterFile("private.proto", fileDescriptorPrivate) }
 
 var fileDescriptorPrivate = []byte{
-	// 823 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x4f, 0x6f, 0x1b, 0x45,
-	0x14, 0x67, 0xed, 0xb5, 0x6b, 0xbf, 0x28, 0x89, 0x3b, 0x04, 0xb4, 0x8d, 0x22, 0x2b, 0x9a, 0x03,
-	0x0d, 0x3e, 0xf8, 0x50, 0x2e, 0xa8, 0xe5, 0x00, 0xb5, 0x5d, 0xd5, 0x02, 0x17, 0x18, 0x47, 0x3d,
-	0x22, 0x4d, 0xec, 0x07, 0xac, 0xb2, 0xde, 0x35, 0x3b, 0xb3, 0x4e, 0xcd, 0x81, 0xcf, 0x81, 0xc4,
-	0x95, 0x2b, 0xdf, 0x83, 0x23, 0x57, 0x6e, 0x28, 0x5c, 0xf8, 0x18, 0x68, 0xfe, 0xed, 0xae, 0xd7,
-	0x76, 0xaa, 0xf4, 0x36, 0xef, 0xf7, 0xfe, 0xfd, 0xe6, 0xcd, 0x7b, 0x6f, 0x17, 0x0e, 0x97, 0x69,
-	0xb8, 0xe2, 0x12, 0xfb, 0xcb, 0x34, 0x91, 0x09, 0x69, 0x85, 0xb1, 0xc4, 0x34, 0xe6, 0x11, 0xfd,
-	0x1a, 0xda, 0xe3, 0x78, 0x8e, 0x6f, 0x26, 0x28, 0x39, 0x39, 0x87, 0x83, 0x41, 0x12, 0x65, 0x8b,
-	0xf8, 0x2b, 0x7e, 0x85, 0x51, 0xe0, 0x9d, 0x7b, 0x17, 0x6d, 0x56, 0x86, 0x94, 0xc5, 0x65, 0xb8,
-	0xc0, 0x6f, 0x33, 0x1e, 0xcb, 0x6c, 0x11, 0xd4, 0x8c, 0x45, 0x09, 0xa2, 0x7f, 0x78, 0xd0, 0x7e,
-	0x91, 0xf2, 0x05, 0xea, 0x88, 0xa7, 0xd0, 0x62, 0xc9, 0x4d, 0x39, 0x5c, 0x2e, 0x93, 0x8f, 0xe0,
-	0x68, 0x1c, 0xaf, 0x30, 0x15, 0x38, 0x8a, 0xf9, 0x55, 0x84, 0x73, 0x1d, 0xae, 0xc5, 0x2a, 0x28,
-	0x39, 0x83, 0xf6, 0x80, 0xcf, 0x7e, 0xc4, 0xcb, 0xf5, 0x12, 0x83, 0xba, 0x0e, 0x52, 0x00, 0xb9,
-	0x76, 0x1a, 0xfe, 0x8c, 0x81, 0x7f, 0xee, 0x5d, 0x1c, 0xb2, 0x02, 0xa8, 0xf2, 0x6d, 0x6c, 0xf3,
-	0xa5, 0x70, 0x34, 0x5e, 0x2c, 0x93, 0x54, 0x32, 0x14, 0xcb, 0x24, 0x16, 0x48, 0x3a, 0x50, 0x1f,
-	0xa5, 0xa9, 0xa5, 0xab, 0x8e, 0xf4, 0x17, 0xe8, 0x3c, 0x8f, 0x92, 0xd9, 0xf5, 0x90, 0x4b, 0xce,
-	0xf0, 0xa7, 0x0c, 0x85, 0x24, 0x27, 0xd0, 0xd0, 0x85, 0xb3, 0x76, 0x46, 0x50, 0xa8, 0xbe, 0xbc,
-	0xad, 0x8c, 0x11, 0x14, 0xaa, 0xfd, 0x35, 0x7b, 0x9f, 0x19, 0x41, 0xa1, 0xd3, 0x28, 0x9c, 0x19,
-	0xd6, 0x3e, 0x33, 0x02, 0x21, 0xe0, 0xbf, 0x0e, 0xf1, 0xc6, 0x52, 0xd5, 0x67, 0x3a, 0x86, 0x87,
-	0xa5, 0xfc, 0x96, 0xe6, 0x87, 0xd0, 0x64, 0xc9, 0xcd, 0x78, 0x28, 0x02, 0xef, 0xbc, 0x7e, 0xe1,
-	0x33, 0x2b, 0xe9, 0x82, 0xe8, 0x17, 0x53, 0xaa, 0x9a, 0x56, 0x15, 0x00, 0x7d, 0x04, 0x0d, 0x5d,
-	0x1d, 0x75, 0xcb, 0xc2, 0x57, 0x1d, 0xe9, 0x6f, 0x1e, 0x3c, 0x9c, 0xf0, 0x37, 0x9a, 0x86, 0xc8,
-	0xd3, 0xbc, 0x84, 0x76, 0x0e, 0x6a, 0xeb, 0x83, 0x27, 0xbd, 0xbe, 0x6b, 0x9f, 0xfe, 0x96, 0x7d,
-	0x81, 0x8c, 0x62, 0x99, 0xae, 0x59, 0xe1, 0x7c, 0xfa, 0x19, 0x1c, 0x6d, 0x2a, 0x15, 0x87, 0x6b,
-	0x5c, 0xbb, 0x4a, 0x5f, 0xe3, 0x5a, 0xd5, 0x64, 0xc5, 0xa3, 0xcc, 0xd4, 0xcf, 0x67, 0x46, 0x78,
-	0x5a, 0xfb, 0xd4, 0xa3, 0xdf, 0x01, 0x19, 0xa4, 0xc8, 0x25, 0xea, 0x00, 0x13, 0x14, 0x82, 0xff,
-	0x80, 0xfb, 0x5f, 0xc1, 0x54, 0xb6, 0x56, 0xae, 0xec, 0x19, 0xb4, 0xc7, 0xc2, 0xf6, 0x96, 0x7e,
-	0x89, 0x16, 0x2b, 0x00, 0xda, 0x03, 0x32, 0xc4, 0x08, 0x25, 0xda, 0x71, 0xb8, 0x23, 0x3e, 0x9d,
-	0x3a, 0x2e, 0x6f, 0xb7, 0x25, 0x8f, 0xc1, 0x57, 0x93, 0xa0, 0xa9, 0x1c, 0x3c, 0x79, 0xbf, 0x28,
-	0x5d, 0x3e, 0x76, 0x4c, 0x1b, 0xd0, 0xd0, 0x05, 0xb5, 0xd3, 0xf3, 0x96, 0x0b, 0xee, 0x68, 0x33,
-	0x97, 0xaa, 0x5e, 0x4d, 0x95, 0xcf, 0xa3, 0x4d, 0xf5, 0xb9, 0xbb, 0xeb, 0xbb, 0xa6, 0xa2, 0x43,
-	0x8b, 0xaa, 0x76, 0x7d, 0xa5, 0xb4, 0xc6, 0x47, 0x9f, 0xf7, 0x5f, 0xb9, 0xca, 0xe3, 0x3f, 0xcf,
-	0xa6, 0xbc, 0x5f, 0x98, 0x4a, 0xe5, 0xd4, 0x92, 0x71, 0x8d, 0x65, 0x27, 0x2c, 0x97, 0xc9, 0x63,
-	0x68, 0xea, 0xac, 0x22, 0xf0, 0x75, 0xef, 0x1e, 0x57, 0xd8, 0x30, 0xab, 0x56, 0xe3, 0x64, 0x9b,
-	0xbc, 0x61, 0xc6, 0xc9, 0x48, 0x64, 0x04, 0x9d, 0x71, 0xbc, 0xcc, 0xe4, 0x10, 0xbf, 0x0f, 0xe3,
-	0x50, 0x86, 0x49, 0x2c, 0x82, 0xa6, 0x0e, 0xf5, 0xa8, 0xcc, 0x68, 0xc3, 0x82, 0x6d, 0xb9, 0xd0,
-	0xdf, 0x3d, 0x38, 0xae, 0x80, 0x7b, 0x2e, 0xed, 0xf8, 0xd6, 0xee, 0xe6, 0x7b, 0x09, 0x1f, 0x54,
-	0xe2, 0xbd, 0x08, 0x31, 0x9a, 0x8b, 0xa0, 0xae, 0xfd, 0xba, 0x7b, 0xc9, 0x69, 0x33, 0xb6, 0xdb,
-	0x99, 0xae, 0xe0, 0x64, 0x97, 0x62, 0x27, 0xd5, 0x2e, 0xc0, 0x37, 0x69, 0xb8, 0xe0, 0xe9, 0xfa,
-	0x4b, 0x5c, 0xdb, 0xdd, 0x5d, 0x42, 0x48, 0x0f, 0x1e, 0x7c, 0x31, 0x33, 0x05, 0x33, 0x9c, 0x3a,
-	0x05, 0x27, 0xa3, 0x60, 0xce, 0x80, 0xfe, 0xed, 0x41, 0xd3, 0x9c, 0x8b, 0x86, 0xf3, 0xca, 0xbd,
-	0xdd, 0x83, 0xce, 0x6b, 0xb5, 0x0b, 0x86, 0x28, 0x64, 0x18, 0x73, 0x65, 0x69, 0x3b, 0x72, 0x0b,
-	0x27, 0x4f, 0xa1, 0xa5, 0xb1, 0x09, 0x5f, 0x6e, 0x57, 0xc3, 0x64, 0xe9, 0x3b, 0x03, 0xb3, 0xa5,
-	0x72, 0x7b, 0x95, 0x5d, 0xef, 0x51, 0xb7, 0x94, 0xb5, 0x70, 0xfa, 0x0c, 0x0e, 0x37, 0x1c, 0xee,
-	0xb9, 0xb9, 0xce, 0xdc, 0xb6, 0xd8, 0xa8, 0xec, 0xdd, 0x73, 0x77, 0xb1, 0xd5, 0x2f, 0xf6, 0xbe,
-	0x55, 0x98, 0x72, 0x80, 0x57, 0xc9, 0x1c, 0xa7, 0x92, 0xcb, 0x4c, 0xa8, 0x97, 0x7a, 0x99, 0x08,
-	0xe9, 0x5e, 0x4a, 0x9d, 0xf5, 0x3e, 0x94, 0x5c, 0xe6, 0x33, 0xac, 0x05, 0xf2, 0x31, 0x3c, 0xd0,
-	0xa9, 0xd0, 0xbd, 0xcf, 0x71, 0x65, 0xc4, 0x98, 0xd3, 0xd3, 0x67, 0x70, 0x38, 0x88, 0x32, 0x21,
-	0x31, 0xb5, 0x59, 0x7a, 0xd0, 0x50, 0x39, 0xdd, 0x17, 0xe1, 0xa4, 0xf0, 0x2c, 0xa8, 0x30, 0x63,
-	0xf2, 0xbc, 0xf3, 0xe7, 0x6d, 0xd7, 0xfb, 0xeb, 0xb6, 0xeb, 0xfd, 0x73, 0xdb, 0xf5, 0x7e, 0xfd,
-	0xb7, 0xfb, 0xde, 0x55, 0x53, 0xff, 0x85, 0x7c, 0xf2, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe2,
-	0x37, 0x53, 0x60, 0x96, 0x08, 0x00, 0x00,
+	// 835 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcd, 0x8e, 0x1b, 0x45,
+	0x10, 0x66, 0xec, 0xb1, 0x63, 0xd7, 0x6a, 0x77, 0x9d, 0x66, 0x41, 0x93, 0xd5, 0xca, 0x5a, 0xf5,
+	0x81, 0x2c, 0x3e, 0xec, 0x21, 0x5c, 0x20, 0xe1, 0x00, 0xb1, 0x1d, 0xc5, 0x02, 0x07, 0x68, 0xaf,
+	0x72, 0x44, 0xea, 0xb5, 0x0b, 0x18, 0xed, 0x78, 0xc6, 0x4c, 0xf7, 0x78, 0x63, 0x0e, 0x5c, 0x78,
+	0x09, 0x24, 0xae, 0x5c, 0x79, 0x0f, 0x8e, 0x5c, 0xb9, 0xa1, 0xe5, 0xc2, 0x63, 0xa0, 0xfe, 0x9b,
+	0x19, 0x8f, 0x7f, 0xa2, 0xe4, 0xd6, 0xf5, 0x75, 0xfd, 0x7c, 0xfd, 0x4d, 0x55, 0xd9, 0x70, 0xb8,
+	0x48, 0xc3, 0x25, 0x97, 0x78, 0xb9, 0x48, 0x13, 0x99, 0x90, 0x56, 0x18, 0x4b, 0x4c, 0x63, 0x1e,
+	0xd1, 0xaf, 0xa0, 0x3d, 0x8a, 0x67, 0xf8, 0x6a, 0x8c, 0x92, 0x93, 0x73, 0x38, 0xe8, 0x27, 0x51,
+	0x36, 0x8f, 0xbf, 0xe4, 0xd7, 0x18, 0x05, 0xde, 0xb9, 0x77, 0xd1, 0x66, 0x65, 0x48, 0x79, 0x5c,
+	0x85, 0x73, 0xfc, 0x26, 0xe3, 0xb1, 0xcc, 0xe6, 0x41, 0xcd, 0x78, 0x94, 0x20, 0xfa, 0x87, 0x07,
+	0xed, 0x67, 0x29, 0x9f, 0xa3, 0xce, 0x78, 0x0a, 0x2d, 0x96, 0xdc, 0x96, 0xd3, 0xe5, 0x36, 0xf9,
+	0x00, 0x8e, 0x46, 0xf1, 0x12, 0x53, 0x81, 0xc3, 0x98, 0x5f, 0x47, 0x38, 0xd3, 0xe9, 0x5a, 0xac,
+	0x82, 0x92, 0x33, 0x68, 0xf7, 0xf9, 0xf4, 0x07, 0xbc, 0x5a, 0x2d, 0x30, 0xa8, 0xeb, 0x24, 0x05,
+	0x90, 0xdf, 0x4e, 0xc2, 0x9f, 0x30, 0xf0, 0xcf, 0xbd, 0x8b, 0x43, 0x56, 0x00, 0x55, 0xbe, 0x8d,
+	0x4d, 0xbe, 0x14, 0x8e, 0x46, 0xf3, 0x45, 0x92, 0x4a, 0x86, 0x62, 0x91, 0xc4, 0x02, 0x49, 0x07,
+	0xea, 0xc3, 0x34, 0xb5, 0x74, 0xd5, 0x91, 0xfe, 0x0c, 0x9d, 0xa7, 0x51, 0x32, 0xbd, 0x19, 0x70,
+	0xc9, 0x19, 0xfe, 0x98, 0xa1, 0x90, 0xe4, 0x04, 0x1a, 0x5a, 0x38, 0xeb, 0x67, 0x0c, 0x85, 0xea,
+	0xc7, 0x5b, 0x65, 0x8c, 0xa1, 0x50, 0x1d, 0xaf, 0xd9, 0xfb, 0xcc, 0x18, 0x0a, 0x9d, 0x44, 0xe1,
+	0xd4, 0xb0, 0xf6, 0x99, 0x31, 0x08, 0x01, 0xff, 0x65, 0x88, 0xb7, 0x96, 0xaa, 0x3e, 0xd3, 0x11,
+	0xdc, 0x2f, 0xd5, 0xb7, 0x34, 0xdf, 0x87, 0x26, 0x4b, 0x6e, 0x47, 0x03, 0x11, 0x78, 0xe7, 0xf5,
+	0x0b, 0x9f, 0x59, 0x4b, 0x0b, 0xa2, 0xbf, 0x98, 0xba, 0xaa, 0xe9, 0xab, 0x02, 0xa0, 0x0f, 0xa0,
+	0xa1, 0xd5, 0x51, 0xaf, 0x2c, 0x62, 0xd5, 0x91, 0xfe, 0xe6, 0xc1, 0xfd, 0x31, 0x7f, 0xa5, 0x69,
+	0x88, 0xbc, 0xcc, 0x73, 0x68, 0xe7, 0xa0, 0xf6, 0x3e, 0x78, 0xd4, 0xbb, 0x74, 0xed, 0x73, 0xb9,
+	0xe1, 0x5f, 0x20, 0xc3, 0x58, 0xa6, 0x2b, 0x56, 0x04, 0x9f, 0x7e, 0x0a, 0x47, 0xeb, 0x97, 0x8a,
+	0xc3, 0x0d, 0xae, 0x9c, 0xd2, 0x37, 0xb8, 0x52, 0x9a, 0x2c, 0x79, 0x94, 0x19, 0xfd, 0x7c, 0x66,
+	0x8c, 0xc7, 0xb5, 0x8f, 0x3d, 0xfa, 0x2d, 0x90, 0x7e, 0x8a, 0x5c, 0xa2, 0x4e, 0x30, 0x46, 0x21,
+	0xf8, 0xf7, 0xb8, 0xfb, 0x2b, 0x18, 0x65, 0x6b, 0x65, 0x65, 0xcf, 0xa0, 0x3d, 0x12, 0xb6, 0xb7,
+	0xf4, 0x97, 0x68, 0xb1, 0x02, 0xa0, 0x3d, 0x20, 0x03, 0x8c, 0x50, 0xa2, 0x1d, 0x87, 0x3d, 0xf9,
+	0xe9, 0xc4, 0x71, 0x79, 0xbd, 0x2f, 0x79, 0x08, 0xbe, 0x9a, 0x04, 0x4d, 0xe5, 0xe0, 0xd1, 0xbb,
+	0x85, 0x74, 0xf9, 0xd8, 0x31, 0xed, 0x40, 0x43, 0x97, 0xd4, 0x4e, 0xcf, 0x6b, 0x1e, 0xb8, 0xa5,
+	0xcd, 0x5c, 0xa9, 0x7a, 0xb5, 0x54, 0x3e, 0x8f, 0xb6, 0xd4, 0x67, 0xee, 0xad, 0x6f, 0x5b, 0x8a,
+	0x0e, 0x2c, 0xaa, 0xda, 0xf5, 0x85, 0xba, 0x35, 0x31, 0xfa, 0xbc, 0xfb, 0xc9, 0x55, 0x1e, 0xff,
+	0x79, 0xb6, 0xe4, 0x9b, 0xa5, 0xa9, 0x28, 0xa7, 0x96, 0x8c, 0x6b, 0x2c, 0x3b, 0x61, 0xb9, 0x4d,
+	0x1e, 0x42, 0x53, 0x57, 0x15, 0x81, 0xaf, 0x7b, 0xf7, 0xb8, 0xc2, 0x86, 0xd9, 0x6b, 0x35, 0x4e,
+	0xb6, 0xc9, 0x1b, 0x66, 0x9c, 0x8c, 0x45, 0x86, 0xd0, 0x19, 0xc5, 0x8b, 0x4c, 0x0e, 0xf0, 0xbb,
+	0x30, 0x0e, 0x65, 0x98, 0xc4, 0x22, 0x68, 0xea, 0x54, 0x0f, 0xca, 0x8c, 0xd6, 0x3c, 0xd8, 0x46,
+	0x08, 0xfd, 0xdd, 0x83, 0xe3, 0x0a, 0xb8, 0xe3, 0xd1, 0x8e, 0x6f, 0x6d, 0x3f, 0xdf, 0x2b, 0x78,
+	0xaf, 0x92, 0xef, 0x59, 0x88, 0xd1, 0x4c, 0x04, 0x75, 0x1d, 0xd7, 0xdd, 0x49, 0x4e, 0xbb, 0xb1,
+	0xed, 0xc1, 0x74, 0x09, 0x27, 0xdb, 0x2e, 0xb6, 0x52, 0xed, 0x02, 0x7c, 0x9d, 0x86, 0x73, 0x9e,
+	0xae, 0xbe, 0xc0, 0x95, 0xdd, 0xdd, 0x25, 0x84, 0xf4, 0xe0, 0xde, 0xe7, 0x53, 0x23, 0x98, 0xe1,
+	0xd4, 0x29, 0x38, 0x99, 0x0b, 0xe6, 0x1c, 0xe8, 0xdf, 0x1e, 0x34, 0xcd, 0xb9, 0x68, 0x38, 0xaf,
+	0xdc, 0xdb, 0x3d, 0xe8, 0xbc, 0x54, 0xbb, 0x60, 0x80, 0x42, 0x86, 0x31, 0x57, 0x9e, 0xb6, 0x23,
+	0x37, 0x70, 0xf2, 0x18, 0x5a, 0x1a, 0x1b, 0xf3, 0xc5, 0xa6, 0x1a, 0xa6, 0xca, 0xa5, 0x73, 0x30,
+	0x5b, 0x2a, 0xf7, 0x57, 0xd5, 0xf5, 0x1e, 0x75, 0x4b, 0x59, 0x1b, 0xa7, 0x4f, 0xe0, 0x70, 0x2d,
+	0xe0, 0x8d, 0x36, 0xd7, 0x2f, 0x1e, 0x9c, 0xb9, 0x75, 0xb1, 0x26, 0xed, 0xfe, 0xc1, 0x73, 0x92,
+	0xd7, 0x4a, 0x92, 0x7f, 0x02, 0x50, 0x84, 0xdb, 0x39, 0xdf, 0xd3, 0x86, 0x25, 0x67, 0xca, 0x01,
+	0x5e, 0x24, 0x33, 0x9c, 0x48, 0x2e, 0x33, 0xa1, 0x92, 0x3f, 0x4f, 0x84, 0x74, 0xdf, 0x53, 0x9d,
+	0xf5, 0xd6, 0x94, 0x5c, 0xe6, 0x93, 0xae, 0x0d, 0xf2, 0x21, 0xdc, 0xd3, 0x7c, 0xd0, 0x7d, 0xc5,
+	0xe3, 0xca, 0x20, 0x32, 0x77, 0x4f, 0x9f, 0xc0, 0x61, 0x3f, 0xca, 0x84, 0xc4, 0xd4, 0x56, 0xe9,
+	0x41, 0x43, 0xd5, 0x74, 0xbf, 0x1b, 0x27, 0x45, 0x64, 0x41, 0x85, 0x19, 0x97, 0xa7, 0x9d, 0x3f,
+	0xef, 0xba, 0xde, 0x5f, 0x77, 0x5d, 0xef, 0x9f, 0xbb, 0xae, 0xf7, 0xeb, 0xbf, 0xdd, 0x77, 0xae,
+	0x9b, 0xfa, 0xbf, 0xca, 0x47, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x2c, 0x40, 0x32, 0xbc, 0xbc,
+	0x08, 0x00, 0x00,
 }
diff --git a/internal/private.proto b/internal/private.proto
index 4329a33f7..d0b60d366 100644
--- a/internal/private.proto
+++ b/internal/private.proto
@@ -102,7 +102,8 @@ message Action {
 
 message CreateInputDefinitionMessage {
     string Index = 1;
-    string InputDefinition = 2;
+    string Name = 2;
+    InputDefinition Definition = 3;
 }
 
 message NodeStatus {