diff --git a/example/lib/pages/room.dart b/example/lib/pages/room.dart
index 76376d9..b1616e8 100644
--- a/example/lib/pages/room.dart
+++ b/example/lib/pages/room.dart
@@ -25,7 +25,7 @@ class RoomPage extends StatefulWidget {
 class _RoomPageState extends State<RoomPage> {
   //
   List<Participant> participants = [];
-  late final _listener = EventsListener<LiveKitEvent>(widget.room.events);
+  late final _listener = EventsListener<RoomEvent>(widget.room.events);
 
   @override
   void initState() {
diff --git a/lib/src/room.dart b/lib/src/room.dart
index 59abc16..5a0852e 100644
--- a/lib/src/room.dart
+++ b/lib/src/room.dart
@@ -1,8 +1,6 @@
 import 'dart:async';
 import 'dart:collection';
 
-import 'package:flutter/foundation.dart';
-
 import 'classes/change_notifier.dart';
 import 'constants.dart';
 import 'errors.dart';
@@ -63,7 +61,7 @@ class Room extends LKChangeNotifier {
 
   // suppport for multiple event listeners
   final events = EventsEmitter<RoomEvent>();
-  late final _engineListener = EventsListener<LiveKitEvent>(engine.events);
+  late final _engineListener = EventsListener<EngineEvent>(engine.events);
 
   /// internal use
   /// {@nodoc}
diff --git a/lib/src/rtc_engine.dart b/lib/src/rtc_engine.dart
index 7626c9d..53adb1a 100644
--- a/lib/src/rtc_engine.dart
+++ b/lib/src/rtc_engine.dart
@@ -56,7 +56,7 @@ class RTCEngine {
   int _reconnectAttempts = 0;
 
   final events = EventsEmitter<EngineEvent>();
-  late final _signalListener = EventsListener(signalClient.events, synchronized: true);
+  late final _signalListener = EventsListener<SignalEvent>(signalClient.events, synchronized: true);
 
   final delays = CancelableDelayManager();
 
diff --git a/lib/src/signal_client.dart b/lib/src/signal_client.dart
index bb2a27d..8051d13 100644
--- a/lib/src/signal_client.dart
+++ b/lib/src/signal_client.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
 import 'package:http/http.dart' as http;
 
diff --git a/lib/src/track/local_track_publication.dart b/lib/src/track/local_track_publication.dart
index fc2fb6f..629f5a6 100644
--- a/lib/src/track/local_track_publication.dart
+++ b/lib/src/track/local_track_publication.dart
@@ -1,7 +1,6 @@
 import '../events.dart';
 import '../extensions.dart';
 import '../logger.dart';
-import '../managers/event.dart';
 import '../participant/local_participant.dart';
 import '../proto/livekit_models.pb.dart' as lk_models;
 import 'track.dart';