diff --git a/packages/flutter_timeline/lib/src/flutter_timeline_userstory.dart b/packages/flutter_timeline/lib/src/flutter_timeline_userstory.dart
index 0023867..a40b7b1 100644
--- a/packages/flutter_timeline/lib/src/flutter_timeline_userstory.dart
+++ b/packages/flutter_timeline/lib/src/flutter_timeline_userstory.dart
@@ -10,7 +10,7 @@ import 'package:go_router/go_router.dart';
 List<GoRoute> getTimelineStoryRoutes({
   TimelineUserStoryConfiguration? configuration,
 }) {
-  var config = configuration ??= TimelineUserStoryConfiguration(
+  var config = configuration ?? TimelineUserStoryConfiguration(
     userId: 'test_user',
     service: TimelineService(
       postService: LocalTimelinePostService(),
diff --git a/packages/flutter_timeline/lib/src/models/timeline_configuration.dart b/packages/flutter_timeline/lib/src/models/timeline_configuration.dart
index 02718e6..650f19d 100644
--- a/packages/flutter_timeline/lib/src/models/timeline_configuration.dart
+++ b/packages/flutter_timeline/lib/src/models/timeline_configuration.dart
@@ -9,9 +9,9 @@ import 'package:flutter_timeline_view/flutter_timeline_view.dart';
 @immutable
 class TimelineUserStoryConfiguration {
   const TimelineUserStoryConfiguration({
-    required this.userId,
     required this.service,
     required this.optionsBuilder,
+    this.userId = 'test_user',
     this.openPageBuilder,
     this.onPostTap,
     this.onUserTap,
diff --git a/packages/flutter_timeline_firebase/lib/flutter_timeline_firebase.dart b/packages/flutter_timeline_firebase/lib/flutter_timeline_firebase.dart
index 84481b0..b138166 100644
--- a/packages/flutter_timeline_firebase/lib/flutter_timeline_firebase.dart
+++ b/packages/flutter_timeline_firebase/lib/flutter_timeline_firebase.dart
@@ -7,4 +7,5 @@ library flutter_timeline_firebase;
 
 export 'src/config/firebase_timeline_options.dart';
 export 'src/service/firebase_post_service.dart';
+export 'src/service/firebase_timeline_service.dart';
 export 'src/service/firebase_user_service.dart';
diff --git a/packages/flutter_timeline_firebase/lib/src/service/firebase_timeline_service.dart b/packages/flutter_timeline_firebase/lib/src/service/firebase_timeline_service.dart
index 9fe9d61..2e56f8d 100644
--- a/packages/flutter_timeline_firebase/lib/src/service/firebase_timeline_service.dart
+++ b/packages/flutter_timeline_firebase/lib/src/service/firebase_timeline_service.dart
@@ -9,8 +9,7 @@ class FirebaseTimelineService implements TimelineService {
     this.firebasePostService,
     this.firebaseUserService,
   }) {
-    firebaseUserService ??= FirebaseTimelinePostService(
-      userService: userService,
+    firebaseUserService ??= FirebaseTimelineUserService(
       options: options,
       app: app,
     );
@@ -45,7 +44,7 @@ class FirebaseTimelineService implements TimelineService {
     if (firebaseUserService != null) {
       return firebaseUserService!;
     } else {
-      return FirebaseUserService(
+      return FirebaseTimelineUserService(
         options: options,
         app: app,
       );
diff --git a/packages/flutter_timeline_firebase/lib/src/service/firebase_user_service.dart b/packages/flutter_timeline_firebase/lib/src/service/firebase_user_service.dart
index fb1da17..e034116 100644
--- a/packages/flutter_timeline_firebase/lib/src/service/firebase_user_service.dart
+++ b/packages/flutter_timeline_firebase/lib/src/service/firebase_user_service.dart
@@ -8,8 +8,8 @@ import 'package:flutter_timeline_firebase/src/config/firebase_timeline_options.d
 import 'package:flutter_timeline_firebase/src/models/firebase_user_document.dart';
 import 'package:flutter_timeline_interface/flutter_timeline_interface.dart';
 
-class FirebaseUserService implements TimelineUserService {
-  FirebaseUserService({
+class FirebaseTimelineUserService implements TimelineUserService {
+  FirebaseTimelineUserService({
     FirebaseApp? app,
     options = const FirebaseTimelineOptions(),
   }) {