diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
index 7792b4f..2a7db3b 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
@@ -466,7 +466,7 @@
 	protected static List<MethodDeclaration> getGetterMethods(TypeDeclaration component, String resourceName) {
 		List<MethodDeclaration> getters = new ArrayList<>();
 		for (MethodDeclaration m: component.getMethods()) {
-			if (m.getName().startsWith(getterPrefix + resourceName)) {
+			if (m.getName().equals(getterPrefix + resourceName)) {
 				getters.add(m);
 			}
 		}
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
index 41c68e4..c104e9c 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JavaMethodBodyGenerator.java
@@ -587,118 +587,120 @@
 			for (ResourceHierarchy resource: model.getResourceHierarchies()) {
 				String resourceName = JavaCodeGenerator.getComponentName(resource);
 				TypeDeclaration component = componentMap.get(resourceName);
-				if (component != null) {
-					// state getter method
-					Type resourceType = JavaCodeGenerator.getImplStateType(resource);
-					MethodDeclaration stateGetter = getMethod(component, "getValue");
-					if (stateGetter != null && (stateGetter.getBody() == null || stateGetter.getBody().getStatements().size() == 0)) {
-						if (model.isPrimitiveType(resourceType)) {
-							// primitive type
-							stateGetter.addStatement("return value;");							
-						} else {
-							if (resource.getChildren() != null && resource.getChildren().size() == 1 && resource.getChildren().iterator().next().getNumParameters() > 0) {
-								// list or map
-								String implTypeName = resourceType.getImplementationTypeName();
-								// copy the current state to be returned as a 'value'
-								stateGetter.addStatement("return new " + implTypeName + "(value);");
+				if (JavaCodeGenerator.generatesComponent(resource)) {
+					if (component != null) {
+						// state getter method
+						Type resourceType = JavaCodeGenerator.getImplStateType(resource);
+						MethodDeclaration stateGetter = getMethod(component, "getValue");
+						if (stateGetter != null && (stateGetter.getBody() == null || stateGetter.getBody().getStatements().size() == 0)) {
+							if (model.isPrimitiveType(resourceType)) {
+								// primitive type
+								stateGetter.addStatement("return value;");							
 							} else {
-								if (resource.getChildren() == null || resource.getChildren().size() == 0) {
-									// a leaf resource
+								if (resource.getChildren() != null && resource.getChildren().size() == 1 && resource.getChildren().iterator().next().getNumParameters() > 0) {
+									// list or map
 									String implTypeName = resourceType.getImplementationTypeName();
+									// copy the current state to be returned as a 'value'
 									stateGetter.addStatement("return new " + implTypeName + "(value);");
 								} else {
-									Term composer = null; 
-									Term composerSub = new Constant(DataConstraintModel.nil);
-									composerSub.setType(DataConstraintModel.typeMap);
-									for (ResourceHierarchy child: resource.getChildren()) {
-										String childTypeName = JavaCodeGenerator.getComponentName(child);
-										String fieldName = JavaCodeGenerator.toVariableName(childTypeName);
-										Term childGetter = null; 
-										if ((child.getChildren() == null || child.getChildren().size() == 0) && child.getNumParameters() == 0) {
-											// the child is not a class
-											childGetter = new Term(new Symbol("get" + childTypeName, 1, Symbol.Type.METHOD));
-											childGetter.addChild(new Constant("this"));
-										} else {
-											// the child is a class
-											childGetter = new Term(new Symbol("getValue", 1, Symbol.Type.METHOD));
-											childGetter.addChild(new Field(fieldName, JavaCodeGenerator.getImplStateType(child)));
-										}
-										composer = new Term(DataConstraintModel.insert);
-										composer.addChild(composerSub);
-										composer.addChild(new Constant(fieldName, DataConstraintModel.typeString));		// key
-										composer.addChild(childGetter);													// value
-										composer.setType(DataConstraintModel.typeMap);
-										composerSub = composer;
-									}
-									composer.setType(stateGetter.getReturnType());
-									String[] sideEffects = new String[] {null};
-									String returnValue = composer.toImplementation(sideEffects);
-									if (sideEffects[0] != null) {
-										stateGetter.addStatement(sideEffects[0] + "return " + returnValue+ ";");
+									if (resource.getChildren() == null || resource.getChildren().size() == 0) {
+										// a leaf resource
+										String implTypeName = resourceType.getImplementationTypeName();
+										stateGetter.addStatement("return new " + implTypeName + "(value);");
 									} else {
-										stateGetter.addStatement("return " + returnValue+ ";");
+										Term composer = null; 
+										Term composerSub = new Constant(DataConstraintModel.nil);
+										composerSub.setType(DataConstraintModel.typeMap);
+										for (ResourceHierarchy child: resource.getChildren()) {
+											String childTypeName = JavaCodeGenerator.getComponentName(child);
+											String fieldName = JavaCodeGenerator.toVariableName(childTypeName);
+											Term childGetter = null; 
+											if ((child.getChildren() == null || child.getChildren().size() == 0) && child.getNumParameters() == 0) {
+												// the child is not a class
+												childGetter = new Term(new Symbol("get" + childTypeName, 1, Symbol.Type.METHOD));
+												childGetter.addChild(new Constant("this"));
+											} else {
+												// the child is a class
+												childGetter = new Term(new Symbol("getValue", 1, Symbol.Type.METHOD));
+												childGetter.addChild(new Field(fieldName, JavaCodeGenerator.getImplStateType(child)));
+											}
+											composer = new Term(DataConstraintModel.insert);
+											composer.addChild(composerSub);
+											composer.addChild(new Constant(fieldName, DataConstraintModel.typeString));		// key
+											composer.addChild(childGetter);													// value
+											composer.setType(DataConstraintModel.typeMap);
+											composerSub = composer;
+										}
+										composer.setType(stateGetter.getReturnType());
+										String[] sideEffects = new String[] {null};
+										String returnValue = composer.toImplementation(sideEffects);
+										if (sideEffects[0] != null) {
+											stateGetter.addStatement(sideEffects[0] + "return " + returnValue+ ";");
+										} else {
+											stateGetter.addStatement("return " + returnValue+ ";");
+										}
 									}
 								}
 							}
 						}
-					}
-					
-					// descendant getter method
-					if (resource.getChildren().size() > 0) {
-						for (ResourceHierarchy child: resource.getChildren()) {
-							ResourceHierarchy parent = resource;
-							ResourceHierarchy descendant = child;
-							Set<ResourceHierarchy> children;
-							Expression selector;
-							int params = 0;
-							if (DataConstraintModel.typeList.isAncestorOf(parent.getResourceStateType())) {
-								selector = new Field("value");
-								params++;
-							} else if (DataConstraintModel.typeMap.isAncestorOf(parent.getResourceStateType())) {
-								selector = new Field("value");
-								params++;
-							} else {
-								String fieldName = JavaCodeGenerator.getComponentName(descendant);
-								selector = new Field(JavaCodeGenerator.toVariableName(fieldName));
+						
+						// descendant getter method
+						if (resource.getChildren().size() > 0) {
+							for (ResourceHierarchy child: resource.getChildren()) {
+								ResourceHierarchy parent = resource;
+								ResourceHierarchy descendant = child;
+								Set<ResourceHierarchy> children;
+								Expression selector;
+								int params = 0;
+								if (DataConstraintModel.typeList.isAncestorOf(parent.getResourceStateType())) {
+									selector = new Field("value");
+									params++;
+								} else if (DataConstraintModel.typeMap.isAncestorOf(parent.getResourceStateType())) {
+									selector = new Field("value");
+									params++;
+								} else {
+									String fieldName = JavaCodeGenerator.getComponentName(descendant);
+									selector = new Field(JavaCodeGenerator.toVariableName(fieldName));
+								}
+								do {
+									String methodName = JavaCodeGenerator.getComponentName(descendant);
+									MethodDeclaration descendantGetter = null;
+									for (MethodDeclaration getter: getGetterMethods(component, methodName)) {
+										if ((getter.getParameters() == null && params == 0) || (getter.getParameters() != null && getter.getParameters().size() == params)) {
+											descendantGetter = getter;
+										}
+									}
+									if (descendantGetter != null) {
+										if (DataConstraintModel.typeList.isAncestorOf(parent.getResourceStateType())) {
+											Term newSelector = new Term(DataConstraintModel.get);
+											newSelector.addChild(selector);
+											newSelector.addChild(new Variable(descendantGetter.getParameters().get(descendantGetter.getParameters().size() - 1).getName()));
+											newSelector.setType(descendantGetter.getReturnType());
+											selector = newSelector;
+											params++;
+										} else if (DataConstraintModel.typeMap.isAncestorOf(parent.getResourceStateType())) {
+											Term newSelector = new Term(DataConstraintModel.lookup);
+											newSelector.addChild(selector);
+											newSelector.addChild(new Variable(descendantGetter.getParameters().get(descendantGetter.getParameters().size() - 1).getName()));
+											newSelector.setType(descendantGetter.getReturnType());
+											selector = newSelector;
+											params++;
+										}
+										if (descendantGetter != null && (descendantGetter.getBody() == null || descendantGetter.getBody().getStatements().size() == 0)) {
+											String[] sideEffects = new String[] {null};
+											String returnValue = selector.toImplementation(sideEffects);
+											if (sideEffects[0] != null) descendantGetter.addStatement(sideEffects[0]);
+											descendantGetter.addStatement("return " + returnValue + ";");
+										}
+									}
+									if (JavaCodeGenerator.generatesComponent(descendant)) {
+										// If the descendant generates a component.
+										break;
+									}
+									parent = descendant;
+									children = descendant.getChildren();
+								} while (children != null && children.size() == 1 && (descendant = children.iterator().next()) != null);
 							}
-							do {
-								String methodName = JavaCodeGenerator.getComponentName(descendant);
-								MethodDeclaration descendantGetter = null;
-								for (MethodDeclaration getter: getGetterMethods(component, methodName)) {
-									if ((getter.getParameters() == null && params == 0) || (getter.getParameters() != null && getter.getParameters().size() == params)) {
-										descendantGetter = getter;
-									}
-								}
-								if (descendantGetter != null) {
-									if (DataConstraintModel.typeList.isAncestorOf(parent.getResourceStateType())) {
-										Term newSelector = new Term(DataConstraintModel.get);
-										newSelector.addChild(selector);
-										newSelector.addChild(new Variable(descendantGetter.getParameters().get(descendantGetter.getParameters().size() - 1).getName()));
-										newSelector.setType(descendantGetter.getReturnType());
-										selector = newSelector;
-										params++;
-									} else if (DataConstraintModel.typeMap.isAncestorOf(parent.getResourceStateType())) {
-										Term newSelector = new Term(DataConstraintModel.lookup);
-										newSelector.addChild(selector);
-										newSelector.addChild(new Variable(descendantGetter.getParameters().get(descendantGetter.getParameters().size() - 1).getName()));
-										newSelector.setType(descendantGetter.getReturnType());
-										selector = newSelector;
-										params++;
-									}
-									if (descendantGetter != null && (descendantGetter.getBody() == null || descendantGetter.getBody().getStatements().size() == 0)) {
-										String[] sideEffects = new String[] {null};
-										String returnValue = selector.toImplementation(sideEffects);
-										if (sideEffects[0] != null) descendantGetter.addStatement(sideEffects[0]);
-										descendantGetter.addStatement("return " + returnValue + ";");
-									}
-								}
-								if (JavaCodeGenerator.generatesComponent(descendant)) {
-									// If the descendant generates a component.
-									break;
-								}
-								parent = descendant;
-								children = descendant.getChildren();
-							} while (children != null && children.size() == 1 && (descendant = children.iterator().next()) != null);
 						}
 					}
 				}
@@ -972,7 +974,7 @@
 	private static List<MethodDeclaration> getGetterMethods(TypeDeclaration component, String resourceName) {
 		List<MethodDeclaration> getters = new ArrayList<>();
 		for (MethodDeclaration m: component.getMethods()) {
-			if (m.getName().startsWith("get" + resourceName)) {
+			if (m.getName().equals("get" + resourceName)) {
 				getters.add(m);
 			}
 		}
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
index ffcc360..1e4b295 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JerseyMethodBodyGenerator.java
@@ -711,120 +711,122 @@
 			for (ResourceHierarchy resource: model.getResourceHierarchies()) {
 				String resourceName = JerseyCodeGenerator.getComponentName(resource);
 				TypeDeclaration component = componentMap.get(resourceName);
-				if (component != null) {
-					// state getter method
-					Type resourceType = JerseyCodeGenerator.getImplStateType(resource);
-					MethodDeclaration stateGetter = getMethod(component, "getValue");
-					if (stateGetter.getBody() == null || stateGetter.getBody().getStatements().size() == 0) {
-						if (model.isPrimitiveType(resourceType)) {
-							// primitive type
-							stateGetter.addStatement("return value;");
-						} else {
-							if (resource.getChildren() != null && resource.getChildren().size() == 1 && resource.getChildren().iterator().next().getNumParameters() > 0) {
-								// list or map
-								String implTypeName = resourceType.getImplementationTypeName();
-								// copy the current state to be returned as a 'value'
-								stateGetter.addStatement("return new " + implTypeName + "(value);");
+				if (JavaCodeGenerator.generatesComponent(resource)) {
+					if (component != null) {
+						// state getter method
+						Type resourceType = JerseyCodeGenerator.getImplStateType(resource);
+						MethodDeclaration stateGetter = getMethod(component, "getValue");
+						if (stateGetter.getBody() == null || stateGetter.getBody().getStatements().size() == 0) {
+							if (model.isPrimitiveType(resourceType)) {
+								// primitive type
+								stateGetter.addStatement("return value;");
 							} else {
-								if (resource.getChildren() == null || resource.getChildren().size() == 0) {
-									// a leaf resource
+								if (resource.getChildren() != null && resource.getChildren().size() == 1 && resource.getChildren().iterator().next().getNumParameters() > 0) {
+									// list or map
 									String implTypeName = resourceType.getImplementationTypeName();
+									// copy the current state to be returned as a 'value'
 									stateGetter.addStatement("return new " + implTypeName + "(value);");
 								} else {
-									Term composer = null; 
-									Term composerSub = new Constant(DataConstraintModel.nil);
-									composerSub.setType(DataConstraintModel.typeMap);
-									for (ResourceHierarchy child: resource.getChildren()) {
-										String childTypeName = JerseyCodeGenerator.getComponentName(child);
-										String fieldName = JerseyCodeGenerator.toVariableName(childTypeName);
-										Term childGetter = null; 
-										if ((child.getChildren() == null || child.getChildren().size() == 0) && child.getNumParameters() == 0) {
-											// the child is not a class
-											childGetter = new Term(new Symbol("get" + childTypeName, 1, Symbol.Type.METHOD));
-											childGetter.addChild(new Constant("this"));
-										} else {
-											// the child is a class
-											childGetter = new Term(new Symbol("getValue", 1, Symbol.Type.METHOD));
-											childGetter.addChild(new Field(fieldName, JerseyCodeGenerator.getImplStateType(child)));
-										}
-										composer = new Term(DataConstraintModel.insert);
-										composer.addChild(composerSub);
-										composer.addChild(new Constant(fieldName, DataConstraintModel.typeString));		// key
-										composer.addChild(childGetter);													// value
-										composer.setType(DataConstraintModel.typeMap);
-										composerSub = composer;
-									}
-									composer.setType(stateGetter.getReturnType());
-									String[] sideEffects = new String[] {null};
-									String returnValue = composer.toImplementation(sideEffects);
-									if (sideEffects[0] != null) {
-										stateGetter.addStatement(sideEffects[0] + "return " + returnValue+ ";");
+									if (resource.getChildren() == null || resource.getChildren().size() == 0) {
+										// a leaf resource
+										String implTypeName = resourceType.getImplementationTypeName();
+										stateGetter.addStatement("return new " + implTypeName + "(value);");
 									} else {
-										stateGetter.addStatement("return " + returnValue+ ";");
-									}
-								}
-							}
-						}
-					}
-					
-					// descendant getter method
-					if (resource.getChildren().size() > 0) {
-						for (ResourceHierarchy child: resource.getChildren()) {
-							ResourceHierarchy parent = resource;
-							ResourceHierarchy descendant = child;
-							Set<ResourceHierarchy> children;
-							Expression selector;
-							int params = 0;
-							if (DataConstraintModel.typeList.isAncestorOf(parent.getResourceStateType())) {
-								selector = new Field("value");
-								params++;
-							} else if (DataConstraintModel.typeMap.isAncestorOf(parent.getResourceStateType())) {
-								selector = new Field("value");
-								params++;
-							} else {
-								String fieldName = JerseyCodeGenerator.getComponentName(descendant);
-								selector = new Field(JerseyCodeGenerator.toVariableName(fieldName));
-							}
-							do {
-								String methodName = JerseyCodeGenerator.getComponentName(descendant);
-								MethodDeclaration descendantGetter = null;
-								for (MethodDeclaration getter: getGetterMethods(component, methodName)) {
-									if ((getter.getParameters() == null && params == 0) || (getter.getParameters() != null && getter.getParameters().size() == params)) {
-										descendantGetter = getter;
-									}
-								}
-								if (descendantGetter != null) {
-									if (DataConstraintModel.typeList.isAncestorOf(parent.getResourceStateType())) {
-										Term newSelector = new Term(DataConstraintModel.get);
-										newSelector.addChild(selector);
-										newSelector.addChild(new Variable(descendantGetter.getParameters().get(descendantGetter.getParameters().size() - 1).getName()));
-										newSelector.setType(descendantGetter.getReturnType());
-										selector = newSelector;
-										params++;
-									} else if (DataConstraintModel.typeMap.isAncestorOf(parent.getResourceStateType())) {
-										Term newSelector = new Term(DataConstraintModel.lookup);
-										newSelector.addChild(selector);
-										newSelector.addChild(new Variable(descendantGetter.getParameters().get(descendantGetter.getParameters().size() - 1).getName()));
-										newSelector.setType(descendantGetter.getReturnType());
-										selector = newSelector;
-										params++;
-									}
-									if (descendantGetter != null && (descendantGetter.getBody() == null || descendantGetter.getBody().getStatements().size() == 0)) {
+										Term composer = null; 
+										Term composerSub = new Constant(DataConstraintModel.nil);
+										composerSub.setType(DataConstraintModel.typeMap);
+										for (ResourceHierarchy child: resource.getChildren()) {
+											String childTypeName = JerseyCodeGenerator.getComponentName(child);
+											String fieldName = JerseyCodeGenerator.toVariableName(childTypeName);
+											Term childGetter = null; 
+											if ((child.getChildren() == null || child.getChildren().size() == 0) && child.getNumParameters() == 0) {
+												// the child is not a class
+												childGetter = new Term(new Symbol("get" + childTypeName, 1, Symbol.Type.METHOD));
+												childGetter.addChild(new Constant("this"));
+											} else {
+												// the child is a class
+												childGetter = new Term(new Symbol("getValue", 1, Symbol.Type.METHOD));
+												childGetter.addChild(new Field(fieldName, JerseyCodeGenerator.getImplStateType(child)));
+											}
+											composer = new Term(DataConstraintModel.insert);
+											composer.addChild(composerSub);
+											composer.addChild(new Constant(fieldName, DataConstraintModel.typeString));		// key
+											composer.addChild(childGetter);													// value
+											composer.setType(DataConstraintModel.typeMap);
+											composerSub = composer;
+										}
+										composer.setType(stateGetter.getReturnType());
 										String[] sideEffects = new String[] {null};
-										String returnValue = selector.toImplementation(sideEffects);
-										if (sideEffects[0] != null) descendantGetter.addStatement(sideEffects[0]);
-										descendantGetter.addStatement("return " + returnValue + ";");
+										String returnValue = composer.toImplementation(sideEffects);
+										if (sideEffects[0] != null) {
+											stateGetter.addStatement(sideEffects[0] + "return " + returnValue+ ";");
+										} else {
+											stateGetter.addStatement("return " + returnValue+ ";");
+										}
 									}
 								}
-								if (JerseyCodeGenerator.generatesComponent(descendant)) {
-									// If the descendant generates a component.
-									break;
-								}
-								parent = descendant;
-								children = descendant.getChildren();
-							} while (children != null && children.size() == 1 && (descendant = children.iterator().next()) != null);
+							}
 						}
-					}					
+						
+						// descendant getter method
+						if (resource.getChildren().size() > 0) {
+							for (ResourceHierarchy child: resource.getChildren()) {
+								ResourceHierarchy parent = resource;
+								ResourceHierarchy descendant = child;
+								Set<ResourceHierarchy> children;
+								Expression selector;
+								int params = 0;
+								if (DataConstraintModel.typeList.isAncestorOf(parent.getResourceStateType())) {
+									selector = new Field("value");
+									params++;
+								} else if (DataConstraintModel.typeMap.isAncestorOf(parent.getResourceStateType())) {
+									selector = new Field("value");
+									params++;
+								} else {
+									String fieldName = JerseyCodeGenerator.getComponentName(descendant);
+									selector = new Field(JerseyCodeGenerator.toVariableName(fieldName));
+								}
+								do {
+									String methodName = JerseyCodeGenerator.getComponentName(descendant);
+									MethodDeclaration descendantGetter = null;
+									for (MethodDeclaration getter: getGetterMethods(component, methodName)) {
+										if ((getter.getParameters() == null && params == 0) || (getter.getParameters() != null && getter.getParameters().size() == params)) {
+											descendantGetter = getter;
+										}
+									}
+									if (descendantGetter != null) {
+										if (DataConstraintModel.typeList.isAncestorOf(parent.getResourceStateType())) {
+											Term newSelector = new Term(DataConstraintModel.get);
+											newSelector.addChild(selector);
+											newSelector.addChild(new Variable(descendantGetter.getParameters().get(descendantGetter.getParameters().size() - 1).getName()));
+											newSelector.setType(descendantGetter.getReturnType());
+											selector = newSelector;
+											params++;
+										} else if (DataConstraintModel.typeMap.isAncestorOf(parent.getResourceStateType())) {
+											Term newSelector = new Term(DataConstraintModel.lookup);
+											newSelector.addChild(selector);
+											newSelector.addChild(new Variable(descendantGetter.getParameters().get(descendantGetter.getParameters().size() - 1).getName()));
+											newSelector.setType(descendantGetter.getReturnType());
+											selector = newSelector;
+											params++;
+										}
+										if (descendantGetter != null && (descendantGetter.getBody() == null || descendantGetter.getBody().getStatements().size() == 0)) {
+											String[] sideEffects = new String[] {null};
+											String returnValue = selector.toImplementation(sideEffects);
+											if (sideEffects[0] != null) descendantGetter.addStatement(sideEffects[0]);
+											descendantGetter.addStatement("return " + returnValue + ";");
+										}
+									}
+									if (JerseyCodeGenerator.generatesComponent(descendant)) {
+										// If the descendant generates a component.
+										break;
+									}
+									parent = descendant;
+									children = descendant.getChildren();
+								} while (children != null && children.size() == 1 && (descendant = children.iterator().next()) != null);
+							}
+						}					
+					}
 				}
 				
 				// methods for input events
@@ -1275,7 +1277,7 @@
 	private static List<MethodDeclaration> getGetterMethods(TypeDeclaration component, String resourceName) {
 		List<MethodDeclaration> getters = new ArrayList<>();
 		for (MethodDeclaration m: component.getMethods()) {
-			if (m.getName().startsWith("get" + resourceName)) {
+			if (m.getName().equals("get" + resourceName)) {
 				getters.add(m);
 			}
 		}