diff --git a/lib/database/exercises/exercise_database.dart b/lib/database/exercises/exercise_database.dart
index fa3969c6..64082ff3 100644
--- a/lib/database/exercises/exercise_database.dart
+++ b/lib/database/exercises/exercise_database.dart
@@ -21,6 +21,11 @@ class Exercises extends Table {
   // TextColumn get data => text().map(const ExerciseBaseConverter())();
 
   DateTimeColumn get lastUpdate => dateTime()();
+
+  /// The date when the exercise was last fetched from the API. While we know
+  /// when the exercise itself was last updated in `lastUpdate`, we can save
+  /// ourselves a lot of requests if we don't check too often
+  DateTimeColumn get lastFetched => dateTime()();
 }
 
 @DataClassName('MuscleTable')
diff --git a/lib/database/exercises/exercise_database.g.dart b/lib/database/exercises/exercise_database.g.dart
index 4c5ea73d..4109167e 100644
--- a/lib/database/exercises/exercise_database.g.dart
+++ b/lib/database/exercises/exercise_database.g.dart
@@ -21,8 +21,13 @@ class $ExercisesTable extends Exercises with TableInfo<$ExercisesTable, Exercise
   late final GeneratedColumn<DateTime> lastUpdate = GeneratedColumn<DateTime>(
       'last_update', aliasedName, false,
       type: DriftSqlType.dateTime, requiredDuringInsert: true);
+  static const VerificationMeta _lastFetchedMeta = const VerificationMeta('lastFetched');
   @override
-  List<GeneratedColumn> get $columns => [id, data, lastUpdate];
+  late final GeneratedColumn<DateTime> lastFetched = GeneratedColumn<DateTime>(
+      'last_fetched', aliasedName, false,
+      type: DriftSqlType.dateTime, requiredDuringInsert: true);
+  @override
+  List<GeneratedColumn> get $columns => [id, data, lastUpdate, lastFetched];
   @override
   String get aliasedName => _alias ?? actualTableName;
   @override
@@ -49,6 +54,12 @@ class $ExercisesTable extends Exercises with TableInfo<$ExercisesTable, Exercise
     } else if (isInserting) {
       context.missing(_lastUpdateMeta);
     }
+    if (data.containsKey('last_fetched')) {
+      context.handle(_lastFetchedMeta,
+          lastFetched.isAcceptableOrUnknown(data['last_fetched']!, _lastFetchedMeta));
+    } else if (isInserting) {
+      context.missing(_lastFetchedMeta);
+    }
     return context;
   }
 
@@ -62,6 +73,8 @@ class $ExercisesTable extends Exercises with TableInfo<$ExercisesTable, Exercise
       data: attachedDatabase.typeMapping.read(DriftSqlType.string, data['${effectivePrefix}data'])!,
       lastUpdate: attachedDatabase.typeMapping
           .read(DriftSqlType.dateTime, data['${effectivePrefix}last_update'])!,
+      lastFetched: attachedDatabase.typeMapping
+          .read(DriftSqlType.dateTime, data['${effectivePrefix}last_fetched'])!,
     );
   }
 
@@ -75,13 +88,20 @@ class ExerciseTable extends DataClass implements Insertable<ExerciseTable> {
   final int id;
   final String data;
   final DateTime lastUpdate;
-  const ExerciseTable({required this.id, required this.data, required this.lastUpdate});
+
+  /// The date when the exercise was last fetched from the API. While we know
+  /// when the exercise itself was last updated in `lastUpdate`, we can save
+  /// ourselves a lot of requests if we don't check too often
+  final DateTime lastFetched;
+  const ExerciseTable(
+      {required this.id, required this.data, required this.lastUpdate, required this.lastFetched});
   @override
   Map<String, Expression> toColumns(bool nullToAbsent) {
     final map = <String, Expression>{};
     map['id'] = Variable<int>(id);
     map['data'] = Variable<String>(data);
     map['last_update'] = Variable<DateTime>(lastUpdate);
+    map['last_fetched'] = Variable<DateTime>(lastFetched);
     return map;
   }
 
@@ -90,6 +110,7 @@ class ExerciseTable extends DataClass implements Insertable<ExerciseTable> {
       id: Value(id),
       data: Value(data),
       lastUpdate: Value(lastUpdate),
+      lastFetched: Value(lastFetched),
     );
   }
 
@@ -99,6 +120,7 @@ class ExerciseTable extends DataClass implements Insertable<ExerciseTable> {
       id: serializer.fromJson<int>(json['id']),
       data: serializer.fromJson<String>(json['data']),
       lastUpdate: serializer.fromJson<DateTime>(json['lastUpdate']),
+      lastFetched: serializer.fromJson<DateTime>(json['lastFetched']),
     );
   }
   @override
@@ -108,74 +130,90 @@ class ExerciseTable extends DataClass implements Insertable<ExerciseTable> {
       'id': serializer.toJson<int>(id),
       'data': serializer.toJson<String>(data),
       'lastUpdate': serializer.toJson<DateTime>(lastUpdate),
+      'lastFetched': serializer.toJson<DateTime>(lastFetched),
     };
   }
 
-  ExerciseTable copyWith({int? id, String? data, DateTime? lastUpdate}) => ExerciseTable(
+  ExerciseTable copyWith({int? id, String? data, DateTime? lastUpdate, DateTime? lastFetched}) =>
+      ExerciseTable(
         id: id ?? this.id,
         data: data ?? this.data,
         lastUpdate: lastUpdate ?? this.lastUpdate,
+        lastFetched: lastFetched ?? this.lastFetched,
       );
   @override
   String toString() {
     return (StringBuffer('ExerciseTable(')
           ..write('id: $id, ')
           ..write('data: $data, ')
-          ..write('lastUpdate: $lastUpdate')
+          ..write('lastUpdate: $lastUpdate, ')
+          ..write('lastFetched: $lastFetched')
           ..write(')'))
         .toString();
   }
 
   @override
-  int get hashCode => Object.hash(id, data, lastUpdate);
+  int get hashCode => Object.hash(id, data, lastUpdate, lastFetched);
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
       (other is ExerciseTable &&
           other.id == this.id &&
           other.data == this.data &&
-          other.lastUpdate == this.lastUpdate);
+          other.lastUpdate == this.lastUpdate &&
+          other.lastFetched == this.lastFetched);
 }
 
 class ExercisesCompanion extends UpdateCompanion<ExerciseTable> {
   final Value<int> id;
   final Value<String> data;
   final Value<DateTime> lastUpdate;
+  final Value<DateTime> lastFetched;
   final Value<int> rowid;
   const ExercisesCompanion({
     this.id = const Value.absent(),
     this.data = const Value.absent(),
     this.lastUpdate = const Value.absent(),
+    this.lastFetched = const Value.absent(),
     this.rowid = const Value.absent(),
   });
   ExercisesCompanion.insert({
     required int id,
     required String data,
     required DateTime lastUpdate,
+    required DateTime lastFetched,
     this.rowid = const Value.absent(),
   })  : id = Value(id),
         data = Value(data),
-        lastUpdate = Value(lastUpdate);
+        lastUpdate = Value(lastUpdate),
+        lastFetched = Value(lastFetched);
   static Insertable<ExerciseTable> custom({
     Expression<int>? id,
     Expression<String>? data,
     Expression<DateTime>? lastUpdate,
+    Expression<DateTime>? lastFetched,
     Expression<int>? rowid,
   }) {
     return RawValuesInsertable({
       if (id != null) 'id': id,
       if (data != null) 'data': data,
       if (lastUpdate != null) 'last_update': lastUpdate,
+      if (lastFetched != null) 'last_fetched': lastFetched,
       if (rowid != null) 'rowid': rowid,
     });
   }
 
   ExercisesCompanion copyWith(
-      {Value<int>? id, Value<String>? data, Value<DateTime>? lastUpdate, Value<int>? rowid}) {
+      {Value<int>? id,
+      Value<String>? data,
+      Value<DateTime>? lastUpdate,
+      Value<DateTime>? lastFetched,
+      Value<int>? rowid}) {
     return ExercisesCompanion(
       id: id ?? this.id,
       data: data ?? this.data,
       lastUpdate: lastUpdate ?? this.lastUpdate,
+      lastFetched: lastFetched ?? this.lastFetched,
       rowid: rowid ?? this.rowid,
     );
   }
@@ -192,6 +230,9 @@ class ExercisesCompanion extends UpdateCompanion<ExerciseTable> {
     if (lastUpdate.present) {
       map['last_update'] = Variable<DateTime>(lastUpdate.value);
     }
+    if (lastFetched.present) {
+      map['last_fetched'] = Variable<DateTime>(lastFetched.value);
+    }
     if (rowid.present) {
       map['rowid'] = Variable<int>(rowid.value);
     }
@@ -204,6 +245,7 @@ class ExercisesCompanion extends UpdateCompanion<ExerciseTable> {
           ..write('id: $id, ')
           ..write('data: $data, ')
           ..write('lastUpdate: $lastUpdate, ')
+          ..write('lastFetched: $lastFetched, ')
           ..write('rowid: $rowid')
           ..write(')'))
         .toString();
diff --git a/lib/helpers/misc.dart b/lib/helpers/misc.dart
index 26c34cc2..b880e8c2 100644
--- a/lib/helpers/misc.dart
+++ b/lib/helpers/misc.dart
@@ -92,6 +92,15 @@ extension TimeOfDayExtension on TimeOfDay {
   }
 }
 
+extension DateTimeExtension on DateTime {
+  bool isSameDayAs(DateTime other) {
+    final thisDay = DateTime(year, month, day);
+    final otherDay = DateTime(other.year, other.month, other.day);
+
+    return thisDay.isAtSameMomentAs(otherDay);
+  }
+}
+
 void launchURL(String url, BuildContext context) async {
   final scaffoldMessenger = ScaffoldMessenger.of(context);
   final launched = await launchUrl(Uri.parse(url));
diff --git a/lib/models/exercises/exercise.dart b/lib/models/exercises/exercise.dart
index e8247b09..3adecd42 100644
--- a/lib/models/exercises/exercise.dart
+++ b/lib/models/exercises/exercise.dart
@@ -21,7 +21,9 @@ import 'package:json_annotation/json_annotation.dart';
 import 'package:wger/helpers/consts.dart';
 import 'package:wger/models/exercises/category.dart';
 import 'package:wger/models/exercises/equipment.dart';
+import 'package:wger/models/exercises/exercise_api.dart';
 import 'package:wger/models/exercises/image.dart';
+import 'package:wger/models/exercises/language.dart';
 import 'package:wger/models/exercises/muscle.dart';
 import 'package:wger/models/exercises/translation.dart';
 import 'package:wger/models/exercises/video.dart';
@@ -31,22 +33,22 @@ part 'exercise.g.dart';
 @JsonSerializable(explicitToJson: true)
 class Exercise extends Equatable {
   @JsonKey(required: true)
-  final int? id;
+  late final int? id;
 
   @JsonKey(required: true)
-  final String? uuid;
+  late final String? uuid;
 
   @JsonKey(required: true, name: 'variations')
-  final int? variationId;
+  late final int? variationId;
 
   @JsonKey(required: true, name: 'created')
-  final DateTime? created;
+  late final DateTime? created;
 
   @JsonKey(required: true, name: 'last_update')
-  final DateTime? lastUpdate;
+  late final DateTime? lastUpdate;
 
   @JsonKey(required: true, name: 'last_update_global')
-  final DateTime? lastUpdateGlobal;
+  late final DateTime? lastUpdateGlobal;
 
   @JsonKey(required: true, name: 'category')
   late int categoryId;
@@ -81,6 +83,12 @@ class Exercise extends Equatable {
   @JsonKey(includeFromJson: false, includeToJson: false)
   List<Video> videos = [];
 
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  List<String> authors = [];
+
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  List<String> authorsGlobal = [];
+
   Exercise({
     this.id,
     this.uuid,
@@ -95,6 +103,8 @@ class Exercise extends Equatable {
     List<Translation>? translations,
     ExerciseCategory? category,
     List<Video>? videos,
+    List<String>? authors,
+    List<String>? authorsGlobal,
   }) {
     this.images = images ?? [];
     this.equipment = equipment ?? [];
@@ -119,12 +129,44 @@ class Exercise extends Equatable {
     }
 
     if (translations != null) {
-      translations = translations;
+      this.translations = translations;
     }
 
     if (videos != null) {
       this.videos = videos;
     }
+    this.authors = authors ?? [];
+    this.authorsGlobal = authorsGlobal ?? [];
+  }
+
+  Exercise.fromApiData(ExerciseApiData baseData, List<Language> languages) {
+    final List<Translation> translations = [];
+    for (final translationData in baseData.translations) {
+      final translation = translationData;
+      translation.language = languages.firstWhere((l) => l.id == translationData.languageId);
+      translations.add(translation);
+    }
+
+    id = baseData.id;
+    uuid = baseData.uuid;
+    categoryId = baseData.category.id;
+    category = baseData.category;
+
+    created = baseData.created;
+    lastUpdate = baseData.lastUpdate;
+    lastUpdateGlobal = baseData.lastUpdateGlobal;
+
+    musclesSecondary = baseData.muscles;
+    muscles = baseData.muscles;
+    equipment = baseData.equipment;
+    category = baseData.category;
+    images = baseData.images;
+    this.translations = translations;
+    videos = baseData.videos;
+
+    authors = baseData.authors;
+    authorsGlobal = baseData.authorsGlobal;
+    variationId = baseData.variationId;
   }
 
   /// Returns exercises for the given language
@@ -143,7 +185,7 @@ class Exercise extends Equatable {
       (e) => e.languageObj.shortName == languageCode,
       orElse: () => translations.firstWhere(
         (e) => e.languageObj.shortName == LANGUAGE_SHORT_ENGLISH,
-        orElse: () => Translation(name: "name", description: "description"),
+        orElse: () => translations.first,
       ),
     );
   }
diff --git a/lib/models/exercises/exercise_api.dart b/lib/models/exercises/exercise_api.dart
new file mode 100644
index 00000000..44d72c7f
--- /dev/null
+++ b/lib/models/exercises/exercise_api.dart
@@ -0,0 +1,50 @@
+import 'dart:convert';
+
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:wger/models/exercises/category.dart';
+import 'package:wger/models/exercises/equipment.dart';
+import 'package:wger/models/exercises/image.dart';
+import 'package:wger/models/exercises/muscle.dart';
+import 'package:wger/models/exercises/translation.dart';
+import 'package:wger/models/exercises/video.dart';
+
+part 'exercise_api.freezed.dart';
+part 'exercise_api.g.dart';
+
+/// Model for an exercise as returned from the exercisebaseinfo endpoint
+///
+/// Basically this is just used as a convenience to create "real" exercise
+/// objects and nothing more
+@freezed
+class ExerciseApiData with _$ExerciseApiData {
+  factory ExerciseApiData({
+    required int id,
+    required String uuid,
+    // ignore: invalid_annotation_target
+    @Default(null) @JsonKey(name: 'variations') int? variationId,
+    // ignore: invalid_annotation_target
+    @JsonKey(name: 'created') required DateTime created,
+    // ignore: invalid_annotation_target
+    @JsonKey(name: 'last_update') required DateTime lastUpdate,
+    // ignore: invalid_annotation_target
+    @JsonKey(name: 'last_update_global') required DateTime lastUpdateGlobal,
+    required ExerciseCategory category,
+    required List<Muscle> muscles,
+    // ignore: invalid_annotation_target
+    @JsonKey(name: 'muscles_secondary') required List<Muscle> musclesSecondary,
+    // ignore: invalid_annotation_target
+    required List<Equipment> equipment,
+    // ignore: invalid_annotation_target
+    @JsonKey(name: 'exercises') required List<Translation> translations,
+    required List<ExerciseImage> images,
+    required List<Video> videos,
+    // ignore: invalid_annotation_target
+    @JsonKey(name: 'author_history') required List<String> authors,
+    // ignore: invalid_annotation_target
+    @JsonKey(name: 'total_authors_history') required List<String> authorsGlobal,
+  }) = _ExerciseBaseData;
+
+  factory ExerciseApiData.fromString(String input) => _$ExerciseApiDataFromJson(json.decode(input));
+
+  factory ExerciseApiData.fromJson(Map<String, dynamic> json) => _$ExerciseApiDataFromJson(json);
+}
diff --git a/lib/models/exercises/exercise_base_data.freezed.dart b/lib/models/exercises/exercise_api.freezed.dart
similarity index 62%
rename from lib/models/exercises/exercise_base_data.freezed.dart
rename to lib/models/exercises/exercise_api.freezed.dart
index 0a281c81..79dbc58f 100644
--- a/lib/models/exercises/exercise_base_data.freezed.dart
+++ b/lib/models/exercises/exercise_api.freezed.dart
@@ -3,7 +3,7 @@
 // ignore_for_file: type=lint
 // ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
 
-part of 'exercise_base_data.dart';
+part of 'exercise_api.dart';
 
 // **************************************************************************
 // FreezedGenerator
@@ -14,14 +14,16 @@ T _$identity<T>(T value) => value;
 final _privateConstructorUsedError = UnsupportedError(
     'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
 
-ExerciseBaseData _$ExerciseBaseDataFromJson(Map<String, dynamic> json) {
+ExerciseApiData _$ExerciseApiDataFromJson(Map<String, dynamic> json) {
   return _ExerciseBaseData.fromJson(json);
 }
 
 /// @nodoc
-mixin _$ExerciseBaseData {
+mixin _$ExerciseApiData {
   int get id => throw _privateConstructorUsedError;
   String get uuid => throw _privateConstructorUsedError; // ignore: invalid_annotation_target
+  @JsonKey(name: 'variations')
+  int? get variationId => throw _privateConstructorUsedError; // ignore: invalid_annotation_target
   @JsonKey(name: 'created')
   DateTime get created => throw _privateConstructorUsedError; // ignore: invalid_annotation_target
   @JsonKey(name: 'last_update')
@@ -33,25 +35,34 @@ mixin _$ExerciseBaseData {
   List<Muscle> get muscles =>
       throw _privateConstructorUsedError; // ignore: invalid_annotation_target
   @JsonKey(name: 'muscles_secondary')
-  List<Muscle> get musclesSecondary => throw _privateConstructorUsedError;
-  List<Equipment> get equipment => throw _privateConstructorUsedError;
-  List<ExerciseData> get exercises => throw _privateConstructorUsedError;
+  List<Muscle> get musclesSecondary =>
+      throw _privateConstructorUsedError; // ignore: invalid_annotation_target
+  List<Equipment> get equipment =>
+      throw _privateConstructorUsedError; // ignore: invalid_annotation_target
+  @JsonKey(name: 'exercises')
+  List<Translation> get translations => throw _privateConstructorUsedError;
   List<ExerciseImage> get images => throw _privateConstructorUsedError;
-  List<Video> get videos => throw _privateConstructorUsedError;
+  List<Video> get videos => throw _privateConstructorUsedError; // ignore: invalid_annotation_target
+  @JsonKey(name: 'author_history')
+  List<String> get authors =>
+      throw _privateConstructorUsedError; // ignore: invalid_annotation_target
+  @JsonKey(name: 'total_authors_history')
+  List<String> get authorsGlobal => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
-  $ExerciseBaseDataCopyWith<ExerciseBaseData> get copyWith => throw _privateConstructorUsedError;
+  $ExerciseApiDataCopyWith<ExerciseApiData> get copyWith => throw _privateConstructorUsedError;
 }
 
 /// @nodoc
-abstract class $ExerciseBaseDataCopyWith<$Res> {
-  factory $ExerciseBaseDataCopyWith(ExerciseBaseData value, $Res Function(ExerciseBaseData) then) =
-      _$ExerciseBaseDataCopyWithImpl<$Res, ExerciseBaseData>;
+abstract class $ExerciseApiDataCopyWith<$Res> {
+  factory $ExerciseApiDataCopyWith(ExerciseApiData value, $Res Function(ExerciseApiData) then) =
+      _$ExerciseApiDataCopyWithImpl<$Res, ExerciseApiData>;
   @useResult
   $Res call(
       {int id,
       String uuid,
+      @JsonKey(name: 'variations') int? variationId,
       @JsonKey(name: 'created') DateTime created,
       @JsonKey(name: 'last_update') DateTime lastUpdate,
       @JsonKey(name: 'last_update_global') DateTime lastUpdateGlobal,
@@ -59,15 +70,17 @@ abstract class $ExerciseBaseDataCopyWith<$Res> {
       List<Muscle> muscles,
       @JsonKey(name: 'muscles_secondary') List<Muscle> musclesSecondary,
       List<Equipment> equipment,
-      List<ExerciseData> exercises,
+      @JsonKey(name: 'exercises') List<Translation> translations,
       List<ExerciseImage> images,
-      List<Video> videos});
+      List<Video> videos,
+      @JsonKey(name: 'author_history') List<String> authors,
+      @JsonKey(name: 'total_authors_history') List<String> authorsGlobal});
 }
 
 /// @nodoc
-class _$ExerciseBaseDataCopyWithImpl<$Res, $Val extends ExerciseBaseData>
-    implements $ExerciseBaseDataCopyWith<$Res> {
-  _$ExerciseBaseDataCopyWithImpl(this._value, this._then);
+class _$ExerciseApiDataCopyWithImpl<$Res, $Val extends ExerciseApiData>
+    implements $ExerciseApiDataCopyWith<$Res> {
+  _$ExerciseApiDataCopyWithImpl(this._value, this._then);
 
   // ignore: unused_field
   final $Val _value;
@@ -79,6 +92,7 @@ class _$ExerciseBaseDataCopyWithImpl<$Res, $Val extends ExerciseBaseData>
   $Res call({
     Object? id = null,
     Object? uuid = null,
+    Object? variationId = freezed,
     Object? created = null,
     Object? lastUpdate = null,
     Object? lastUpdateGlobal = null,
@@ -86,9 +100,11 @@ class _$ExerciseBaseDataCopyWithImpl<$Res, $Val extends ExerciseBaseData>
     Object? muscles = null,
     Object? musclesSecondary = null,
     Object? equipment = null,
-    Object? exercises = null,
+    Object? translations = null,
     Object? images = null,
     Object? videos = null,
+    Object? authors = null,
+    Object? authorsGlobal = null,
   }) {
     return _then(_value.copyWith(
       id: null == id
@@ -99,6 +115,10 @@ class _$ExerciseBaseDataCopyWithImpl<$Res, $Val extends ExerciseBaseData>
           ? _value.uuid
           : uuid // ignore: cast_nullable_to_non_nullable
               as String,
+      variationId: freezed == variationId
+          ? _value.variationId
+          : variationId // ignore: cast_nullable_to_non_nullable
+              as int?,
       created: null == created
           ? _value.created
           : created // ignore: cast_nullable_to_non_nullable
@@ -127,10 +147,10 @@ class _$ExerciseBaseDataCopyWithImpl<$Res, $Val extends ExerciseBaseData>
           ? _value.equipment
           : equipment // ignore: cast_nullable_to_non_nullable
               as List<Equipment>,
-      exercises: null == exercises
-          ? _value.exercises
-          : exercises // ignore: cast_nullable_to_non_nullable
-              as List<ExerciseData>,
+      translations: null == translations
+          ? _value.translations
+          : translations // ignore: cast_nullable_to_non_nullable
+              as List<Translation>,
       images: null == images
           ? _value.images
           : images // ignore: cast_nullable_to_non_nullable
@@ -139,12 +159,20 @@ class _$ExerciseBaseDataCopyWithImpl<$Res, $Val extends ExerciseBaseData>
           ? _value.videos
           : videos // ignore: cast_nullable_to_non_nullable
               as List<Video>,
+      authors: null == authors
+          ? _value.authors
+          : authors // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+      authorsGlobal: null == authorsGlobal
+          ? _value.authorsGlobal
+          : authorsGlobal // ignore: cast_nullable_to_non_nullable
+              as List<String>,
     ) as $Val);
   }
 }
 
 /// @nodoc
-abstract class _$$ExerciseBaseDataImplCopyWith<$Res> implements $ExerciseBaseDataCopyWith<$Res> {
+abstract class _$$ExerciseBaseDataImplCopyWith<$Res> implements $ExerciseApiDataCopyWith<$Res> {
   factory _$$ExerciseBaseDataImplCopyWith(
           _$ExerciseBaseDataImpl value, $Res Function(_$ExerciseBaseDataImpl) then) =
       __$$ExerciseBaseDataImplCopyWithImpl<$Res>;
@@ -153,6 +181,7 @@ abstract class _$$ExerciseBaseDataImplCopyWith<$Res> implements $ExerciseBaseDat
   $Res call(
       {int id,
       String uuid,
+      @JsonKey(name: 'variations') int? variationId,
       @JsonKey(name: 'created') DateTime created,
       @JsonKey(name: 'last_update') DateTime lastUpdate,
       @JsonKey(name: 'last_update_global') DateTime lastUpdateGlobal,
@@ -160,14 +189,16 @@ abstract class _$$ExerciseBaseDataImplCopyWith<$Res> implements $ExerciseBaseDat
       List<Muscle> muscles,
       @JsonKey(name: 'muscles_secondary') List<Muscle> musclesSecondary,
       List<Equipment> equipment,
-      List<ExerciseData> exercises,
+      @JsonKey(name: 'exercises') List<Translation> translations,
       List<ExerciseImage> images,
-      List<Video> videos});
+      List<Video> videos,
+      @JsonKey(name: 'author_history') List<String> authors,
+      @JsonKey(name: 'total_authors_history') List<String> authorsGlobal});
 }
 
 /// @nodoc
 class __$$ExerciseBaseDataImplCopyWithImpl<$Res>
-    extends _$ExerciseBaseDataCopyWithImpl<$Res, _$ExerciseBaseDataImpl>
+    extends _$ExerciseApiDataCopyWithImpl<$Res, _$ExerciseBaseDataImpl>
     implements _$$ExerciseBaseDataImplCopyWith<$Res> {
   __$$ExerciseBaseDataImplCopyWithImpl(
       _$ExerciseBaseDataImpl _value, $Res Function(_$ExerciseBaseDataImpl) _then)
@@ -178,6 +209,7 @@ class __$$ExerciseBaseDataImplCopyWithImpl<$Res>
   $Res call({
     Object? id = null,
     Object? uuid = null,
+    Object? variationId = freezed,
     Object? created = null,
     Object? lastUpdate = null,
     Object? lastUpdateGlobal = null,
@@ -185,9 +217,11 @@ class __$$ExerciseBaseDataImplCopyWithImpl<$Res>
     Object? muscles = null,
     Object? musclesSecondary = null,
     Object? equipment = null,
-    Object? exercises = null,
+    Object? translations = null,
     Object? images = null,
     Object? videos = null,
+    Object? authors = null,
+    Object? authorsGlobal = null,
   }) {
     return _then(_$ExerciseBaseDataImpl(
       id: null == id
@@ -198,6 +232,10 @@ class __$$ExerciseBaseDataImplCopyWithImpl<$Res>
           ? _value.uuid
           : uuid // ignore: cast_nullable_to_non_nullable
               as String,
+      variationId: freezed == variationId
+          ? _value.variationId
+          : variationId // ignore: cast_nullable_to_non_nullable
+              as int?,
       created: null == created
           ? _value.created
           : created // ignore: cast_nullable_to_non_nullable
@@ -226,10 +264,10 @@ class __$$ExerciseBaseDataImplCopyWithImpl<$Res>
           ? _value._equipment
           : equipment // ignore: cast_nullable_to_non_nullable
               as List<Equipment>,
-      exercises: null == exercises
-          ? _value._exercises
-          : exercises // ignore: cast_nullable_to_non_nullable
-              as List<ExerciseData>,
+      translations: null == translations
+          ? _value._translations
+          : translations // ignore: cast_nullable_to_non_nullable
+              as List<Translation>,
       images: null == images
           ? _value._images
           : images // ignore: cast_nullable_to_non_nullable
@@ -238,6 +276,14 @@ class __$$ExerciseBaseDataImplCopyWithImpl<$Res>
           ? _value._videos
           : videos // ignore: cast_nullable_to_non_nullable
               as List<Video>,
+      authors: null == authors
+          ? _value._authors
+          : authors // ignore: cast_nullable_to_non_nullable
+              as List<String>,
+      authorsGlobal: null == authorsGlobal
+          ? _value._authorsGlobal
+          : authorsGlobal // ignore: cast_nullable_to_non_nullable
+              as List<String>,
     ));
   }
 }
@@ -248,6 +294,7 @@ class _$ExerciseBaseDataImpl implements _ExerciseBaseData {
   _$ExerciseBaseDataImpl(
       {required this.id,
       required this.uuid,
+      @JsonKey(name: 'variations') this.variationId = null,
       @JsonKey(name: 'created') required this.created,
       @JsonKey(name: 'last_update') required this.lastUpdate,
       @JsonKey(name: 'last_update_global') required this.lastUpdateGlobal,
@@ -255,15 +302,19 @@ class _$ExerciseBaseDataImpl implements _ExerciseBaseData {
       required final List<Muscle> muscles,
       @JsonKey(name: 'muscles_secondary') required final List<Muscle> musclesSecondary,
       required final List<Equipment> equipment,
-      required final List<ExerciseData> exercises,
+      @JsonKey(name: 'exercises') required final List<Translation> translations,
       required final List<ExerciseImage> images,
-      required final List<Video> videos})
+      required final List<Video> videos,
+      @JsonKey(name: 'author_history') required final List<String> authors,
+      @JsonKey(name: 'total_authors_history') required final List<String> authorsGlobal})
       : _muscles = muscles,
         _musclesSecondary = musclesSecondary,
         _equipment = equipment,
-        _exercises = exercises,
+        _translations = translations,
         _images = images,
-        _videos = videos;
+        _videos = videos,
+        _authors = authors,
+        _authorsGlobal = authorsGlobal;
 
   factory _$ExerciseBaseDataImpl.fromJson(Map<String, dynamic> json) =>
       _$$ExerciseBaseDataImplFromJson(json);
@@ -272,6 +323,10 @@ class _$ExerciseBaseDataImpl implements _ExerciseBaseData {
   final int id;
   @override
   final String uuid;
+// ignore: invalid_annotation_target
+  @override
+  @JsonKey(name: 'variations')
+  final int? variationId;
 // ignore: invalid_annotation_target
   @override
   @JsonKey(name: 'created')
@@ -305,7 +360,9 @@ class _$ExerciseBaseDataImpl implements _ExerciseBaseData {
     return EqualUnmodifiableListView(_musclesSecondary);
   }
 
+// ignore: invalid_annotation_target
   final List<Equipment> _equipment;
+// ignore: invalid_annotation_target
   @override
   List<Equipment> get equipment {
     if (_equipment is EqualUnmodifiableListView) return _equipment;
@@ -313,12 +370,15 @@ class _$ExerciseBaseDataImpl implements _ExerciseBaseData {
     return EqualUnmodifiableListView(_equipment);
   }
 
-  final List<ExerciseData> _exercises;
+// ignore: invalid_annotation_target
+  final List<Translation> _translations;
+// ignore: invalid_annotation_target
   @override
-  List<ExerciseData> get exercises {
-    if (_exercises is EqualUnmodifiableListView) return _exercises;
+  @JsonKey(name: 'exercises')
+  List<Translation> get translations {
+    if (_translations is EqualUnmodifiableListView) return _translations;
     // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(_exercises);
+    return EqualUnmodifiableListView(_translations);
   }
 
   final List<ExerciseImage> _images;
@@ -337,9 +397,31 @@ class _$ExerciseBaseDataImpl implements _ExerciseBaseData {
     return EqualUnmodifiableListView(_videos);
   }
 
+// ignore: invalid_annotation_target
+  final List<String> _authors;
+// ignore: invalid_annotation_target
+  @override
+  @JsonKey(name: 'author_history')
+  List<String> get authors {
+    if (_authors is EqualUnmodifiableListView) return _authors;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_authors);
+  }
+
+// ignore: invalid_annotation_target
+  final List<String> _authorsGlobal;
+// ignore: invalid_annotation_target
+  @override
+  @JsonKey(name: 'total_authors_history')
+  List<String> get authorsGlobal {
+    if (_authorsGlobal is EqualUnmodifiableListView) return _authorsGlobal;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_authorsGlobal);
+  }
+
   @override
   String toString() {
-    return 'ExerciseBaseData(id: $id, uuid: $uuid, created: $created, lastUpdate: $lastUpdate, lastUpdateGlobal: $lastUpdateGlobal, category: $category, muscles: $muscles, musclesSecondary: $musclesSecondary, equipment: $equipment, exercises: $exercises, images: $images, videos: $videos)';
+    return 'ExerciseApiData(id: $id, uuid: $uuid, variationId: $variationId, created: $created, lastUpdate: $lastUpdate, lastUpdateGlobal: $lastUpdateGlobal, category: $category, muscles: $muscles, musclesSecondary: $musclesSecondary, equipment: $equipment, translations: $translations, images: $images, videos: $videos, authors: $authors, authorsGlobal: $authorsGlobal)';
   }
 
   @override
@@ -349,6 +431,7 @@ class _$ExerciseBaseDataImpl implements _ExerciseBaseData {
             other is _$ExerciseBaseDataImpl &&
             (identical(other.id, id) || other.id == id) &&
             (identical(other.uuid, uuid) || other.uuid == uuid) &&
+            (identical(other.variationId, variationId) || other.variationId == variationId) &&
             (identical(other.created, created) || other.created == created) &&
             (identical(other.lastUpdate, lastUpdate) || other.lastUpdate == lastUpdate) &&
             (identical(other.lastUpdateGlobal, lastUpdateGlobal) ||
@@ -357,9 +440,11 @@ class _$ExerciseBaseDataImpl implements _ExerciseBaseData {
             const DeepCollectionEquality().equals(other._muscles, _muscles) &&
             const DeepCollectionEquality().equals(other._musclesSecondary, _musclesSecondary) &&
             const DeepCollectionEquality().equals(other._equipment, _equipment) &&
-            const DeepCollectionEquality().equals(other._exercises, _exercises) &&
+            const DeepCollectionEquality().equals(other._translations, _translations) &&
             const DeepCollectionEquality().equals(other._images, _images) &&
-            const DeepCollectionEquality().equals(other._videos, _videos));
+            const DeepCollectionEquality().equals(other._videos, _videos) &&
+            const DeepCollectionEquality().equals(other._authors, _authors) &&
+            const DeepCollectionEquality().equals(other._authorsGlobal, _authorsGlobal));
   }
 
   @JsonKey(ignore: true)
@@ -368,6 +453,7 @@ class _$ExerciseBaseDataImpl implements _ExerciseBaseData {
       runtimeType,
       id,
       uuid,
+      variationId,
       created,
       lastUpdate,
       lastUpdateGlobal,
@@ -375,9 +461,11 @@ class _$ExerciseBaseDataImpl implements _ExerciseBaseData {
       const DeepCollectionEquality().hash(_muscles),
       const DeepCollectionEquality().hash(_musclesSecondary),
       const DeepCollectionEquality().hash(_equipment),
-      const DeepCollectionEquality().hash(_exercises),
+      const DeepCollectionEquality().hash(_translations),
       const DeepCollectionEquality().hash(_images),
-      const DeepCollectionEquality().hash(_videos));
+      const DeepCollectionEquality().hash(_videos),
+      const DeepCollectionEquality().hash(_authors),
+      const DeepCollectionEquality().hash(_authorsGlobal));
 
   @JsonKey(ignore: true)
   @override
@@ -393,20 +481,24 @@ class _$ExerciseBaseDataImpl implements _ExerciseBaseData {
   }
 }
 
-abstract class _ExerciseBaseData implements ExerciseBaseData {
+abstract class _ExerciseBaseData implements ExerciseApiData {
   factory _ExerciseBaseData(
-      {required final int id,
-      required final String uuid,
-      @JsonKey(name: 'created') required final DateTime created,
-      @JsonKey(name: 'last_update') required final DateTime lastUpdate,
-      @JsonKey(name: 'last_update_global') required final DateTime lastUpdateGlobal,
-      required final ExerciseCategory category,
-      required final List<Muscle> muscles,
-      @JsonKey(name: 'muscles_secondary') required final List<Muscle> musclesSecondary,
-      required final List<Equipment> equipment,
-      required final List<ExerciseData> exercises,
-      required final List<ExerciseImage> images,
-      required final List<Video> videos}) = _$ExerciseBaseDataImpl;
+          {required final int id,
+          required final String uuid,
+          @JsonKey(name: 'variations') final int? variationId,
+          @JsonKey(name: 'created') required final DateTime created,
+          @JsonKey(name: 'last_update') required final DateTime lastUpdate,
+          @JsonKey(name: 'last_update_global') required final DateTime lastUpdateGlobal,
+          required final ExerciseCategory category,
+          required final List<Muscle> muscles,
+          @JsonKey(name: 'muscles_secondary') required final List<Muscle> musclesSecondary,
+          required final List<Equipment> equipment,
+          @JsonKey(name: 'exercises') required final List<Translation> translations,
+          required final List<ExerciseImage> images,
+          required final List<Video> videos,
+          @JsonKey(name: 'author_history') required final List<String> authors,
+          @JsonKey(name: 'total_authors_history') required final List<String> authorsGlobal}) =
+      _$ExerciseBaseDataImpl;
 
   factory _ExerciseBaseData.fromJson(Map<String, dynamic> json) = _$ExerciseBaseDataImpl.fromJson;
 
@@ -415,6 +507,9 @@ abstract class _ExerciseBaseData implements ExerciseBaseData {
   @override
   String get uuid;
   @override // ignore: invalid_annotation_target
+  @JsonKey(name: 'variations')
+  int? get variationId;
+  @override // ignore: invalid_annotation_target
   @JsonKey(name: 'created')
   DateTime get created;
   @override // ignore: invalid_annotation_target
@@ -430,14 +525,21 @@ abstract class _ExerciseBaseData implements ExerciseBaseData {
   @override // ignore: invalid_annotation_target
   @JsonKey(name: 'muscles_secondary')
   List<Muscle> get musclesSecondary;
-  @override
+  @override // ignore: invalid_annotation_target
   List<Equipment> get equipment;
-  @override
-  List<ExerciseData> get exercises;
+  @override // ignore: invalid_annotation_target
+  @JsonKey(name: 'exercises')
+  List<Translation> get translations;
   @override
   List<ExerciseImage> get images;
   @override
   List<Video> get videos;
+  @override // ignore: invalid_annotation_target
+  @JsonKey(name: 'author_history')
+  List<String> get authors;
+  @override // ignore: invalid_annotation_target
+  @JsonKey(name: 'total_authors_history')
+  List<String> get authorsGlobal;
   @override
   @JsonKey(ignore: true)
   _$$ExerciseBaseDataImplCopyWith<_$ExerciseBaseDataImpl> get copyWith =>
diff --git a/lib/models/exercises/exercise_base_data.g.dart b/lib/models/exercises/exercise_api.g.dart
similarity index 77%
rename from lib/models/exercises/exercise_base_data.g.dart
rename to lib/models/exercises/exercise_api.g.dart
index 8122ded6..3fc31410 100644
--- a/lib/models/exercises/exercise_base_data.g.dart
+++ b/lib/models/exercises/exercise_api.g.dart
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'exercise_base_data.dart';
+part of 'exercise_api.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator
@@ -10,6 +10,7 @@ _$ExerciseBaseDataImpl _$$ExerciseBaseDataImplFromJson(Map<String, dynamic> json
     _$ExerciseBaseDataImpl(
       id: json['id'] as int,
       uuid: json['uuid'] as String,
+      variationId: json['variations'] as int? ?? null,
       created: DateTime.parse(json['created'] as String),
       lastUpdate: DateTime.parse(json['last_update'] as String),
       lastUpdateGlobal: DateTime.parse(json['last_update_global'] as String),
@@ -23,8 +24,8 @@ _$ExerciseBaseDataImpl _$$ExerciseBaseDataImplFromJson(Map<String, dynamic> json
       equipment: (json['equipment'] as List<dynamic>)
           .map((e) => Equipment.fromJson(e as Map<String, dynamic>))
           .toList(),
-      exercises: (json['exercises'] as List<dynamic>)
-          .map((e) => ExerciseData.fromJson(e as Map<String, dynamic>))
+      translations: (json['exercises'] as List<dynamic>)
+          .map((e) => Translation.fromJson(e as Map<String, dynamic>))
           .toList(),
       images: (json['images'] as List<dynamic>)
           .map((e) => ExerciseImage.fromJson(e as Map<String, dynamic>))
@@ -32,12 +33,16 @@ _$ExerciseBaseDataImpl _$$ExerciseBaseDataImplFromJson(Map<String, dynamic> json
       videos: (json['videos'] as List<dynamic>)
           .map((e) => Video.fromJson(e as Map<String, dynamic>))
           .toList(),
+      authors: (json['author_history'] as List<dynamic>).map((e) => e as String).toList(),
+      authorsGlobal:
+          (json['total_authors_history'] as List<dynamic>).map((e) => e as String).toList(),
     );
 
 Map<String, dynamic> _$$ExerciseBaseDataImplToJson(_$ExerciseBaseDataImpl instance) =>
     <String, dynamic>{
       'id': instance.id,
       'uuid': instance.uuid,
+      'variations': instance.variationId,
       'created': instance.created.toIso8601String(),
       'last_update': instance.lastUpdate.toIso8601String(),
       'last_update_global': instance.lastUpdateGlobal.toIso8601String(),
@@ -45,7 +50,9 @@ Map<String, dynamic> _$$ExerciseBaseDataImplToJson(_$ExerciseBaseDataImpl instan
       'muscles': instance.muscles,
       'muscles_secondary': instance.musclesSecondary,
       'equipment': instance.equipment,
-      'exercises': instance.exercises,
+      'exercises': instance.translations,
       'images': instance.images,
       'videos': instance.videos,
+      'author_history': instance.authors,
+      'total_authors_history': instance.authorsGlobal,
     };
diff --git a/lib/models/exercises/exercise_base_data.dart b/lib/models/exercises/exercise_base_data.dart
deleted file mode 100644
index bcc55af8..00000000
--- a/lib/models/exercises/exercise_base_data.dart
+++ /dev/null
@@ -1,34 +0,0 @@
-import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:wger/models/exercises/category.dart';
-import 'package:wger/models/exercises/equipment.dart';
-import 'package:wger/models/exercises/exercise_model.dart';
-import 'package:wger/models/exercises/image.dart';
-import 'package:wger/models/exercises/muscle.dart';
-import 'package:wger/models/exercises/video.dart';
-
-part 'exercise_base_data.freezed.dart';
-part 'exercise_base_data.g.dart';
-
-@freezed
-class ExerciseBaseData with _$ExerciseBaseData {
-  factory ExerciseBaseData({
-    required int id,
-    required String uuid,
-    // ignore: invalid_annotation_target
-    @JsonKey(name: 'created') required DateTime created,
-    // ignore: invalid_annotation_target
-    @JsonKey(name: 'last_update') required DateTime lastUpdate,
-    // ignore: invalid_annotation_target
-    @JsonKey(name: 'last_update_global') required DateTime lastUpdateGlobal,
-    required ExerciseCategory category,
-    required List<Muscle> muscles,
-    // ignore: invalid_annotation_target
-    @JsonKey(name: 'muscles_secondary') required List<Muscle> musclesSecondary,
-    required List<Equipment> equipment,
-    required List<ExerciseData> exercises,
-    required List<ExerciseImage> images,
-    required List<Video> videos,
-  }) = _ExerciseBaseData;
-
-  factory ExerciseBaseData.fromJson(Map<String, dynamic> json) => _$ExerciseBaseDataFromJson(json);
-}
diff --git a/lib/models/exercises/exercise_model.dart b/lib/models/exercises/exercise_model.dart
deleted file mode 100644
index e3d699bd..00000000
--- a/lib/models/exercises/exercise_model.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-import 'package:freezed_annotation/freezed_annotation.dart';
-import 'package:wger/models/exercises/alias.dart';
-import 'package:wger/models/exercises/comment.dart';
-
-part 'exercise_model.freezed.dart';
-part 'exercise_model.g.dart';
-
-@freezed
-class ExerciseData with _$ExerciseData {
-  factory ExerciseData({
-    required int id,
-    required String uuid,
-    // ignore: invalid_annotation_target
-    @JsonKey(name: 'language') required int languageId,
-    // ignore: invalid_annotation_target
-    @JsonKey(required: true, name: 'exercise_base') required int exerciseId,
-    required String description,
-    required String name,
-    required List<Alias> aliases,
-    required List<Comment> notes,
-  }) = _ExerciseData;
-
-  factory ExerciseData.fromJson(Map<String, dynamic> json) => _$ExerciseDataFromJson(json);
-}
diff --git a/lib/models/exercises/exercise_model.freezed.dart b/lib/models/exercises/exercise_model.freezed.dart
deleted file mode 100644
index 85cc18db..00000000
--- a/lib/models/exercises/exercise_model.freezed.dart
+++ /dev/null
@@ -1,313 +0,0 @@
-// coverage:ignore-file
-// GENERATED CODE - DO NOT MODIFY BY HAND
-// ignore_for_file: type=lint
-// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
-
-part of 'exercise_model.dart';
-
-// **************************************************************************
-// FreezedGenerator
-// **************************************************************************
-
-T _$identity<T>(T value) => value;
-
-final _privateConstructorUsedError = UnsupportedError(
-    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#custom-getters-and-methods');
-
-ExerciseData _$ExerciseDataFromJson(Map<String, dynamic> json) {
-  return _ExerciseData.fromJson(json);
-}
-
-/// @nodoc
-mixin _$ExerciseData {
-  int get id => throw _privateConstructorUsedError;
-  String get uuid => throw _privateConstructorUsedError; // ignore: invalid_annotation_target
-  @JsonKey(name: 'language')
-  int get languageId => throw _privateConstructorUsedError; // ignore: invalid_annotation_target
-  @JsonKey(required: true, name: 'exercise_base')
-  int get exerciseId => throw _privateConstructorUsedError;
-  String get description => throw _privateConstructorUsedError;
-  String get name => throw _privateConstructorUsedError;
-  List<Alias> get aliases => throw _privateConstructorUsedError;
-  List<Comment> get notes => throw _privateConstructorUsedError;
-
-  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
-  @JsonKey(ignore: true)
-  $ExerciseDataCopyWith<ExerciseData> get copyWith => throw _privateConstructorUsedError;
-}
-
-/// @nodoc
-abstract class $ExerciseDataCopyWith<$Res> {
-  factory $ExerciseDataCopyWith(ExerciseData value, $Res Function(ExerciseData) then) =
-      _$ExerciseDataCopyWithImpl<$Res, ExerciseData>;
-  @useResult
-  $Res call(
-      {int id,
-      String uuid,
-      @JsonKey(name: 'language') int languageId,
-      @JsonKey(required: true, name: 'exercise_base') int exerciseId,
-      String description,
-      String name,
-      List<Alias> aliases,
-      List<Comment> notes});
-}
-
-/// @nodoc
-class _$ExerciseDataCopyWithImpl<$Res, $Val extends ExerciseData>
-    implements $ExerciseDataCopyWith<$Res> {
-  _$ExerciseDataCopyWithImpl(this._value, this._then);
-
-  // ignore: unused_field
-  final $Val _value;
-  // ignore: unused_field
-  final $Res Function($Val) _then;
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? id = null,
-    Object? uuid = null,
-    Object? languageId = null,
-    Object? exerciseId = null,
-    Object? description = null,
-    Object? name = null,
-    Object? aliases = null,
-    Object? notes = null,
-  }) {
-    return _then(_value.copyWith(
-      id: null == id
-          ? _value.id
-          : id // ignore: cast_nullable_to_non_nullable
-              as int,
-      uuid: null == uuid
-          ? _value.uuid
-          : uuid // ignore: cast_nullable_to_non_nullable
-              as String,
-      languageId: null == languageId
-          ? _value.languageId
-          : languageId // ignore: cast_nullable_to_non_nullable
-              as int,
-      exerciseId: null == exerciseId
-          ? _value.exerciseId
-          : exerciseId // ignore: cast_nullable_to_non_nullable
-              as int,
-      description: null == description
-          ? _value.description
-          : description // ignore: cast_nullable_to_non_nullable
-              as String,
-      name: null == name
-          ? _value.name
-          : name // ignore: cast_nullable_to_non_nullable
-              as String,
-      aliases: null == aliases
-          ? _value.aliases
-          : aliases // ignore: cast_nullable_to_non_nullable
-              as List<Alias>,
-      notes: null == notes
-          ? _value.notes
-          : notes // ignore: cast_nullable_to_non_nullable
-              as List<Comment>,
-    ) as $Val);
-  }
-}
-
-/// @nodoc
-abstract class _$$ExerciseDataImplCopyWith<$Res> implements $ExerciseDataCopyWith<$Res> {
-  factory _$$ExerciseDataImplCopyWith(
-          _$ExerciseDataImpl value, $Res Function(_$ExerciseDataImpl) then) =
-      __$$ExerciseDataImplCopyWithImpl<$Res>;
-  @override
-  @useResult
-  $Res call(
-      {int id,
-      String uuid,
-      @JsonKey(name: 'language') int languageId,
-      @JsonKey(required: true, name: 'exercise_base') int exerciseId,
-      String description,
-      String name,
-      List<Alias> aliases,
-      List<Comment> notes});
-}
-
-/// @nodoc
-class __$$ExerciseDataImplCopyWithImpl<$Res>
-    extends _$ExerciseDataCopyWithImpl<$Res, _$ExerciseDataImpl>
-    implements _$$ExerciseDataImplCopyWith<$Res> {
-  __$$ExerciseDataImplCopyWithImpl(
-      _$ExerciseDataImpl _value, $Res Function(_$ExerciseDataImpl) _then)
-      : super(_value, _then);
-
-  @pragma('vm:prefer-inline')
-  @override
-  $Res call({
-    Object? id = null,
-    Object? uuid = null,
-    Object? languageId = null,
-    Object? exerciseId = null,
-    Object? description = null,
-    Object? name = null,
-    Object? aliases = null,
-    Object? notes = null,
-  }) {
-    return _then(_$ExerciseDataImpl(
-      id: null == id
-          ? _value.id
-          : id // ignore: cast_nullable_to_non_nullable
-              as int,
-      uuid: null == uuid
-          ? _value.uuid
-          : uuid // ignore: cast_nullable_to_non_nullable
-              as String,
-      languageId: null == languageId
-          ? _value.languageId
-          : languageId // ignore: cast_nullable_to_non_nullable
-              as int,
-      exerciseId: null == exerciseId
-          ? _value.exerciseId
-          : exerciseId // ignore: cast_nullable_to_non_nullable
-              as int,
-      description: null == description
-          ? _value.description
-          : description // ignore: cast_nullable_to_non_nullable
-              as String,
-      name: null == name
-          ? _value.name
-          : name // ignore: cast_nullable_to_non_nullable
-              as String,
-      aliases: null == aliases
-          ? _value._aliases
-          : aliases // ignore: cast_nullable_to_non_nullable
-              as List<Alias>,
-      notes: null == notes
-          ? _value._notes
-          : notes // ignore: cast_nullable_to_non_nullable
-              as List<Comment>,
-    ));
-  }
-}
-
-/// @nodoc
-@JsonSerializable()
-class _$ExerciseDataImpl implements _ExerciseData {
-  _$ExerciseDataImpl(
-      {required this.id,
-      required this.uuid,
-      @JsonKey(name: 'language') required this.languageId,
-      @JsonKey(required: true, name: 'exercise_base') required this.exerciseId,
-      required this.description,
-      required this.name,
-      required final List<Alias> aliases,
-      required final List<Comment> notes})
-      : _aliases = aliases,
-        _notes = notes;
-
-  factory _$ExerciseDataImpl.fromJson(Map<String, dynamic> json) =>
-      _$$ExerciseDataImplFromJson(json);
-
-  @override
-  final int id;
-  @override
-  final String uuid;
-// ignore: invalid_annotation_target
-  @override
-  @JsonKey(name: 'language')
-  final int languageId;
-// ignore: invalid_annotation_target
-  @override
-  @JsonKey(required: true, name: 'exercise_base')
-  final int exerciseId;
-  @override
-  final String description;
-  @override
-  final String name;
-  final List<Alias> _aliases;
-  @override
-  List<Alias> get aliases {
-    if (_aliases is EqualUnmodifiableListView) return _aliases;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(_aliases);
-  }
-
-  final List<Comment> _notes;
-  @override
-  List<Comment> get notes {
-    if (_notes is EqualUnmodifiableListView) return _notes;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(_notes);
-  }
-
-  @override
-  String toString() {
-    return 'ExerciseData(id: $id, uuid: $uuid, languageId: $languageId, exerciseId: $exerciseId, description: $description, name: $name, aliases: $aliases, notes: $notes)';
-  }
-
-  @override
-  bool operator ==(dynamic other) {
-    return identical(this, other) ||
-        (other.runtimeType == runtimeType &&
-            other is _$ExerciseDataImpl &&
-            (identical(other.id, id) || other.id == id) &&
-            (identical(other.uuid, uuid) || other.uuid == uuid) &&
-            (identical(other.languageId, languageId) || other.languageId == languageId) &&
-            (identical(other.exerciseId, exerciseId) || other.exerciseId == exerciseId) &&
-            (identical(other.description, description) || other.description == description) &&
-            (identical(other.name, name) || other.name == name) &&
-            const DeepCollectionEquality().equals(other._aliases, _aliases) &&
-            const DeepCollectionEquality().equals(other._notes, _notes));
-  }
-
-  @JsonKey(ignore: true)
-  @override
-  int get hashCode => Object.hash(runtimeType, id, uuid, languageId, exerciseId, description, name,
-      const DeepCollectionEquality().hash(_aliases), const DeepCollectionEquality().hash(_notes));
-
-  @JsonKey(ignore: true)
-  @override
-  @pragma('vm:prefer-inline')
-  _$$ExerciseDataImplCopyWith<_$ExerciseDataImpl> get copyWith =>
-      __$$ExerciseDataImplCopyWithImpl<_$ExerciseDataImpl>(this, _$identity);
-
-  @override
-  Map<String, dynamic> toJson() {
-    return _$$ExerciseDataImplToJson(
-      this,
-    );
-  }
-}
-
-abstract class _ExerciseData implements ExerciseData {
-  factory _ExerciseData(
-      {required final int id,
-      required final String uuid,
-      @JsonKey(name: 'language') required final int languageId,
-      @JsonKey(required: true, name: 'exercise_base') required final int exerciseId,
-      required final String description,
-      required final String name,
-      required final List<Alias> aliases,
-      required final List<Comment> notes}) = _$ExerciseDataImpl;
-
-  factory _ExerciseData.fromJson(Map<String, dynamic> json) = _$ExerciseDataImpl.fromJson;
-
-  @override
-  int get id;
-  @override
-  String get uuid;
-  @override // ignore: invalid_annotation_target
-  @JsonKey(name: 'language')
-  int get languageId;
-  @override // ignore: invalid_annotation_target
-  @JsonKey(required: true, name: 'exercise_base')
-  int get exerciseId;
-  @override
-  String get description;
-  @override
-  String get name;
-  @override
-  List<Alias> get aliases;
-  @override
-  List<Comment> get notes;
-  @override
-  @JsonKey(ignore: true)
-  _$$ExerciseDataImplCopyWith<_$ExerciseDataImpl> get copyWith =>
-      throw _privateConstructorUsedError;
-}
diff --git a/lib/models/exercises/exercise_model.g.dart b/lib/models/exercises/exercise_model.g.dart
deleted file mode 100644
index 42eb4c32..00000000
--- a/lib/models/exercises/exercise_model.g.dart
+++ /dev/null
@@ -1,39 +0,0 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'exercise_model.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-_$ExerciseDataImpl _$$ExerciseDataImplFromJson(Map<String, dynamic> json) {
-  $checkKeys(
-    json,
-    requiredKeys: const ['exercise_base'],
-  );
-  return _$ExerciseDataImpl(
-    id: json['id'] as int,
-    uuid: json['uuid'] as String,
-    languageId: json['language'] as int,
-    exerciseId: json['exercise_base'] as int,
-    description: json['description'] as String,
-    name: json['name'] as String,
-    aliases: (json['aliases'] as List<dynamic>)
-        .map((e) => Alias.fromJson(e as Map<String, dynamic>))
-        .toList(),
-    notes: (json['notes'] as List<dynamic>)
-        .map((e) => Comment.fromJson(e as Map<String, dynamic>))
-        .toList(),
-  );
-}
-
-Map<String, dynamic> _$$ExerciseDataImplToJson(_$ExerciseDataImpl instance) => <String, dynamic>{
-      'id': instance.id,
-      'uuid': instance.uuid,
-      'language': instance.languageId,
-      'exercise_base': instance.exerciseId,
-      'description': instance.description,
-      'name': instance.name,
-      'aliases': instance.aliases,
-      'notes': instance.notes,
-    };
diff --git a/lib/models/exercises/translation.dart b/lib/models/exercises/translation.dart
index 0ef338f7..d7a3775d 100644
--- a/lib/models/exercises/translation.dart
+++ b/lib/models/exercises/translation.dart
@@ -36,7 +36,7 @@ class Translation extends Equatable {
   @JsonKey(required: true, name: 'language')
   late int languageId;
 
-  @JsonKey(includeFromJson: true, includeToJson: true)
+  @JsonKey(includeFromJson: false, includeToJson: false)
   late Language languageObj;
 
   @JsonKey(required: true, name: 'created')
@@ -51,10 +51,10 @@ class Translation extends Equatable {
   @JsonKey(required: true)
   final String description;
 
-  @JsonKey(includeFromJson: true, includeToJson: true)
+  @JsonKey(includeFromJson: true, includeToJson: false)
   List<Comment> notes = [];
 
-  @JsonKey(includeFromJson: true, includeToJson: true)
+  @JsonKey(includeFromJson: true, includeToJson: false)
   List<Alias> aliases = [];
 
   Translation({
diff --git a/lib/models/exercises/translation.g.dart b/lib/models/exercises/translation.g.dart
index a8b3a886..30a8f82c 100644
--- a/lib/models/exercises/translation.g.dart
+++ b/lib/models/exercises/translation.g.dart
@@ -28,7 +28,6 @@ Translation _$TranslationFromJson(Map<String, dynamic> json) {
     exerciseId: json['exercise_base'] as int?,
   )
     ..languageId = json['language'] as int
-    ..languageObj = Language.fromJson(json['languageObj'] as Map<String, dynamic>)
     ..notes = (json['notes'] as List<dynamic>)
         .map((e) => Comment.fromJson(e as Map<String, dynamic>))
         .toList()
@@ -41,11 +40,8 @@ Map<String, dynamic> _$TranslationToJson(Translation instance) => <String, dynam
       'id': instance.id,
       'uuid': instance.uuid,
       'language': instance.languageId,
-      'languageObj': instance.languageObj,
       'created': instance.created?.toIso8601String(),
       'exercise_base': instance.exerciseId,
       'name': instance.name,
       'description': instance.description,
-      'notes': instance.notes,
-      'aliases': instance.aliases,
     };
diff --git a/lib/providers/exercises.dart b/lib/providers/exercises.dart
index b997f1bb..3d0dcde2 100644
--- a/lib/providers/exercises.dart
+++ b/lib/providers/exercises.dart
@@ -27,14 +27,12 @@ import 'package:wger/core/locator.dart';
 import 'package:wger/database/exercises/exercise_database.dart';
 import 'package:wger/exceptions/no_such_entry_exception.dart';
 import 'package:wger/helpers/consts.dart';
-import 'package:wger/models/exercises/alias.dart';
 import 'package:wger/models/exercises/category.dart';
 import 'package:wger/models/exercises/equipment.dart';
 import 'package:wger/models/exercises/exercise.dart';
-import 'package:wger/models/exercises/exercise_base_data.dart';
+import 'package:wger/models/exercises/exercise_api.dart';
 import 'package:wger/models/exercises/language.dart';
 import 'package:wger/models/exercises/muscle.dart';
-import 'package:wger/models/exercises/translation.dart';
 import 'package:wger/models/exercises/variation.dart';
 import 'package:wger/providers/base_provider.dart';
 
@@ -44,6 +42,7 @@ class ExercisesProvider with ChangeNotifier {
   ExercisesProvider(this.baseProvider);
 
   static const EXERCISE_CACHE_DAYS = 7;
+  static const EXERCISE_FETCH_HOURS = 4;
   static const CACHE_VERSION = 4;
 
   static const exerciseInfoUrlPath = 'exercisebaseinfo';
@@ -55,11 +54,7 @@ class ExercisesProvider with ChangeNotifier {
   static const equipmentUrlPath = 'equipment';
   static const languageUrlPath = 'language';
 
-  List<Exercise> _exercises = [];
-
-  set exerciseBases(List<Exercise> exercisesBases) {
-    _exercises = exercisesBases;
-  }
+  List<Exercise> exercises = [];
 
   List<ExerciseCategory> _categories = [];
   List<Muscle> _muscles = [];
@@ -88,7 +83,7 @@ class ExercisesProvider with ChangeNotifier {
   Map<int, List<Exercise>> get exerciseBasesByVariation {
     final Map<int, List<Exercise>> variations = {};
 
-    for (final exercise in _exercises.where((e) => e.variationId != null)) {
+    for (final exercise in exercises.where((e) => e.variationId != null)) {
       if (!variations.containsKey(exercise.variationId)) {
         variations[exercise.variationId!] = [];
       }
@@ -99,8 +94,6 @@ class ExercisesProvider with ChangeNotifier {
     return variations;
   }
 
-  List<Exercise> get bases => [..._exercises];
-
   List<ExerciseCategory> get categories => [..._categories];
 
   List<Muscle> get muscles => [..._muscles];
@@ -150,13 +143,13 @@ class ExercisesProvider with ChangeNotifier {
 
     // Filters are initialized and nothing is marked
     if (filters!.isNothingMarked && filters!.searchTerm.length <= 1) {
-      filteredExercises = _exercises;
+      filteredExercises = exercises;
       return;
     }
 
     filteredExercises = [];
 
-    List<Exercise> filteredItems = _exercises;
+    List<Exercise> filteredItems = exercises;
     if (filters!.searchTerm.length > 1) {
       filteredItems = await searchExercise(filters!.searchTerm);
     }
@@ -180,12 +173,14 @@ class ExercisesProvider with ChangeNotifier {
     _muscles = [];
     _categories = [];
     _languages = [];
-    _exercises = [];
+    exercises = [];
   }
 
   /// Find exercise base by ID
+  ///
+  /// Note: prefer using the async `fetchAndSetExercise` method
   Exercise findExerciseById(int id) {
-    return _exercises.firstWhere(
+    return exercises.firstWhere(
       (base) => base.id == id,
       orElse: () => throw NoSuchEntryException(),
     );
@@ -198,7 +193,7 @@ class ExercisesProvider with ChangeNotifier {
   /// not interested in seeing that same exercise returned in the list of variations.
   /// If this parameter is not passed, all exercises are returned.
   List<Exercise> findExerciseBasesByVariationId(int id, {int? exerciseBaseIdToExclude}) {
-    var out = _exercises.where((base) => base.variationId == id).toList();
+    var out = exercises.where((base) => base.variationId == id).toList();
 
     if (exerciseBaseIdToExclude != null) {
       out = out.where((e) => e.id != exerciseBaseIdToExclude).toList();
@@ -277,93 +272,100 @@ class ExercisesProvider with ChangeNotifier {
     }
   }
 
-  Future<Language> fetchAndSetLanguageFromApi(int id) async {
-    final language = await baseProvider.fetch(baseProvider.makeUrl(languageUrlPath, id: id));
-    return Language.fromJson(language);
-  }
-
   /// Returns the exercise with the given ID
   ///
   /// If the exercise is not known locally, it is fetched from the server.
-  /// This method is called when a workout is first loaded, after that the
-  /// regular not-async getById method can be used
   Future<Exercise> fetchAndSetExercise(int exerciseId) async {
+    final database = locator<ExerciseDatabase>();
+
     try {
-      return findExerciseById(exerciseId);
+      final exercise = findExerciseById(exerciseId);
+
+      // Note: no await since we don't care for the updated data right now. It
+      // will be written to the db whenever the request finishes and we will get
+      // the updated exercise the next time
+      handleUpdateExerciseFromApi(database, exerciseId);
+
+      return exercise;
     } on NoSuchEntryException {
+      return handleUpdateExerciseFromApi(database, exerciseId);
+    }
+  }
+
+  /// Handles updates to exercises from the server to the local database
+  ///
+  /// The current logic is:
+  /// Is the exercise known locally:
+  /// -> no: fetch and add to the DB
+  /// -> yes: Do we need to re-fetch?
+  ///    -> no: just return what we have in the DB
+  ///    -> yes: fetch data and update if necessary
+  Future<Exercise> handleUpdateExerciseFromApi(ExerciseDatabase database, int exerciseId) async {
+    Exercise exercise;
+    final exerciseDb = await (database.select(database.exercises)
+          ..where((e) => e.id.equals(exerciseId)))
+        .getSingleOrNull();
+
+    // Exercise is already known locally
+    if (exerciseDb != null) {
+      final nextFetch = exerciseDb.lastFetched.add(const Duration(hours: EXERCISE_FETCH_HOURS));
+      final exerciseDbData = ExerciseApiData.fromString(exerciseDb.data);
+      exercise = Exercise.fromApiData(exerciseDbData, _languages);
+
+      // Fetch and update
+      if (nextFetch.isBefore(DateTime.now())) {
+        final apiData = await baseProvider.fetch(
+          baseProvider.makeUrl(exerciseInfoUrlPath, id: exerciseId),
+        );
+        final exerciseApiData = ExerciseApiData.fromJson(apiData);
+
+        // There have been changes on the server, update
+        if (exerciseApiData.lastUpdateGlobal.isAfter(exerciseDb.lastUpdate)) {
+          exercise = Exercise.fromApiData(exerciseApiData, _languages);
+
+          await (database.update(database.exercises)..where((e) => e.id.equals(exerciseId))).write(
+            ExercisesCompanion(
+              data: Value(jsonEncode(apiData)),
+              lastUpdate: Value(exerciseApiData.lastUpdateGlobal),
+              lastFetched: Value(DateTime.now()),
+            ),
+          );
+          // Update last fetched date, otherwise we'll keep hitting the API
+        } else {
+          await (database.update(database.exercises)..where((e) => e.id.equals(exerciseId))).write(
+            ExercisesCompanion(lastFetched: Value(DateTime.now())),
+          );
+        }
+      }
+      // New exercise, fetch and insert to DB
+    } else {
       final baseData = await baseProvider.fetch(
         baseProvider.makeUrl(exerciseInfoUrlPath, id: exerciseId),
       );
 
-      final exercise = readExerciseFromBaseInfo(ExerciseBaseData.fromJson(baseData));
-      final database = locator<ExerciseDatabase>();
+      final exerciseData = ExerciseApiData.fromJson(baseData);
+      exercise = Exercise.fromApiData(exerciseData, _languages);
 
-      final exerciseDb = await (database.select(database.exercises)
-            ..where((e) => e.id.equals(baseData['id'])))
-          .getSingleOrNull();
-
-      // New exercise, insert
       if (exerciseDb == null) {
-        database.into(database.exercises).insert(
+        await database.into(database.exercises).insert(
               ExercisesCompanion.insert(
-                id: baseData['id'],
-                data: jsonEncode(baseData),
-                lastUpdate: DateTime.parse(baseData['last_update_global']),
-              ),
+                  id: exerciseData.id,
+                  data: jsonEncode(baseData),
+                  lastUpdate: exerciseData.lastUpdateGlobal,
+                  lastFetched: DateTime.now()),
             );
       }
-
-      // If there were updates on the server, update
-      final lastUpdateApi = DateTime.parse(baseData['last_update_global']);
-      if (exerciseDb != null && lastUpdateApi.isAfter(exerciseDb.lastUpdate)) {
-        (database.update(database.exercises)..where((e) => e.id.equals(baseData['id']))).write(
-          ExercisesCompanion(
-            id: Value(baseData['id']),
-            data: Value(jsonEncode(baseData)),
-            lastUpdate: Value(DateTime.parse(baseData['last_update_global'])),
-          ),
-        );
-      }
-
-      _exercises.add(exercise);
-      return exercise;
-    }
-  }
-
-  /// Parses the response from the "exercisebaseinfo" endpoint and returns
-  /// a full exercise base
-  Exercise readExerciseFromBaseInfo(ExerciseBaseData baseData) {
-    final List<Translation> translations = [];
-    for (final translationData in baseData.exercises) {
-      final translation = Translation(
-        id: translationData.id,
-        uuid: translationData.uuid,
-        name: translationData.name,
-        description: translationData.description,
-        exerciseId: baseData.id,
-      );
-      translation.aliases = translationData.aliases
-          .map((e) => Alias(exerciseId: translation.id ?? 0, alias: e.alias))
-          .toList();
-      translation.notes = translationData.notes;
-      translation.language = findLanguageById(translationData.languageId);
-      translations.add(translation);
     }
 
-    return Exercise(
-      id: baseData.id,
-      uuid: baseData.uuid,
-      created: baseData.created,
-      lastUpdate: baseData.lastUpdate,
-      lastUpdateGlobal: baseData.lastUpdateGlobal,
-      musclesSecondary: baseData.muscles,
-      muscles: baseData.muscles,
-      equipment: baseData.equipment,
-      category: baseData.category,
-      images: baseData.images,
-      translations: translations,
-      videos: baseData.videos,
-    );
+    // Either update or add the exercise to local list
+    final index = exercises.indexWhere((element) => element.id == exerciseId);
+    if (index != -1) {
+      exercises[index] = exercise;
+    } else {
+      exercises.add(exercise);
+    }
+
+    return exercise;
   }
 
   /// Checks the required cache version
@@ -430,7 +432,7 @@ class ExercisesProvider with ChangeNotifier {
   /// - Categories
   /// - Languages
   /// - Equipment
-  /// - Exercises
+  /// - Exercises (only local cache)
   Future<void> fetchAndSetInitialData() async {
     clear();
 
@@ -446,32 +448,30 @@ class ExercisesProvider with ChangeNotifier {
       fetchAndSetLanguages(database),
       fetchAndSetEquipments(database),
     ]);
-    await fetchAndSetExercises(database);
+    await setExercisesFromDatabase(database);
 
     _initFilters();
     notifyListeners();
   }
 
-  /// Fetches and sets the available exercises
-  ///
-  /// We first try to read from the local DB, and from the API if the data is too old
-  Future<void> fetchAndSetExercises(ExerciseDatabase database,
+  /// Set the available exercises as available in the db
+  Future<void> setExercisesFromDatabase(ExerciseDatabase database,
       {bool forceDeleteCache = false}) async {
     if (forceDeleteCache) {
       await database.delete(database.exercises).go();
     }
 
-    final exercises = await database.select(database.exercises).get();
-    log('Loaded ${exercises.length} exercises from cache');
+    final exercisesDb = await database.select(database.exercises).get();
+    log('Loaded ${exercisesDb.length} exercises from cache');
 
-    _exercises = exercises
-        .map((e) => readExerciseFromBaseInfo(ExerciseBaseData.fromJson(json.decode(e.data))))
-        //.map((e) => e.data)
+    exercises = exercisesDb
+        .map((e) => Exercise.fromApiData(ExerciseApiData.fromJson(json.decode(e.data)), _languages))
         .toList();
 
     // updateExerciseCache(database);
   }
 
+  /// Updates the exercise database with *all* the exercises from the server
   Future<void> updateExerciseCache(ExerciseDatabase database) async {
     final data = await Future.wait<dynamic>([
       baseProvider.fetch(baseProvider.makeUrl(exerciseInfoUrlPath, query: {'limit': '1000'})),
@@ -480,8 +480,9 @@ class ExercisesProvider with ChangeNotifier {
     ]);
 
     final List<dynamic> exercisesData = data[0]['results'];
-    final exerciseBaseData = exercisesData.map((e) => ExerciseBaseData.fromJson(e)).toList();
-    _exercises = exerciseBaseData.map((e) => readExerciseFromBaseInfo(e)).toList();
+    exercises = exercisesData
+        .map((e) => Exercise.fromApiData(ExerciseApiData.fromJson(e), _languages))
+        .toList();
 
     // Insert new entries and update ones that have been edited
     Future.forEach(exercisesData, (exerciseData) async {
@@ -493,10 +494,10 @@ class ExercisesProvider with ChangeNotifier {
       if (exercise == null) {
         database.into(database.exercises).insert(
               ExercisesCompanion.insert(
-                id: exerciseData['id'],
-                data: jsonEncode(exerciseData),
-                lastUpdate: DateTime.parse(exerciseData['last_update_global']),
-              ),
+                  id: exerciseData['id'],
+                  data: jsonEncode(exerciseData),
+                  lastUpdate: DateTime.parse(exerciseData['last_update_global']),
+                  lastFetched: DateTime.now()),
             );
       }
 
@@ -511,6 +512,7 @@ class ExercisesProvider with ChangeNotifier {
             id: Value(exerciseData['id']),
             data: Value(jsonEncode(exerciseData)),
             lastUpdate: Value(DateTime.parse(exerciseData['last_update_global'])),
+            lastFetched: Value(DateTime.now()),
           ),
         );
       }
diff --git a/lib/widgets/add_exercise/steps/step2variations.dart b/lib/widgets/add_exercise/steps/step2variations.dart
index ebe9254e..4a92a1e6 100644
--- a/lib/widgets/add_exercise/steps/step2variations.dart
+++ b/lib/widgets/add_exercise/steps/step2variations.dart
@@ -63,7 +63,7 @@ class Step2Variations extends StatelessWidget {
                       )
                       .toList(),
                   // Exercise bases without variations
-                  ...exerciseProvider.bases
+                  ...exerciseProvider.exercises
                       .where((b) => b.variationId == null)
                       .map(
                         (base) => Row(
diff --git a/test/exercises/contribute_exercise_test.dart b/test/exercises/contribute_exercise_test.dart
index 0b887902..5730678b 100644
--- a/test/exercises/contribute_exercise_test.dart
+++ b/test/exercises/contribute_exercise_test.dart
@@ -76,7 +76,7 @@ void main() {
     when(mockExerciseProvider.muscles).thenReturn(testMuscles);
     when(mockExerciseProvider.equipment).thenReturn(testEquipment);
     when(mockExerciseProvider.exerciseBasesByVariation).thenReturn({});
-    when(mockExerciseProvider.bases).thenReturn(getTestExerciseBases());
+    when(mockExerciseProvider.exercises).thenReturn(getTestExerciseBases());
     when(mockExerciseProvider.languages).thenReturn(testLanguages);
 
     when(mockAddExerciseProvider.equipment).thenReturn([]);
diff --git a/test/exercises/exercise_provider_db_test.dart b/test/exercises/exercise_provider_db_test.dart
index 5412c77f..bf1d5081 100644
--- a/test/exercises/exercise_provider_db_test.dart
+++ b/test/exercises/exercise_provider_db_test.dart
@@ -7,6 +7,8 @@ import 'package:mockito/mockito.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:wger/database/exercises/exercise_database.dart';
 import 'package:wger/helpers/consts.dart';
+import 'package:wger/helpers/misc.dart';
+import 'package:wger/models/exercises/exercise_api.dart';
 import 'package:wger/models/exercises/muscle.dart';
 import 'package:wger/providers/exercises.dart';
 
@@ -31,12 +33,18 @@ void main() {
     path: 'api/v2/$categoryUrl/',
   );
 
-  final Uri texerciseBaseInfoUri = Uri(
+  final Uri tExerciseInfoUri = Uri(
     scheme: 'http',
     host: 'localhost',
     path: 'api/v2/$exerciseBaseInfoUrl/',
   );
 
+  final Uri tExerciseInfoDetailUri = Uri(
+    scheme: 'http',
+    host: 'localhost',
+    path: 'api/v2/$exerciseBaseInfoUrl/9/',
+  );
+
   final Uri tMuscleEntriesUri = Uri(
     scheme: 'http',
     host: 'localhost',
@@ -101,13 +109,20 @@ void main() {
     // Mock languages
     when(mockBaseProvider.makeUrl(languageUrl, query: anyNamed('query')))
         .thenReturn(tLanguageEntriesUri);
-    when(mockBaseProvider.fetchPaginated(tLanguageEntriesUri))
-        .thenAnswer((_) => Future.value(tLanguageMap['results']));
+    when(mockBaseProvider.fetchPaginated(tLanguageEntriesUri)).thenAnswer(
+      (_) => Future.value(tLanguageMap['results']),
+    );
 
     // Mock base info response
-    when(mockBaseProvider.makeUrl(exerciseBaseInfoUrl)).thenReturn(texerciseBaseInfoUri);
-    when(mockBaseProvider.fetch(texerciseBaseInfoUri))
-        .thenAnswer((_) => Future.value(tExerciseBaseInfoMap));
+    when(mockBaseProvider.makeUrl(exerciseBaseInfoUrl)).thenReturn(tExerciseInfoUri);
+    when(mockBaseProvider.fetch(tExerciseInfoUri)).thenAnswer(
+      (_) => Future.value(tExerciseBaseInfoMap),
+    );
+
+    when(mockBaseProvider.makeUrl(exerciseBaseInfoUrl, id: 9)).thenReturn(tExerciseInfoDetailUri);
+    when(mockBaseProvider.fetch(tExerciseInfoDetailUri)).thenAnswer(
+      (_) => Future.value(tExerciseBaseInfoMap),
+    );
   });
 
   tearDown(() async {
@@ -126,10 +141,7 @@ void main() {
       // Assert
       final updateTime = DateTime.parse(prefs.getString(PREFS_LAST_UPDATED_MUSCLES)!);
       final valid = DateTime.now().add(const Duration(days: ExercisesProvider.EXERCISE_CACHE_DAYS));
-      expect(
-        DateTime(updateTime.year, updateTime.month, updateTime.day),
-        DateTime(valid.year, valid.month, valid.day),
-      );
+      expect(updateTime.isSameDayAs(valid), true);
 
       final muscles = await database.select(database.muscles).get();
 
@@ -144,6 +156,7 @@ void main() {
       expect(muscles[2].id, 4);
       expect(muscles[2].data, muscle3);
 
+      expect(provider.muscles.length, 3);
       expect(provider.muscles[0], muscle2);
       expect(provider.muscles[1], muscle1);
       expect(provider.muscles[2], muscle3);
@@ -169,11 +182,9 @@ void main() {
 
       // Assert
       final updateTime = DateTime.parse(prefs.getString(PREFS_LAST_UPDATED_MUSCLES)!);
-      expect(
-        DateTime(updateTime.year, updateTime.month, updateTime.day),
-        DateTime(valid.year, valid.month, valid.day),
-      );
+      expect(updateTime.isSameDayAs(valid), true);
 
+      expect(provider.muscles.length, 2);
       expect(provider.muscles[0], muscle1);
       expect(provider.muscles[1], muscle2);
 
@@ -193,10 +204,7 @@ void main() {
       // Assert
       final updateTime = DateTime.parse(prefs.getString(PREFS_LAST_UPDATED_LANGUAGES)!);
       final valid = DateTime.now().add(const Duration(days: ExercisesProvider.EXERCISE_CACHE_DAYS));
-      expect(
-        DateTime(updateTime.year, updateTime.month, updateTime.day),
-        DateTime(valid.year, valid.month, valid.day),
-      );
+      expect(updateTime.isSameDayAs(valid), true);
 
       final languages = await database.select(database.languages).get();
 
@@ -214,6 +222,7 @@ void main() {
       expect(languages[3].id, tLanguage3.id);
       expect(languages[3].data, tLanguage3);
 
+      expect(provider.languages.length, 5);
       expect(provider.languages[0], tLanguage1);
       expect(provider.languages[1], tLanguage2);
       expect(provider.languages[2], tLanguage4);
@@ -240,11 +249,9 @@ void main() {
 
       // Assert
       final updateTime = DateTime.parse(prefs.getString(PREFS_LAST_UPDATED_LANGUAGES)!);
-      expect(
-        DateTime(updateTime.year, updateTime.month, updateTime.day),
-        DateTime(valid.year, valid.month, valid.day),
-      );
+      expect(updateTime.isSameDayAs(valid), true);
 
+      expect(provider.languages.length, 2);
       expect(provider.languages[0], tLanguage1);
       expect(provider.languages[1], tLanguage2);
 
@@ -263,10 +270,7 @@ void main() {
       // Assert
       final updateTime = DateTime.parse(prefs.getString(PREFS_LAST_UPDATED_CATEGORIES)!);
       final valid = DateTime.now().add(const Duration(days: ExercisesProvider.EXERCISE_CACHE_DAYS));
-      expect(
-        DateTime(updateTime.year, updateTime.month, updateTime.day),
-        DateTime(valid.year, valid.month, valid.day),
-      );
+      expect(updateTime.isSameDayAs(valid), true);
 
       final categories = await database.select(database.categories).get();
 
@@ -278,6 +282,7 @@ void main() {
       expect(categories[1].id, tCategory2.id);
       expect(categories[1].data, tCategory2);
 
+      expect(provider.categories.length, 2);
       expect(provider.categories[0], tCategory1);
       expect(provider.categories[1], tCategory2);
     });
@@ -302,11 +307,9 @@ void main() {
 
       // Assert
       final updateTime = DateTime.parse(prefs.getString(PREFS_LAST_UPDATED_CATEGORIES)!);
-      expect(
-        DateTime(updateTime.year, updateTime.month, updateTime.day),
-        DateTime(valid.year, valid.month, valid.day),
-      );
+      expect(updateTime.isSameDayAs(valid), true);
 
+      expect(provider.categories.length, 2);
       expect(provider.categories[0], tCategory1);
       expect(provider.categories[1], tCategory2);
 
@@ -326,10 +329,7 @@ void main() {
       // Assert
       final updateTime = DateTime.parse(prefs.getString(PREFS_LAST_UPDATED_EQUIPMENT)!);
       final valid = DateTime.now().add(const Duration(days: ExercisesProvider.EXERCISE_CACHE_DAYS));
-      expect(
-        DateTime(updateTime.year, updateTime.month, updateTime.day),
-        DateTime(valid.year, valid.month, valid.day),
-      );
+      expect(updateTime.isSameDayAs(valid), true);
 
       final equipmentList = await database.select(database.equipments).get();
 
@@ -341,6 +341,7 @@ void main() {
       expect(equipmentList[1].id, tEquipment2.id);
       expect(equipmentList[1].data, tEquipment2);
 
+      expect(provider.equipment.length, 4);
       expect(provider.equipment[0], tEquipment1);
       expect(provider.equipment[1], tEquipment2);
       expect(provider.equipment[2], tEquipment3);
@@ -367,11 +368,9 @@ void main() {
 
       // Assert
       final updateTime = DateTime.parse(prefs.getString(PREFS_LAST_UPDATED_EQUIPMENT)!);
-      expect(
-        DateTime(updateTime.year, updateTime.month, updateTime.day),
-        DateTime(valid.year, valid.month, valid.day),
-      );
+      expect(updateTime.isSameDayAs(valid), true);
 
+      expect(provider.equipment.length, 2);
       expect(provider.equipment[0], tEquipment1);
       expect(provider.equipment[1], tEquipment2);
 
@@ -392,6 +391,7 @@ void main() {
               id: tExerciseBaseInfoMap['id'],
               data: json.encode(tExerciseBaseInfoMap),
               lastUpdate: DateTime.parse(tExerciseBaseInfoMap['last_update_global']),
+              lastFetched: DateTime.now(),
             ),
           );
       await database
@@ -406,12 +406,99 @@ void main() {
 
       // Act
       await provider.fetchAndSetLanguages(database);
-      await provider.fetchAndSetExercises(database);
+      await provider.setExercisesFromDatabase(database);
 
       // Assert
-      expect(provider.bases[0].id, 9);
-      expect(provider.bases[0].uuid, '1b020b3a-3732-4c7e-92fd-a0cec90ed69b');
+      expect(provider.exercises.length, 1);
+      expect(provider.exercises.first.id, 9);
+      expect(provider.exercises.first.uuid, '1b020b3a-3732-4c7e-92fd-a0cec90ed69b');
       verifyNever(mockBaseProvider.fetchPaginated(any));
     });
+
+    test('fetching a known exercise - no API refresh', () async {
+      // Arrange
+      provider.languages = testLanguages;
+      await database.into(database.exercises).insert(
+            ExercisesCompanion.insert(
+              id: tExerciseBaseInfoMap['id'],
+              data: json.encode(tExerciseBaseInfoMap),
+              lastUpdate: DateTime.parse(tExerciseBaseInfoMap['last_update_global']),
+              lastFetched: DateTime.now().subtract(const Duration(hours: 1)),
+            ),
+          );
+
+      // Assert
+      expect(provider.exercises.length, 0);
+
+      // Act
+      await provider.handleUpdateExerciseFromApi(database, 9);
+
+      // Assert
+      expect(provider.exercises.length, 1);
+      expect(provider.exercises.first.id, 9);
+      expect(provider.exercises.first.uuid, '1b020b3a-3732-4c7e-92fd-a0cec90ed69b');
+      verifyNever(mockBaseProvider.fetch(any));
+    });
+
+    test('fetching a known exercise - needed API refresh - no new data', () async {
+      // Arrange
+      provider.languages = testLanguages;
+      await database.into(database.exercises).insert(
+            ExercisesCompanion.insert(
+              id: tExerciseBaseInfoMap['id'],
+              data: json.encode(tExerciseBaseInfoMap),
+              lastUpdate: DateTime.parse(tExerciseBaseInfoMap['last_update_global']),
+              lastFetched: DateTime.now().subtract(const Duration(days: 10)),
+            ),
+          );
+
+      // Assert
+      expect(provider.exercises.length, 0);
+
+      // Act
+      await provider.handleUpdateExerciseFromApi(database, 9);
+      final exerciseDb = await (database.select(database.exercises)..where((e) => e.id.equals(9)))
+          .getSingleOrNull();
+
+      // Assert
+      verify(mockBaseProvider.fetch(any));
+      expect(provider.exercises.length, 1);
+      expect(provider.exercises.first.id, 9);
+      expect(provider.exercises.first.uuid, '1b020b3a-3732-4c7e-92fd-a0cec90ed69b');
+      expect(exerciseDb!.lastFetched.isSameDayAs(DateTime.now()), true);
+    });
+
+    test('fetching a known exercise - needed API refresh - new data from API', () async {
+      // Arrange
+      provider.languages = testLanguages;
+      final newData = Map.from(tExerciseBaseInfoMap);
+      newData['uuid'] = 'bf6d5557-1c49-48fd-922e-75d11f81d4eb';
+
+      await database.into(database.exercises).insert(
+            ExercisesCompanion.insert(
+              id: newData['id'],
+              data: json.encode(newData),
+              lastUpdate: DateTime(2023, 1, 1),
+              lastFetched: DateTime.now().subtract(const Duration(days: 10)),
+            ),
+          );
+
+      // Assert
+      expect(provider.exercises.length, 0);
+
+      // Act
+      await provider.handleUpdateExerciseFromApi(database, 9);
+      final exerciseDb = await (database.select(database.exercises)..where((e) => e.id.equals(9)))
+          .getSingleOrNull();
+      final exerciseData = ExerciseApiData.fromString(exerciseDb!.data);
+
+      // Assert
+      verify(mockBaseProvider.fetch(any));
+      expect(provider.exercises.length, 1);
+      expect(provider.exercises.first.id, 9);
+      expect(provider.exercises.first.uuid, '1b020b3a-3732-4c7e-92fd-a0cec90ed69b');
+      expect(exerciseDb.lastFetched.isSameDayAs(DateTime.now()), true);
+      expect(exerciseData.uuid, '1b020b3a-3732-4c7e-92fd-a0cec90ed69b');
+    });
   });
 }
diff --git a/test/exercises/exercise_provider_load_test.dart b/test/exercises/exercise_provider_load_test.dart
index 2291345e..9dc25ed9 100644
--- a/test/exercises/exercise_provider_load_test.dart
+++ b/test/exercises/exercise_provider_load_test.dart
@@ -2,7 +2,8 @@ import 'dart:convert';
 
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
-import 'package:wger/models/exercises/exercise_base_data.dart';
+import 'package:wger/models/exercises/exercise.dart';
+import 'package:wger/models/exercises/exercise_api.dart';
 import 'package:wger/providers/exercises.dart';
 
 import '../../test_data/exercises.dart';
@@ -28,7 +29,7 @@ void main() {
   setUp(() {
     mockBaseProvider = MockWgerBaseProvider();
     provider = ExercisesProvider(mockBaseProvider);
-    provider.exerciseBases = getTestExerciseBases();
+    provider.exercises = getTestExerciseBases();
     provider.languages = [tLanguage1, tLanguage2, tLanguage3];
 
     // Mock base info response
@@ -62,41 +63,44 @@ void main() {
       // arrange
 
       // arrange and act
-      final base = provider.readExerciseFromBaseInfo(ExerciseBaseData.fromJson(tExerciseInfoMap));
+      final exercise = Exercise.fromApiData(
+        ExerciseApiData.fromJson(tExerciseInfoMap),
+        const [tLanguage1, tLanguage2, tLanguage3],
+      );
 
       // assert
-      expect(base.id, 9);
-      expect(base.uuid, '1b020b3a-3732-4c7e-92fd-a0cec90ed69b');
-      expect(base.categoryId, 10);
-      expect(base.equipment.map((e) => e.name), ['Kettlebell']);
-      expect(base.muscles.map((e) => e.name), [
+      expect(exercise.id, 9);
+      expect(exercise.uuid, '1b020b3a-3732-4c7e-92fd-a0cec90ed69b');
+      expect(exercise.categoryId, 10);
+      expect(exercise.equipment.map((e) => e.name), ['Kettlebell']);
+      expect(exercise.muscles.map((e) => e.name), [
         'Biceps femoris',
         'Brachialis',
         'Obliquus externus abdominis',
       ]);
-      expect(base.musclesSecondary.map((e) => e.name), [
+      expect(exercise.musclesSecondary.map((e) => e.name), [
         'Biceps femoris',
         'Brachialis',
         'Obliquus externus abdominis',
       ]);
-      expect(base.images.map((e) => e.uuid), [
+      expect(exercise.images.map((e) => e.uuid), [
         '1f5d2b2f-d4ea-4eeb-9377-56176465e08d',
         'ab645585-26ef-4992-a9ec-15425687ece9',
         'd8aa5990-bb47-4111-9823-e2fbd98fe07f',
         '49a159e1-1e00-409a-81c9-b4d4489fbd67'
       ]);
-      expect(base.videos.map((v) => v.uuid), ['63e996e9-a772-4ca5-9d09-8b4be03f6be4']);
+      expect(exercise.videos.map((v) => v.uuid), ['63e996e9-a772-4ca5-9d09-8b4be03f6be4']);
 
-      final exercise1 = base.translations[0];
-      expect(exercise1.name, '2 Handed Kettlebell Swing');
-      expect(exercise1.languageObj.shortName, 'en');
-      expect(exercise1.notes[0].comment, "it's important to do the exercise correctly");
-      expect(exercise1.notes[1].comment, 'put a lot of effort into this exercise');
-      expect(exercise1.notes[2].comment, 'have fun');
-      expect(exercise1.aliases[0].alias, 'double handed kettlebell');
-      expect(exercise1.aliases[1].alias, 'Kettlebell russian style');
-      expect(base.translations[1].name, 'Kettlebell Con Dos Manos');
-      expect(base.translations[2].name, 'Zweihändiges Kettlebell');
+      final translation1 = exercise.translations[0];
+      expect(translation1.name, '2 Handed Kettlebell Swing');
+      expect(translation1.languageObj.shortName, 'en');
+      expect(translation1.notes[0].comment, "it's important to do the exercise correctly");
+      expect(translation1.notes[1].comment, 'put a lot of effort into this exercise');
+      expect(translation1.notes[2].comment, 'have fun');
+      expect(translation1.aliases[0].alias, 'double handed kettlebell');
+      expect(translation1.aliases[1].alias, 'Kettlebell russian style');
+      expect(exercise.translations[1].name, 'Kettlebell Con Dos Manos');
+      expect(exercise.translations[2].name, 'Zweihändiges Kettlebell');
     });
   });
 }
diff --git a/test/exercises/exercise_provider_test.dart b/test/exercises/exercise_provider_test.dart
index f9622ea8..312fcb53 100644
--- a/test/exercises/exercise_provider_test.dart
+++ b/test/exercises/exercise_provider_test.dart
@@ -208,7 +208,7 @@ void main() {
           equipment: FilterCategory<Equipment>(title: 'Equipment', items: {}),
         );
 
-        provider.exerciseBases = data.getTestExerciseBases();
+        provider.exercises = data.getTestExerciseBases();
       });
 
       test('Nothing is selected with no search term', () async {
diff --git a/test/exercises/model_exercise_test.dart b/test/exercises/model_exercise_test.dart
new file mode 100644
index 00000000..65b63f51
--- /dev/null
+++ b/test/exercises/model_exercise_test.dart
@@ -0,0 +1,77 @@
+import 'dart:convert';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:wger/models/exercises/exercise.dart';
+import 'package:wger/models/exercises/exercise_api.dart';
+
+import '../../test_data/exercises.dart';
+import '../fixtures/fixture_reader.dart';
+
+void main() {
+  final Map<String, dynamic> tExerciseInfoMap = jsonDecode(
+    fixture('exercises/exercisebaseinfo_response.json'),
+  );
+
+  group('Model tests', () {
+    test('test getExercise', () async {
+      // arrange and act
+      final base = getTestExerciseBases()[1];
+
+      // assert
+      expect(base.getExercise('en').id, 5);
+      expect(base.getExercise('en-UK').id, 5);
+      expect(base.getExercise('de').id, 4);
+      expect(base.getExercise('de-AT').id, 4);
+      expect(base.getExercise('fr').id, 3);
+      expect(base.getExercise('fr-FR').id, 3);
+      expect(base.getExercise('pt').id, 5); // English again
+    });
+
+    test('Load the readExerciseBaseFromBaseInfo parse method', () {
+      // arrange
+
+      // arrange and act
+      final exercise = Exercise.fromApiData(
+        ExerciseApiData.fromJson(tExerciseInfoMap),
+        const [tLanguage1, tLanguage2, tLanguage3],
+      );
+
+      // assert
+      expect(exercise.id, 9);
+      expect(exercise.uuid, '1b020b3a-3732-4c7e-92fd-a0cec90ed69b');
+      expect(exercise.categoryId, 10);
+      expect(exercise.variationId, 25);
+      expect(exercise.authors, ["Foo Bar"]);
+      expect(exercise.authorsGlobal, ["Foo Bar", "tester McTestface", "Mr. X"]);
+      expect(exercise.equipment.map((e) => e.name), ['Kettlebell']);
+      expect(exercise.muscles.map((e) => e.name), [
+        'Biceps femoris',
+        'Brachialis',
+        'Obliquus externus abdominis',
+      ]);
+      expect(exercise.musclesSecondary.map((e) => e.name), [
+        'Biceps femoris',
+        'Brachialis',
+        'Obliquus externus abdominis',
+      ]);
+      expect(exercise.images.map((e) => e.uuid), [
+        '1f5d2b2f-d4ea-4eeb-9377-56176465e08d',
+        'ab645585-26ef-4992-a9ec-15425687ece9',
+        'd8aa5990-bb47-4111-9823-e2fbd98fe07f',
+        '49a159e1-1e00-409a-81c9-b4d4489fbd67'
+      ]);
+      expect(exercise.videos.map((v) => v.uuid), ['63e996e9-a772-4ca5-9d09-8b4be03f6be4']);
+
+      final translation1 = exercise.translations[0];
+      expect(translation1.name, '2 Handed Kettlebell Swing');
+      expect(translation1.languageObj.shortName, 'en');
+      expect(translation1.notes[0].comment, "it's important to do the exercise correctly");
+      expect(translation1.notes[1].comment, 'put a lot of effort into this exercise');
+      expect(translation1.notes[2].comment, 'have fun');
+      expect(translation1.aliases[0].alias, 'double handed kettlebell');
+      expect(translation1.aliases[1].alias, 'Kettlebell russian style');
+      expect(exercise.translations[1].name, 'Kettlebell Con Dos Manos');
+      expect(exercise.translations[2].name, 'Zweihändiges Kettlebell');
+    });
+  });
+}
diff --git a/test/exercises/model_exercisebase_test.dart b/test/exercises/model_exercisebase_test.dart
deleted file mode 100644
index ba0764c4..00000000
--- a/test/exercises/model_exercisebase_test.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-import 'package:flutter_test/flutter_test.dart';
-
-import '../../test_data/exercises.dart';
-
-void main() {
-  group('Model tests', () {
-    test('test getExercise', () async {
-      // arrange and act
-      final base = getTestExerciseBases()[1];
-
-      // assert
-      expect(base.getExercise('en').id, 5);
-      expect(base.getExercise('en-UK').id, 5);
-      expect(base.getExercise('de').id, 4);
-      expect(base.getExercise('de-AT').id, 4);
-      expect(base.getExercise('fr').id, 3);
-      expect(base.getExercise('fr-FR').id, 3);
-      expect(base.getExercise('pt').id, 5); // English again
-    });
-  });
-}
diff --git a/test/fixtures/exercises/exercisebaseinfo_response.json b/test/fixtures/exercises/exercisebaseinfo_response.json
index 097c2b03..7076d729 100644
--- a/test/fixtures/exercises/exercisebaseinfo_response.json
+++ b/test/fixtures/exercises/exercisebaseinfo_response.json
@@ -158,7 +158,15 @@
       "created": "2015-08-03T18:22:54.909478+02:00",
       "language": 2,
       "license": 2,
-      "license_author": "deusinvictus"
+      "license_author": "deusinvictus",
+      "license_title": "",
+      "license_object_url": "",
+      "license_author_url": "",
+      "license_derivative_source_url": "",
+      "author_history": [
+        "deusinvictus",
+        "Foo Bar"
+      ]
     },
     {
       "id": 856,
@@ -187,7 +195,14 @@
       "created": "2022-03-14T18:22:54.909478+02:00",
       "language": 3,
       "license": 2,
-      "license_author": "tester McTestface"
+      "license_author": "tester McTestface",
+      "license_title": "",
+      "license_object_url": "",
+      "license_author_url": "",
+      "license_derivative_source_url": "",
+      "author_history": [
+        "tester McTestface"
+      ]
     },
     {
       "id": 855,
@@ -205,9 +220,25 @@
       ],
       "created": "2022-03-14T18:22:54.909478+02:00",
       "language": 1,
-      "license": 2,
-      "license_author": "tester McTestface"
+      "license": 1,
+      "license_title": "",
+      "license_object_url": "",
+      "license_author": "GrosseHund",
+      "license_author_url": "",
+      "license_derivative_source_url": "",
+      "author_history": [
+        "GrosseHund",
+        "Wunschcoach"
+      ]
     }
   ],
-  "variations": 25
+  "variations": 25,
+  "author_history": [
+    "Foo Bar"
+  ],
+  "total_authors_history": [
+    "Foo Bar",
+    "tester McTestface",
+    "Mr. X"
+  ]
 }
\ No newline at end of file
diff --git a/test/workout/gym_mode_screen_test.mocks.dart b/test/workout/gym_mode_screen_test.mocks.dart
index 47bf5c09..b7ae36ac 100644
--- a/test/workout/gym_mode_screen_test.mocks.dart
+++ b/test/workout/gym_mode_screen_test.mocks.dart
@@ -4,15 +4,14 @@
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i10;
-import 'dart:ui' as _i14;
+import 'dart:ui' as _i13;
 
 import 'package:http/http.dart' as _i3;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:wger/database/exercises/exercise_database.dart' as _i13;
+import 'package:wger/database/exercises/exercise_database.dart' as _i12;
 import 'package:wger/models/exercises/category.dart' as _i6;
 import 'package:wger/models/exercises/equipment.dart' as _i7;
 import 'package:wger/models/exercises/exercise.dart' as _i5;
-import 'package:wger/models/exercises/exercise_base_data.dart' as _i12;
 import 'package:wger/models/exercises/language.dart' as _i9;
 import 'package:wger/models/exercises/muscle.dart' as _i8;
 import 'package:wger/providers/auth.dart' as _i2;
@@ -311,24 +310,30 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider {
       ) as _i4.WgerBaseProvider);
 
   @override
-  set exerciseBases(List<_i5.Exercise>? exercisesBases) => super.noSuchMethod(
+  List<_i5.Exercise> get exercises => (super.noSuchMethod(
+        Invocation.getter(#exercises),
+        returnValue: <_i5.Exercise>[],
+      ) as List<_i5.Exercise>);
+
+  @override
+  set exercises(List<_i5.Exercise>? _exercises) => super.noSuchMethod(
         Invocation.setter(
-          #exerciseBases,
-          exercisesBases,
+          #exercises,
+          _exercises,
         ),
         returnValueForMissingStub: null,
       );
 
   @override
   List<_i5.Exercise> get filteredExercises => (super.noSuchMethod(
-        Invocation.getter(#filteredExerciseBases),
+        Invocation.getter(#filteredExercises),
         returnValue: <_i5.Exercise>[],
       ) as List<_i5.Exercise>);
 
   @override
   set filteredExercises(List<_i5.Exercise>? newFilteredExercises) => super.noSuchMethod(
         Invocation.setter(
-          #filteredExerciseBases,
+          #filteredExercises,
           newFilteredExercises,
         ),
         returnValueForMissingStub: null,
@@ -340,12 +345,6 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider {
         returnValue: <int, List<_i5.Exercise>>{},
       ) as Map<int, List<_i5.Exercise>>);
 
-  @override
-  List<_i5.Exercise> get bases => (super.noSuchMethod(
-        Invocation.getter(#bases),
-        returnValue: <_i5.Exercise>[],
-      ) as List<_i5.Exercise>);
-
   @override
   List<_i6.ExerciseCategory> get categories => (super.noSuchMethod(
         Invocation.getter(#categories),
@@ -553,21 +552,6 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider {
         returnValueForMissingStub: _i10.Future<void>.value(),
       ) as _i10.Future<void>);
 
-  @override
-  _i10.Future<_i9.Language> fetchAndSetLanguageFromApi(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetLanguageFromApi,
-          [id],
-        ),
-        returnValue: _i10.Future<_i9.Language>.value(_FakeLanguage_9(
-          this,
-          Invocation.method(
-            #fetchAndSetLanguageFromApi,
-            [id],
-          ),
-        )),
-      ) as _i10.Future<_i9.Language>);
-
   @override
   _i10.Future<_i5.Exercise> fetchAndSetExercise(int? exerciseId) => (super.noSuchMethod(
         Invocation.method(
@@ -584,19 +568,29 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider {
       ) as _i10.Future<_i5.Exercise>);
 
   @override
-  _i5.Exercise readExerciseFromBaseInfo(_i12.ExerciseBaseData? baseData) => (super.noSuchMethod(
+  _i10.Future<_i5.Exercise> handleUpdateExerciseFromApi(
+    _i12.ExerciseDatabase? database,
+    int? exerciseId,
+  ) =>
+      (super.noSuchMethod(
         Invocation.method(
-          #readExerciseFromBaseInfo,
-          [baseData],
+          #handleUpdateExerciseFromApi,
+          [
+            database,
+            exerciseId,
+          ],
         ),
-        returnValue: _FakeExercise_5(
+        returnValue: _i10.Future<_i5.Exercise>.value(_FakeExercise_5(
           this,
           Invocation.method(
-            #readExerciseFromBaseInfo,
-            [baseData],
+            #handleUpdateExerciseFromApi,
+            [
+              database,
+              exerciseId,
+            ],
           ),
-        ),
-      ) as _i5.Exercise);
+        )),
+      ) as _i10.Future<_i5.Exercise>);
 
   @override
   _i10.Future<void> checkExerciseCacheVersion() => (super.noSuchMethod(
@@ -609,10 +603,11 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider {
       ) as _i10.Future<void>);
 
   @override
-  _i10.Future<void> initCacheTimesLocalPrefs() => (super.noSuchMethod(
+  _i10.Future<void> initCacheTimesLocalPrefs({dynamic forceInit = false}) => (super.noSuchMethod(
         Invocation.method(
           #initCacheTimesLocalPrefs,
           [],
+          {#forceInit: forceInit},
         ),
         returnValue: _i10.Future<void>.value(),
         returnValueForMissingStub: _i10.Future<void>.value(),
@@ -639,13 +634,13 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider {
       ) as _i10.Future<void>);
 
   @override
-  _i10.Future<void> fetchAndSetExercises(
-    _i13.ExerciseDatabase? database, {
+  _i10.Future<void> setExercisesFromDatabase(
+    _i12.ExerciseDatabase? database, {
     bool? forceDeleteCache = false,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
-          #fetchAndSetExercises,
+          #setExercisesFromDatabase,
           [database],
           {#forceDeleteCache: forceDeleteCache},
         ),
@@ -654,7 +649,7 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider {
       ) as _i10.Future<void>);
 
   @override
-  _i10.Future<void> updateExerciseCache(_i13.ExerciseDatabase? database) => (super.noSuchMethod(
+  _i10.Future<void> updateExerciseCache(_i12.ExerciseDatabase? database) => (super.noSuchMethod(
         Invocation.method(
           #updateExerciseCache,
           [database],
@@ -664,7 +659,7 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider {
       ) as _i10.Future<void>);
 
   @override
-  _i10.Future<void> fetchAndSetMuscles(_i13.ExerciseDatabase? database) => (super.noSuchMethod(
+  _i10.Future<void> fetchAndSetMuscles(_i12.ExerciseDatabase? database) => (super.noSuchMethod(
         Invocation.method(
           #fetchAndSetMuscles,
           [database],
@@ -674,7 +669,7 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider {
       ) as _i10.Future<void>);
 
   @override
-  _i10.Future<void> fetchAndSetCategories(_i13.ExerciseDatabase? database) => (super.noSuchMethod(
+  _i10.Future<void> fetchAndSetCategories(_i12.ExerciseDatabase? database) => (super.noSuchMethod(
         Invocation.method(
           #fetchAndSetCategories,
           [database],
@@ -684,7 +679,7 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider {
       ) as _i10.Future<void>);
 
   @override
-  _i10.Future<void> fetchAndSetLanguages(_i13.ExerciseDatabase? database) => (super.noSuchMethod(
+  _i10.Future<void> fetchAndSetLanguages(_i12.ExerciseDatabase? database) => (super.noSuchMethod(
         Invocation.method(
           #fetchAndSetLanguages,
           [database],
@@ -694,7 +689,7 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider {
       ) as _i10.Future<void>);
 
   @override
-  _i10.Future<void> fetchAndSetEquipments(_i13.ExerciseDatabase? database) => (super.noSuchMethod(
+  _i10.Future<void> fetchAndSetEquipments(_i12.ExerciseDatabase? database) => (super.noSuchMethod(
         Invocation.method(
           #fetchAndSetEquipments,
           [database],
@@ -722,7 +717,7 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider {
       ) as _i10.Future<List<_i5.Exercise>>);
 
   @override
-  void addListener(_i14.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(_i13.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -731,7 +726,7 @@ class MockExercisesProvider extends _i1.Mock implements _i11.ExercisesProvider {
       );
 
   @override
-  void removeListener(_i14.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(_i13.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
diff --git a/test/workout/workout_set_form_test.mocks.dart b/test/workout/workout_set_form_test.mocks.dart
index d78ec8c1..2bb582cf 100644
--- a/test/workout/workout_set_form_test.mocks.dart
+++ b/test/workout/workout_set_form_test.mocks.dart
@@ -4,19 +4,18 @@
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'dart:async' as _i19;
-import 'dart:ui' as _i22;
+import 'dart:ui' as _i21;
 
 import 'package:http/http.dart' as _i9;
 import 'package:mockito/mockito.dart' as _i1;
-import 'package:mockito/src/dummies.dart' as _i25;
-import 'package:wger/database/exercises/exercise_database.dart' as _i21;
+import 'package:mockito/src/dummies.dart' as _i24;
+import 'package:wger/database/exercises/exercise_database.dart' as _i20;
 import 'package:wger/models/exercises/category.dart' as _i4;
 import 'package:wger/models/exercises/equipment.dart' as _i5;
 import 'package:wger/models/exercises/exercise.dart' as _i3;
-import 'package:wger/models/exercises/exercise_base_data.dart' as _i20;
 import 'package:wger/models/exercises/language.dart' as _i7;
 import 'package:wger/models/exercises/muscle.dart' as _i6;
-import 'package:wger/models/exercises/translation.dart' as _i24;
+import 'package:wger/models/exercises/translation.dart' as _i23;
 import 'package:wger/models/workouts/day.dart' as _i13;
 import 'package:wger/models/workouts/log.dart' as _i17;
 import 'package:wger/models/workouts/repetition_unit.dart' as _i11;
@@ -28,7 +27,7 @@ import 'package:wger/models/workouts/workout_plan.dart' as _i12;
 import 'package:wger/providers/auth.dart' as _i8;
 import 'package:wger/providers/base_provider.dart' as _i2;
 import 'package:wger/providers/exercises.dart' as _i18;
-import 'package:wger/providers/workout_plans.dart' as _i23;
+import 'package:wger/providers/workout_plans.dart' as _i22;
 
 // ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
@@ -241,24 +240,30 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider {
       ) as _i2.WgerBaseProvider);
 
   @override
-  set exerciseBases(List<_i3.Exercise>? exercisesBases) => super.noSuchMethod(
+  List<_i3.Exercise> get exercises => (super.noSuchMethod(
+        Invocation.getter(#exercises),
+        returnValue: <_i3.Exercise>[],
+      ) as List<_i3.Exercise>);
+
+  @override
+  set exercises(List<_i3.Exercise>? _exercises) => super.noSuchMethod(
         Invocation.setter(
-          #exerciseBases,
-          exercisesBases,
+          #exercises,
+          _exercises,
         ),
         returnValueForMissingStub: null,
       );
 
   @override
   List<_i3.Exercise> get filteredExercises => (super.noSuchMethod(
-        Invocation.getter(#filteredExerciseBases),
+        Invocation.getter(#filteredExercises),
         returnValue: <_i3.Exercise>[],
       ) as List<_i3.Exercise>);
 
   @override
   set filteredExercises(List<_i3.Exercise>? newFilteredExercises) => super.noSuchMethod(
         Invocation.setter(
-          #filteredExerciseBases,
+          #filteredExercises,
           newFilteredExercises,
         ),
         returnValueForMissingStub: null,
@@ -270,12 +275,6 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider {
         returnValue: <int, List<_i3.Exercise>>{},
       ) as Map<int, List<_i3.Exercise>>);
 
-  @override
-  List<_i3.Exercise> get bases => (super.noSuchMethod(
-        Invocation.getter(#bases),
-        returnValue: <_i3.Exercise>[],
-      ) as List<_i3.Exercise>);
-
   @override
   List<_i4.ExerciseCategory> get categories => (super.noSuchMethod(
         Invocation.getter(#categories),
@@ -483,21 +482,6 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider {
         returnValueForMissingStub: _i19.Future<void>.value(),
       ) as _i19.Future<void>);
 
-  @override
-  _i19.Future<_i7.Language> fetchAndSetLanguageFromApi(int? id) => (super.noSuchMethod(
-        Invocation.method(
-          #fetchAndSetLanguageFromApi,
-          [id],
-        ),
-        returnValue: _i19.Future<_i7.Language>.value(_FakeLanguage_5(
-          this,
-          Invocation.method(
-            #fetchAndSetLanguageFromApi,
-            [id],
-          ),
-        )),
-      ) as _i19.Future<_i7.Language>);
-
   @override
   _i19.Future<_i3.Exercise> fetchAndSetExercise(int? exerciseId) => (super.noSuchMethod(
         Invocation.method(
@@ -514,19 +498,29 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider {
       ) as _i19.Future<_i3.Exercise>);
 
   @override
-  _i3.Exercise readExerciseFromBaseInfo(_i20.ExerciseBaseData? baseData) => (super.noSuchMethod(
+  _i19.Future<_i3.Exercise> handleUpdateExerciseFromApi(
+    _i20.ExerciseDatabase? database,
+    int? exerciseId,
+  ) =>
+      (super.noSuchMethod(
         Invocation.method(
-          #readExerciseFromBaseInfo,
-          [baseData],
+          #handleUpdateExerciseFromApi,
+          [
+            database,
+            exerciseId,
+          ],
         ),
-        returnValue: _FakeExercise_1(
+        returnValue: _i19.Future<_i3.Exercise>.value(_FakeExercise_1(
           this,
           Invocation.method(
-            #readExerciseFromBaseInfo,
-            [baseData],
+            #handleUpdateExerciseFromApi,
+            [
+              database,
+              exerciseId,
+            ],
           ),
-        ),
-      ) as _i3.Exercise);
+        )),
+      ) as _i19.Future<_i3.Exercise>);
 
   @override
   _i19.Future<void> checkExerciseCacheVersion() => (super.noSuchMethod(
@@ -539,10 +533,11 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider {
       ) as _i19.Future<void>);
 
   @override
-  _i19.Future<void> initCacheTimesLocalPrefs() => (super.noSuchMethod(
+  _i19.Future<void> initCacheTimesLocalPrefs({dynamic forceInit = false}) => (super.noSuchMethod(
         Invocation.method(
           #initCacheTimesLocalPrefs,
           [],
+          {#forceInit: forceInit},
         ),
         returnValue: _i19.Future<void>.value(),
         returnValueForMissingStub: _i19.Future<void>.value(),
@@ -569,13 +564,13 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider {
       ) as _i19.Future<void>);
 
   @override
-  _i19.Future<void> fetchAndSetExercises(
-    _i21.ExerciseDatabase? database, {
+  _i19.Future<void> setExercisesFromDatabase(
+    _i20.ExerciseDatabase? database, {
     bool? forceDeleteCache = false,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
-          #fetchAndSetExercises,
+          #setExercisesFromDatabase,
           [database],
           {#forceDeleteCache: forceDeleteCache},
         ),
@@ -584,7 +579,7 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider {
       ) as _i19.Future<void>);
 
   @override
-  _i19.Future<void> updateExerciseCache(_i21.ExerciseDatabase? database) => (super.noSuchMethod(
+  _i19.Future<void> updateExerciseCache(_i20.ExerciseDatabase? database) => (super.noSuchMethod(
         Invocation.method(
           #updateExerciseCache,
           [database],
@@ -594,7 +589,7 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider {
       ) as _i19.Future<void>);
 
   @override
-  _i19.Future<void> fetchAndSetMuscles(_i21.ExerciseDatabase? database) => (super.noSuchMethod(
+  _i19.Future<void> fetchAndSetMuscles(_i20.ExerciseDatabase? database) => (super.noSuchMethod(
         Invocation.method(
           #fetchAndSetMuscles,
           [database],
@@ -604,7 +599,7 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider {
       ) as _i19.Future<void>);
 
   @override
-  _i19.Future<void> fetchAndSetCategories(_i21.ExerciseDatabase? database) => (super.noSuchMethod(
+  _i19.Future<void> fetchAndSetCategories(_i20.ExerciseDatabase? database) => (super.noSuchMethod(
         Invocation.method(
           #fetchAndSetCategories,
           [database],
@@ -614,7 +609,7 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider {
       ) as _i19.Future<void>);
 
   @override
-  _i19.Future<void> fetchAndSetLanguages(_i21.ExerciseDatabase? database) => (super.noSuchMethod(
+  _i19.Future<void> fetchAndSetLanguages(_i20.ExerciseDatabase? database) => (super.noSuchMethod(
         Invocation.method(
           #fetchAndSetLanguages,
           [database],
@@ -624,7 +619,7 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider {
       ) as _i19.Future<void>);
 
   @override
-  _i19.Future<void> fetchAndSetEquipments(_i21.ExerciseDatabase? database) => (super.noSuchMethod(
+  _i19.Future<void> fetchAndSetEquipments(_i20.ExerciseDatabase? database) => (super.noSuchMethod(
         Invocation.method(
           #fetchAndSetEquipments,
           [database],
@@ -652,7 +647,7 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider {
       ) as _i19.Future<List<_i3.Exercise>>);
 
   @override
-  void addListener(_i22.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(_i21.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -661,7 +656,7 @@ class MockExercisesProvider extends _i1.Mock implements _i18.ExercisesProvider {
       );
 
   @override
-  void removeListener(_i22.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(_i21.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],
@@ -852,7 +847,7 @@ class MockWgerBaseProvider extends _i1.Mock implements _i2.WgerBaseProvider {
 /// A class which mocks [WorkoutPlansProvider].
 ///
 /// See the documentation for Mockito's code generation for more information.
-class MockWorkoutPlansProvider extends _i1.Mock implements _i23.WorkoutPlansProvider {
+class MockWorkoutPlansProvider extends _i1.Mock implements _i22.WorkoutPlansProvider {
   MockWorkoutPlansProvider() {
     _i1.throwOnMissingStub(this);
   }
@@ -1198,7 +1193,7 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i23.WorkoutPlansProv
   @override
   _i19.Future<String> fetchSmartText(
     _i14.Set? workoutSet,
-    _i24.Translation? exercise,
+    _i23.Translation? exercise,
   ) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -1208,7 +1203,7 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i23.WorkoutPlansProv
             exercise,
           ],
         ),
-        returnValue: _i19.Future<String>.value(_i25.dummyValue<String>(
+        returnValue: _i19.Future<String>.value(_i24.dummyValue<String>(
           this,
           Invocation.method(
             #fetchSmartText,
@@ -1295,7 +1290,7 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i23.WorkoutPlansProv
       ) as _i19.Future<void>);
 
   @override
-  void addListener(_i22.VoidCallback? listener) => super.noSuchMethod(
+  void addListener(_i21.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #addListener,
           [listener],
@@ -1304,7 +1299,7 @@ class MockWorkoutPlansProvider extends _i1.Mock implements _i23.WorkoutPlansProv
       );
 
   @override
-  void removeListener(_i22.VoidCallback? listener) => super.noSuchMethod(
+  void removeListener(_i21.VoidCallback? listener) => super.noSuchMethod(
         Invocation.method(
           #removeListener,
           [listener],