diff --git a/model/setpoint.go b/model/setpoint.go
index 6fc4f99..5650f9f 100644
--- a/model/setpoint.go
+++ b/model/setpoint.go
@@ -65,8 +65,8 @@ type SetpointConstraintsListDataSelectorsType struct {
 
 type SetpointDescriptionDataType struct {
 	SetpointId    *SetpointIdType        `json:"setpointId,omitempty" eebus:"key"`
-	MeasurementId *SetpointIdType        `json:"measurementId,omitempty"`
-	TimeTableId   *SetpointIdType        `json:"timeTableId,omitempty"`
+	MeasurementId *SetpointIdType        `json:"measurementId,omitempty" eebus:"key"`
+	TimeTableId   *SetpointIdType        `json:"timeTableId,omitempty" eebus:"key"`
 	SetpointType  *SetpointTypeType      `json:"setpointType,omitempty"`
 	Unit          *UnitOfMeasurementType `json:"unit,omitempty"`
 	ScopeType     *ScopeTypeType         `json:"scopeType,omitempty"`
diff --git a/model/setpoint_additions_test.go b/model/setpoint_additions_test.go
index 98d97c2..2fb2f71 100644
--- a/model/setpoint_additions_test.go
+++ b/model/setpoint_additions_test.go
@@ -50,12 +50,16 @@ func TestSetpointDescriptionListDataType_Update(t *testing.T) {
 	sut := SetpointDescriptionListDataType{
 		SetpointDescriptionData: []SetpointDescriptionDataType{
 			{
-				SetpointId:  util.Ptr(SetpointIdType(0)),
-				Description: util.Ptr(DescriptionType("old")),
+				SetpointId:    util.Ptr(SetpointIdType(0)),
+				MeasurementId: util.Ptr(SetpointIdType(0)),
+				TimeTableId:   util.Ptr(SetpointIdType(0)),
+				Description:   util.Ptr(DescriptionType("old")),
 			},
 			{
-				SetpointId:  util.Ptr(SetpointIdType(1)),
-				Description: util.Ptr(DescriptionType("old")),
+				SetpointId:    util.Ptr(SetpointIdType(1)),
+				MeasurementId: util.Ptr(SetpointIdType(1)),
+				TimeTableId:   util.Ptr(SetpointIdType(1)),
+				Description:   util.Ptr(DescriptionType("old")),
 			},
 		},
 	}
@@ -63,8 +67,10 @@ func TestSetpointDescriptionListDataType_Update(t *testing.T) {
 	newData := SetpointDescriptionListDataType{
 		SetpointDescriptionData: []SetpointDescriptionDataType{
 			{
-				SetpointId:  util.Ptr(SetpointIdType(1)),
-				Description: util.Ptr(DescriptionType("new")),
+				SetpointId:    util.Ptr(SetpointIdType(1)),
+				MeasurementId: util.Ptr(SetpointIdType(1)),
+				TimeTableId:   util.Ptr(SetpointIdType(1)),
+				Description:   util.Ptr(DescriptionType("new")),
 			},
 		},
 	}