diff --git a/packages/flutter_community_chat/pubspec.lock b/packages/flutter_community_chat/pubspec.lock
index f46ec76..efcbe8d 100644
--- a/packages/flutter_community_chat/pubspec.lock
+++ b/packages/flutter_community_chat/pubspec.lock
@@ -179,7 +179,7 @@ packages:
     description:
       path: "packages/flutter_community_chat_interface"
       ref: HEAD
-      resolved-ref: "3793e853721291dc50655ca4ee7999508fe9e2fe"
+      resolved-ref: "5c4556f800e2b9806605f9e934dc4a5e471214d6"
       url: "https://github.com/Iconica-Development/flutter_community_chat.git"
     source: git
     version: "0.0.1"
@@ -188,7 +188,7 @@ packages:
     description:
       path: "packages/flutter_community_chat_view"
       ref: HEAD
-      resolved-ref: "3793e853721291dc50655ca4ee7999508fe9e2fe"
+      resolved-ref: "5c4556f800e2b9806605f9e934dc4a5e471214d6"
       url: "https://github.com/Iconica-Development/flutter_community_chat.git"
     source: git
     version: "0.0.1"
@@ -445,14 +445,14 @@ packages:
       name: pub_semver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   rxdart:
     dependency: transitive
     description:
       name: rxdart
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.27.5"
+    version: "0.27.7"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -541,7 +541,7 @@ packages:
       name: uuid
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.6"
+    version: "3.0.7"
   vector_math:
     dependency: transitive
     description:
diff --git a/packages/flutter_community_chat_firebase/lib/config/firebase_chat_options.dart b/packages/flutter_community_chat_firebase/lib/config/firebase_chat_options.dart
index 688491f..7374d4a 100644
--- a/packages/flutter_community_chat_firebase/lib/config/firebase_chat_options.dart
+++ b/packages/flutter_community_chat_firebase/lib/config/firebase_chat_options.dart
@@ -2,8 +2,8 @@
 //
 // SPDX-License-Identifier: BSD-3-Clause
 
-class FirebaseChatOptoons {
-  const FirebaseChatOptoons({
+class FirebaseChatOptions {
+  const FirebaseChatOptions({
     this.chatsCollectionName = 'chats',
     this.messagesCollectionName = 'messages',
     this.usersCollectionName = 'users',
diff --git a/packages/flutter_community_chat_firebase/lib/flutter_community_chat_firebase.dart b/packages/flutter_community_chat_firebase/lib/flutter_community_chat_firebase.dart
index 5682e30..8613bd6 100644
--- a/packages/flutter_community_chat_firebase/lib/flutter_community_chat_firebase.dart
+++ b/packages/flutter_community_chat_firebase/lib/flutter_community_chat_firebase.dart
@@ -20,10 +20,10 @@ class FirebaseCommunityChatDataProvider extends CommunityChatInterface {
   late final FirebaseUserService _userService;
   late final FirebaseMessageService _messageService;
   late final FirebaseChatService _chatService;
-  final FirebaseChatOptoons firebaseChatOptoons;
+  final FirebaseChatOptions firebaseChatOptions;
 
   FirebaseCommunityChatDataProvider({
-    this.firebaseChatOptoons = const FirebaseChatOptoons(),
+    this.firebaseChatOptions = const FirebaseChatOptions(),
     FirebaseApp? app,
   }) {
     var appInstance = app ?? Firebase.app();
@@ -35,13 +35,13 @@ class FirebaseCommunityChatDataProvider extends CommunityChatInterface {
     _userService = FirebaseUserService(
       db: db,
       auth: auth,
-      options: firebaseChatOptoons,
+      options: firebaseChatOptions,
     );
 
     _chatService = FirebaseChatService(
       db: db,
       userService: _userService,
-      options: firebaseChatOptoons,
+      options: firebaseChatOptions,
     );
 
     _messageService = FirebaseMessageService(
@@ -49,7 +49,7 @@ class FirebaseCommunityChatDataProvider extends CommunityChatInterface {
       storage: storage,
       userService: _userService,
       chatService: _chatService,
-      options: firebaseChatOptoons,
+      options: firebaseChatOptions,
     );
   }
 
diff --git a/packages/flutter_community_chat_firebase/lib/service/firebase_chat_service.dart b/packages/flutter_community_chat_firebase/lib/service/firebase_chat_service.dart
index c6e514b..867dd24 100644
--- a/packages/flutter_community_chat_firebase/lib/service/firebase_chat_service.dart
+++ b/packages/flutter_community_chat_firebase/lib/service/firebase_chat_service.dart
@@ -3,12 +3,10 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 import 'dart:async';
-
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:flutter_community_chat_firebase/config/firebase_chat_options.dart';
 import 'package:flutter_community_chat_firebase/dto/firebase_chat_document.dart';
 import 'package:flutter_community_chat_interface/flutter_community_chat_interface.dart';
-
 import 'firebase_user_service.dart';
 
 class FirebaseChatService {
@@ -20,7 +18,7 @@ class FirebaseChatService {
 
   FirebaseFirestore db;
   FirebaseUserService userService;
-  FirebaseChatOptoons options;
+  FirebaseChatOptions options;
 
   StreamSubscription<QuerySnapshot> _addChatSubscription(
     List<String> chatIds,
diff --git a/packages/flutter_community_chat_firebase/lib/service/firebase_message_service.dart b/packages/flutter_community_chat_firebase/lib/service/firebase_message_service.dart
index e4b8c3c..cce14dc 100644
--- a/packages/flutter_community_chat_firebase/lib/service/firebase_message_service.dart
+++ b/packages/flutter_community_chat_firebase/lib/service/firebase_message_service.dart
@@ -27,7 +27,7 @@ class FirebaseMessageService {
   final FirebaseStorage storage;
   final FirebaseUserService userService;
   final FirebaseChatService chatService;
-  FirebaseChatOptoons options;
+  FirebaseChatOptions options;
   late StreamController<List<ChatMessageModel>> _controller;
   StreamSubscription<QuerySnapshot>? _subscription;
   ChatModel? _chat;
diff --git a/packages/flutter_community_chat_firebase/lib/service/firebase_user_service.dart b/packages/flutter_community_chat_firebase/lib/service/firebase_user_service.dart
index d23faae..29c827a 100644
--- a/packages/flutter_community_chat_firebase/lib/service/firebase_user_service.dart
+++ b/packages/flutter_community_chat_firebase/lib/service/firebase_user_service.dart
@@ -17,7 +17,7 @@ class FirebaseUserService {
 
   FirebaseFirestore db;
   FirebaseAuth auth;
-  FirebaseChatOptoons options;
+  FirebaseChatOptions options;
   ChatUserModel? _currentUser;
   final Map<String, ChatUserModel> _users = {};
 
diff --git a/packages/flutter_community_chat_firebase/pubspec.lock b/packages/flutter_community_chat_firebase/pubspec.lock
index 9fb24bc..a6c3c0d 100644
--- a/packages/flutter_community_chat_firebase/pubspec.lock
+++ b/packages/flutter_community_chat_firebase/pubspec.lock
@@ -228,7 +228,7 @@ packages:
     description:
       path: "packages/flutter_community_chat_interface"
       ref: HEAD
-      resolved-ref: "3793e853721291dc50655ca4ee7999508fe9e2fe"
+      resolved-ref: "5c4556f800e2b9806605f9e934dc4a5e471214d6"
       url: "https://github.com/Iconica-Development/flutter_community_chat.git"
     source: git
     version: "0.0.1"
@@ -362,7 +362,7 @@ packages:
       name: pub_semver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -430,7 +430,7 @@ packages:
       name: uuid
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.6"
+    version: "3.0.7"
   vector_math:
     dependency: transitive
     description:
diff --git a/packages/flutter_community_chat_interface/pubspec.lock b/packages/flutter_community_chat_interface/pubspec.lock
index 9c167b1..c177e0c 100644
--- a/packages/flutter_community_chat_interface/pubspec.lock
+++ b/packages/flutter_community_chat_interface/pubspec.lock
@@ -203,7 +203,7 @@ packages:
       name: pub_semver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   sky_engine:
     dependency: transitive
     description: flutter
diff --git a/packages/flutter_community_chat_view/example/pubspec.lock b/packages/flutter_community_chat_view/example/pubspec.lock
index 508f699..8a20979 100644
--- a/packages/flutter_community_chat_view/example/pubspec.lock
+++ b/packages/flutter_community_chat_view/example/pubspec.lock
@@ -186,7 +186,7 @@ packages:
     description:
       path: "packages/flutter_community_chat_interface"
       ref: HEAD
-      resolved-ref: "3793e853721291dc50655ca4ee7999508fe9e2fe"
+      resolved-ref: "5c4556f800e2b9806605f9e934dc4a5e471214d6"
       url: "https://github.com/Iconica-Development/flutter_community_chat.git"
     source: git
     version: "0.0.1"
@@ -392,14 +392,14 @@ packages:
       name: pub_semver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   rxdart:
     dependency: transitive
     description:
       name: rxdart
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.27.5"
+    version: "0.27.7"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -488,7 +488,7 @@ packages:
       name: uuid
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.6"
+    version: "3.0.7"
   vector_math:
     dependency: transitive
     description:
diff --git a/packages/flutter_community_chat_view/pubspec.lock b/packages/flutter_community_chat_view/pubspec.lock
index dd78a2f..fc162a7 100644
--- a/packages/flutter_community_chat_view/pubspec.lock
+++ b/packages/flutter_community_chat_view/pubspec.lock
@@ -179,7 +179,7 @@ packages:
     description:
       path: "packages/flutter_community_chat_interface"
       ref: HEAD
-      resolved-ref: "3793e853721291dc50655ca4ee7999508fe9e2fe"
+      resolved-ref: "5c4556f800e2b9806605f9e934dc4a5e471214d6"
       url: "https://github.com/Iconica-Development/flutter_community_chat.git"
     source: git
     version: "0.0.1"
@@ -378,14 +378,14 @@ packages:
       name: pub_semver
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.2"
+    version: "2.1.3"
   rxdart:
     dependency: transitive
     description:
       name: rxdart
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.27.5"
+    version: "0.27.7"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -474,7 +474,7 @@ packages:
       name: uuid
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.6"
+    version: "3.0.7"
   vector_math:
     dependency: transitive
     description: