diff --git a/app/lib/model/cross_file.mapper.dart b/app/lib/model/cross_file.mapper.dart
index f3dd16e018a..781ada0dd82 100644
--- a/app/lib/model/cross_file.mapper.dart
+++ b/app/lib/model/cross_file.mapper.dart
@@ -37,7 +37,7 @@ class CrossFileMapper extends ClassMapperBase<CrossFile> {
   static const Field<CrossFile, List<int>> _f$bytes = Field('bytes', _$bytes);
 
   @override
-  final Map<Symbol, Field<CrossFile, dynamic>> fields = const {
+  final MappableFields<CrossFile> fields = const {
     #name: _f$name,
     #fileType: _f$fileType,
     #size: _f$size,
diff --git a/app/lib/model/log_entry.mapper.dart b/app/lib/model/log_entry.mapper.dart
index c7b864d660b..483a39db495 100644
--- a/app/lib/model/log_entry.mapper.dart
+++ b/app/lib/model/log_entry.mapper.dart
@@ -26,7 +26,7 @@ class LogEntryMapper extends ClassMapperBase<LogEntry> {
   static const Field<LogEntry, String> _f$log = Field('log', _$log);
 
   @override
-  final Map<Symbol, Field<LogEntry, dynamic>> fields = const {
+  final MappableFields<LogEntry> fields = const {
     #timestamp: _f$timestamp,
     #log: _f$log,
   };
diff --git a/app/lib/model/persistence/favorite_device.mapper.dart b/app/lib/model/persistence/favorite_device.mapper.dart
index ed0b0bcd5ad..6660a57984c 100644
--- a/app/lib/model/persistence/favorite_device.mapper.dart
+++ b/app/lib/model/persistence/favorite_device.mapper.dart
@@ -34,7 +34,7 @@ class FavoriteDeviceMapper extends ClassMapperBase<FavoriteDevice> {
   static const Field<FavoriteDevice, bool> _f$customAlias = Field('customAlias', _$customAlias, opt: true, def: false);
 
   @override
-  final Map<Symbol, Field<FavoriteDevice, dynamic>> fields = const {
+  final MappableFields<FavoriteDevice> fields = const {
     #id: _f$id,
     #fingerprint: _f$fingerprint,
     #ip: _f$ip,
diff --git a/app/lib/model/persistence/receive_history_entry.mapper.dart b/app/lib/model/persistence/receive_history_entry.mapper.dart
index e342ad88ec8..2bc3dab6340 100644
--- a/app/lib/model/persistence/receive_history_entry.mapper.dart
+++ b/app/lib/model/persistence/receive_history_entry.mapper.dart
@@ -39,7 +39,7 @@ class ReceiveHistoryEntryMapper extends ClassMapperBase<ReceiveHistoryEntry> {
   static const Field<ReceiveHistoryEntry, DateTime> _f$timestamp = Field('timestamp', _$timestamp);
 
   @override
-  final Map<Symbol, Field<ReceiveHistoryEntry, dynamic>> fields = const {
+  final MappableFields<ReceiveHistoryEntry> fields = const {
     #id: _f$id,
     #fileName: _f$fileName,
     #fileType: _f$fileType,
diff --git a/app/lib/model/state/nearby_devices_state.mapper.dart b/app/lib/model/state/nearby_devices_state.mapper.dart
index 62939fa0e23..4d6033caa0c 100644
--- a/app/lib/model/state/nearby_devices_state.mapper.dart
+++ b/app/lib/model/state/nearby_devices_state.mapper.dart
@@ -29,7 +29,7 @@ class NearbyDevicesStateMapper extends ClassMapperBase<NearbyDevicesState> {
   static const Field<NearbyDevicesState, Map<String, Device>> _f$devices = Field('devices', _$devices);
 
   @override
-  final Map<Symbol, Field<NearbyDevicesState, dynamic>> fields = const {
+  final MappableFields<NearbyDevicesState> fields = const {
     #runningFavoriteScan: _f$runningFavoriteScan,
     #runningIps: _f$runningIps,
     #devices: _f$devices,
diff --git a/app/lib/model/state/network_state.mapper.dart b/app/lib/model/state/network_state.mapper.dart
index 9a820756fa7..a096d3f7574 100644
--- a/app/lib/model/state/network_state.mapper.dart
+++ b/app/lib/model/state/network_state.mapper.dart
@@ -26,7 +26,7 @@ class NetworkStateMapper extends ClassMapperBase<NetworkState> {
   static const Field<NetworkState, bool> _f$initialized = Field('initialized', _$initialized);
 
   @override
-  final Map<Symbol, Field<NetworkState, dynamic>> fields = const {
+  final MappableFields<NetworkState> fields = const {
     #localIps: _f$localIps,
     #initialized: _f$initialized,
   };
diff --git a/app/lib/model/state/purchase_state.mapper.dart b/app/lib/model/state/purchase_state.mapper.dart
index faabe3ce29d..2a06bb6e06d 100644
--- a/app/lib/model/state/purchase_state.mapper.dart
+++ b/app/lib/model/state/purchase_state.mapper.dart
@@ -28,7 +28,7 @@ class PurchaseStateMapper extends ClassMapperBase<PurchaseState> {
   static const Field<PurchaseState, bool> _f$pending = Field('pending', _$pending);
 
   @override
-  final Map<Symbol, Field<PurchaseState, dynamic>> fields = const {
+  final MappableFields<PurchaseState> fields = const {
     #prices: _f$prices,
     #purchases: _f$purchases,
     #pending: _f$pending,
diff --git a/app/lib/model/state/send/send_session_state.mapper.dart b/app/lib/model/state/send/send_session_state.mapper.dart
index 0d30ca2a25c..100c14339f2 100644
--- a/app/lib/model/state/send/send_session_state.mapper.dart
+++ b/app/lib/model/state/send/send_session_state.mapper.dart
@@ -44,7 +44,7 @@ class SendSessionStateMapper extends ClassMapperBase<SendSessionState> {
   static const Field<SendSessionState, String> _f$errorMessage = Field('errorMessage', _$errorMessage);
 
   @override
-  final Map<Symbol, Field<SendSessionState, dynamic>> fields = const {
+  final MappableFields<SendSessionState> fields = const {
     #sessionId: _f$sessionId,
     #remoteSessionId: _f$remoteSessionId,
     #background: _f$background,
diff --git a/app/lib/model/state/send/sending_file.mapper.dart b/app/lib/model/state/send/sending_file.mapper.dart
index c913fadabc7..83c429906f7 100644
--- a/app/lib/model/state/send/sending_file.mapper.dart
+++ b/app/lib/model/state/send/sending_file.mapper.dart
@@ -38,7 +38,7 @@ class SendingFileMapper extends ClassMapperBase<SendingFile> {
   static const Field<SendingFile, String> _f$errorMessage = Field('errorMessage', _$errorMessage);
 
   @override
-  final Map<Symbol, Field<SendingFile, dynamic>> fields = const {
+  final MappableFields<SendingFile> fields = const {
     #file: _f$file,
     #status: _f$status,
     #token: _f$token,
diff --git a/app/lib/model/state/send/web/web_send_file.mapper.dart b/app/lib/model/state/send/web/web_send_file.mapper.dart
index c76a5e1a43a..fa6c8b44af7 100644
--- a/app/lib/model/state/send/web/web_send_file.mapper.dart
+++ b/app/lib/model/state/send/web/web_send_file.mapper.dart
@@ -30,7 +30,7 @@ class WebSendFileMapper extends ClassMapperBase<WebSendFile> {
   static const Field<WebSendFile, List<int>> _f$bytes = Field('bytes', _$bytes);
 
   @override
-  final Map<Symbol, Field<WebSendFile, dynamic>> fields = const {
+  final MappableFields<WebSendFile> fields = const {
     #file: _f$file,
     #asset: _f$asset,
     #path: _f$path,
diff --git a/app/lib/model/state/send/web/web_send_session.mapper.dart b/app/lib/model/state/send/web/web_send_session.mapper.dart
index 30a786bcb0b..dd8cd979065 100644
--- a/app/lib/model/state/send/web/web_send_session.mapper.dart
+++ b/app/lib/model/state/send/web/web_send_session.mapper.dart
@@ -30,7 +30,7 @@ class WebSendSessionMapper extends ClassMapperBase<WebSendSession> {
   static const Field<WebSendSession, String> _f$deviceInfo = Field('deviceInfo', _$deviceInfo);
 
   @override
-  final Map<Symbol, Field<WebSendSession, dynamic>> fields = const {
+  final MappableFields<WebSendSession> fields = const {
     #sessionId: _f$sessionId,
     #responseHandler: _f$responseHandler,
     #ip: _f$ip,
diff --git a/app/lib/model/state/send/web/web_send_state.mapper.dart b/app/lib/model/state/send/web/web_send_state.mapper.dart
index b9bf7b6a5b5..50578d6f0d1 100644
--- a/app/lib/model/state/send/web/web_send_state.mapper.dart
+++ b/app/lib/model/state/send/web/web_send_state.mapper.dart
@@ -30,7 +30,7 @@ class WebSendStateMapper extends ClassMapperBase<WebSendState> {
   static const Field<WebSendState, bool> _f$autoAccept = Field('autoAccept', _$autoAccept);
 
   @override
-  final Map<Symbol, Field<WebSendState, dynamic>> fields = const {
+  final MappableFields<WebSendState> fields = const {
     #sessions: _f$sessions,
     #files: _f$files,
     #autoAccept: _f$autoAccept,
diff --git a/app/lib/model/state/server/receive_session_state.mapper.dart b/app/lib/model/state/server/receive_session_state.mapper.dart
index f8b7a33fabd..07d68cb38a8 100644
--- a/app/lib/model/state/server/receive_session_state.mapper.dart
+++ b/app/lib/model/state/server/receive_session_state.mapper.dart
@@ -44,7 +44,7 @@ class ReceiveSessionStateMapper extends ClassMapperBase<ReceiveSessionState> {
   static const Field<ReceiveSessionState, StreamController<Map<String, String>?>> _f$responseHandler = Field('responseHandler', _$responseHandler);
 
   @override
-  final Map<Symbol, Field<ReceiveSessionState, dynamic>> fields = const {
+  final MappableFields<ReceiveSessionState> fields = const {
     #sessionId: _f$sessionId,
     #status: _f$status,
     #sender: _f$sender,
diff --git a/app/lib/model/state/server/receiving_file.mapper.dart b/app/lib/model/state/server/receiving_file.mapper.dart
index 8268ce703c2..84601697af3 100644
--- a/app/lib/model/state/server/receiving_file.mapper.dart
+++ b/app/lib/model/state/server/receiving_file.mapper.dart
@@ -36,7 +36,7 @@ class ReceivingFileMapper extends ClassMapperBase<ReceivingFile> {
   static const Field<ReceivingFile, String> _f$errorMessage = Field('errorMessage', _$errorMessage);
 
   @override
-  final Map<Symbol, Field<ReceivingFile, dynamic>> fields = const {
+  final MappableFields<ReceivingFile> fields = const {
     #file: _f$file,
     #status: _f$status,
     #token: _f$token,
diff --git a/app/lib/model/state/server/server_state.mapper.dart b/app/lib/model/state/server/server_state.mapper.dart
index 37d069b0066..3ceb85886a3 100644
--- a/app/lib/model/state/server/server_state.mapper.dart
+++ b/app/lib/model/state/server/server_state.mapper.dart
@@ -36,7 +36,7 @@ class ServerStateMapper extends ClassMapperBase<ServerState> {
   static const Field<ServerState, WebSendState> _f$webSendState = Field('webSendState', _$webSendState);
 
   @override
-  final Map<Symbol, Field<ServerState, dynamic>> fields = const {
+  final MappableFields<ServerState> fields = const {
     #httpServer: _f$httpServer,
     #alias: _f$alias,
     #port: _f$port,
diff --git a/app/lib/model/state/settings_state.mapper.dart b/app/lib/model/state/settings_state.mapper.dart
index 06ec05f5d20..873a8c695ff 100644
--- a/app/lib/model/state/settings_state.mapper.dart
+++ b/app/lib/model/state/settings_state.mapper.dart
@@ -67,7 +67,7 @@ class SettingsStateMapper extends ClassMapperBase<SettingsState> {
   static const Field<SettingsState, bool> _f$shareViaLinkAutoAccept = Field('shareViaLinkAutoAccept', _$shareViaLinkAutoAccept);
 
   @override
-  final Map<Symbol, Field<SettingsState, dynamic>> fields = const {
+  final MappableFields<SettingsState> fields = const {
     #showToken: _f$showToken,
     #alias: _f$alias,
     #theme: _f$theme,
diff --git a/app/lib/pages/tabs/settings_tab_vm.mapper.dart b/app/lib/pages/tabs/settings_tab_vm.mapper.dart
index ae2fbe1e067..6d6a98e6f42 100644
--- a/app/lib/pages/tabs/settings_tab_vm.mapper.dart
+++ b/app/lib/pages/tabs/settings_tab_vm.mapper.dart
@@ -58,7 +58,7 @@ class SettingsTabVmMapper extends ClassMapperBase<SettingsTabVm> {
   static const Field<SettingsTabVm, List<ThemeMode>> _f$themeModes = Field('themeModes', _$themeModes, mode: FieldMode.member);
 
   @override
-  final Map<Symbol, Field<SettingsTabVm, dynamic>> fields = const {
+  final MappableFields<SettingsTabVm> fields = const {
     #advanced: _f$advanced,
     #aliasController: _f$aliasController,
     #deviceModelController: _f$deviceModelController,
diff --git a/app/lib/provider/param/apk_provider_param.mapper.dart b/app/lib/provider/param/apk_provider_param.mapper.dart
index b4d63b128f0..0554f0c3f34 100644
--- a/app/lib/provider/param/apk_provider_param.mapper.dart
+++ b/app/lib/provider/param/apk_provider_param.mapper.dart
@@ -28,7 +28,7 @@ class ApkProviderParamMapper extends ClassMapperBase<ApkProviderParam> {
   static const Field<ApkProviderParam, bool> _f$onlyAppsWithLaunchIntent = Field('onlyAppsWithLaunchIntent', _$onlyAppsWithLaunchIntent);
 
   @override
-  final Map<Symbol, Field<ApkProviderParam, dynamic>> fields = const {
+  final MappableFields<ApkProviderParam> fields = const {
     #query: _f$query,
     #includeSystemApps: _f$includeSystemApps,
     #onlyAppsWithLaunchIntent: _f$onlyAppsWithLaunchIntent,
diff --git a/app/lib/provider/param/cached_apk_provider_param.mapper.dart b/app/lib/provider/param/cached_apk_provider_param.mapper.dart
index 6c5df9a9c50..adb0b1bdf1b 100644
--- a/app/lib/provider/param/cached_apk_provider_param.mapper.dart
+++ b/app/lib/provider/param/cached_apk_provider_param.mapper.dart
@@ -26,7 +26,7 @@ class CachedApkProviderParamMapper extends ClassMapperBase<CachedApkProviderPara
   static const Field<CachedApkProviderParam, bool> _f$onlyAppsWithLaunchIntent = Field('onlyAppsWithLaunchIntent', _$onlyAppsWithLaunchIntent);
 
   @override
-  final Map<Symbol, Field<CachedApkProviderParam, dynamic>> fields = const {
+  final MappableFields<CachedApkProviderParam> fields = const {
     #includeSystemApps: _f$includeSystemApps,
     #onlyAppsWithLaunchIntent: _f$onlyAppsWithLaunchIntent,
   };