diff --git a/spring-webflow-samples/fileupload/.springWebflow b/spring-webflow-samples/fileupload/.springWebflow
index da38082c..89e80050 100644
--- a/spring-webflow-samples/fileupload/.springWebflow
+++ b/spring-webflow-samples/fileupload/.springWebflow
@@ -4,6 +4,7 @@
 		<config>
 			<file>src/main/webapp/WEB-INF/fileupload.xml</file>
 			<name>fileupload</name>
+			<beans-config>1:BeansModel|2:swf-fileupload|3:src/main/webapp/WEB-INF/fileupload-servlet.xml</beans-config>
 		</config>
 	</configs>
 </webflow-project-description>
diff --git a/spring-webflow-samples/itemlist/.springWebflow b/spring-webflow-samples/itemlist/.springWebflow
index 8ae9dc58..9eba5a30 100644
--- a/spring-webflow-samples/itemlist/.springWebflow
+++ b/spring-webflow-samples/itemlist/.springWebflow
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <webflow-project-description>
 	<configs>
-		<config>
-			<file>src/main/webapp/WEB-INF/itemlist.xml</file>
-			<name>itemlist</name>
-		</config>
 		<config>
 			<file>src/main/webapp/WEB-INF/itemlist-alternate.xml</file>
 			<name>itemlist-alternate</name>
+			<beans-config>1:BeansModel|2:swf-itemlist|3:src/main/webapp/WEB-INF/itemlist-servlet.xml</beans-config>
+		</config>
+		<config>
+			<file>src/main/webapp/WEB-INF/itemlist.xml</file>
+			<name>itemlist</name>
+			<beans-config>1:BeansModel|2:swf-itemlist|3:src/main/webapp/WEB-INF/itemlist-servlet.xml</beans-config>
 		</config>
 	</configs>
 </webflow-project-description>
diff --git a/spring-webflow-samples/itemlist/src/main/webapp/WEB-INF/itemlist-alternate.xml b/spring-webflow-samples/itemlist/src/main/webapp/WEB-INF/itemlist-alternate.xml
index 0b33f67d..3bc29ed3 100644
--- a/spring-webflow-samples/itemlist/src/main/webapp/WEB-INF/itemlist-alternate.xml
+++ b/spring-webflow-samples/itemlist/src/main/webapp/WEB-INF/itemlist-alternate.xml
@@ -26,17 +26,12 @@
 			<start-state idref="displayItem"/>
 			
 			<view-state id="displayItem" view="item">
-				<transition on="submit" to="mapItem" />
+				<transition on="submit" to="finish" />
 			</view-state>
 
-			<action-state id="mapItem">
-				<action bean="mapItemAction" />
-				<transition on="success" to="finish" />
-			</action-state>
-
 			<end-state id="finish">
 				<output-mapper>
-					<mapping source="flowScope.item" target="item" />
+					<mapping source="requestParameters.data" target="item" />
 				</output-mapper>
 			</end-state>
 		</flow>
diff --git a/spring-webflow-samples/itemlist/src/main/webapp/WEB-INF/itemlist-servlet.xml b/spring-webflow-samples/itemlist/src/main/webapp/WEB-INF/itemlist-servlet.xml
index 9a667594..95040e4f 100644
--- a/spring-webflow-samples/itemlist/src/main/webapp/WEB-INF/itemlist-servlet.xml
+++ b/spring-webflow-samples/itemlist/src/main/webapp/WEB-INF/itemlist-servlet.xml
@@ -49,10 +49,4 @@
 
 	<bean id="addItemAction" class="org.springframework.webflow.samples.itemlist.AddItemAction" />
 
-	<bean id="mapItemAction" class="org.springframework.webflow.action.AttributeMapperAction">
-		<constructor-arg>
-			<bean class="org.springframework.webflow.samples.itemlist.DataMapper" />
-		</constructor-arg>
-	</bean>
-
 </beans>
\ No newline at end of file
diff --git a/spring-webflow-samples/itemlist/src/main/webapp/index.jsp b/spring-webflow-samples/itemlist/src/main/webapp/index.jsp
index ebd01e64..afa0d3fa 100644
--- a/spring-webflow-samples/itemlist/src/main/webapp/index.jsp
+++ b/spring-webflow-samples/itemlist/src/main/webapp/index.jsp
@@ -11,6 +11,9 @@
 			<P>
 				<A href="app/itemlist">Item List</A>
 			</P>			
+			<P>
+				<A href="app/itemlist-alternate">Item List Alternate</A> (same flow with the 'add item' process modeled as a subflow)
+			</P>
 			<P>
 				This Spring web flow sample application illustrates several features:
 			</P>
diff --git a/spring-webflow-samples/phonebook-portlet/.springBeans b/spring-webflow-samples/phonebook-portlet/.springBeans
index 427d0a04..2e3cc403 100644
--- a/spring-webflow-samples/phonebook-portlet/.springBeans
+++ b/spring-webflow-samples/phonebook-portlet/.springBeans
@@ -4,23 +4,18 @@
 		<configExtension>xml</configExtension>
 	</configExtensions>
 	<configs>
+		<config>src/main/webapp/WEB-INF/phonebook-webflow-config.xml</config>
+		<config>src/main/webapp/WEB-INF/phonebook-portlet-config.xml</config>
+		<config>src/main/java/org/springframework/webflow/samples/phonebook/stub/services-config.xml</config>
 		<config>src/main/webapp/WEB-INF/flows/search-flow-beans.xml</config>
 	</configs>
 	<configSets>
 		<configSet>
-			<name>search-flow</name>
+			<name>serviceLayer</name>
 			<allowBeanDefinitionOverriding>false</allowBeanDefinitionOverriding>
 			<incomplete>false</incomplete>
 			<configs>
-				<config>src/main/webapp/WEB-INF/flows/search-flow-beans.xml</config>
-			</configs>
-		</configSet>
-		<configSet>
-			<name>service-layer</name>
-			<allowBeanDefinitionOverriding>false</allowBeanDefinitionOverriding>
-			<incomplete>false</incomplete>
-			<configs>
-				<config>src/main/java/org/springframework/webflow/samples/phonebook/domain/services.xml</config>
+				<config>src/main/java/org/springframework/webflow/samples/phonebook/stub/services-config.xml</config>
 			</configs>
 		</configSet>
 		<configSet>
@@ -28,8 +23,10 @@
 			<allowBeanDefinitionOverriding>false</allowBeanDefinitionOverriding>
 			<incomplete>false</incomplete>
 			<configs>
-				<config>src/main/webapp/WEB-INF/dispatcher-portlet.xml</config>
-				<config>src/main/webapp/WEB-INF/webflow.xml</config>
+				<config>src/main/java/org/springframework/webflow/samples/phonebook/stub/services-config.xml</config>
+				<config>src/main/webapp/WEB-INF/phonebook-portlet-config.xml</config>
+				<config>src/main/webapp/WEB-INF/phonebook-webflow-config.xml</config>
+				<config>src/main/webapp/WEB-INF/flows/search-flow-beans.xml</config>
 			</configs>
 		</configSet>
 	</configSets>
diff --git a/spring-webflow-samples/phonebook-portlet/.springWebflow b/spring-webflow-samples/phonebook-portlet/.springWebflow
new file mode 100644
index 00000000..0cee5662
--- /dev/null
+++ b/spring-webflow-samples/phonebook-portlet/.springWebflow
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<webflow-project-description>
+	<configs>
+		<config>
+			<file>src/main/webapp/WEB-INF/flows/detail-flow.xml</file>
+			<name>detail-flow</name>
+			<beans-config>1:BeansModel|2:swf-phonebook-portlet|3:src/main/webapp/WEB-INF/flows/search-flow-beans.xml</beans-config>
+			<beans-config>1:BeansModel|2:swf-phonebook-portlet|3:src/main/java/org/springframework/webflow/samples/phonebook/stub/services-config.xml</beans-config>
+		</config>
+		<config>
+			<file>src/main/webapp/WEB-INF/flows/search-flow.xml</file>
+			<name>search-flow</name>
+			<beans-config>1:BeansModel|2:swf-phonebook-portlet|3:src/main/webapp/WEB-INF/flows/search-flow-beans.xml</beans-config>
+			<beans-config>1:BeansModel|2:swf-phonebook-portlet|3:src/main/java/org/springframework/webflow/samples/phonebook/stub/services-config.xml</beans-config>
+		</config>
+	</configs>
+</webflow-project-description>