diff --git a/packages/wyatt_bloc_layout/lib/src/core/crud_cubit_consumer_screen_mixin.dart b/packages/wyatt_bloc_layout/lib/src/core/crud_cubit_consumer_screen_mixin.dart
index a549af5b..b5798454 100644
--- a/packages/wyatt_bloc_layout/lib/src/core/crud_cubit_consumer_screen_mixin.dart
+++ b/packages/wyatt_bloc_layout/lib/src/core/crud_cubit_consumer_screen_mixin.dart
@@ -1,4 +1,4 @@
-// Copyright (C) 2022 WYATT GROUP
+// Copyright (C) 2023 WYATT GROUP
 // Please see the AUTHORS file for details.
 //
 // This program is free software: you can redistribute it and/or modify
@@ -16,11 +16,10 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart' as bloc_base;
-
 import 'package:wyatt_crud_bloc/wyatt_crud_bloc.dart';
 import 'package:wyatt_ui_components/wyatt_ui_components.dart';
 
-mixin CrudMixin<Cubit extends bloc_base.Cubit<dynamic>,
+mixin CrudMixin<Bloc extends bloc_base.StateStreamable<CrudState>,
     SuccessState extends CrudSuccess> {
   String? get loaderComponentId => null;
   String? get errorComponentId => null;
@@ -40,11 +39,10 @@ mixin CrudMixin<Cubit extends bloc_base.Cubit<dynamic>,
   Widget successBuilder(BuildContext context, SuccessState state);
 
   Widget crudBuilder(BuildContext context, CrudState state) =>
-      CrudBuilder<CrudInitial, CrudLoading, SuccessState, CrudError>(
+      CrudBuilder<Bloc, CrudInitial, CrudLoading, SuccessState, CrudError>(
         errorBuilder: errorBuilder,
         loadingBuilder: loadingBuilder,
         initialBuilder: initialBuilder,
-        state: state,
         builder: successBuilder,
       );
 }