diff --git a/function-samples/http-click-ingest/src/main/java/org/springframework/cloud/dataflow/samples/source/HttpIngest.java b/function-samples/http-click-ingest/src/main/java/org/springframework/cloud/dataflow/samples/source/HttpClickIngest.java
similarity index 59%
rename from function-samples/http-click-ingest/src/main/java/org/springframework/cloud/dataflow/samples/source/HttpIngest.java
rename to function-samples/http-click-ingest/src/main/java/org/springframework/cloud/dataflow/samples/source/HttpClickIngest.java
index 3124ad4..5034a26 100644
--- a/function-samples/http-click-ingest/src/main/java/org/springframework/cloud/dataflow/samples/source/HttpIngest.java
+++ b/function-samples/http-click-ingest/src/main/java/org/springframework/cloud/dataflow/samples/source/HttpClickIngest.java
@@ -22,35 +22,35 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
+import org.springframework.integration.support.MutableMessage;
 import org.springframework.messaging.Message;
-import org.springframework.messaging.MessageHeaders;
-import org.springframework.messaging.support.MessageBuilder;
 
 @SpringBootApplication
 @Import({ org.springframework.cloud.fn.supplier.http.HttpSupplierConfiguration.class })
-public class HttpIngest {
+public class HttpClickIngest {
 
 	@Bean
-	public Function<Message<?>, Message<?>> byteArrayToLong() {
+	public Function<Message<?>, Message<UserClicks>> toUserClicks() {
 		return message -> {
-			if (message.getPayload() instanceof byte[]) {
-				MessageHeaders headers = message.getHeaders();
-				String contentType = headers.containsKey("contentType") ?
-						headers.get("contentType").toString() :
-						"application/json";
-				if (contentType.contains("text") || contentType.contains("json") || contentType
-						.contains("x-spring-tuple")) {
-					message = MessageBuilder
-							.withPayload(Long.valueOf(new String((byte[]) ((byte[]) message.getPayload()))))
-							.copyHeaders(message.getHeaders()).build();
-				}
-			}
-
-			return message;
+			return new MutableMessage<>(new UserClicks(
+					(String) message.getHeaders().get("kafka_receivedMessageKey"),
+					Long.valueOf(new String((byte[])message.getPayload()))));
 		};
 	}
 
+	public class UserClicks {
+
+		private String username;
+
+		private Long clicks;
+
+		public UserClicks(String username, Long clicks) {
+			this.username = username;
+			this.clicks = clicks;
+		}
+	}
+
 	public static void main(String[] args) {
-		SpringApplication.run(HttpIngest.class, args);
+		SpringApplication.run(HttpClickIngest.class, args);
 	}
 }
diff --git a/function-samples/http-region-ingest/src/main/java/org/springframework/cloud/dataflow/samples/source/HttpIngest.java b/function-samples/http-region-ingest/src/main/java/org/springframework/cloud/dataflow/samples/source/HttpRegionIngest.java
similarity index 92%
rename from function-samples/http-region-ingest/src/main/java/org/springframework/cloud/dataflow/samples/source/HttpIngest.java
rename to function-samples/http-region-ingest/src/main/java/org/springframework/cloud/dataflow/samples/source/HttpRegionIngest.java
index 44a22a6..63188e9 100644
--- a/function-samples/http-region-ingest/src/main/java/org/springframework/cloud/dataflow/samples/source/HttpIngest.java
+++ b/function-samples/http-region-ingest/src/main/java/org/springframework/cloud/dataflow/samples/source/HttpRegionIngest.java
@@ -28,7 +28,7 @@ import org.springframework.messaging.support.MessageBuilder;
 
 @SpringBootApplication
 @Import({ org.springframework.cloud.fn.supplier.http.HttpSupplierConfiguration.class })
-public class HttpIngest {
+public class HttpRegionIngest {
 
 	@Bean
 	public Function<Message<?>, Message<?>> byteArrayToString() {
@@ -41,7 +41,7 @@ public class HttpIngest {
 				if (contentType.contains("text") || contentType.contains("json") || contentType
 						.contains("x-spring-tuple")) {
 					message = MessageBuilder
-							.withPayload(new String((byte[]) ((byte[]) message.getPayload())))
+							.withPayload(new String((byte[]) (message.getPayload())))
 							.copyHeaders(message.getHeaders()).build();
 				}
 			}
@@ -51,6 +51,6 @@ public class HttpIngest {
 	}
 
 	public static void main(String[] args) {
-		SpringApplication.run(HttpIngest.class, args);
+		SpringApplication.run(HttpRegionIngest.class, args);
 	}
 }
diff --git a/function-samples/uppercase-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/function-samples/uppercase-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
index cab2cd1..0e7811b 100644
--- a/function-samples/uppercase-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
+++ b/function-samples/uppercase-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties
@@ -1,4 +1,3 @@
 configuration-properties.classes=org.springframework.cloud.fn.supplier.http.HttpSupplierProperties,\
   org.springframework.cloud.fn.supplier.http.HttpSupplierProperties$Cors
 configuration-properties.names=server.port
-configuration-properties.outbound-ports=clicks