diff --git a/packages/chat_repository_interface/lib/chat_repository_interface.dart b/packages/chat_repository_interface/lib/chat_repository_interface.dart
index 5aab41d..c7e5f0b 100644
--- a/packages/chat_repository_interface/lib/chat_repository_interface.dart
+++ b/packages/chat_repository_interface/lib/chat_repository_interface.dart
@@ -2,9 +2,11 @@
 export "src/exceptions/chat.dart";
 // Interfaces
 export "src/interfaces/chat_repostory_interface.dart";
+export "src/interfaces/pending_message_repository_interface.dart";
 export "src/interfaces/user_repository_interface.dart";
 // Local implementations
 export "src/local/local_chat_repository.dart";
+export "src/local/local_pending_message_repository.dart";
 export "src/local/local_user_repository.dart";
 // Models
 export "src/models/chat_model.dart";
diff --git a/packages/chat_repository_interface/lib/src/local/local_pending_message_repository.dart.dart b/packages/chat_repository_interface/lib/src/local/local_pending_message_repository.dart
similarity index 96%
rename from packages/chat_repository_interface/lib/src/local/local_pending_message_repository.dart.dart
rename to packages/chat_repository_interface/lib/src/local/local_pending_message_repository.dart
index 5f843f4..9a8dd91 100644
--- a/packages/chat_repository_interface/lib/src/local/local_pending_message_repository.dart.dart
+++ b/packages/chat_repository_interface/lib/src/local/local_pending_message_repository.dart
@@ -2,7 +2,6 @@ import "dart:async";
 import "dart:math" as math;
 
 import "package:chat_repository_interface/chat_repository_interface.dart";
-import "package:chat_repository_interface/src/interfaces/pending_message_repository_interface.dart";
 import "package:chat_repository_interface/src/local/local_memory_db.dart";
 import "package:collection/collection.dart";
 import "package:rxdart/rxdart.dart";
diff --git a/packages/chat_repository_interface/lib/src/services/chat_service.dart b/packages/chat_repository_interface/lib/src/services/chat_service.dart
index 1112388..0ff32db 100644
--- a/packages/chat_repository_interface/lib/src/services/chat_service.dart
+++ b/packages/chat_repository_interface/lib/src/services/chat_service.dart
@@ -5,7 +5,7 @@ import "package:chat_repository_interface/src/interfaces/chat_repostory_interfac
 import "package:chat_repository_interface/src/interfaces/pending_message_repository_interface.dart";
 import "package:chat_repository_interface/src/interfaces/user_repository_interface.dart";
 import "package:chat_repository_interface/src/local/local_chat_repository.dart";
-import "package:chat_repository_interface/src/local/local_pending_message_repository.dart.dart";
+import "package:chat_repository_interface/src/local/local_pending_message_repository.dart";
 import "package:chat_repository_interface/src/local/local_user_repository.dart";
 import "package:chat_repository_interface/src/models/chat_model.dart";
 import "package:chat_repository_interface/src/models/message_model.dart";