diff --git a/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java b/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java
new file mode 100644
index 0000000..752fc18
--- /dev/null
+++ b/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java
@@ -0,0 +1,25 @@
+// Generated file.
+//
+// If you wish to remove Flutter's multidex support, delete this entire file.
+//
+// Modifications to this file should be done in a copy under a different name
+// as this file may be regenerated.
+
+package io.flutter.app;
+
+import android.app.Application;
+import android.content.Context;
+import androidx.annotation.CallSuper;
+import androidx.multidex.MultiDex;
+
+/**
+ * Extension of {@link android.app.Application}, adding multidex support.
+ */
+public class FlutterMultiDexApplication extends Application {
+  @Override
+  @CallSuper
+  protected void attachBaseContext(Context base) {
+    super.attachBaseContext(base);
+    MultiDex.install(this);
+  }
+}
diff --git a/lib/logic/config.dart b/lib/logic/config.dart
index 7c3ab1c..e7bfec9 100644
--- a/lib/logic/config.dart
+++ b/lib/logic/config.dart
@@ -7,6 +7,9 @@ import 'package:hive_flutter/hive_flutter.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:provider/provider.dart';
 import 'package:selfprivacy/logic/appsettingscubit.dart';
+import 'package:selfprivacy/logic/courierscubit.dart';
+import 'package:selfprivacy/logic/itemscubit.dart';
+import 'package:selfprivacy/logic/orderscubit.dart';
 
 final GetIt getIt = GetIt.instance;
 
@@ -112,6 +115,15 @@ class BlocAndProviderConfig extends StatelessWidget {
           BlocProvider(
             create: (final _) => AppSettingsCubit(key: '')..load(),
           ),
+          BlocProvider(
+            create: (final _) => ItemsCubit()..load(),
+          ),
+          BlocProvider(
+            create: (final _) => CouriersCubit()..load(),
+          ),
+          BlocProvider(
+            create: (final _) => OrdersCubit()..load(),
+          ),
         ],
         child: child,
       );
diff --git a/lib/models/order.dart b/lib/models/order.dart
index b443809..dec444f 100644
--- a/lib/models/order.dart
+++ b/lib/models/order.dart
@@ -35,6 +35,7 @@ class Order {
   final String address;
   final String status;
   final int id;
+  @JsonKey(name: 'courier_id')
   final int courierId;
 
   final List<Item> items;
diff --git a/lib/models/order.g.dart b/lib/models/order.g.dart
index cf3db0e..6268238 100644
--- a/lib/models/order.g.dart
+++ b/lib/models/order.g.dart
@@ -16,7 +16,7 @@ Order _$OrderFromJson(Map<String, dynamic> json) => Order(
       deliveryDate: json['delivery_date'] as String,
       address: json['address'] as String,
       status: json['status'] as String,
-      courierId: json['courierId'] as int,
+      courierId: json['courier_id'] as int,
       items: (json['items'] as List<dynamic>)
           .map((e) => Item.fromJson(e as Map<String, dynamic>))
           .toList(),
@@ -32,6 +32,6 @@ Map<String, dynamic> _$OrderToJson(Order instance) => <String, dynamic>{
       'address': instance.address,
       'status': instance.status,
       'id': instance.id,
-      'courierId': instance.courierId,
+      'courier_id': instance.courierId,
       'items': instance.items,
     };