diff --git a/src/kpi_manager/service/KpiManagerServiceServicerImpl.py b/src/kpi_manager/service/KpiManagerServiceServicerImpl.py
index 7f62280ff9ed01c1f075dffe7088043a57171d02..d099f8a5e11a7bac3c0277d0670396291e77596e 100644
--- a/src/kpi_manager/service/KpiManagerServiceServicerImpl.py
+++ b/src/kpi_manager/service/KpiManagerServiceServicerImpl.py
@@ -21,9 +21,10 @@ from common.proto.kpi_manager_pb2_grpc import KpiManagerServiceServicer
 from common.proto.kpi_manager_pb2 import KpiId, KpiDescriptor, KpiDescriptorFilter, KpiDescriptorList
 from monitoring.service.NameMapping import NameMapping
 # from monitoring.service import ManagementDBTools
-from kpi_manager.service.database.Kpi_DB import Kpi_DB
 
-from telemetry.database.TelemetryModel import Kpi as KpiModel
+from kpi_manager.service.database.Kpi_DB import Kpi_DB
+from kpi_manager.service.database.KpiModel import Kpi as KpiModel
+# from telemetry.database.TelemetryModel import Kpi as KpiModel
 from common.proto.context_pb2 import DeviceId, LinkId, ServiceId, SliceId,\
                              ConnectionId, EndPointId
 
@@ -56,7 +57,7 @@ class KpiManagerServiceServicerImpl(KpiManagerServiceServicer):
             kpi_to_insert.service_id      = request.service_id.service_uuid.uuid 
             kpi_to_insert.slice_id        = request.slice_id.slice_uuid.uuid 
             kpi_to_insert.connection_id   = request.connection_id.connection_uuid.uuid
-            # kpi_to_insert.link_id         = request.link_id.link_id.uuid
+            kpi_to_insert.link_id         = request.link_id.link_uuid.uuid
             if(self.Kpi_DBobj.add_row_to_db(kpi_to_insert)):
                 response.kpi_id.uuid = request.kpi_id.kpi_id.uuid
                 # LOGGER.info("Added Row: {:}".format(response))