diff --git a/proto/device.proto b/proto/device.proto
index 30e60079db6c1eb8641d10115f6f43840eabf39c..98cca8ce937d4bccdb5076a7d26e9a27388641be 100644
--- a/proto/device.proto
+++ b/proto/device.proto
@@ -16,7 +16,8 @@ syntax = "proto3";
 package device;
 
 import "context.proto";
-import "monitoring.proto";
+//import "monitoring.proto";
+import "kpi_manager.proto";
 
 service DeviceService {
   rpc AddDevice       (context.Device    ) returns (context.DeviceId    ) {}
@@ -27,8 +28,8 @@ service DeviceService {
 }
 
 message MonitoringSettings {
-  monitoring.KpiId kpi_id = 1;
-  monitoring.KpiDescriptor kpi_descriptor = 2;
+  kpi_manager.KpiId kpi_id = 1;
+  kpi_manager.KpiDescriptor kpi_descriptor = 2;
   float sampling_duration_s = 3;
   float sampling_interval_s = 4;
 }
diff --git a/proto/optical_attack_detector.proto b/proto/optical_attack_detector.proto
index ebe3b5e06163c6e5a3bf7889065d5bb31923dd89..0d3ed58de81283e3f77fb013bed77ede14c7e849 100644
--- a/proto/optical_attack_detector.proto
+++ b/proto/optical_attack_detector.proto
@@ -17,7 +17,8 @@ syntax = "proto3";
 package optical_attack_detector;
 
 import "context.proto";
-import "monitoring.proto";
+//import "monitoring.proto";
+import "kpi_manager.proto";
 
 service OpticalAttackDetectorService {
   
@@ -28,5 +29,5 @@ service OpticalAttackDetectorService {
 
 message DetectionRequest {
   context.ServiceId service_id = 1;
-  monitoring.KpiId  kpi_id     = 2;
+  kpi_manager.KpiId  kpi_id     = 2;
 }
diff --git a/proto/policy_condition.proto b/proto/policy_condition.proto
index 2037af93c375838209e78a07ec95e25d469d1d5a..c0af929efdbdbd6f237d6a6aba471952da1d2d6a 100644
--- a/proto/policy_condition.proto
+++ b/proto/policy_condition.proto
@@ -16,10 +16,11 @@ syntax = "proto3";
 package policy;
 
 import "monitoring.proto";
+import "kpi_manager.proto";
 
 // Condition
 message PolicyRuleCondition {
-  monitoring.KpiId kpiId = 1;
+  kpi_manager.KpiId kpiId = 1;
   NumericalOperator numericalOperator = 2;
   monitoring.KpiValue kpiValue = 3;
 }