diff --git a/spring-integration-samples/loan-broker/pom.xml b/spring-integration-samples/loan-broker/pom.xml
index 34872a1c0c..36b6a73ba6 100644
--- a/spring-integration-samples/loan-broker/pom.xml
+++ b/spring-integration-samples/loan-broker/pom.xml
@@ -47,8 +47,18 @@
 					<junitArtifactName>org.junit:com.springsource.org.junit</junitArtifactName>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.0.2</version>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
+	
 
 	<repositories>
 		<repository>
diff --git a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/BanksChannelSelector.java b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/BanksChannelSelector.java
index 561bbe8d07..37e9245e38 100644
--- a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/BanksChannelSelector.java
+++ b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/BanksChannelSelector.java
@@ -33,7 +33,7 @@ import org.springframework.integration.core.Message;
  *									   : #banks.?[value.equals('secondary')].keySet()
  * </pre><br>
  * The above SpEL expression upon evaluation will return the list of premier bank 
- * channels if customer's credit score is above 780. 
+ * channels if customer's credit score (retrieved from message header 'CREDIT_SCORE') is above 780. 
  * 
  * @author Oleg Zhurakousky
  *
diff --git a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/demo/LoanBrokerDemo.java b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/demo/LoanBrokerDemo.java
index d051b99aa0..f89c5651e7 100644
--- a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/demo/LoanBrokerDemo.java
+++ b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/loanbroker/demo/LoanBrokerDemo.java
@@ -18,6 +18,7 @@ package org.springframework.integration.loanbroker.demo;
 import java.util.List;
 
 import org.apache.log4j.Logger;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.loanbroker.LoanBrokerGateway;
 import org.springframework.integration.loanbroker.domain.Customer;
@@ -34,7 +35,8 @@ public class LoanBrokerDemo {
 	 * @param args
 	 */
 	public static void main(String[] args) {
-		ClassPathXmlApplicationContext ac = new ClassPathXmlApplicationContext("loan-broker-config.xml");
+		ConfigurableApplicationContext ac = 
+						new ClassPathXmlApplicationContext("bootstrap-config/stubed-loan-broker.xml");
 		LoanBrokerGateway broker = ac.getBean("loanBrokerGateway", LoanBrokerGateway.class);
 		LoanRequest loanRequest = new LoanRequest();
 		loanRequest.setCustomer(new Customer());   
diff --git a/spring-integration-samples/loan-broker/src/main/resources/bootstrap-config/stubed-loan-broker.xml b/spring-integration-samples/loan-broker/src/main/resources/bootstrap-config/stubed-loan-broker.xml
new file mode 100644
index 0000000000..fc22b63cb7
--- /dev/null
+++ b/spring-integration-samples/loan-broker/src/main/resources/bootstrap-config/stubed-loan-broker.xml
@@ -0,0 +1,10 @@
+<?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">
+
+	<import resource="classpath:stub-services-config.xml" />
+	<import resource="classpath:loan-broker-config.xml" />
+	<import resource="classpath:bank-channel-mappings-config.xml" />
+
+</beans>
diff --git a/spring-integration-samples/loan-broker/src/main/resources/loan-broker-config.xml b/spring-integration-samples/loan-broker/src/main/resources/loan-broker-config.xml
index a121535631..1060842b50 100644
--- a/spring-integration-samples/loan-broker/src/main/resources/loan-broker-config.xml
+++ b/spring-integration-samples/loan-broker/src/main/resources/loan-broker-config.xml
@@ -7,9 +7,6 @@
 	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:util="http://www.springframework.org/schema/util">
 
-	<import resource="classpath:bank-channel-mappings-config.xml" />
-	<import resource="classpath:stub-services-config.xml" />
-
 	<int:gateway id="loanBrokerGateway"
 		default-request-channel="loanBrokerPreProcessingChannel"
 		service-interface="org.springframework.integration.loanbroker.LoanBrokerGateway"/>