diff --git a/auth_flutter/lib/src/auth_flutter.dart b/auth_flutter/lib/src/auth_flutter.dart
index 1402389..db00d76 100644
--- a/auth_flutter/lib/src/auth_flutter.dart
+++ b/auth_flutter/lib/src/auth_flutter.dart
@@ -116,7 +116,7 @@ class _UserFlutterImpl implements User, UserInfoWithIdToken {
 
 /// Flutter impl
 class AuthFlutterImpl
-    with FirebaseAppProductMixin, FirebaseAuthMixin
+    with FirebaseAppProductMixin<FirebaseAuth>, FirebaseAuthMixin
     implements AuthFlutter {
   /// The native instance
   final native.FirebaseAuth nativeAuth;
diff --git a/firestore_flutter/lib/src/firestore_flutter.dart b/firestore_flutter/lib/src/firestore_flutter.dart
index e718ba0..94fa12e 100644
--- a/firestore_flutter/lib/src/firestore_flutter.dart
+++ b/firestore_flutter/lib/src/firestore_flutter.dart
@@ -1,6 +1,7 @@
 import 'package:cloud_firestore/cloud_firestore.dart' as native;
 import 'package:flutter/foundation.dart';
 import 'package:path/path.dart';
+import 'package:tekartik_firebase/firebase_mixin.dart';
 import 'package:tekartik_firebase_flutter/src/firebase_flutter.dart'; // ignore: implementation_imports
 
 import 'aggregate_query_flutter.dart';
@@ -20,9 +21,7 @@ FirestoreService get firestoreServiceFlutter =>
     _firestoreServiceFlutter ?? FirestoreServiceFlutter();
 
 class FirestoreServiceFlutter
-    with
-        FirestoreServiceDefaultMixin,
-        FirebaseProductServiceMixin<FirestoreFlutter>
+    with FirebaseProductServiceMixin<Firestore>, FirestoreServiceDefaultMixin
     implements FirestoreService {
   @override
   FirestoreFlutter firestore(App app) {
@@ -68,7 +67,9 @@ class FirestoreServiceFlutter
   bool get supportsAggregateQueries => true;
 }
 
-class FirestoreFlutter with FirestoreDefaultMixin implements Firestore {
+class FirestoreFlutter
+    with FirebaseAppProductMixin<Firestore>, FirestoreDefaultMixin
+    implements Firestore {
   @override
   final FirestoreServiceFlutter service;
   final native.FirebaseFirestore nativeInstance;
diff --git a/firestore_flutter/pubspec.yaml b/firestore_flutter/pubspec.yaml
index 2634331..bacb86e 100644
--- a/firestore_flutter/pubspec.yaml
+++ b/firestore_flutter/pubspec.yaml
@@ -24,6 +24,11 @@ dependencies:
       ref: dart3a
     version: '>=0.6.0'
   cloud_firestore: '>=4.14.0'
+  tekartik_firebase:
+    git:
+      url: https://github.com/tekartik/firebase.dart
+      ref: dart3a
+      path: firebase
 
 dev_dependencies:
   flutter_test:
diff --git a/functions_call_flutter/lib/src/functions_call_flutter.dart b/functions_call_flutter/lib/src/functions_call_flutter.dart
index cd8e9a7..d3ba9fe 100644
--- a/functions_call_flutter/lib/src/functions_call_flutter.dart
+++ b/functions_call_flutter/lib/src/functions_call_flutter.dart
@@ -1,6 +1,7 @@
 import 'package:cloud_functions/cloud_functions.dart' as native;
 import 'package:tekartik_common_utils/common_utils_import.dart';
 import 'package:tekartik_firebase/firebase.dart';
+import 'package:tekartik_firebase/firebase_mixin.dart';
 // ignore: implementation_imports
 import 'package:tekartik_firebase_flutter/src/firebase_flutter.dart'
     show FirebaseAppFlutter;
@@ -16,7 +17,9 @@ FirebaseFunctionsCallService get firebaseFunctionsCallServiceFlutter =>
 
 /// Firebase functions call service flutter
 class FirebaseFunctionsCallServiceFlutter
-    with FirebaseFunctionsCallServiceDefaultMixin
+    with
+        FirebaseProductServiceMixin<FirebaseFunctionsCall>,
+        FirebaseFunctionsCallServiceDefaultMixin
     implements FirebaseFunctionsCallService {
   /// Most implementation need a single instance, keep it in memory!
   final _instances = <String, FirebaseFunctionsCallFlutter>{};
@@ -48,7 +51,9 @@ class FirebaseFunctionsCallServiceFlutter
 }
 
 /// Firebase functions call flutter
-class FirebaseFunctionsCallFlutter implements FirebaseFunctionsCall {
+class FirebaseFunctionsCallFlutter
+    with FirebaseAppProductMixin<FirebaseFunctionsCall>
+    implements FirebaseFunctionsCall {
   /// Service
   final FirebaseFunctionsCallServiceFlutter service;
 
diff --git a/storage_flutter/lib/src/storage_flutter.dart b/storage_flutter/lib/src/storage_flutter.dart
index 6c6d8af..8db11eb 100644
--- a/storage_flutter/lib/src/storage_flutter.dart
+++ b/storage_flutter/lib/src/storage_flutter.dart
@@ -9,7 +9,9 @@ import 'package:tekartik_firebase_storage/utils/link.dart';
 
 import 'import.dart';
 
-class StorageServiceFlutter with StorageServiceMixin implements StorageService {
+class StorageServiceFlutter
+    with FirebaseProductServiceMixin<FirebaseStorage>, StorageServiceMixin
+    implements StorageService {
   StorageServiceFlutter();
 
   @override