diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
index ae6acca..0e03b38 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
@@ -377,7 +377,7 @@
 			accessor = langSpec.newMethodDeclaration(getterPrefix + getComponentName(accessRes.getResourceHierarchy(), langSpec), false, getImplStateType(accessRes.getResourceHierarchy(), langSpec), mainGetterParams);
 		}
 		Block block = new Block();
-		Expression getState = JavaCodeGenerator.pullAccessor.getCurrentStateAccessorFor(accessRes.getOutSideResource(), null);
+		Expression getState = getPullAccessor().getDirectStateAccessorFor(accessRes.getOutSideResource(), null);
 		block.addStatement(langSpec.getReturnStatement(getState.toImplementation(new String[] {null})) + langSpec.getStatementDelimiter());
 //		if (stateGetter.getParameters() == null || stateGetter.getParameters().size() == 0) {
 //			block.addStatement(langSpec.getReturnStatement(langSpec.getMethodInvocation(accessRes.getResourceName(), stateGetter.getName())) + langSpec.getStatementDelimiter());
@@ -448,22 +448,38 @@
 	protected IResourceStateAccessor getPushAccessor() {
 		return new IResourceStateAccessor() {
 			@Override
-			public Expression getCurrentStateAccessorFor(ResourcePath target, ResourcePath from) {
-				if (target.equals(from)) {
+			public Expression getCurrentStateAccessorFor(ChannelMember target, ChannelMember from) {
+				ResourcePath targetRes= target.getResource();
+				ResourcePath fromRes= from.getResource();
+				if (targetRes.equals(fromRes)) {
 					return new Field(fieldOfResourceState,
-							target.getResourceStateType() != null ? target.getResourceStateType()
+							targetRes.getResourceStateType() != null ? targetRes.getResourceStateType()
 									: DataConstraintModel.typeInt);
 				}
 				// for reference channel member
-				return new Parameter(target.getResourceName(),
-						target.getResourceStateType() != null ? target.getResourceStateType()
+				return new Parameter(targetRes.getResourceName(),
+						targetRes.getResourceStateType() != null ? targetRes.getResourceStateType()
 								: DataConstraintModel.typeInt);
 			}
 
 			@Override
-			public Expression getNextStateAccessorFor(ResourcePath target, ResourcePath from) {
-				return new Parameter(target.getResourceName(),
-						target.getResourceStateType() != null ? target.getResourceStateType()
+			public Expression getNextStateAccessorFor(ChannelMember target, ChannelMember from) {
+				ResourcePath targerRes= target.getResource();
+				return new Parameter(targerRes.getResourceName(),
+						targerRes.getResourceStateType() != null ? targerRes.getResourceStateType()
+								: DataConstraintModel.typeInt);
+			}
+
+			@Override
+			public Expression getDirectStateAccessorFor(ResourcePath targetRes, ResourcePath fromRes) {
+				if (fromRes != null && targetRes.equals(fromRes)) {
+					return new Field(fieldOfResourceState,
+							targetRes.getResourceStateType() != null ? targetRes.getResourceStateType()
+									: DataConstraintModel.typeInt);
+				}
+				// for reference channel member
+				return new Parameter(targetRes.getResourceName(),
+						targetRes.getResourceStateType() != null ? targetRes.getResourceStateType()
 								: DataConstraintModel.typeInt);
 			}
 		};
@@ -472,21 +488,71 @@
 	protected IResourceStateAccessor getPullAccessor() {
 		return new IResourceStateAccessor() {
 			@Override
-			public Expression getCurrentStateAccessorFor(ResourcePath target, ResourcePath from) {
+			public Expression getCurrentStateAccessorFor(ChannelMember target, ChannelMember from) {
+				ResourcePath targetRes= target.getResource();
 				if (from != null) {
-					if (target.equals(from)) {
+					ResourcePath fromRes= from.getResource();
+					if (!target.isOutside()) {
+						return getDirectStateAccessorFor(targetRes, fromRes);
+					}
+					Term getter = null;
+					String targetComponentName = getComponentName(targetRes.getResourceHierarchy(), langSpec);
+					if (generatesComponent(targetRes.getResourceHierarchy())) {
+						getter = new Term(new Symbol(getterOfResourceState, 1, Symbol.Type.METHOD));
+						getter.addChild(new Field(langSpec.toVariableName(targetComponentName), targetRes.getResourceStateType()));
+					} else {
+						String parentName = langSpec.toVariableName(getComponentName(targetRes.getResourceHierarchy().getParent(), langSpec));
+						Type parentType = targetRes.getResourceHierarchy().getParent().getResourceStateType();
+						getter = new Term(new Symbol(getterPrefix + targetComponentName, 1, Symbol.Type.METHOD));
+						getter.addChild(new Field(parentName, parentType));
+					}
+					return getter;
+				} else {
+					return getDirectStateAccessorFor(targetRes, null);
+				}
+			}
+
+			@Override
+			public Expression getNextStateAccessorFor(ChannelMember target, ChannelMember from) {
+				ResourcePath targetRes= target.getResource();
+				if (from != null) {
+					ResourcePath fromRes= from.getResource();
+					if (!target.isOutside()) {
+						return getDirectStateAccessorFor(targetRes, fromRes);
+					}
+					Term getter = null;
+					String targetComponentName = getComponentName(targetRes.getResourceHierarchy(), langSpec);
+					if (generatesComponent(targetRes.getResourceHierarchy())) {
+						getter = new Term(new Symbol(getterOfResourceState, 1, Symbol.Type.METHOD));
+						getter.addChild(new Field(langSpec.toVariableName(targetComponentName), targetRes.getResourceStateType()));
+					} else {
+						String parentName = langSpec.toVariableName(getComponentName(targetRes.getResourceHierarchy().getParent(), langSpec));
+						Type parentType = targetRes.getResourceHierarchy().getParent().getResourceStateType();
+						getter = new Term(new Symbol(getterPrefix + targetComponentName, 1, Symbol.Type.METHOD));
+						getter.addChild(new Field(parentName, parentType));
+					}
+					return getter;
+				} else {
+					return getDirectStateAccessorFor(targetRes, null);
+				}
+			}
+			
+			@Override
+			public Expression getDirectStateAccessorFor(ResourcePath targetRes, ResourcePath fromRes) {
+				if (fromRes != null) {
+					if (targetRes.equals(fromRes)) {
 						return new Field(fieldOfResourceState,
-								target.getResourceStateType() != null ? target.getResourceStateType()
+								targetRes.getResourceStateType() != null ? targetRes.getResourceStateType()
 										: DataConstraintModel.typeInt);
 					}
 					// for reference channel member
 					Term getter = new Term(new Symbol(getterOfResourceState, 1, Symbol.Type.METHOD));
-					getter.addChild(new Field(target.getResourceName(), target.getResourceStateType()));
+					getter.addChild(new Field(targetRes.getResourceName(), targetRes.getResourceStateType()));
 					return getter;
 				} else {
 					// access from the outside of the hierarchy
 					Stack<ResourcePath> pathStack = new Stack<>();
-					ResourcePath curPath = target;
+					ResourcePath curPath = targetRes;
 					do {
 						pathStack.push(curPath);
 						curPath = curPath.getParent();					
@@ -522,7 +588,7 @@
 						}
 					}
 					
-					if (generatesComponent(target.getResourceHierarchy())) {
+					if (generatesComponent(targetRes.getResourceHierarchy())) {
 						Term newGetter = new Term(new Symbol(getterOfResourceState, 1, Symbol.Type.METHOD));
 						newGetter.addChild(getter);
 						getter = newGetter;
@@ -530,13 +596,6 @@
 					return getter;
 				}
 			}
-
-			@Override
-			public Expression getNextStateAccessorFor(ResourcePath target, ResourcePath from) {
-				Term getter = new Term(new Symbol(getterOfResourceState, 1, Symbol.Type.METHOD));
-				getter.addChild(new Field(target.getResourceName(), target.getResourceStateType()));
-				return getter;
-			}
 		};
 	}
 }