diff --git a/helloworld/src/main/java/org/springframework/amqp/helloworld/HelloWorldConfiguration.java b/helloworld/src/main/java/org/springframework/amqp/helloworld/HelloWorldConfiguration.java
index 395344a..6a6a4fc 100644
--- a/helloworld/src/main/java/org/springframework/amqp/helloworld/HelloWorldConfiguration.java
+++ b/helloworld/src/main/java/org/springframework/amqp/helloworld/HelloWorldConfiguration.java
@@ -32,12 +32,12 @@ public class HelloWorldConfiguration extends AbstractRabbitConfiguration {
 	}
 
 	@Bean
+	// Every queue is bound to the default direct exchange
 	public Queue helloWorldQueue() {
 		return new Queue(this.helloWorldQueueName);
 	}
 
 	/*
-	//Each queue is bound to the default direct exchange
 	@Bean 
 	public Binding binding() {
 		return declare(new Binding(helloWorldQueue(), defaultDirectExchange()));
diff --git a/helloworld/src/main/resources/rabbitConfiguration.xml b/helloworld/src/main/resources/rabbitConfiguration.xml
index 36a673c..970f935 100644
--- a/helloworld/src/main/resources/rabbitConfiguration.xml
+++ b/helloworld/src/main/resources/rabbitConfiguration.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:rabbit="http://www.springframework.org/schema/rabbit"
+	xsi:schemaLocation="http://www.springframework.org/schema/rabbit http://www.springframework.org/schema/rabbit/spring-rabbit.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
 	<bean id="connectionFactory" class="org.springframework.amqp.rabbit.connection.SingleConnectionFactory">
 	    <constructor-arg value="localhost"/>
@@ -9,8 +10,6 @@
 	    <property name="password" value="guest"/>
 	</bean>
 	
-	<bean id="amqpAdmin" class="org.springframework.amqp.rabbit.core.RabbitAdmin">
-		<constructor-arg ref="connectionFactory"/>
-	</bean>
+	<rabbit:admin connection-factory="connectionFactory"/>
 	
 </beans>