diff --git a/org.springframework.integration/src/main/resources/org/springframework/integration/config/xml/spring-integration-1.0.xsd b/org.springframework.integration/src/main/resources/org/springframework/integration/config/xml/spring-integration-1.0.xsd
index e955422a39..89c0fa8e4d 100644
--- a/org.springframework.integration/src/main/resources/org/springframework/integration/config/xml/spring-integration-1.0.xsd
+++ b/org.springframework.integration/src/main/resources/org/springframework/integration/config/xml/spring-integration-1.0.xsd
@@ -470,10 +470,6 @@
 		</xsd:annotation>
 		<xsd:complexContent>
 			<xsd:extension base="beans:identifiedType">
-				<xsd:sequence>
-					<xsd:element name="poller" type="innerPollerType"
-						minOccurs="0" maxOccurs="1" />
-				</xsd:sequence>
 				<xsd:attribute name="input-channel" type="xsd:string">
 					<xsd:annotation>
 						<xsd:appinfo>
@@ -532,6 +528,11 @@
 		<xsd:complexType>
 			<xsd:complexContent>
 				<xsd:extension base="inputEndpointType">
+					<xsd:choice minOccurs="1" maxOccurs="unbounded">
+						<xsd:any processContents="strict" namespace="##other"
+							minOccurs="0" maxOccurs="unbounded" />
+						<xsd:element ref="poller" />
+					</xsd:choice>
 					<xsd:attribute name="output-channel" type="xsd:string"
 						use="optional">
 						<xsd:annotation>
@@ -569,6 +570,7 @@
 						<xsd:element ref="aggregator" />
 						<xsd:element ref="router" />
 						<xsd:element ref="chain" />
+						<xsd:element ref="poller" />
 					</xsd:choice>
 				</xsd:extension>
 			</xsd:complexContent>
@@ -848,7 +850,7 @@
 		</xsd:annotation>
 	</xsd:element>
 
-	<xsd:element name="object-to-string-transformer" type="inputOutputEndpointType">
+	<xsd:element name="object-to-string-transformer">
 		<xsd:annotation>
 			<xsd:documentation>
 				Defines a Transformer that converts any Object
@@ -856,9 +858,20 @@
 				invoking its toString() method.
 			</xsd:documentation>
 		</xsd:annotation>
+		<xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="inputOutputEndpointType">
+                    <xsd:choice minOccurs="1" maxOccurs="unbounded">
+                        <xsd:any processContents="strict" namespace="##other"
+                            minOccurs="0" maxOccurs="unbounded" />
+                        <xsd:element ref="poller" />
+                    </xsd:choice>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
 	</xsd:element>
 
-	<xsd:element name="payload-serializing-transformer" type="inputOutputEndpointType">
+	<xsd:element name="payload-serializing-transformer">
 		<xsd:annotation>
 			<xsd:documentation>
 				Defines a Transformer that serializes any Object
@@ -866,9 +879,20 @@
 				Serializable into a byte array.
 			</xsd:documentation>
 		</xsd:annotation>
+		<xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="inputOutputEndpointType">
+                    <xsd:choice minOccurs="1" maxOccurs="unbounded">
+                        <xsd:any processContents="strict" namespace="##other"
+                            minOccurs="0" maxOccurs="unbounded" />
+                        <xsd:element ref="poller" />
+                    </xsd:choice>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
 	</xsd:element>
 
-	<xsd:element name="payload-deserializing-transformer" type="inputOutputEndpointType">
+	<xsd:element name="payload-deserializing-transformer">
 		<xsd:annotation>
 			<xsd:documentation>
 				Defines a Transformer that deserializes a byte
@@ -876,6 +900,17 @@
 				Object.
 			</xsd:documentation>
 		</xsd:annotation>
+		<xsd:complexType>
+            <xsd:complexContent>
+                <xsd:extension base="inputOutputEndpointType">
+                    <xsd:choice minOccurs="1" maxOccurs="unbounded">
+                        <xsd:any processContents="strict" namespace="##other"
+                            minOccurs="0" maxOccurs="unbounded" />
+                        <xsd:element ref="poller" />
+                    </xsd:choice>
+                </xsd:extension>
+            </xsd:complexContent>
+        </xsd:complexType>
 	</xsd:element>
 
 	<xsd:element name="filter">
@@ -983,9 +1018,11 @@
 		<xsd:complexType>
 			<xsd:complexContent>
 				<xsd:extension base="channelResolvingRouterType">
-					<xsd:choice>
-						<xsd:element ref="beans:bean" minOccurs="0" maxOccurs="1" />
-					</xsd:choice>
+					<xsd:all>   
+					  <xsd:element name="poller" type="innerPollerType"
+							minOccurs="0" maxOccurs="1" />          
+	                    <xsd:element ref="beans:bean" minOccurs="0" maxOccurs="1" />                
+	                </xsd:all>
 					<xsd:attribute name="ref" type="xsd:string">
 						<xsd:annotation>
 							<xsd:appinfo>
@@ -1060,10 +1097,7 @@
 				</xsd:documentation>
 			</xsd:annotation> 
 			<xsd:complexContent>
-				<xsd:extension base="handlerEndpointType">
-					<xsd:choice>            
-                    	<xsd:element ref="beans:bean" minOccurs="0" maxOccurs="1" />
-               		</xsd:choice>
+				<xsd:extension base="innerEndpointDefinitionAware">
 					<xsd:attribute name="completion-strategy" type="xsd:string">
 						<xsd:annotation>
 							<xsd:appinfo>
@@ -1285,9 +1319,11 @@
 	<xsd:complexType name="innerEndpointDefinitionAware">
 		<xsd:complexContent>
 			<xsd:extension base="handlerEndpointType">
-				<xsd:sequence>            
+				<xsd:all>     			    
                     <xsd:element ref="beans:bean" minOccurs="0" maxOccurs="1" />
-                </xsd:sequence>
+                     <xsd:element name="poller" type="innerPollerType"
+						minOccurs="0" maxOccurs="1" />    
+                </xsd:all>
 			</xsd:extension>
 		</xsd:complexContent>
 	</xsd:complexType>
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests.java
index cfeacd8bb9..fef4a9ab13 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests.java
@@ -64,6 +64,17 @@ public class InnerDefinitionHandlerAwareEndpointParserTests {
 		String configProperty = testConfigurations.getProperty("splitter-inner-success");
 		this.testSplitterDefinitionSuccess(configProperty);
 	}
+	
+	@Test
+	public void testInnerSplitterDefinitionSuccessWithPoller(){
+		String configProperty = testConfigurations.getProperty("splitter-inner-success-with-poller");
+		this.bootStrap(configProperty);
+	}
+	@Test
+	public void testInnerSplitterDefinitionSuccessWithPollerReversedOrder(){
+		String configProperty = testConfigurations.getProperty("splitter-inner-success-with-poller-reversed-order");
+		this.bootStrap(configProperty);
+	}
 	@Test
 	public void testRefSplitterDefinitionSuccess(){
 		String configProperty = testConfigurations.getProperty("splitter-ref-success");
@@ -135,11 +146,11 @@ public class InnerDefinitionHandlerAwareEndpointParserTests {
 		String configProperty = testConfigurations.getProperty("aggregator-inner-concurrent-success");
 		this.testAggregatorDefinitionSuccess(configProperty);
 	}
-//	@Test
-//	public void testInnerConcurrentAggregatorDefinitionSuccessReorderBeanPoller(){
-//		String configProperty = testConfigurations.getProperty("aggregator-inner-concurrent-success-reorder-bean-poller");
-//		this.testAggregatorDefinitionSuccess(configProperty);
-//	}
+	@Test
+	public void testInnerConcurrentAggregatorDefinitionSuccessReorderBeanPoller(){
+		String configProperty = testConfigurations.getProperty("aggregator-inner-concurrent-success-reorder-bean-poller");
+		this.testAggregatorDefinitionSuccess(configProperty);
+	}
 	@Test
 	public void testRefAggregatorDefinitionSuccess(){
 		String configProperty = testConfigurations.getProperty("aggregator-ref-success");
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties
index 56a1aade99..771f61bc04 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties
@@ -14,6 +14,50 @@ splitter-inner-success=\
 		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestSplitter" /> \
 	</splitter>  \
 </beans:beans> 
+splitter-inner-success-with-poller=\
+<?xml version="1.0" encoding="UTF-8"?> \
+<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" \
+	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"> \
+	<channel id="inChannel"> \
+		<queue capacity="2" /> \
+	</channel> \
+	<channel id="outChannel"> \
+		<queue capacity="2" /> \
+	</channel> \
+	<splitter id="testSplitter" input-channel="inChannel" output-channel="outChannel"> \
+		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestSplitter" /> \
+		<poller task-executor="executor" max-messages-per-poll="5"> \
+            <interval-trigger interval="20" /> \
+        </poller> \
+	</splitter>  \
+	<thread-pool-task-executor id="executor" core-size="5" /> \
+</beans:beans> 
+splitter-inner-success-with-poller-reversed-order=\
+<?xml version="1.0" encoding="UTF-8"?> \
+<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" \
+	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"> \
+	<channel id="inChannel"> \
+		<queue capacity="2" /> \
+	</channel> \
+	<channel id="outChannel"> \
+		<queue capacity="2" /> \
+	</channel> \
+	<splitter id="testSplitter" input-channel="inChannel" output-channel="outChannel"> \
+		<poller task-executor="executor" max-messages-per-poll="5"> \
+            <interval-trigger interval="20" /> \
+        </poller> \
+        <beans:bean class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestSplitter" /> \
+	</splitter>  \
+	<thread-pool-task-executor id="executor" core-size="5" /> \
+</beans:beans> 
 splitter-ref-success=\
 <?xml version="1.0" encoding="UTF-8"?> \
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \