diff --git a/src/common/type_checkers/Assertions.py b/src/common/type_checkers/Assertions.py
index 9fb48bcde48962c66a6dc1b9675dbad4f3298445..f241dc0fbb4c0197ba98f0f053bf13673365d2ce 100644
--- a/src/common/type_checkers/Assertions.py
+++ b/src/common/type_checkers/Assertions.py
@@ -472,7 +472,7 @@ def validate_topology(message, num_devices=None, num_links=None):
 
 def validate_endpoint(message):
     assert isinstance(message, dict)
-    assert len(message.keys()) == 4
+    assert len(message.keys()) == 6
     assert 'endpoint_id' in message
     validate_endpoint_id(message['endpoint_id'])
     assert 'name' in message
@@ -482,6 +482,10 @@ def validate_endpoint(message):
     assert 'kpi_sample_types' in message
     assert isinstance(message['kpi_sample_types'], list)
     for kpi_sample_type in message['kpi_sample_types']: validate_kpi_sample_types_enum(kpi_sample_type)
+    assert 'endpoint_location' in message
+    # TODO: validate "endpoint_location"
+    assert 'capabilities' in message
+    # TODO: validate "capabilities"
 
 def validate_component(component):
     assert isinstance(component, dict)