diff --git a/src/server/index.ts b/src/server/index.ts
index e5e2388..3912a64 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -1,5 +1,4 @@
 import * as grpc from '@grpc/grpc-js';
-import { sendUnaryData } from '@grpc/grpc-js/build/src/server-call';
 import { Empty } from 'google-protobuf/google/protobuf/empty_pb';
 import { Song, Comment } from '../proto/songs_pb';
 import { ISongsServer, SongsService } from '../proto/songs_grpc_pb';
@@ -8,19 +7,19 @@ import addSong from './add-song';
 import getChat from './get-chat';
 import { addComment, registerListener } from './live-chat';
 
-class SongsServer implements ISongsServer {
-    getSong(call: grpc.ServerUnaryCall<Empty, Song>, callback: sendUnaryData<Song>): void {
+const createSongsServer = (): ISongsServer => ({
+    getSong(_call, callback): void {
         console.log(`${new Date().toISOString()}    getSong`);
         callback(null, getSong());
-    }
-    addSongs(call: grpc.ServerReadableStream<Song, Empty>, callback: sendUnaryData<Empty>): void {
+    },
+    addSongs(call, callback): void {
         console.log(`${new Date().toISOString()}    addSongs`);
         call.on('data', (song: Song) => {
             addSong(song);
         });
         call.on('end', () => callback(null, new Empty()));
-    }
-    async getChat(call: grpc.ServerWritableStream<Song, Comment>): Promise<void> {
+    },
+    async getChat(call): Promise<void> {
         console.log(`${new Date().toISOString()}    getChat`);
         const song = call.request as Song;
         const comments = await getChat(song.getId());
@@ -28,8 +27,8 @@ class SongsServer implements ISongsServer {
             call.write(comment);
         }
         call.end();
-    }
-    liveChat(call: grpc.ServerDuplexStream<Comment, Comment>): void {
+    },
+    liveChat(call): void {
         console.log(`${new Date().toISOString()}    liveChat`);
         registerListener((comment) => call.write(comment));
         call.on('data', (comment: Comment) => {
@@ -37,12 +36,12 @@ class SongsServer implements ISongsServer {
         });
         call.on('end', () => call.end());
     }
-}
+});
 
 function serve(): void {
     const server = new grpc.Server();
     // @ts-ignore
-    server.addService(SongsService, new SongsServer());
+    server.addService(SongsService, createSongsServer());
     server.bindAsync(`localhost:${process.env.PORT}`, grpc.ServerCredentials.createInsecure(), (err, port) => {
         if (err) {
             throw err;