diff --git a/plugins/org.etsi.mts.tdl.TPLan2/src/org/etsi/mts/tdl/scoping/TPLan2ScopeProvider.java b/plugins/org.etsi.mts.tdl.TPLan2/src/org/etsi/mts/tdl/scoping/TPLan2ScopeProvider.java
index baa4ada5d93684444fc5ac7a709b7286bc9bf75b..9835f5d5206bf2f3f72dbe4c15013dc35dd9239a 100644
--- a/plugins/org.etsi.mts.tdl.TPLan2/src/org/etsi/mts/tdl/scoping/TPLan2ScopeProvider.java
+++ b/plugins/org.etsi.mts.tdl.TPLan2/src/org/etsi/mts/tdl/scoping/TPLan2ScopeProvider.java
@@ -52,13 +52,13 @@ public class TPLan2ScopeProvider extends AbstractDeclarativeScopeProvider {
 		} else if (Parameter.class.isAssignableFrom(reference.getEType().getInstanceClass())) {
 			if (context instanceof MemberAssignment) {
 				if (context.eContainer() instanceof StructuredDataInstance) {
-					IScope scope = Scopes.scopeFor(((StructuredDataType)((StructuredDataInstance)context.eContainer()).getDataType()).getMember());
+					IScope scope = Scopes.scopeFor(((StructuredDataType)((StructuredDataInstance)context.eContainer()).getDataType()).allMembers());
 					return scope;
 				}
 			} else if (context instanceof ParameterBinding) {
 				if (context.eContainer() instanceof DataInstanceUse) {
 					if (((DataInstanceUse)context.eContainer()).getDataInstance() instanceof StructuredDataInstance) {
-						IScope scope = Scopes.scopeFor(((StructuredDataType)((StructuredDataInstance)((DataInstanceUse)context.eContainer()).getDataInstance()).getDataType()).getMember());
+						IScope scope = Scopes.scopeFor(((StructuredDataType)((StructuredDataInstance)((DataInstanceUse)context.eContainer()).getDataInstance()).getDataType()).allMembers());
 						return scope;
 					}
 				}
@@ -67,26 +67,26 @@ public class TPLan2ScopeProvider extends AbstractDeclarativeScopeProvider {
 					EObject targetContext = ((DataUse)context.eContainer()).getReduction().get(((DataUse)context.eContainer()).getReduction().indexOf(context)-1);
 					if (((MemberReference)targetContext).getMember()!=null) {
 						if (((MemberReference)targetContext).getMember().getDataType() instanceof StructuredDataType) {
-							IScope scope = Scopes.scopeFor(((StructuredDataType)((MemberReference)targetContext).getMember().getDataType()).getMember());
+							IScope scope = Scopes.scopeFor(((StructuredDataType)((MemberReference)targetContext).getMember().getDataType()).allMembers());
 							return scope;
 						}
 					}
 				} 
 				if (context.eContainer() instanceof DataInstanceUse) {
 					if (((DataInstanceUse)context.eContainer()).getDataInstance() instanceof StructuredDataInstance) {
-						IScope scope = Scopes.scopeFor(((StructuredDataType)((StructuredDataInstance)((DataInstanceUse)context.eContainer()).getDataInstance()).getDataType()).getMember());
+						IScope scope = Scopes.scopeFor(((StructuredDataType)((StructuredDataInstance)((DataInstanceUse)context.eContainer()).getDataInstance()).getDataType()).allMembers());
 						return scope;
 					}
 				}
 			} else if (context instanceof Content) {
 				if (context.eContainer() instanceof LiteralValue) {
 					if (((LiteralValue)context.eContainer()).getDataType() instanceof StructuredDataType) {
-						IScope scope = Scopes.scopeFor(((StructuredDataType)((LiteralValue)context.eContainer()).getDataType()).getMember());
+						IScope scope = Scopes.scopeFor(((StructuredDataType)((LiteralValue)context.eContainer()).getDataType()).allMembers());
 						return scope;
 					}
 				} else if (context.eContainer() instanceof Content) {
 					if (((Content)context.eContainer()).getMember().getDataType() instanceof StructuredDataType) {
-						IScope scope = Scopes.scopeFor(((StructuredDataType)((Content)context.eContainer()).getMember().getDataType()).getMember());
+						IScope scope = Scopes.scopeFor(((StructuredDataType)((Content)context.eContainer()).getMember().getDataType()).allMembers());
 						return scope;
 					}
 				}