diff --git a/src/kpi_manager/client/KpiManagerClient.py b/src/kpi_manager/client/KpiManagerClient.py
index a129cd327e9beb118f1bca7341e792f9919654fa..5a4cd2e20cd34e5b212cf3032358c65fb611792d 100755
--- a/src/kpi_manager/client/KpiManagerClient.py
+++ b/src/kpi_manager/client/KpiManagerClient.py
@@ -19,7 +19,7 @@ from common.Settings import get_service_host, get_service_port_grpc
 from common.tools.client.RetryDecorator import retry, delay_exponential
 from common.tools.grpc.Tools import grpc_message_to_json_string
 from common.proto.context_pb2 import Empty
-from common.proto.kpi_manager_pb2 import KpiId, KpiDescriptor, KpiDescriptorList
+from common.proto.kpi_manager_pb2 import KpiId, KpiDescriptor, KpiDescriptorFilter, KpiDescriptorList
 from common.proto.kpi_manager_pb2_grpc import KpiManagerServiceStub
 
 LOGGER = logging.getLogger(__name__)
@@ -29,8 +29,8 @@ RETRY_DECORATOR = retry(max_retries=MAX_RETRIES, delay_function=DELAY_FUNCTION,
 
 class KpiManagerClient:
     def __init__(self, host=None, port=None):
-        if not host: host = get_service_host(ServiceNameEnum.KPIMANAGER) # update enum
-        if not port: port = get_service_port_grpc(ServiceNameEnum.KPIMANAGER) # update enum 
+        if not host: host = get_service_host(ServiceNameEnum.KPIMANAGER) 
+        if not port: port = get_service_port_grpc(ServiceNameEnum.KPIMANAGER) 
         self.endpoint = '{:s}:{:s}'.format(str(host), str(port))
         LOGGER.debug('Creating channel to {:s}...'.format(str(self.endpoint)))
         self.channel = None
@@ -48,17 +48,17 @@ class KpiManagerClient:
         self.stub = None
 
     @RETRY_DECORATOR
-    def SetKpi(self, request : KpiDescriptor) -> KpiId:
-        LOGGER.debug('SetKpi: {:s}'.format(grpc_message_to_json_string(request)))
-        response = self.stub.SetKpi(request)
-        LOGGER.debug('SetKpi result: {:s}'.format(grpc_message_to_json_string(response)))
+    def SetKpiDescriptor(self, request : KpiDescriptor) -> KpiId:
+        LOGGER.debug('SetKpiDescriptor: {:s}'.format(grpc_message_to_json_string(request)))
+        response = self.stub.SetKpiDescriptor(request)
+        LOGGER.debug('SetKpiDescriptor result: {:s}'.format(grpc_message_to_json_string(response)))
         return response
 
     @RETRY_DECORATOR
-    def DeleteKpi(self,request : KpiId) -> Empty:
-        LOGGER.debug('DeleteKpi: {:s}'.format(grpc_message_to_json_string(request)))
-        response = self.stub.DeleteKpi(request)
-        LOGGER.info('DeleteKpi result: {:s}'.format(grpc_message_to_json_string(response)))
+    def DeleteKpiDescriptor(self,request : KpiId) -> Empty:
+        LOGGER.debug('DeleteKpiDescriptor: {:s}'.format(grpc_message_to_json_string(request)))
+        response = self.stub.DeleteKpiDescriptor(request)
+        LOGGER.info('DeleteKpiDescriptor result: {:s}'.format(grpc_message_to_json_string(response)))
         return response
 
     @RETRY_DECORATOR
@@ -69,8 +69,8 @@ class KpiManagerClient:
         return response
 
     @RETRY_DECORATOR
-    def GetKpiDescriptorList(self, request : Empty) -> KpiDescriptorList:
-        LOGGER.debug('GetKpiDescriptorList: {:s}'.format(grpc_message_to_json_string(request)))
-        response = self.stub.GetKpiDescriptorList(request)
-        LOGGER.debug('GetKpiDescriptorList result: {:s}'.format(grpc_message_to_json_string(response)))
+    def SelectKpiDescriptor(self, request : KpiDescriptorFilter) -> KpiDescriptorList:
+        LOGGER.debug('SelectKpiDescriptor: {:s}'.format(grpc_message_to_json_string(request)))
+        response = self.stub.SelectKpiDescriptor(request)
+        LOGGER.debug('SelectKpiDescriptor result: {:s}'.format(grpc_message_to_json_string(response)))
         return response
\ No newline at end of file