diff --git a/.classpath b/.classpath
deleted file mode 100644
index 87b4010..0000000
--- a/.classpath
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
-	<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
-	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/.gitignore b/.gitignore
index 1beb459..0677479 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 target
 .settings
 .springBeans
+.classpath
+.project
diff --git a/.project b/.project
deleted file mode 100644
index ba707a1..0000000
--- a/.project
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>spring-integration-flow</name>
-	<comment></comment>
-	<projects>
-		<project>spring-integration-core</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.springframework.ide.eclipse.core.springbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.springframework.ide.eclipse.core.springnature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-	</natures>
-</projectDescription>
diff --git a/pom.xml b/pom.xml
index 0cb7e21..ddcc7e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     
     <properties>
         <project.build.sourceEncoding>UTF8</project.build.sourceEncoding>
-        <spring.framework.version>3.1.0.M2</spring.framework.version>
+        <spring.framework.version>3.1.0.RC1</spring.framework.version>
         <spring.integration.version>2.1.0.M2</spring.integration.version>
         <maven.test.search.classdir>true</maven.test.search.classdir>
     </properties>
@@ -77,6 +77,12 @@
 			<artifactId>spring-integration-core</artifactId>
 			<version>${spring.integration.version}</version>
 		</dependency>
+            <dependency>
+            <groupId>org.springframework.integration</groupId>
+            <artifactId>spring-integration-jmx</artifactId>
+            <version>${spring.integration.version}</version>
+            <scope>test</scope>
+        </dependency>
 
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -187,9 +193,6 @@
 								</groovyc>
 							</tasks>
 						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
 					</execution>
 				</executions>
 			</plugin>
diff --git a/src/main/java/org/springframework/integration/flow/Flow.java b/src/main/java/org/springframework/integration/flow/Flow.java
index f927384..ce81dfb 100644
--- a/src/main/java/org/springframework/integration/flow/Flow.java
+++ b/src/main/java/org/springframework/integration/flow/Flow.java
@@ -70,7 +70,7 @@ public class Flow implements InitializingBean, BeanNameAware, ChannelResolver, A
 
 	private volatile ChannelResolver flowChannelResolver;
 
-	private volatile PublishSubscribeChannel flowOutputChannel;
+	private volatile SubscribableChannel flowOutputChannel;
 
 	private volatile boolean help;
 
@@ -211,7 +211,7 @@ public class Flow implements InitializingBean, BeanNameAware, ChannelResolver, A
 	 * a single PublishSubscribeChannel
 	 * @return the publish-subscribe channel
 	 */
-	public PublishSubscribeChannel getFlowOutputChannel() {
+	public SubscribableChannel getFlowOutputChannel() {
 		return flowOutputChannel;
 	}
 
@@ -220,8 +220,8 @@ public class Flow implements InitializingBean, BeanNameAware, ChannelResolver, A
 	 * a single PublishSubscribeChannel
 	 * @param the publish-subscribe channel
 	 */
-	public void setFlowOutputChannel(PublishSubscribeChannel flowOutputChannel) {
-		this.flowOutputChannel = flowOutputChannel;
+	public void setFlowOutputChannel(SubscribableChannel flowOutputChannel) {
+		this.flowOutputChannel =  flowOutputChannel;
 	}
 
 	@Override
diff --git a/src/test/java/org/springframework/integration/flow/config/xml/FlowContextTest.java b/src/test/java/org/springframework/integration/flow/config/xml/FlowContextTest.java
index 80c242a..26e95f0 100644
--- a/src/test/java/org/springframework/integration/flow/config/xml/FlowContextTest.java
+++ b/src/test/java/org/springframework/integration/flow/config/xml/FlowContextTest.java
@@ -32,4 +32,12 @@ public class FlowContextTest {
 		  throw e;
 	  }
 	}
+	
+	@Test 
+	public void testFlowWithJMX() {
+	  
+		new ClassPathXmlApplicationContext("/FlowContextWithJMXTest-context.xml");
+	  
+	}
+ 
 }
diff --git a/src/test/resources/FlowContextTest-context.xml b/src/test/resources/FlowContextTest-context.xml
index 9b24b2d..8827133 100644
--- a/src/test/resources/FlowContextTest-context.xml
+++ b/src/test/resources/FlowContextTest-context.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:int="http://www.springframework.org/schema/integration"
-	xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
-	xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:int="http://www.springframework.org/schema/integration"
+    xmlns:int-flow="http://www.springframework.org/schema/integration/flow"
+    xsi:schemaLocation="http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
 		http://www.springframework.org/schema/integration/flow http://www.springframework.org/schema/integration/flow/spring-integration-flow.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
+ 
 	<!-- Instantiate the flow -->
 	<int-flow:flow id="subflow" flow-id="flow-with-channel-conflict"/>