diff --git a/spring-webflow-samples/booking-jsf/.springBeans b/spring-webflow-samples/booking-jsf/.springBeans
index 359b8990..7df5daff 100755
--- a/spring-webflow-samples/booking-jsf/.springBeans
+++ b/spring-webflow-samples/booking-jsf/.springBeans
@@ -6,10 +6,12 @@
 	<configs>
 		<config>src/main/webapp/WEB-INF/config/application-layer-config.xml</config>
 		<config>src/main/webapp/WEB-INF/config/web-application-config.xml</config>
+		<config>src/main/webapp/flow/main/main-beans.xml</config>
+		<config>src/main/webapp/flow/booking/booking-beans.xml</config>
 	</configs>
 	<configSets>
 		<configSet>
-			<name><![CDATA[webapp]]></name>
+			<name><![CDATA[webapp-config]]></name>
 			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
 			<incomplete>false</incomplete>
 			<configs>
@@ -17,5 +19,23 @@
 				<config>src/main/webapp/WEB-INF/config/web-application-config.xml</config>
 			</configs>
 		</configSet>
+		<configSet>
+			<name><![CDATA[booking]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/webapp/flow/booking/booking-beans.xml</config>
+				<config>src/main/webapp/WEB-INF/config/application-layer-config.xml</config>
+			</configs>
+		</configSet>
+		<configSet>
+			<name><![CDATA[main]]></name>
+			<allowBeanDefinitionOverriding>true</allowBeanDefinitionOverriding>
+			<incomplete>false</incomplete>
+			<configs>
+				<config>src/main/webapp/flow/main/main-beans.xml</config>
+				<config>src/main/webapp/WEB-INF/config/application-layer-config.xml</config>
+			</configs>
+		</configSet>
 	</configSets>
 </beansProjectDescription>
diff --git a/spring-webflow-samples/booking-jsf/.springWebflow b/spring-webflow-samples/booking-jsf/.springWebflow
index 48eb91a1..737a5617 100755
--- a/spring-webflow-samples/booking-jsf/.springWebflow
+++ b/spring-webflow-samples/booking-jsf/.springWebflow
@@ -2,12 +2,14 @@
 <webflow-project-description>
 	<configs>
 		<config>
-			<file>src/main/webapp/flows/booking/booking-flow.xml</file>
-			<name><![CDATA[booking-flow]]></name>
+			<file>src/main/webapp/flow/booking/booking.xml</file>
+			<name><![CDATA[booking]]></name>
+			<beans-config><![CDATA[1:BeansModel|2:swf-booking-jsf|4:booking]]></beans-config>
 		</config>
 		<config>
-			<file>src/main/webapp/flows/main/main-flow.xml</file>
-			<name><![CDATA[main-flow]]></name>
+			<file>src/main/webapp/flow/main/main.xml</file>
+			<name><![CDATA[main]]></name>
+			<beans-config><![CDATA[1:BeansModel|2:swf-booking-jsf|4:main]]></beans-config>
 		</config>
 	</configs>
 </webflow-project-description>