diff --git a/protos/dmi/commons.proto b/protos/dmi/commons.proto
index 60fdbfd..61d6466 100644
--- a/protos/dmi/commons.proto
+++ b/protos/dmi/commons.proto
@@ -21,6 +21,7 @@
     LOGGING_ENDPOINT_ERROR = 5;
     LOGGING_ENDPOINT_PROTOCOL_ERROR = 6;
     KAFKA_ENDPOINT_ERROR = 7;
+    UNKNOWN_LOG_ENTITY = 8;
 }
 
 //Log Level
diff --git a/protos/dmi/hw_management_service.proto b/protos/dmi/hw_management_service.proto
index a805b03..1ca65e7 100644
--- a/protos/dmi/hw_management_service.proto
+++ b/protos/dmi/hw_management_service.proto
@@ -101,10 +101,6 @@
 }
 
 message SetLogLevelResponse {
-    repeated DeviceLogResponse responses = 1;
-}
-
-message DeviceLogResponse{
     Uuid device_uuid = 1;
     Status status = 2;
     Reason reason = 3;
@@ -159,7 +155,7 @@
     rpc SetLoggingEndpoint(SetLoggingEndpointRequest) returns(SetRemoteEndpointResponse);
 
     // Gets the configured location to which the logs are being shipped
-    rpc GetLoggingEndpoint(Uuid) returns(GetLoggingEndpointResponse);
+    rpc GetLoggingEndpoint(HardwareID) returns(GetLoggingEndpointResponse);
 
     // Sets the location of the Message Bus to which events and metrics are shipped
     rpc SetMsgBusEndpoint(SetMsgBusEndpointRequest) returns(SetRemoteEndpointResponse);
@@ -172,7 +168,7 @@
     // interface, package etc.
     rpc GetLoggableEntities(GetLoggableEntitiesRequest) returns(GetLogLevelResponse);
 
-    // Sets the log level for one or more devices for each given entity to a certain level.
+    // Sets the log level of the device, for each given entity to a certain level.
     // If only one EntitiesLogLevel is provided for the device and that request contains only a log level with
     // no entity in the list it's assumed that the caller wants to set that level for all the entities.
     rpc SetLogLevel(SetLogLevelRequest) returns(SetLogLevelResponse);