diff --git a/org.springframework.integration.samples/scripts/cafeDemo.xml b/org.springframework.integration.samples/scripts/cafeDemo.xml
index c37d23538d..5ea6223f2e 100644
--- a/org.springframework.integration.samples/scripts/cafeDemo.xml
+++ b/org.springframework.integration.samples/scripts/cafeDemo.xml
@@ -1,31 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration"
+<beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
-	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:stream="http://www.springframework.org/schema/integration/stream"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
-			http://www.springframework.org/schema/context
-			http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+			http://www.springframework.org/schema/integration/stream
+			http://www.springframework.org/schema/integration/stream/spring-integration-stream-1.0.xsd">
 
 	<message-bus/>
-	<annotation-driven/>
 
-	<context:component-scan base-package="org.springframework.integration.samples.cafe"/>
+	<gateway id="cafe" service-interface="org.springframework.integration.samples.cafe.Cafe"/>
 
 	<channel id="orders"/>
+	<splitter input-channel="orders" ref="orderSplitter" method="split" output-channel="drinks"/>
+
 	<channel id="drinks"/>
-	<channel id="coldDrinks"/>
-	<channel id="hotDrinks"/>
+	<router input-channel="drinks" ref="drinkRouter" method="resolveOrderItemChannel"/>
 
-	<service-activator input-channel="coldDrinks" ref="barista" method="prepareColdDrink"/>
+	<channel id="coldDrinks">
+		<queue capacity="10"/>
+	</channel>
+	<service-activator input-channel="coldDrinks" ref="barista" method="prepareColdDrink" output-channel="preparedDrinks"/>
 
-	<service-activator input-channel="hotDrinks" ref="barista" method="prepareHotDrink"/>
+	<channel id="hotDrinks">
+		<queue capacity="10"/>
+	</channel>
+	<service-activator input-channel="hotDrinks" ref="barista" method="prepareHotDrink" output-channel="preparedDrinks"/>
 
-	<beans:bean id="cafe" class="org.springframework.integration.samples.cafe.Cafe">
-		<beans:property name="orderChannel" ref="orders"/>
-	</beans:bean>
+    <channel id="preparedDrinks"/>
+    <aggregator input-channel="preparedDrinks" ref="waiter" method="prepareDelivery" output-channel="deliveries"/>
+
+	<stream:stdout-channel-adapter id="deliveries"/>
+
+	<beans:bean id="orderSplitter" class="org.springframework.integration.samples.cafe.xml.OrderSplitter"/>
+
+	<beans:bean id="drinkRouter" class="org.springframework.integration.samples.cafe.xml.DrinkRouter"/>
+
+	<beans:bean id="barista" class="org.springframework.integration.samples.cafe.xml.Barista"/>
+
+	<beans:bean id="waiter" class="org.springframework.integration.samples.cafe.xml.Waiter"/>
 
 </beans:beans>