diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/AbstractActionModel.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/AbstractActionModel.java
index c076cb5a..63b48b3e 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/AbstractActionModel.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/AbstractActionModel.java
@@ -43,7 +43,7 @@ public abstract class AbstractActionModel extends AbstractModel {
 	}
 
 	protected void fillCopy(AbstractActionModel copy) {
-		copy.setOutputs(copyList(attributes));
+		copy.setAttributes(copyList(attributes));
 	}
 
 	/**
@@ -56,21 +56,8 @@ public abstract class AbstractActionModel extends AbstractModel {
 	/**
 	 * @param attributes the attributes to set
 	 */
-	public void setOutputs(LinkedList attributes) {
+	public void setAttributes(LinkedList attributes) {
 		this.attributes = attributes;
 	}
 
-	/**
-	 * @param attributes the attributes to add
-	 */
-	public void addAttributes(LinkedList attributes) {
-		if (attributes == null || attributes.isEmpty()) {
-			return;
-		}
-		if (this.attributes == null) {
-			this.attributes = new LinkedList();
-		}
-		this.attributes.addAll(attributes);
-	}
-
 }
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/XmlFlowModelBuilder.java b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/XmlFlowModelBuilder.java
index d5a19997..b0d0128b 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/XmlFlowModelBuilder.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/engine/model/builder/xml/XmlFlowModelBuilder.java
@@ -533,20 +533,20 @@ public class XmlFlowModelBuilder implements FlowModelBuilder {
 		EvaluateModel evaluate = new EvaluateModel(element.getAttribute("expression"));
 		evaluate.setResult(element.getAttribute("result"));
 		evaluate.setResultType(element.getAttribute("result-type"));
-		evaluate.addAttributes(parseAttributes(element));
+		evaluate.setAttributes(parseAttributes(element));
 		return evaluate;
 	}
 
 	private RenderModel parseRender(Element element) {
 		RenderModel render = new RenderModel(element.getAttribute("fragments"));
-		render.addAttributes(parseAttributes(element));
+		render.setAttributes(parseAttributes(element));
 		return render;
 	}
 
 	private SetModel parseSet(Element element) {
 		SetModel set = new SetModel(element.getAttribute("name"), element.getAttribute("value"));
 		set.setType(element.getAttribute("type"));
-		set.addAttributes(parseAttributes(element));
+		set.setAttributes(parseAttributes(element));
 		return set;
 	}