diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java
index f785945b57..fd6c2bb702 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java
@@ -32,6 +32,7 @@ import org.springframework.integration.endpoint.AbstractEndpoint;
 import org.springframework.integration.endpoint.EventDrivenConsumer;
 import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.message.MessageHandler;
+import org.springframework.integration.scheduling.PollerMetadata;
 import org.springframework.util.Assert;
 
 /**
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java
index 4114a54e7b..06c4517054 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java
@@ -27,6 +27,7 @@ import org.springframework.integration.context.IntegrationContextUtils;
 import org.springframework.integration.core.MessageChannel;
 import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
 import org.springframework.integration.message.MessageSource;
+import org.springframework.integration.scheduling.PollerMetadata;
 import org.springframework.util.Assert;
 
 /**
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java
index fb680a8cff..2587686a57 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceUtils.java
@@ -154,7 +154,8 @@ public abstract class IntegrationNamespaceUtils {
 		else {
 			ParserContext childContext = new ParserContext(
 					parserContext.getReaderContext(), parserContext.getDelegate(), targetBuilder.getBeanDefinition());
-			BeanDefinition beanDefinition = new PollerParser().parse(pollerElement, childContext);
+			BeanDefinition beanDefinition = parserContext.getReaderContext().getNamespaceHandlerResolver().resolve(
+					pollerElement.getNamespaceURI()).parse(pollerElement, childContext);
 			Assert.notNull(beanDefinition, "BeanDefinition must not be null");
 			Assert.isInstanceOf(AbstractBeanDefinition.class, beanDefinition);
 			pollerMetadataRef = BeanDefinitionReaderUtils.registerWithGeneratedName(
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/PollerParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/PollerParser.java
index bd7bb69892..97f8ff09b2 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/PollerParser.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/PollerParser.java
@@ -26,10 +26,10 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
 import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.integration.config.PollerMetadata;
 import org.springframework.integration.context.IntegrationContextUtils;
 import org.springframework.integration.scheduling.CronTrigger;
 import org.springframework.integration.scheduling.IntervalTrigger;
+import org.springframework.integration.scheduling.PollerMetadata;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 import org.springframework.util.Assert;
 import org.springframework.util.xml.DomUtils;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/context/IntegrationContextUtils.java b/org.springframework.integration/src/main/java/org/springframework/integration/context/IntegrationContextUtils.java
index f54534ffb6..15860ab5dd 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/context/IntegrationContextUtils.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/context/IntegrationContextUtils.java
@@ -19,8 +19,8 @@ package org.springframework.integration.context;
 import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy;
 
 import org.springframework.beans.factory.BeanFactory;
-import org.springframework.integration.config.PollerMetadata;
 import org.springframework.integration.core.MessageChannel;
+import org.springframework.integration.scheduling.PollerMetadata;
 import org.springframework.integration.scheduling.TaskScheduler;
 import org.springframework.scheduling.concurrent.CustomizableThreadFactory;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/PollerMetadata.java b/org.springframework.integration/src/main/java/org/springframework/integration/scheduling/PollerMetadata.java
similarity index 95%
rename from org.springframework.integration/src/main/java/org/springframework/integration/config/PollerMetadata.java
rename to org.springframework.integration/src/main/java/org/springframework/integration/scheduling/PollerMetadata.java
index f0150dca6a..97b8670c80 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/config/PollerMetadata.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/scheduling/PollerMetadata.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.integration.config;
+package org.springframework.integration.scheduling;
 
 import org.springframework.core.task.TaskExecutor;
-import org.springframework.integration.scheduling.Trigger;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionDefinition;