diff --git a/src/pathcomp/frontend/service/algorithms/_Algorithm.py b/src/pathcomp/frontend/service/algorithms/_Algorithm.py
index 6cc4c5496597cce06be04587d69335d0a614cef5..b486ec1b59457b1ac575fb6197c7713b10c306e3 100644
--- a/src/pathcomp/frontend/service/algorithms/_Algorithm.py
+++ b/src/pathcomp/frontend/service/algorithms/_Algorithm.py
@@ -64,6 +64,7 @@ class _Algorithm:
             _device_uuid = grpc_device.device_id.device_uuid.uuid
             _device_name = grpc_device.name
             self.device_name_mapping[_device_name] = _device_uuid
+            self.device_name_mapping[_device_uuid] = _device_uuid
 
             device_endpoint_dict : Dict[str, Tuple[Dict, EndPointId]] = dict()
             for json_endpoint,grpc_endpoint in zip(json_device['device_endpoints'], grpc_device.device_endpoints):
@@ -75,6 +76,8 @@ class _Algorithm:
                 _endpoint_name = grpc_endpoint.name
                 self.endpoint_name_mapping[(_device_uuid, _endpoint_name)] = _endpoint_uuid
                 self.endpoint_name_mapping[(_device_name, _endpoint_name)] = _endpoint_uuid
+                self.endpoint_name_mapping[(_device_uuid, _endpoint_uuid)] = _endpoint_uuid
+                self.endpoint_name_mapping[(_device_name, _endpoint_uuid)] = _endpoint_uuid
 
             self.endpoint_dict[device_uuid] = device_endpoint_dict