diff --git a/plugins/org.etsi.mts.tdl.graphical.viewpoint/description/TDL.odesign b/plugins/org.etsi.mts.tdl.graphical.viewpoint/description/TDL.odesign
index e6b6bc63b17a98061f69888e34908459a8857230..52e2e28bc59e3a452b599886c563d9d319c76efa 100644
--- a/plugins/org.etsi.mts.tdl.graphical.viewpoint/description/TDL.odesign
+++ b/plugins/org.etsi.mts.tdl.graphical.viewpoint/description/TDL.odesign
@@ -25,14 +25,14 @@
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="timeConstraint" domainClass="tdl.TimeConstraint">
+        <nodeMappings name="timeConstraint" semanticCandidatesExpression="[allBehaviours()->select(oclIsKindOf(AtomicBehaviour)).oclAsType(AtomicBehaviour).timeConstraint/]" domainClass="tdl.TimeConstraint">
           <style xsi:type="style:SquareDescription" showIcon="false" labelExpression="['{' + serialise(timeConstraintExpression) + '}'/]" labelPosition="node" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
           </style>
         </nodeMappings>
-        <nodeMappings name="timeLabel" domainClass="tdl.TimeLabel">
+        <nodeMappings name="timeLabel" semanticCandidatesExpression="[allBehaviours()->select(oclIsKindOf(AtomicBehaviour)).oclAsType(AtomicBehaviour).timeLabel/]" domainClass="tdl.TimeLabel">
           <style xsi:type="style:SquareDescription" showIcon="false" labelExpression="['@ ' + name/]" labelPosition="node" resizeKind="NSEW">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
@@ -438,7 +438,7 @@
             </style>
           </conditionnalStyles>
         </containerMappings>
-        <containerMappings name="componentInstance" domainClass="tdl.ComponentInstance" childrenPresentation="List">
+        <containerMappings name="componentInstance" semanticCandidatesExpression="[testConfiguration.componentInstance/]" domainClass="tdl.ComponentInstance" childrenPresentation="List">
           <subNodeMappings name="componentInstance.name" semanticCandidatesExpression="[self/]" domainClass="tdl.ComponentInstance">
             <style xsi:type="style:SquareDescription" borderSizeComputationExpression="-1" showIcon="false" labelExpression="[name + ' : ' + type.name/]" labelPosition="node" resizeKind="NSEW">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>