diff --git a/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs b/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs
index 692d121eb3..a43d893307 100644
--- a/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs
+++ b/src/Microsoft.AspNet.Server.WebListener/MessagePump.cs
@@ -19,12 +19,13 @@ using System;
 using System.Diagnostics.Contracts;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNet.FeatureModel;
 using Microsoft.Framework.Logging;
 using Microsoft.Net.Http.Server;
 
 namespace Microsoft.AspNet.Server.WebListener
 {
-    using AppFunc = Func<object, Task>;
+    using AppFunc = Func<IFeatureCollection, Task>;
 
     internal class MessagePump : IDisposable
     {
diff --git a/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs b/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs
index f2eab5f7bc..0ee2f188c9 100644
--- a/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs
+++ b/src/Microsoft.AspNet.Server.WebListener/ServerFactory.cs
@@ -35,11 +35,10 @@
 // limitations under the License.
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNet.FeatureModel;
 using Microsoft.AspNet.Hosting.Server;
 using Microsoft.Framework.ConfigurationModel;
 using Microsoft.Framework.Logging;
@@ -47,7 +46,7 @@ using Microsoft.Net.Http.Server;
 
 namespace Microsoft.AspNet.Server.WebListener
 {
-    using AppFunc = Func<object, Task>;
+    using AppFunc = Func<IFeatureCollection, Task>;
 
     /// <summary>
     /// Implements the setup process for this server.