diff --git a/aws-serverless-express/aws-serverless-express-tests.ts b/aws-serverless-express/aws-serverless-express-tests.ts
index c46056ed25..97d236e043 100644
--- a/aws-serverless-express/aws-serverless-express-tests.ts
+++ b/aws-serverless-express/aws-serverless-express-tests.ts
@@ -1,9 +1,10 @@
-/// <reference types="express"/>
-
 import * as awsServerlessExpress from 'aws-serverless-express';
 import * as express from 'express';
+import { eventContext } from 'aws-serverless-express/middleware';
 
 const app = express();
+app.use(eventContext());
+
 const server = awsServerlessExpress.createServer(app, () => {});
 
 const mockEvent = {
diff --git a/aws-serverless-express/index.d.ts b/aws-serverless-express/index.d.ts
index e4601e6ccd..db49e6ca6b 100644
--- a/aws-serverless-express/index.d.ts
+++ b/aws-serverless-express/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for aws-serverless-express
+// Type definitions for aws-serverless-express 2.1
 // Project: https://github.com/awslabs/aws-serverless-express
-// Definitions by: Ben Speakman <https://github.com/threesquared>
+// Definitions by: Ben Speakman <https://github.com/threesquared>, Josh Caffey <https://github.com/jcaffey>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node"/>
@@ -16,4 +16,4 @@ export function proxy(
     server: http.Server,
     event: any,
     context: lambda.Context
-): void;
\ No newline at end of file
+): void;
diff --git a/aws-serverless-express/middleware.d.ts b/aws-serverless-express/middleware.d.ts
new file mode 100644
index 0000000000..ff33b4c6ea
--- /dev/null
+++ b/aws-serverless-express/middleware.d.ts
@@ -0,0 +1,8 @@
+import { RequestHandler } from 'express';
+
+export interface Options {
+    reqPropKey?: string;
+    deleteHeaders?: boolean;
+}
+
+export function eventContext(options?: Options): RequestHandler;
diff --git a/aws-serverless-express/tsconfig.json b/aws-serverless-express/tsconfig.json
index a62cead1a1..62885fcda3 100644
--- a/aws-serverless-express/tsconfig.json
+++ b/aws-serverless-express/tsconfig.json
@@ -17,6 +17,7 @@
     },
     "files": [
         "index.d.ts",
+        "middleware.d.ts",
         "aws-serverless-express-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/aws-serverless-express/tslint.json b/aws-serverless-express/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/aws-serverless-express/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }