diff --git a/controller/mocks/NetworkElement.go b/controller/mocks/NetworkElement.go
index a8ccd7fba27dd568e5bbbb93eeda0b954f04f918..a37cedfef29ac038d9d030b0b1e22296cc8e4ed9 100644
--- a/controller/mocks/NetworkElement.go
+++ b/controller/mocks/NetworkElement.go
@@ -20,6 +20,22 @@ type NetworkElement struct {
 	mock.Mock
 }
 
+// GetGnmiSubscriptionPaths provides a mock function with given fields:
+func (_m *NetworkElement) GetGnmiSubscriptionPaths() [][]string {
+	ret := _m.Called()
+
+	var r0 [][]string
+	if rf, ok := ret.Get(0).(func() [][]string); ok {
+		r0 = rf()
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).([][]string)
+		}
+	}
+
+	return r0
+}
+
 // GetMetadata provides a mock function with given fields:
 func (_m *NetworkElement) GetMetadata() conflict.Metadata {
 	ret := _m.Called()
diff --git a/controller/northbound/server/configurationmanagement.go b/controller/northbound/server/configurationmanagement.go
index fc9c8879ad90e9edb49cba6de18b69bd500bf1bb..539a567acc3f534b0e0d6849a020fc3d437d4231 100644
--- a/controller/northbound/server/configurationmanagement.go
+++ b/controller/northbound/server/configurationmanagement.go
@@ -327,7 +327,7 @@ func (c ConfigurationManagementServer) createNetworkElements(sdnConfig *loadedSD
 			&transportOption,
 			pndUUID,
 			plugin,
-			[][]string{}, // TODO: change here!
+			inputNetworkElement.GnmiSubscriptionPaths,
 			conflict.Metadata{ResourceVersion: inputNetworkElement.Metadata.ResourceVersion},
 		)
 		if err != nil {
diff --git a/controller/nucleus/networkElementService.go b/controller/nucleus/networkElementService.go
index 5ce62e79e3f6b887056d6cf70cfa2f22c6f8939a..635c190bee0e0fe19e03bc5663966d8dd5afbb81 100644
--- a/controller/nucleus/networkElementService.go
+++ b/controller/nucleus/networkElementService.go
@@ -145,7 +145,6 @@ func (s *NetworkElementService) UpdateModel(networkElementID uuid.UUID, modelAsS
 		return err
 	}
 
-	// TODO (faseid): check if we want to add the paths with values here instead of empty map!
 	pubEvent := event.NewUpdateEvent(networkElementID)
 	if err := s.eventService.PublishEvent(NetworkElementEventTopic, pubEvent); err != nil {
 		go func() {
@@ -168,7 +167,6 @@ func (s *NetworkElementService) Update(networkElementToUpdate networkelement.Net
 		return err
 	}
 
-	// TODO (faseid): check if we want to add the paths with values here instead of empty map!
 	pubEvent := event.NewUpdateEvent(networkElementToUpdate.ID())
 	if err := s.eventService.PublishEvent(NetworkElementEventTopic, pubEvent); err != nil {
 		go func() {