diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/SimpleWebServiceOutboundGateway.java b/spring-integration-ws/src/main/java/org/springframework/integration/ws/SimpleWebServiceOutboundGateway.java
index 2ccd6f0844..958aa7c336 100644
--- a/spring-integration-ws/src/main/java/org/springframework/integration/ws/SimpleWebServiceOutboundGateway.java
+++ b/spring-integration-ws/src/main/java/org/springframework/integration/ws/SimpleWebServiceOutboundGateway.java
@@ -38,21 +38,22 @@ import org.springframework.xml.transform.TransformerObjectSupport;
  * An outbound Messaging Gateway for invoking a Web Service.
  * 
  * @author Mark Fisher
+ * @author Oleg Zhurakousky
  */
 public class SimpleWebServiceOutboundGateway extends AbstractWebServiceOutboundGateway {
 
-	private final SourceExtractor sourceExtractor;
+	private final SourceExtractor<?> sourceExtractor;
 
 
 	public SimpleWebServiceOutboundGateway(DestinationProvider destinationProvider) {
 		this(destinationProvider, null, null);
 	}
 
-	public SimpleWebServiceOutboundGateway(DestinationProvider destinationProvider, SourceExtractor sourceExtractor) {
+	public SimpleWebServiceOutboundGateway(DestinationProvider destinationProvider, SourceExtractor<?> sourceExtractor) {
 		this(destinationProvider, sourceExtractor, (WebServiceMessageFactory) null);
 	}
 
-	public SimpleWebServiceOutboundGateway(DestinationProvider destinationProvider, SourceExtractor sourceExtractor, WebServiceMessageFactory messageFactory) {
+	public SimpleWebServiceOutboundGateway(DestinationProvider destinationProvider, SourceExtractor<?> sourceExtractor, WebServiceMessageFactory messageFactory) {
 		super(destinationProvider, messageFactory);
 		this.sourceExtractor = (sourceExtractor != null) ? sourceExtractor : new DefaultSourceExtractor();
 	}
@@ -83,11 +84,11 @@ public class SimpleWebServiceOutboundGateway extends AbstractWebServiceOutboundG
 	}
 
 
-	private static class DefaultSourceExtractor extends TransformerObjectSupport implements SourceExtractor {
+	private static class DefaultSourceExtractor extends TransformerObjectSupport implements SourceExtractor<DOMSource> {
 
-		public Object extractData(Source source) throws IOException, TransformerException {
+		public DOMSource extractData(Source source) throws IOException, TransformerException {
 			if (source instanceof DOMSource) {
-				return source;
+				return (DOMSource)source;
 			}
 			DOMResult result = new DOMResult();
 			this.transform(source, result);
diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/StubSourceExtractor.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/StubSourceExtractor.java
index ea616d20a8..f847c2b528 100644
--- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/StubSourceExtractor.java
+++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/StubSourceExtractor.java
@@ -26,7 +26,7 @@ import org.springframework.ws.client.core.SourceExtractor;
 /**
  * @author Mark Fisher
  */
-public class StubSourceExtractor implements SourceExtractor {
+public class StubSourceExtractor implements SourceExtractor<Object> {
 
 	public Object extractData(Source source) throws IOException, TransformerException {
 		return "test";
diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java
index d6bbfb70fd..1dc24215b7 100644
--- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java
+++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java
@@ -102,7 +102,7 @@ public class WebServiceOutboundGatewayParserTests {
 		Object gateway = new DirectFieldAccessor(endpoint).getPropertyValue("handler");
 		assertEquals(SimpleWebServiceOutboundGateway.class, gateway.getClass());
 		DirectFieldAccessor accessor = new DirectFieldAccessor(gateway);
-		SourceExtractor sourceExtractor = (SourceExtractor) context.getBean("sourceExtractor");
+		SourceExtractor<?> sourceExtractor = (SourceExtractor<?>) context.getBean("sourceExtractor");
 		assertEquals(sourceExtractor, accessor.getPropertyValue("sourceExtractor"));
 	}
 
@@ -138,7 +138,7 @@ public class WebServiceOutboundGatewayParserTests {
 		ApplicationContext context = new ClassPathXmlApplicationContext(
 				"simpleWebServiceOutboundGatewayParserTests.xml", this.getClass());
 		AbstractEndpoint endpoint = (AbstractEndpoint) context.getBean("gatewayWithCustomSourceExtractorAndMessageFactory");
-		SourceExtractor sourceExtractor = (SourceExtractor) context.getBean("sourceExtractor");
+		SourceExtractor<?> sourceExtractor = (SourceExtractor<?>) context.getBean("sourceExtractor");
 		assertEquals(EventDrivenConsumer.class, endpoint.getClass());
 		Object gateway = new DirectFieldAccessor(endpoint).getPropertyValue("handler");
 		assertEquals(SimpleWebServiceOutboundGateway.class, gateway.getClass());