diff --git a/types/matrix-appservice-bridge/index.d.ts b/types/matrix-appservice-bridge/index.d.ts
index 6c41bd4d7a..339e21ab91 100644
--- a/types/matrix-appservice-bridge/index.d.ts
+++ b/types/matrix-appservice-bridge/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for matrix-appservice-bridge 1.11
 // Project: https://github.com/matrix-org/matrix-appservice-bridge
 // Definitions by: Huan LI (李卓桓) <https://github.com/huan>
+//                 Brendan Early <https://github.com/mymindstorm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 3.1
 
@@ -11,7 +12,15 @@ import {
     MembershipType,
 } from 'matrix-js-sdk';
 
-export type Controller = any;
+export interface Controller {
+    onEvent: (request: Request, context: BridgeContext) => void;
+    onUserQuery?: (matrixUser: MatrixUser) => ProvisionedUser | Promise<ProvisionedUser>;
+    onAliasQuery?: (alias: string, aliasLocalpart: string) => ProvisionedRoom | Promise<ProvisionedRoom>;
+    onAliasQueried?: (alias: string, aliasLocalpart: string) => void;
+    onLog?: (line: string, isError: boolean) => void;
+    thirdPartyLookup?: any;
+    onRoomUpgrade?: (oldRoomId: string, newRoomId: string, newVersion: string, context: BridgeContext) => void;
+}
 
 export namespace AppServiceRegistration {
     function generateToken(): string;
@@ -25,7 +34,7 @@ export interface BridgeOptions {
     controller: Controller;
     domain: string;
     homeserverUrl: string;
-    registration: AppServiceRegistration;
+    registration: AppServiceRegistration | string;
     suppressEcho?: boolean;     // True to stop receiving onEvent callbacks for events which were sent by a bridge user. Default: true.
 }
 
@@ -38,7 +47,7 @@ export interface CliOptions {
     enableRegistration?: boolean;
     enableLocalpart?: boolean;
     generateRegistration: (reg: any, callback: (r: any) => void) => void;
-    port: number;
+    port?: number;
     registrationPath?: string;
     run: (port: number, config: any) => void;
 }
@@ -382,6 +391,7 @@ export interface EventContent {
     reason?: string;
     topic?: string;
     url?: string;
+    [key: string]: any;
     // m.relates_to? : unknown
 }
 
diff --git a/types/matrix-appservice-bridge/matrix-appservice-bridge-tests.ts b/types/matrix-appservice-bridge/matrix-appservice-bridge-tests.ts
index 071d95aef2..e30f7973d3 100644
--- a/types/matrix-appservice-bridge/matrix-appservice-bridge-tests.ts
+++ b/types/matrix-appservice-bridge/matrix-appservice-bridge-tests.ts
@@ -2,7 +2,7 @@
  * Generate from https://github.com/wechaty/matrix-appservice-wechaty/blob/master/src/cli/create-cli.ts
  */
 import {
-  Cli,
+  Cli, Bridge,
 } from 'matrix-appservice-bridge';
 
 const port             = 8788;
@@ -29,4 +29,13 @@ const cli = new Cli({
     run,
 });
 
+const bridge = new Bridge({
+    homeserverUrl: "xxx",
+    domain: "xxx",
+    controller: {
+        onEvent: async (req, ctx) => { }
+    },
+    registration: "xxx"
+});
+
 cli.run();