diff --git a/packages/grpc-js/src/index.ts b/packages/grpc-js/src/index.ts
index 614ca6c7..b9406fdb 100644
--- a/packages/grpc-js/src/index.ts
+++ b/packages/grpc-js/src/index.ts
@@ -36,6 +36,7 @@ import {
   loadPackageDefinition,
   makeClientConstructor,
   Serialize,
+  ServiceDefinition
 } from './make-client';
 import { Metadata } from './metadata';
 import {
@@ -46,6 +47,9 @@ import {
 import { KeyCertPair, ServerCredentials } from './server-credentials';
 import { StatusBuilder } from './status-builder';
 import {
+  handleBidiStreamingCall,
+  handleServerStreamingCall,
+  handleUnaryCall,
   ServerUnaryCall,
   ServerReadableStream,
   ServerWritableStream,
@@ -227,10 +231,19 @@ export {
   ServerReadableStream,
   ServerWritableStream,
   ServerDuplexStream,
+  ServiceDefinition,
   UntypedHandleCall,
   UntypedServiceImplementation,
 };
 
+/**** Server ****/
+
+export {
+  handleBidiStreamingCall,
+  handleServerStreamingCall,
+  handleUnaryCall,
+};
+
 /* tslint:disable:no-any */
 export type Call =
   | ClientUnaryCall
diff --git a/packages/grpc-js/src/make-client.ts b/packages/grpc-js/src/make-client.ts
index f30710e6..fc44c674 100644
--- a/packages/grpc-js/src/make-client.ts
+++ b/packages/grpc-js/src/make-client.ts
@@ -39,7 +39,7 @@ export interface MethodDefinition<RequestType, ResponseType> {
 }
 
 export interface ServiceDefinition {
-  [index: string]: MethodDefinition<object, object>;
+  [index: string]: MethodDefinition<any, any>;
 }
 
 export interface ProtobufTypeDefinition {