diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
index 612b7086f5..32cd822190 100644
--- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
+++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/xml/cafeDemo.xml
@@ -18,7 +18,9 @@
 	</splitter>
 
 	<channel id="drinks"/>
-	<router input-channel="drinks" ref="drinkRouter" method="resolveOrderItemChannel"/>
+	<router input-channel="drinks"  method="resolveOrderItemChannel">
+		<beans:bean class="org.springframework.integration.samples.cafe.xml.DrinkRouter"/>
+	</router>
 
 	<channel id="coldDrinks">
 		<queue capacity="10"/>
@@ -31,16 +33,14 @@
 	<service-activator input-channel="hotDrinks" ref="barista" method="prepareHotDrink" output-channel="preparedDrinks"/>
 
     <channel id="preparedDrinks"/>
-    <aggregator input-channel="preparedDrinks" ref="waiter" method="prepareDelivery" output-channel="deliveries"/>
+    <aggregator input-channel="preparedDrinks"  method="prepareDelivery" output-channel="deliveries">
+    	<beans:bean class="org.springframework.integration.samples.cafe.xml.Waiter"/>
+    </aggregator>
 
 	<stream:stdout-channel-adapter id="deliveries"/>
 
-	<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"/>
-
 	<poller id="poller" default="true">
 		<interval-trigger interval="1000"/>
 	</poller>