diff --git a/school_data_hub_client/lib/src/protocol/_features/schoolday_events/models/schoolday_event.dart b/school_data_hub_client/lib/src/protocol/_features/schoolday_events/models/schoolday_event.dart
index 1a8a968d..2f8465fe 100644
--- a/school_data_hub_client/lib/src/protocol/_features/schoolday_events/models/schoolday_event.dart
+++ b/school_data_hub_client/lib/src/protocol/_features/schoolday_events/models/schoolday_event.dart
@@ -22,6 +22,7 @@ abstract class SchooldayEvent implements _i1.SerializableModel {
     required this.eventId,
     required this.eventType,
     required this.eventReason,
+    this.eventTime,
     required this.createdBy,
     required this.processed,
     this.processedBy,
@@ -42,6 +43,7 @@ abstract class SchooldayEvent implements _i1.SerializableModel {
     required String eventId,
     required _i2.SchooldayEventType eventType,
     required String eventReason,
+    String? eventTime,
     required String createdBy,
     required bool processed,
     String? processedBy,
@@ -64,6 +66,7 @@ abstract class SchooldayEvent implements _i1.SerializableModel {
       eventType: _i2.SchooldayEventType.fromJson(
           (jsonSerialization['eventType'] as String)),
       eventReason: jsonSerialization['eventReason'] as String,
+      eventTime: jsonSerialization['eventTime'] as String?,
       createdBy: jsonSerialization['createdBy'] as String,
       processed: jsonSerialization['processed'] as bool,
       processedBy: jsonSerialization['processedBy'] as String?,
@@ -106,6 +109,8 @@ abstract class SchooldayEvent implements _i1.SerializableModel {
 
   String eventReason;
 
+  String? eventTime;
+
   String createdBy;
 
   bool processed;
@@ -140,6 +145,7 @@ abstract class SchooldayEvent implements _i1.SerializableModel {
     String? eventId,
     _i2.SchooldayEventType? eventType,
     String? eventReason,
+    String? eventTime,
     String? createdBy,
     bool? processed,
     String? processedBy,
@@ -161,6 +167,7 @@ abstract class SchooldayEvent implements _i1.SerializableModel {
       'eventId': eventId,
       'eventType': eventType.toJson(),
       'eventReason': eventReason,
+      if (eventTime != null) 'eventTime': eventTime,
       'createdBy': createdBy,
       'processed': processed,
       if (processedBy != null) 'processedBy': processedBy,
@@ -193,6 +200,7 @@ class _SchooldayEventImpl extends SchooldayEvent {
     required String eventId,
     required _i2.SchooldayEventType eventType,
     required String eventReason,
+    String? eventTime,
     required String createdBy,
     required bool processed,
     String? processedBy,
@@ -211,6 +219,7 @@ class _SchooldayEventImpl extends SchooldayEvent {
           eventId: eventId,
           eventType: eventType,
           eventReason: eventReason,
+          eventTime: eventTime,
           createdBy: createdBy,
           processed: processed,
           processedBy: processedBy,
@@ -235,6 +244,7 @@ class _SchooldayEventImpl extends SchooldayEvent {
     String? eventId,
     _i2.SchooldayEventType? eventType,
     String? eventReason,
+    Object? eventTime = _Undefined,
     String? createdBy,
     bool? processed,
     Object? processedBy = _Undefined,
@@ -254,6 +264,7 @@ class _SchooldayEventImpl extends SchooldayEvent {
       eventId: eventId ?? this.eventId,
       eventType: eventType ?? this.eventType,
       eventReason: eventReason ?? this.eventReason,
+      eventTime: eventTime is String? ? eventTime : this.eventTime,
       createdBy: createdBy ?? this.createdBy,
       processed: processed ?? this.processed,
       processedBy: processedBy is String? ? processedBy : this.processedBy,
diff --git a/school_data_hub_client/lib/src/protocol/client.dart b/school_data_hub_client/lib/src/protocol/client.dart
index 57d682d6..16317633 100644
--- a/school_data_hub_client/lib/src/protocol/client.dart
+++ b/school_data_hub_client/lib/src/protocol/client.dart
@@ -845,6 +845,95 @@ class EndpointCompetence extends _i1.EndpointRef {
       );
 }
 
+/// {@category Endpoint}
+class EndpointCompetenceGoal extends _i1.EndpointRef {
+  EndpointCompetenceGoal(_i1.EndpointCaller caller) : super(caller);
+
+  @override
+  String get name => 'competenceGoal';
+
+  _i2.Future<_i5.PupilData> postCompetenceGoal({
+    required int competenceId,
+    required int pupilId,
+    required String description,
+    List<String>? strategies,
+    required String createdBy,
+    String? modifiedBy,
+    int? score,
+    DateTime? achievedAt,
+  }) =>
+      caller.callServerEndpoint<_i5.PupilData>(
+        'competenceGoal',
+        'postCompetenceGoal',
+        {
+          'competenceId': competenceId,
+          'pupilId': pupilId,
+          'description': description,
+          'strategies': strategies,
+          'createdBy': createdBy,
+          'modifiedBy': modifiedBy,
+          'score': score,
+          'achievedAt': achievedAt,
+        },
+      );
+
+  _i2.Future<_i5.PupilData> updateCompetenceGoal(
+    String publicId, {
+    ({String value})? description,
+    ({List<String>? value})? strategies,
+    ({String value})? modifiedBy,
+    ({int? value})? score,
+    ({DateTime value})? achievedAt,
+  }) =>
+      caller.callServerEndpoint<_i5.PupilData>(
+        'competenceGoal',
+        'updateCompetenceGoal',
+        {
+          'publicId': publicId,
+          'description': _i16.mapRecordToJson(description),
+          'strategies': _i16.mapRecordToJson(strategies),
+          'modifiedBy': _i16.mapRecordToJson(modifiedBy),
+          'score': _i16.mapRecordToJson(score),
+          'achievedAt': _i16.mapRecordToJson(achievedAt),
+        },
+      );
+
+  _i2.Future<_i5.PupilData> deleteCompetenceGoal(String publicId) =>
+      caller.callServerEndpoint<_i5.PupilData>(
+        'competenceGoal',
+        'deleteCompetenceGoal',
+        {'publicId': publicId},
+      );
+
+  _i2.Future<_i5.PupilData> addFileToCompetenceGoal(
+    String publicId,
+    String filePath,
+    String createdBy,
+  ) =>
+      caller.callServerEndpoint<_i5.PupilData>(
+        'competenceGoal',
+        'addFileToCompetenceGoal',
+        {
+          'publicId': publicId,
+          'filePath': filePath,
+          'createdBy': createdBy,
+        },
+      );
+
+  _i2.Future<_i5.PupilData> removeFileFromCompetenceGoal(
+    String publicId,
+    String documentId,
+  ) =>
+      caller.callServerEndpoint<_i5.PupilData>(
+        'competenceGoal',
+        'removeFileFromCompetenceGoal',
+        {
+          'publicId': publicId,
+          'documentId': documentId,
+        },
+      );
+}
+
 /// {@category Endpoint}
 class EndpointLearningSupportPlan extends _i1.EndpointRef {
   EndpointLearningSupportPlan(_i1.EndpointCaller caller) : super(caller);
@@ -1274,8 +1363,8 @@ class EndpointPupilIdentity extends _i1.EndpointRef {
         {},
       );
 
-  _i2.Future<bool> updateLastPupilIdentitiesUpdate(DateTime date) =>
-      caller.callServerEndpoint<bool>(
+  _i2.Future<DateTime?> updateLastPupilIdentitiesUpdate(DateTime date) =>
+      caller.callServerEndpoint<DateTime?>(
         'pupilIdentity',
         'updateLastPupilIdentitiesUpdate',
         {'date': date},
@@ -2514,6 +2603,7 @@ class Client extends _i1.ServerpodClientShared {
     pupilBookLending = EndpointPupilBookLending(this);
     competenceCheck = EndpointCompetenceCheck(this);
     competence = EndpointCompetence(this);
+    competenceGoal = EndpointCompetenceGoal(this);
     learningSupportPlan = EndpointLearningSupportPlan(this);
     preSchoolMedical = EndpointPreSchoolMedical(this);
     supportCategory = EndpointSupportCategory(this);
@@ -2565,6 +2655,8 @@ class Client extends _i1.ServerpodClientShared {
 
   late final EndpointCompetence competence;
 
+  late final EndpointCompetenceGoal competenceGoal;
+
   late final EndpointLearningSupportPlan learningSupportPlan;
 
   late final EndpointPreSchoolMedical preSchoolMedical;
@@ -2628,6 +2720,7 @@ class Client extends _i1.ServerpodClientShared {
         'pupilBookLending': pupilBookLending,
         'competenceCheck': competenceCheck,
         'competence': competence,
+        'competenceGoal': competenceGoal,
         'learningSupportPlan': learningSupportPlan,
         'preSchoolMedical': preSchoolMedical,
         'supportCategory': supportCategory,
diff --git a/school_data_hub_client/lib/src/protocol/protocol.dart b/school_data_hub_client/lib/src/protocol/protocol.dart
index 05aa048d..202a5855 100644
--- a/school_data_hub_client/lib/src/protocol/protocol.dart
+++ b/school_data_hub_client/lib/src/protocol/protocol.dart
@@ -1307,6 +1307,37 @@ class Protocol extends _i1.SerializationManager {
                   : deserialize<String>(data['n']['value']),
             ) as T;
     }
+    if (t == _i1.getType<List<String>?>()) {
+      return (data != null
+          ? (data as List).map((e) => deserialize<String>(e)).toList()
+          : null) as T;
+    }
+    if (t == _i1.getType<({List<String>? value})?>()) {
+      return (data == null)
+          ? null as T
+          : (
+              value: ((data as Map)['n'] as Map)['value'] == null
+                  ? null
+                  : deserialize<List<String>>(data['n']['value']),
+            ) as T;
+    }
+    if (t == _i1.getType<({int? value})?>()) {
+      return (data == null)
+          ? null as T
+          : (
+              value: ((data as Map)['n'] as Map)['value'] == null
+                  ? null
+                  : deserialize<int>(data['n']['value']),
+            ) as T;
+    }
+    if (t == _i1.getType<({DateTime value})?>()) {
+      return (data == null)
+          ? null as T
+          : (
+              value:
+                  deserialize<DateTime>(((data as Map)['n'] as Map)['value']),
+            ) as T;
+    }
     if (t == List<_i93.LearningSupportPlan>) {
       return (data as List)
           .map((e) => deserialize<_i93.LearningSupportPlan>(e))
@@ -2010,6 +2041,27 @@ Map<String, dynamic>? mapRecordToJson(Record? record) {
       },
     };
   }
+  if (record is ({List<String>? value})) {
+    return {
+      "n": {
+        "value": record.value,
+      },
+    };
+  }
+  if (record is ({int? value})) {
+    return {
+      "n": {
+        "value": record.value,
+      },
+    };
+  }
+  if (record is ({DateTime value})) {
+    return {
+      "n": {
+        "value": record.value,
+      },
+    };
+  }
   if (record is ({DateTime? value})) {
     return {
       "n": {
diff --git a/school_data_hub_client/pubspec.yaml b/school_data_hub_client/pubspec.yaml
index 03c0b555..01369a14 100644
--- a/school_data_hub_client/pubspec.yaml
+++ b/school_data_hub_client/pubspec.yaml
@@ -5,5 +5,5 @@ environment:
   sdk: '>=3.3.0 <4.0.0'
 
 dependencies:
-  serverpod_client: 2.9.1
-  serverpod_auth_client: 2.9.1
+  serverpod_client: 2.9.2
+  serverpod_auth_client: 2.9.2
diff --git a/school_data_hub_flutter/.gitignore b/school_data_hub_flutter/.gitignore
index b69e5706..ff0b127c 100644
--- a/school_data_hub_flutter/.gitignore
+++ b/school_data_hub_flutter/.gitignore
@@ -28,6 +28,7 @@ rooms.json
 test_enc.dart
 decrypt_files.dart
 **/scripts/
+cursor_docs/
 
 # Flutter/Dart/Pub related
 **/doc/api/
diff --git a/school_data_hub_flutter/.vscode/settings.json b/school_data_hub_flutter/.vscode/settings.json
index f01283e9..a88affac 100644
--- a/school_data_hub_flutter/.vscode/settings.json
+++ b/school_data_hub_flutter/.vscode/settings.json
@@ -1,4 +1,4 @@
 {
-    "dart.flutterSdkPath": "C:\\Users\\p53\\.puro\\envs\\3.32.8\\flutter",
-    "dart.sdkPath": "C:\\Users\\p53\\.puro\\envs\\3.32.8\\flutter\\bin\\cache\\dart-sdk"
+    "dart.flutterSdkPath": "C:\\src\\flutter",
+    "dart.sdkPath": "C:\\src\\flutter\\bin\\cache\\dart-sdk"
 }
\ No newline at end of file
diff --git a/school_data_hub_flutter/Makefile b/school_data_hub_flutter/Makefile
index 1c2bf3df..e39dad6d 100644
--- a/school_data_hub_flutter/Makefile
+++ b/school_data_hub_flutter/Makefile
@@ -6,5 +6,5 @@ patch_android: ## Create a patch and publish it to Shorebird
 	shorebird patch android
 
 patch_windows: ## Create a patch and publish it to Shorebird
-  shorebird patch windows --platforms=windows --release-version=0.5.1+1
+  shorebird patch windows --platforms=windows --release-version=0.5.2+1
 
diff --git a/school_data_hub_flutter/android/app/src/main/AndroidManifest.xml b/school_data_hub_flutter/android/app/src/main/AndroidManifest.xml
index 473013b8..9c7d6b08 100644
--- a/school_data_hub_flutter/android/app/src/main/AndroidManifest.xml
+++ b/school_data_hub_flutter/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-  <application android:label="school_data_hub_flutter" android:name="${applicationName}" android:icon="@mipmap/launcher_icon">
+  <application android:label="Schuldaten App" android:name="${applicationName}" android:icon="@mipmap/launcher_icon">
     <activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:taskAffinity="" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
       <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
diff --git a/school_data_hub_flutter/devtools_options.yaml b/school_data_hub_flutter/devtools_options.yaml
index 4dcfde9f..ee8326b6 100644
--- a/school_data_hub_flutter/devtools_options.yaml
+++ b/school_data_hub_flutter/devtools_options.yaml
@@ -1,4 +1,5 @@
 description: This file stores settings for Dart & Flutter DevTools.
 documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
 extensions:
-  - shared_preferences: true
\ No newline at end of file
+  - shared_preferences: true
+  - signals: true
\ No newline at end of file
diff --git a/school_data_hub_flutter/lib/app_utils/barcode_stream_scanner.dart b/school_data_hub_flutter/lib/app_utils/barcode_stream_scanner.dart
index 87a430e0..2cd5b909 100644
--- a/school_data_hub_flutter/lib/app_utils/barcode_stream_scanner.dart
+++ b/school_data_hub_flutter/lib/app_utils/barcode_stream_scanner.dart
@@ -1,168 +1,168 @@
-import 'dart:async';
+// import 'dart:async';
 
-import 'package:flutter/material.dart';
-import 'package:mobile_scanner/mobile_scanner.dart';
-import 'package:school_data_hub_flutter/common/theme/styles.dart';
-import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_app_bar.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_manager.dart';
-import 'package:watch_it/watch_it.dart';
+// import 'package:flutter/material.dart';
+// import 'package:mobile_scanner/mobile_scanner.dart';
+// import 'package:school_data_hub_flutter/common/theme/styles.dart';
+// import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_app_bar.dart';
+// import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_manager.dart';
+// import 'package:watch_it/watch_it.dart';
 
-class BarcodeStreamScanner extends StatefulWidget {
-  const BarcodeStreamScanner({super.key});
+// class BarcodeStreamScanner extends StatefulWidget {
+//   const BarcodeStreamScanner({super.key});
 
-  @override
-  State<BarcodeStreamScanner> createState() => _BarcodeStreamScannerState();
-}
+//   @override
+//   State<BarcodeStreamScanner> createState() => _BarcodeStreamScannerState();
+// }
 
-class _BarcodeStreamScannerState extends State<BarcodeStreamScanner> {
-  final MobileScannerController controller = MobileScannerController(
-    torchEnabled: false,
-  );
-  final _pupilIdentityManager = di<PupilIdentityManager>();
+// class _BarcodeStreamScannerState extends State<BarcodeStreamScanner> {
+//   final MobileScannerController controller = MobileScannerController(
+//     torchEnabled: false,
+//   );
+//   final _pupilIdentityManager = di<PupilIdentityManager>();
 
-  int _counter = 0;
-  final List<String> _scannedQrCodes = [];
-  String _lastProcessedQrCode = '';
+//   int _counter = 0;
+//   final List<String> _scannedQrCodes = [];
+//   String _lastProcessedQrCode = '';
 
-  Widget _buildBarcodeStream() {
-    return StreamBuilder<BarcodeCapture>(
-      stream: controller.barcodes,
-      builder: (context, snapshot) {
-        final barcodes = snapshot.data?.barcodes;
+//   Widget _buildBarcodeStream() {
+//     return StreamBuilder<BarcodeCapture>(
+//       stream: controller.barcodes,
+//       builder: (context, snapshot) {
+//         final barcodes = snapshot.data?.barcodes;
 
-        if (barcodes == null || barcodes.isEmpty) {
-          return const Center(
-            child: Text(
-              'Gerät während des Scanvorgangs leicht  nach vorne und hinten bewegen, damit die Codes besser erkannt werden.',
-              style: TextStyle(color: Colors.white, fontSize: 20),
-            ),
-          );
-        }
-        final String? newQrCode = barcodes.last.rawValue;
-        if (newQrCode != null) {
-          if (_lastProcessedQrCode == '' || _lastProcessedQrCode != newQrCode) {
-            WidgetsBinding.instance.addPostFrameCallback((_) {
-              setState(() {
-                _scannedQrCodes.add(newQrCode);
-                _counter++;
-                _lastProcessedQrCode = newQrCode;
-              });
-            });
-          }
-        }
-        return Column(
-          children: [
-            Expanded(
-              child: ListView.builder(
-                itemCount: barcodes.length,
-                itemBuilder: (context, index) {
-                  return Padding(
-                    padding: const EdgeInsets.all(8.0),
-                    child: Text(
-                      'Gescannte codes: $_counter',
-                      textAlign: TextAlign.center,
-                      overflow: TextOverflow.fade,
-                      style: const TextStyle(
-                        color: Colors.white,
-                        fontSize: 30,
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                  );
-                },
-              ),
-            ),
-            const SizedBox(height: 10),
-            Row(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                Expanded(
-                  child: Padding(
-                    padding: const EdgeInsets.only(bottom: 10.0),
-                    child: ElevatedButton(
-                      style: AppStyles.cancelButtonStyle,
-                      onPressed: () {
-                        Navigator.pop(context);
-                      },
-                      child: const Text(
-                        "ABBRECHEN",
-                        style: AppStyles.buttonTextStyle,
-                      ),
-                    ),
-                  ),
-                ),
-                const SizedBox(width: 10),
-                Expanded(
-                  child: Padding(
-                    padding: const EdgeInsets.only(bottom: 10.0),
-                    child: ElevatedButton(
-                      style: AppStyles.successButtonStyle,
-                      onPressed: () {
-                        unawaited(
-                          _pupilIdentityManager
-                              .updatePupilIdentitiesFromEncryptedSource(
-                                _scannedQrCodes,
-                              ),
-                        );
+//         if (barcodes == null || barcodes.isEmpty) {
+//           return const Center(
+//             child: Text(
+//               'Gerät während des Scanvorgangs leicht  nach vorne und hinten bewegen, damit die Codes besser erkannt werden.',
+//               style: TextStyle(color: Colors.white, fontSize: 20),
+//             ),
+//           );
+//         }
+//         final String? newQrCode = barcodes.last.rawValue;
+//         if (newQrCode != null) {
+//           if (_lastProcessedQrCode == '' || _lastProcessedQrCode != newQrCode) {
+//             WidgetsBinding.instance.addPostFrameCallback((_) {
+//               setState(() {
+//                 _scannedQrCodes.add(newQrCode);
+//                 _counter++;
+//                 _lastProcessedQrCode = newQrCode;
+//               });
+//             });
+//           }
+//         }
+//         return Column(
+//           children: [
+//             Expanded(
+//               child: ListView.builder(
+//                 itemCount: barcodes.length,
+//                 itemBuilder: (context, index) {
+//                   return Padding(
+//                     padding: const EdgeInsets.all(8.0),
+//                     child: Text(
+//                       'Gescannte codes: $_counter',
+//                       textAlign: TextAlign.center,
+//                       overflow: TextOverflow.fade,
+//                       style: const TextStyle(
+//                         color: Colors.white,
+//                         fontSize: 30,
+//                         fontWeight: FontWeight.bold,
+//                       ),
+//                     ),
+//                   );
+//                 },
+//               ),
+//             ),
+//             const SizedBox(height: 10),
+//             Row(
+//               mainAxisAlignment: MainAxisAlignment.center,
+//               children: [
+//                 Expanded(
+//                   child: Padding(
+//                     padding: const EdgeInsets.only(bottom: 10.0),
+//                     child: ElevatedButton(
+//                       style: AppStyles.cancelButtonStyle,
+//                       onPressed: () {
+//                         Navigator.pop(context);
+//                       },
+//                       child: const Text(
+//                         "ABBRECHEN",
+//                         style: AppStyles.buttonTextStyle,
+//                       ),
+//                     ),
+//                   ),
+//                 ),
+//                 const SizedBox(width: 10),
+//                 Expanded(
+//                   child: Padding(
+//                     padding: const EdgeInsets.only(bottom: 10.0),
+//                     child: ElevatedButton(
+//                       style: AppStyles.successButtonStyle,
+//                       onPressed: () {
+//                         unawaited(
+//                           _pupilIdentityManager
+//                               .updatePupilIdentitiesFromEncryptedSource(
+//                                 _scannedQrCodes,
+//                               ),
+//                         );
 
-                        //  unawaited(locator<PupilManager>().fetchAllPupils());
-                        Navigator.pop(context);
-                      },
-                      child: const Text(
-                        "SCAN BEENDEN",
-                        style: AppStyles.buttonTextStyle,
-                      ),
-                    ),
-                  ),
-                ),
-              ],
-            ),
-            const SizedBox(height: 20),
-          ],
-        );
-      },
-    );
-  }
+//                         //  unawaited(locator<PupilManager>().fetchAllPupils());
+//                         Navigator.pop(context);
+//                       },
+//                       child: const Text(
+//                         "SCAN BEENDEN",
+//                         style: AppStyles.buttonTextStyle,
+//                       ),
+//                     ),
+//                   ),
+//                 ),
+//               ],
+//             ),
+//             const SizedBox(height: 20),
+//           ],
+//         );
+//       },
+//     );
+//   }
 
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: const GenericAppBar(
-        iconData: Icons.qr_code_scanner_rounded,
-        title: 'QR-Code-Stream scannen',
-      ),
-      backgroundColor: Colors.black,
-      body: Stack(
-        children: [
-          MobileScanner(
-            controller: controller,
-            errorBuilder: (context, error) {
-              return Center(
-                child: Text(
-                  'Error: $error',
-                  style: const TextStyle(color: Colors.red),
-                ),
-              );
-            },
-            fit: BoxFit.contain,
-          ),
-          Align(
-            alignment: Alignment.bottomCenter,
-            child: Container(
-              alignment: Alignment.bottomCenter,
-              height: 150,
-              color: Colors.black.withAlpha((0.4 * 255).toInt()),
-              child: _buildBarcodeStream(),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
+//   @override
+//   Widget build(BuildContext context) {
+//     return Scaffold(
+//       appBar: const GenericAppBar(
+//         iconData: Icons.qr_code_scanner_rounded,
+//         title: 'QR-Code-Stream scannen',
+//       ),
+//       backgroundColor: Colors.black,
+//       body: Stack(
+//         children: [
+//           MobileScanner(
+//             controller: controller,
+//             errorBuilder: (context, error) {
+//               return Center(
+//                 child: Text(
+//                   'Error: $error',
+//                   style: const TextStyle(color: Colors.red),
+//                 ),
+//               );
+//             },
+//             fit: BoxFit.contain,
+//           ),
+//           Align(
+//             alignment: Alignment.bottomCenter,
+//             child: Container(
+//               alignment: Alignment.bottomCenter,
+//               height: 150,
+//               color: Colors.black.withAlpha((0.4 * 255).toInt()),
+//               child: _buildBarcodeStream(),
+//             ),
+//           ),
+//         ],
+//       ),
+//     );
+//   }
 
-  @override
-  Future<void> dispose() async {
-    super.dispose();
-    await controller.dispose();
-  }
-}
+//   @override
+//   Future<void> dispose() async {
+//     super.dispose();
+//     await controller.dispose();
+//   }
+// }
diff --git a/school_data_hub_flutter/lib/app_utils/extensions/datetime_extensions.dart b/school_data_hub_flutter/lib/app_utils/extensions/datetime_extensions.dart
deleted file mode 100644
index 4fd80ecf..00000000
--- a/school_data_hub_flutter/lib/app_utils/extensions/datetime_extensions.dart
+++ /dev/null
@@ -1,105 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-
-extension DateHubExtension on DateTime {
-  bool isSameDate(DateTime other) {
-    if (year == other.year && month == other.month && day == other.day) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  bool isBeforeDate(DateTime other) {
-    return year == other.year && month == other.month && day < other.day ||
-        year == other.year && month < other.month ||
-        year < other.year;
-  }
-
-  bool isAfterDate(DateTime other) {
-    return year == other.year && month == other.month && day > other.day ||
-        year == other.year && month > other.month ||
-        year > other.year;
-  }
-
-  String formatDateForUser() {
-    final date = this.toLocal();
-    final DateFormat dateFormat = DateFormat("dd.MM.yyyy");
-    return dateFormat.format(date).toString();
-  }
-
-  String formatDateForJson() {
-    final DateFormat dateFormat = DateFormat("yyyy-MM-dd");
-    return dateFormat.format(this).toString();
-  }
-
-  /// Format DateTime with time for UI display
-  String formatDateAndTimeForUser() {
-    final date = this.isUtc ? this.toLocal() : this;
-    final DateFormat dateFormat = DateFormat("dd.MM.yyyy HH:mm");
-    return dateFormat.format(date).toString();
-  }
-
-  /// Format time only for UI display
-  String formatTimeForUser() {
-    final date = this.isUtc ? this.toLocal() : this;
-    final DateFormat timeFormat = DateFormat("HH:mm");
-    return timeFormat.format(date).toString();
-  }
-
-  /// Format date with weekday for UI display
-  String formatWithWeekday() {
-    final date = this.isUtc ? this.toLocal() : this;
-    final DateFormat dateFormat = DateFormat("EEEE, dd.MM.yyyy", "de_DE");
-    return dateFormat.format(date).toString();
-  }
-
-  /// Convert to UTC for server communication
-  DateTime formatToUtcForServer() {
-    return this.isUtc ? this : this.toUtc();
-  }
-
-  /// Get the start of day in local time
-  DateTime startOfDayLocal() {
-    final local = this.isUtc ? this.toLocal() : this;
-    return DateTime(local.year, local.month, local.day);
-  }
-
-  /// Get the start of day in UTC
-  DateTime startOfDayUtc() {
-    final utc = this.isUtc ? this : this.toUtc();
-    return DateTime.utc(utc.year, utc.month, utc.day);
-  }
-
-  String asWeekdayName(BuildContext context) {
-    final locale = Localizations.localeOf(context).toString();
-    final DateFormat dateFormat = DateFormat("EEEE", locale);
-    return dateFormat.format(this);
-  }
-}
-
-// extension ColorLog on String {
-//   String logWarning() {
-//     final String message =
-//         "\u001b[1;33m [SCHULDATEN HUB] WARNING: $this \u001b[0m";
-//     return message;
-//   }
-
-//   String logSuccess() {
-//     final String message =
-//         "\u001b[1;32m [SCHULDATEN HUB] SUCCESS: $this \u001b[0m";
-//     return message;
-//   }
-
-//   String logError() {
-//     final String message =
-//         "\u001b[1;31m [SCHULDATEN HUB] ERROR: $this \u001b[0m";
-//     return message;
-//   }
-
-//   String logInfo() {
-//     final String message =
-//         "\u001b[1;34m [SCHULDATEN HUB] INFO: $this \u001b[0m";
-//     return message;
-//   }
-// }
diff --git a/school_data_hub_flutter/lib/app_utils/import_string_from_txt_file.dart b/school_data_hub_flutter/lib/app_utils/import_string_from_txt_file.dart
index 0d932280..89513279 100644
--- a/school_data_hub_flutter/lib/app_utils/import_string_from_txt_file.dart
+++ b/school_data_hub_flutter/lib/app_utils/import_string_from_txt_file.dart
@@ -4,7 +4,7 @@ import 'package:file_picker/file_picker.dart';
 
 Future<String?> importStringfromTxtFile() async {
   FilePickerResult? result = await FilePicker.platform.pickFiles(
-   // allowedExtensions: ['txt'],
+    // allowedExtensions: ['txt'],
   );
   if (result != null) {
     File file = File(result.files.single.path!);
diff --git a/school_data_hub_flutter/lib/app_utils/logger/ansi_code.dart b/school_data_hub_flutter/lib/app_utils/logger/domain/ansi_code.dart
similarity index 100%
rename from school_data_hub_flutter/lib/app_utils/logger/ansi_code.dart
rename to school_data_hub_flutter/lib/app_utils/logger/domain/ansi_code.dart
diff --git a/school_data_hub_flutter/lib/app_utils/logger/exception_chain.dart b/school_data_hub_flutter/lib/app_utils/logger/domain/exception_chain.dart
similarity index 100%
rename from school_data_hub_flutter/lib/app_utils/logger/exception_chain.dart
rename to school_data_hub_flutter/lib/app_utils/logger/domain/exception_chain.dart
diff --git a/school_data_hub_flutter/lib/app_utils/logger/logrecord_formatter.dart b/school_data_hub_flutter/lib/app_utils/logger/domain/log_record_formatter.dart
similarity index 96%
rename from school_data_hub_flutter/lib/app_utils/logger/logrecord_formatter.dart
rename to school_data_hub_flutter/lib/app_utils/logger/domain/log_record_formatter.dart
index 0c35db92..3aab67e1 100644
--- a/school_data_hub_flutter/lib/app_utils/logger/logrecord_formatter.dart
+++ b/school_data_hub_flutter/lib/app_utils/logger/domain/log_record_formatter.dart
@@ -5,9 +5,9 @@ import 'dart:convert';
 import 'dart:isolate';
 
 import 'package:logging/logging.dart';
-import 'package:school_data_hub_flutter/app_utils/logger/ansi_code.dart'
+import 'package:school_data_hub_flutter/app_utils/logger/domain/ansi_code.dart'
     as ansi;
-import 'package:school_data_hub_flutter/app_utils/logger/exception_chain.dart';
+import 'package:school_data_hub_flutter/app_utils/logger/domain/exception_chain.dart';
 
 /// Base class for formatters which are responsible for converting
 /// [LogRecord]s to strings.
diff --git a/school_data_hub_flutter/lib/app_utils/logger/domain/log_service.dart b/school_data_hub_flutter/lib/app_utils/logger/domain/log_service.dart
new file mode 100644
index 00000000..79fecdf1
--- /dev/null
+++ b/school_data_hub_flutter/lib/app_utils/logger/domain/log_service.dart
@@ -0,0 +1,236 @@
+// lib/services/log_service.dart
+import 'package:logging/logging.dart';
+import 'package:signals/signals.dart';
+
+import '../model/app_log.dart';
+
+// Service to manage the list of logs backed by signals
+class LogService {
+  // Define a max number of logs to keep in memory
+  static const int _maxLogs = 1000;
+
+  final Signal<List<AppLog>> _logs = signal(
+    <AppLog>[],
+    debugLabel: 'LogService._logs',
+  );
+  final Signal<String> _searchQuery = signal(
+    '',
+    debugLabel: 'LogService._searchQuery',
+  );
+  final Signal<Map<Level, bool>> _levelVisibility = signal(
+    {},
+    debugLabel: 'LogService._levelVisibility',
+  );
+  final Signal<Set<String>> _loggerNames = signal(
+    <String>{},
+    debugLabel: 'LogService._loggerNames',
+  );
+  final Signal<Set<String>> _selectedLoggerFilters = signal(
+    <String>{},
+    debugLabel: 'LogService._selectedLoggerFilters',
+  );
+
+  void addLogString({
+    required String message,
+    String loggerName = 'App',
+    String levelName = 'INFO',
+  }) {
+    final level = Level.LEVELS.firstWhere(
+      (l) => l.name == levelName,
+      orElse: () => Level.INFO,
+    );
+    addLog(AppLog(level, message, loggerName));
+  }
+
+  late final Computed<List<AppLog>> filteredLogs = computed(
+    _computeFilteredLogs,
+  );
+
+  late final Computed<bool> showInfo = computed(
+    () => _isLevelVisible(Level.INFO),
+  );
+  late final Computed<bool> showWarning = computed(
+    () => _isLevelVisible(Level.WARNING),
+  );
+  late final Computed<bool> showSevere = computed(
+    () => _isLevelVisible(Level.SEVERE),
+  );
+  late final Computed<bool> showShout = computed(
+    () => _isLevelVisible(Level.SHOUT),
+  );
+  late final Computed<bool> showFine = computed(
+    () => _isLevelVisible(Level.FINE),
+  );
+  late final Computed<List<String>> loggerNamesSorted = computed(
+    () => _loggerNames.value.toList()..sort(),
+  );
+  late final Computed<Set<String>> selectedLoggerFilters = computed(
+    () => _selectedLoggerFilters.value,
+  );
+  late final Computed<bool> filtersActive = computed(
+    () =>
+        _selectedLoggerFilters.value.isNotEmpty ||
+        _levelVisibility.value.values.any((isVisible) => !isVisible),
+  );
+
+  Signal<String> get searchQuery => _searchQuery;
+  Signal<Set<String>> get loggerNames => _loggerNames;
+
+  /// Ingest a [LogRecord] and fan out aggregated console strings into
+  /// individual app logs when needed.
+  void ingestRecord(LogRecord record) {
+    final fragments = _splitAggregatedMessage(record.message);
+    if (fragments.isEmpty) {
+      addLog(AppLog(record.level, record.message, record.loggerName));
+      return;
+    }
+
+    for (final fragment in fragments) {
+      final parsed = _parseFragment(fragment);
+      if (parsed != null) {
+        addLog(AppLog(parsed.level, parsed.message, parsed.logger));
+      } else {
+        addLog(AppLog(record.level, fragment, record.loggerName));
+      }
+    }
+  }
+
+  void addLog(AppLog log) {
+    final updated = [log, ..._logs.value];
+    if (updated.length > _maxLogs) {
+      updated.length = _maxLogs;
+    }
+    _logs.value = updated;
+    if (!_loggerNames.value.contains(log.loggerName)) {
+      _loggerNames.value = {..._loggerNames.value, log.loggerName};
+    }
+  }
+
+  void updateSearchQuery(String query) {
+    final normalized = query.trim();
+    if (_searchQuery.value == normalized) {
+      return;
+    }
+    _searchQuery.value = normalized;
+  }
+
+  void setLevelVisibility(Level level, bool isVisible) {
+    final current = _levelVisibility.value[level] ?? true;
+    if (current == isVisible) return;
+
+    if (isVisible) {
+      final next = {..._levelVisibility.value}..remove(level);
+      _levelVisibility.value = next;
+    } else {
+      _levelVisibility.value = {..._levelVisibility.value, level: isVisible};
+    }
+  }
+
+  void toggleLoggerFilter(String loggerName, bool enabled) {
+    final next = {..._selectedLoggerFilters.value};
+    if (enabled) {
+      next.add(loggerName);
+    } else {
+      next.remove(loggerName);
+    }
+    _selectedLoggerFilters.value = next;
+  }
+
+  void clearLoggerFilters() {
+    if (_selectedLoggerFilters.value.isEmpty) return;
+    _selectedLoggerFilters.value = {};
+  }
+
+  void clearLogs() {
+    if (_logs.value.isEmpty) {
+      return;
+    }
+    _logs.value = [];
+  }
+
+  void resetFilters() {
+    _levelVisibility.value = {};
+    _selectedLoggerFilters.value = {};
+  }
+
+  List<AppLog> _computeFilteredLogs() {
+    final visibility = _levelVisibility.value;
+    final query = _searchQuery.value.toLowerCase();
+    final selectedLoggers = _selectedLoggerFilters.value;
+    return _logs.value
+        .where((log) {
+          if (!(visibility[log.level] ?? true)) {
+            return false;
+          }
+          if (selectedLoggers.isNotEmpty &&
+              !selectedLoggers.contains(log.loggerName)) {
+            return false;
+          }
+          if (query.isEmpty) {
+            return true;
+          }
+          final haystack = '${log.loggerName} ${log.message}'.toLowerCase();
+          return haystack.contains(query);
+        })
+        .toList(growable: false);
+  }
+
+  bool _isLevelVisible(Level level) => _levelVisibility.value[level] ?? true;
+
+  List<String> _splitAggregatedMessage(String message) {
+    // split on ", [HH:MM:SS]" patterns which indicate multiple console lines
+    final parts = message.split(RegExp(r',\s+(?=\[\d{2}:\d{2}:\d{2}\])')).map((
+      e,
+    ) {
+      final trimmed = e.trimLeft();
+      return trimmed.startsWith(',')
+          ? trimmed.substring(1).trimLeft()
+          : trimmed;
+    }).toList();
+    return parts.length > 1 ? parts : const [];
+  }
+
+  ({Level level, String logger, String message})? _parseFragment(
+    String fragment,
+  ) {
+    final pattern = RegExp(
+      r'\[\d{2}:\d{2}:\d{2}\]\s+\[(?<level>[A-Z]+)\]\s+\[(?<logger>[^\]]+)\]\s+(?<msg>.+)',
+    );
+    final match = pattern.firstMatch(fragment);
+    if (match == null) {
+      return null;
+    }
+    final levelName = match.namedGroup('level');
+    final logger = match.namedGroup('logger') ?? 'unknown';
+    final msg = match.namedGroup('msg') ?? fragment;
+    final level = _levelFromName(levelName) ?? Level.INFO;
+    return (level: level, logger: logger, message: msg);
+  }
+
+  Level? _levelFromName(String? name) {
+    if (name == null) return null;
+    final upper = name.toUpperCase();
+    switch (upper) {
+      case 'SHOUT':
+        return Level.SHOUT;
+      case 'SEVERE':
+      case 'ERROR':
+        return Level.SEVERE;
+      case 'WARNING':
+      case 'WARN':
+        return Level.WARNING;
+      case 'INFO':
+        return Level.INFO;
+      case 'FINE':
+        return Level.FINE;
+      case 'FINER':
+        return Level.FINER;
+      case 'FINEST':
+        return Level.FINEST;
+      case 'CONFIG':
+        return Level.CONFIG;
+      default:
+        return null;
+    }
+  }
+}
diff --git a/school_data_hub_flutter/lib/app_utils/logger/domain/signals_logger.dart b/school_data_hub_flutter/lib/app_utils/logger/domain/signals_logger.dart
new file mode 100644
index 00000000..5061fbde
--- /dev/null
+++ b/school_data_hub_flutter/lib/app_utils/logger/domain/signals_logger.dart
@@ -0,0 +1,57 @@
+// lib/app_utils/logger/signals_logger.dart
+import 'package:school_data_hub_flutter/app_utils/logger/domain/log_service.dart';
+import 'package:signals/signals_flutter.dart';
+import 'package:watch_it/watch_it.dart';
+
+class AppSignalsObserver extends SignalsObserver {
+  bool _forwarding = false;
+
+  void _forward(String msg) {
+    if (_forwarding) return; // re-entry guard
+    _forwarding = true;
+    // Send straight to LogService; don't go through Logger.root
+    di<LogService>().addLogString(
+      message: msg,
+      levelName: 'FINE',
+      loggerName: 'Signals',
+    );
+    _forwarding = false;
+  }
+
+  @override
+  void onSignalCreated<T>(Signal<T> signal, T value) {
+    if (_shouldSkip(signal.debugLabel)) return;
+    _forward(
+      '[Signals] signal created: ${signal.debugLabel ?? 'unlabeled'} => $value',
+    );
+  }
+
+  @override
+  void onSignalUpdated<T>(Signal<T> signal, T value) {
+    if (_shouldSkip(signal.debugLabel)) return;
+    _forward(
+      '[Signals] signal updated: ${signal.debugLabel ?? 'unlabeled'} => $value',
+    );
+  }
+
+  @override
+  void onComputedCreated<T>(Computed<T> computed) {
+    if (_shouldSkip(computed.debugLabel)) return;
+    _forward(
+      '[Signals] computed created: ${computed.debugLabel ?? 'unlabeled'}',
+    );
+  }
+
+  @override
+  void onComputedUpdated<T>(Computed<T> computed, T value) {
+    if (_shouldSkip(computed.debugLabel)) return;
+    _forward(
+      '[Signals] computed updated: ${computed.debugLabel ?? 'unlabeled'} => $value',
+    );
+  }
+
+  bool _shouldSkip(String? label) {
+    // Avoid logging changes to the log storage signals themselves
+    return label != null && label.startsWith('logService');
+  }
+}
diff --git a/school_data_hub_flutter/lib/app_utils/logger/log_service.dart b/school_data_hub_flutter/lib/app_utils/logger/log_service.dart
deleted file mode 100644
index 010687d1..00000000
--- a/school_data_hub_flutter/lib/app_utils/logger/log_service.dart
+++ /dev/null
@@ -1,85 +0,0 @@
-// lib/services/log_service.dart
-import 'package:flutter/foundation.dart';
-import 'package:logging/logging.dart';
-
-// Represents a single log entry for display
-class AppLog {
-  final Level level;
-  final String message;
-  final String loggerName;
-  final DateTime time;
-
-  AppLog(this.level, this.message, this.loggerName) : time = DateTime.now();
-
-  @override
-  String toString() =>
-      '[${time.toIso8601String().split('T').last.substring(0, 8)}] [${level.name}] [$loggerName] $message';
-}
-
-// Service to manage the list of logs and notify listeners
-class LogService with ChangeNotifier {
-  final List<AppLog> _logs = [];
-  List<AppLog> get logs => _logs;
-  String _searchQuery = '';
-  final Map<Level, bool> _levelVisibility = {};
-
-  List<AppLog> get filteredLogs => _logs.where(_shouldIncludeLog).toList();
-
-  String get searchQuery => _searchQuery;
-
-  bool get showInfo => _isLevelVisible(Level.INFO);
-  bool get showWarning => _isLevelVisible(Level.WARNING);
-  bool get showSevere => _isLevelVisible(Level.SEVERE);
-  bool get showShout => _isLevelVisible(Level.SHOUT);
-
-  // Define a max number of logs to keep in memory
-  static const int _maxLogs = 100;
-
-  void addLog(AppLog log) {
-    // Add the new log entry
-    _logs.insert(
-      0,
-      log,
-    ); // Insert at the beginning for reverse-chronological order
-
-    // Trim the list if it exceeds the maximum size
-    if (_logs.length > _maxLogs) {
-      _logs.removeRange(_maxLogs, _logs.length);
-    }
-
-    // Notify listeners (your Flutter widget) that the list has changed
-    notifyListeners();
-  }
-
-  void updateSearchQuery(String query) {
-    final normalized = query.trim();
-    if (_searchQuery == normalized) {
-      return;
-    }
-    _searchQuery = normalized;
-    notifyListeners();
-  }
-
-  void setLevelVisibility(Level level, bool isVisible) {
-    final current = _levelVisibility[level] ?? true;
-    if (current == isVisible) {
-      return;
-    }
-    _levelVisibility[level] = isVisible;
-    notifyListeners();
-  }
-
-  bool _shouldIncludeLog(AppLog log) {
-    if (!_isLevelVisible(log.level)) {
-      return false;
-    }
-    if (_searchQuery.isEmpty) {
-      return true;
-    }
-    final needle = _searchQuery.toLowerCase();
-    final haystack = '${log.loggerName} ${log.message}'.toLowerCase();
-    return haystack.contains(needle);
-  }
-
-  bool _isLevelVisible(Level level) => _levelVisibility[level] ?? true;
-}
diff --git a/school_data_hub_flutter/lib/app_utils/logger/model/app_log.dart b/school_data_hub_flutter/lib/app_utils/logger/model/app_log.dart
new file mode 100644
index 00000000..98160b43
--- /dev/null
+++ b/school_data_hub_flutter/lib/app_utils/logger/model/app_log.dart
@@ -0,0 +1,15 @@
+// Represents a single log entry for display
+import 'package:logging/logging.dart';
+
+class AppLog {
+  final Level level;
+  final String message;
+  final String loggerName;
+  final DateTime time;
+
+  AppLog(this.level, this.message, this.loggerName) : time = DateTime.now();
+
+  @override
+  String toString() =>
+      '[${time.toIso8601String().split('T').last.substring(0, 8)}] [${level.name}] [$loggerName] $message';
+}
diff --git a/school_data_hub_flutter/lib/app_utils/logger/presentation/logs_page/logs_page.dart b/school_data_hub_flutter/lib/app_utils/logger/presentation/logs_page/logs_page.dart
new file mode 100644
index 00000000..033dfe91
--- /dev/null
+++ b/school_data_hub_flutter/lib/app_utils/logger/presentation/logs_page/logs_page.dart
@@ -0,0 +1,197 @@
+// lib/log_viewer_page.dart
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
+import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_app_bar.dart';
+import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_sliver_list.dart';
+import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_sliver_search_app_bar.dart';
+import 'package:signals_hooks/signals_hooks.dart';
+import 'package:watch_it/watch_it.dart';
+
+import '../../domain/log_service.dart';
+import '../../model/app_log.dart';
+import 'widgets/log_entry_card.dart';
+import 'widgets/logs_filter_bottom_sheet.dart';
+
+class LogViewerPage extends HookWidget {
+  const LogViewerPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final logService = di<LogService>();
+    final searchQuery = useSignalValue(logService.searchQuery);
+    final logs = useSignalValue(logService.filteredLogs);
+    final filtersActive = useSignalValue(logService.filtersActive);
+    final searchController = useTextEditingController(text: searchQuery);
+
+    useEffect(() {
+      if (searchController.text != searchQuery) {
+        searchController.value = TextEditingValue(
+          text: searchQuery,
+          selection: TextSelection.collapsed(offset: searchQuery.length),
+        );
+      }
+      return null;
+    }, [searchQuery, searchController]);
+
+    return Scaffold(
+      backgroundColor: AppColors.canvasColor,
+      appBar: const GenericAppBar(
+        iconData: Icons.bug_report_outlined,
+        title: 'In-App Logs',
+      ),
+      bottomNavigationBar: _LogsBottomNavBar(
+        filtersActive: filtersActive,
+        onShowFilters: () => showLogsFilterBottomSheet(context),
+        onResetFilters: logService.resetFilters,
+      ),
+      body: Center(
+        child: ConstrainedBox(
+          constraints: const BoxConstraints(maxWidth: 700),
+          child: CustomScrollView(
+            slivers: [
+              GenericSliverSearchAppBar(
+                height: 90,
+                title: _LogSearchField(
+                  controller: searchController,
+                  value: searchQuery,
+                  onChanged: logService.updateSearchQuery,
+                  onClear: () => logService.updateSearchQuery(''),
+                ),
+              ),
+              SliverToBoxAdapter(
+                child: Padding(
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: 16,
+                    vertical: 4,
+                  ),
+                  child: Align(
+                    alignment: Alignment.centerRight,
+                    child: FilledButton.icon(
+                      style: FilledButton.styleFrom(
+                        backgroundColor: AppColors.dangerButtonColor,
+                        foregroundColor: Colors.white,
+                      ),
+                      onPressed: logs.isEmpty ? null : logService.clearLogs,
+                      icon: const Icon(Icons.delete_outline),
+                      label: const Text('Protokolle löschen'),
+                    ),
+                  ),
+                ),
+              ),
+              GenericSliverListWithEmptyListCheck<AppLog>(
+                items: logs,
+                itemBuilder: (context, log) => Padding(
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: 8,
+                    vertical: 1,
+                  ),
+                  child: LogEntryCard(log: log),
+                ),
+              ),
+              const SliverToBoxAdapter(child: SizedBox(height: 80)),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _LogSearchField extends StatelessWidget {
+  const _LogSearchField({
+    required this.controller,
+    required this.value,
+    required this.onChanged,
+    required this.onClear,
+  });
+
+  final TextEditingController controller;
+  final String value;
+  final ValueChanged<String> onChanged;
+  final VoidCallback onClear;
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
+      decoration: BoxDecoration(
+        color: AppColors.canvasColor,
+        borderRadius: BorderRadius.circular(16),
+        boxShadow: const [
+          BoxShadow(color: Colors.black12, blurRadius: 6, offset: Offset(0, 2)),
+        ],
+      ),
+      child: TextField(
+        controller: controller,
+        onChanged: onChanged,
+        decoration: InputDecoration(
+          hintText: 'Protokolle durchsuchen',
+          prefixIcon: const Icon(Icons.search),
+          suffixIcon: value.isEmpty
+              ? null
+              : IconButton(
+                  icon: const Icon(Icons.close),
+                  onPressed: () {
+                    controller.clear();
+                    onClear();
+                  },
+                ),
+          border: InputBorder.none,
+        ),
+      ),
+    );
+  }
+}
+
+class _LogsBottomNavBar extends StatelessWidget {
+  const _LogsBottomNavBar({
+    required this.filtersActive,
+    required this.onShowFilters,
+    required this.onResetFilters,
+  });
+
+  final bool filtersActive;
+  final VoidCallback onShowFilters;
+  final VoidCallback onResetFilters;
+
+  @override
+  Widget build(BuildContext context) {
+    return BottomAppBar(
+      height: 60,
+      padding: const EdgeInsets.all(10),
+      color: AppColors.backgroundColor,
+      child: IconTheme(
+        data: IconThemeData(color: Theme.of(context).colorScheme.onPrimary),
+        child: ConstrainedBox(
+          constraints: const BoxConstraints(maxWidth: 800),
+          child: Row(
+            children: [
+              const Spacer(),
+              IconButton(
+                tooltip: 'zurück',
+                icon: const Icon(Icons.arrow_back, size: 30),
+                onPressed: () {
+                  Navigator.pop(context);
+                },
+              ),
+              InkWell(
+                onTap: onShowFilters,
+                onLongPress: onResetFilters,
+                child: Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 12),
+                  child: Icon(
+                    Icons.filter_list,
+                    color: filtersActive ? Colors.deepOrange : Colors.white,
+                    size: 30,
+                  ),
+                ),
+              ),
+              const SizedBox(width: 8),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/school_data_hub_flutter/lib/app_utils/logs_page/widgets/log_entry_card.dart b/school_data_hub_flutter/lib/app_utils/logger/presentation/logs_page/widgets/log_entry_card.dart
similarity index 84%
rename from school_data_hub_flutter/lib/app_utils/logs_page/widgets/log_entry_card.dart
rename to school_data_hub_flutter/lib/app_utils/logger/presentation/logs_page/widgets/log_entry_card.dart
index c20bfa4f..bd068f8f 100644
--- a/school_data_hub_flutter/lib/app_utils/logs_page/widgets/log_entry_card.dart
+++ b/school_data_hub_flutter/lib/app_utils/logger/presentation/logs_page/widgets/log_entry_card.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
-import 'package:school_data_hub_flutter/app_utils/logger/log_service.dart';
+import 'package:school_data_hub_flutter/app_utils/logger/model/app_log.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/theme/styles.dart';
 
@@ -57,7 +57,8 @@ class LogEntryCard extends StatelessWidget {
                 Expanded(
                   child: Text(
                     log.loggerName,
-                    style: AppStyles.subtitle,
+
+                    style: AppStyles.subtitle.copyWith(color: levelColor),
                     overflow: TextOverflow.ellipsis,
                   ),
                 ),
@@ -87,21 +88,9 @@ class LogEntryCard extends StatelessWidget {
   Color _levelColor(Level level) {
     if (level == Level.SEVERE) return AppColors.dangerButtonColor;
     if (level == Level.WARNING) return AppColors.warningButtonColor;
-    if (level == Level.INFO) return Colors.green.shade700;
+    if (level == Level.FINE) return Colors.green.shade700;
+    if (level == Level.INFO) return Colors.blue.shade700;
     if (level == Level.SHOUT) return Colors.red.shade900;
     return Colors.blueGrey;
   }
-
-  IconData _levelIcon(Level level) {
-    if (level == Level.SEVERE || level == Level.SHOUT) {
-      return Icons.error_outline;
-    }
-    if (level == Level.WARNING) {
-      return Icons.warning_amber_rounded;
-    }
-    if (level == Level.INFO) {
-      return Icons.info_outline;
-    }
-    return Icons.bubble_chart_outlined;
-  }
 }
diff --git a/school_data_hub_flutter/lib/app_utils/logger/presentation/logs_page/widgets/logs_filter_bottom_sheet.dart b/school_data_hub_flutter/lib/app_utils/logger/presentation/logs_page/widgets/logs_filter_bottom_sheet.dart
new file mode 100644
index 00000000..811eaeb1
--- /dev/null
+++ b/school_data_hub_flutter/lib/app_utils/logger/presentation/logs_page/widgets/logs_filter_bottom_sheet.dart
@@ -0,0 +1,307 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:gap/gap.dart';
+import 'package:logging/logging.dart';
+import 'package:school_data_hub_flutter/app_utils/logger/domain/log_service.dart';
+import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
+import 'package:school_data_hub_flutter/common/theme/styles.dart';
+import 'package:signals_hooks/signals_hooks.dart';
+import 'package:watch_it/watch_it.dart';
+
+Future<void> showLogsFilterBottomSheet(BuildContext context) {
+  return showModalBottomSheet<void>(
+    context: context,
+    constraints: const BoxConstraints(maxWidth: 800),
+    shape: const RoundedRectangleBorder(
+      borderRadius: BorderRadius.only(
+        topLeft: Radius.circular(20),
+        topRight: Radius.circular(20),
+      ),
+    ),
+    builder: (_) => const LogsFilterBottomSheet(),
+  );
+}
+
+class LogsFilterBottomSheet extends HookWidget {
+  const LogsFilterBottomSheet({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final logService = di<LogService>();
+    final showFine = useSignalValue(logService.showFine);
+    final showInfo = useSignalValue(logService.showInfo);
+    final showWarning = useSignalValue(logService.showWarning);
+    final showSevere = useSignalValue(logService.showSevere);
+    final showShout = useSignalValue(logService.showShout);
+    final loggerNames = useSignalValue(logService.loggerNamesSorted);
+    final selectedLoggers = useSignalValue(logService.selectedLoggerFilters);
+    final filtersActive = useSignalValue(logService.filtersActive);
+
+    return SafeArea(
+      child: Padding(
+        padding: const EdgeInsets.fromLTRB(20, 12, 20, 20),
+        child: SingleChildScrollView(
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              Row(
+                children: [
+                  Text('Filter', style: AppStyles.subtitle),
+                  const Spacer(),
+                  if (filtersActive)
+                    TextButton.icon(
+                      onPressed: logService.resetFilters,
+                      icon: const Icon(Icons.restart_alt),
+                      label: const Text('Zurücksetzen'),
+                    ),
+                  IconButton(
+                    onPressed: () => Navigator.of(context).pop(),
+                    icon: const Icon(Icons.close),
+                    tooltip: 'Schließen',
+                  ),
+                ],
+              ),
+              const Gap(8),
+              _LogLevelSwitches(
+                showFine: showFine,
+                showInfo: showInfo,
+                showWarning: showWarning,
+                showSevere: showSevere,
+                showShout: showShout,
+                onToggle: logService.setLevelVisibility,
+              ),
+              const Gap(12),
+              _LoggerFilterSection(
+                loggerNames: loggerNames,
+                selectedLoggers: selectedLoggers,
+                onToggle: logService.toggleLoggerFilter,
+                onClear: logService.clearLoggerFilters,
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _LogLevelSwitches extends StatelessWidget {
+  const _LogLevelSwitches({
+    required this.showFine,
+    required this.showInfo,
+    required this.showWarning,
+    required this.showSevere,
+    required this.showShout,
+    required this.onToggle,
+  });
+
+  final bool showFine;
+  final bool showInfo;
+  final bool showWarning;
+  final bool showSevere;
+  final bool showShout;
+  final void Function(Level level, bool value) onToggle;
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      color: AppColors.pupilProfileCardColor,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            const Text('Log-Level anzeigen', style: AppStyles.subtitle),
+            const Gap(12),
+            Wrap(
+              spacing: 16,
+              runSpacing: 12,
+              children: [
+                _LevelFilterChip(
+                  label: 'Fein',
+                  level: Level.FINE,
+                  isSelected: showFine,
+                  onToggle: onToggle,
+                ),
+                _LevelFilterChip(
+                  label: 'Info',
+                  level: Level.INFO,
+                  isSelected: showInfo,
+                  onToggle: onToggle,
+                ),
+                _LevelFilterChip(
+                  label: 'Warnung',
+                  level: Level.WARNING,
+                  isSelected: showWarning,
+                  onToggle: onToggle,
+                ),
+                _LevelFilterChip(
+                  label: 'Fehler',
+                  level: Level.SEVERE,
+                  isSelected: showSevere,
+                  onToggle: onToggle,
+                ),
+                _LevelFilterChip(
+                  label: 'Kritisch',
+                  level: Level.SHOUT,
+                  isSelected: showShout,
+                  onToggle: onToggle,
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _LevelFilterChip extends StatelessWidget {
+  const _LevelFilterChip({
+    required this.label,
+    required this.level,
+    required this.isSelected,
+    required this.onToggle,
+  });
+
+  final String label;
+  final Level level;
+  final bool isSelected;
+  final void Function(Level level, bool value) onToggle;
+
+  @override
+  Widget build(BuildContext context) {
+    return FilterChip(
+      label: Text(
+        label,
+        style: AppStyles.textLabel.copyWith(
+          fontWeight: FontWeight.bold,
+          color: isSelected ? Colors.white : Colors.black87,
+        ),
+      ),
+      avatar: Icon(
+        _levelIcon(level),
+        size: 18,
+        color: isSelected ? Colors.white : AppColors.cardInCardBorderColor,
+      ),
+      selected: isSelected,
+      showCheckmark: false,
+      onSelected: (selected) => onToggle(level, selected),
+      backgroundColor: Colors.white,
+      selectedColor: AppColors.accentColor,
+      side: BorderSide(color: AppColors.cardInCardBorderColor),
+      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
+    );
+  }
+
+  IconData _levelIcon(Level level) {
+    if (level == Level.SEVERE || level == Level.SHOUT) {
+      return Icons.error_outline;
+    }
+    if (level == Level.WARNING) {
+      return Icons.warning_amber_rounded;
+    }
+    return Icons.info_outline;
+  }
+}
+
+class _LoggerFilterSection extends StatelessWidget {
+  const _LoggerFilterSection({
+    required this.loggerNames,
+    required this.selectedLoggers,
+    required this.onToggle,
+    required this.onClear,
+  });
+
+  final List<String> loggerNames;
+  final Set<String> selectedLoggers;
+  final void Function(String loggerName, bool enabled) onToggle;
+  final VoidCallback onClear;
+
+  @override
+  Widget build(BuildContext context) {
+    final hasSelection = selectedLoggers.isNotEmpty;
+    return Card(
+      color: AppColors.pupilProfileCardColor,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Text('Logger-Quellen', style: AppStyles.subtitle),
+                const Spacer(),
+                if (hasSelection)
+                  TextButton(
+                    onPressed: onClear,
+                    child: const Text('Alle anzeigen'),
+                  ),
+              ],
+            ),
+            const Gap(12),
+            if (loggerNames.isEmpty)
+              Text(
+                'Noch keine Logger-Namen vorhanden',
+                style: AppStyles.textLabel,
+              )
+            else
+              Wrap(
+                spacing: 12,
+                runSpacing: 10,
+                children: [
+                  _LoggerChip(
+                    label: 'Alle',
+                    isSelected: !hasSelection,
+                    onSelected: (_) => onClear(),
+                  ),
+                  ...loggerNames.map(
+                    (name) => _LoggerChip(
+                      label: name,
+                      isSelected: selectedLoggers.contains(name),
+                      onSelected: (selected) => onToggle(name, selected),
+                    ),
+                  ),
+                ],
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _LoggerChip extends StatelessWidget {
+  const _LoggerChip({
+    required this.label,
+    required this.isSelected,
+    required this.onSelected,
+  });
+
+  final String label;
+  final bool isSelected;
+  final ValueChanged<bool> onSelected;
+
+  @override
+  Widget build(BuildContext context) {
+    return FilterChip(
+      label: Text(
+        label,
+        style: AppStyles.textLabel.copyWith(
+          fontWeight: FontWeight.bold,
+          color: isSelected ? Colors.white : Colors.black87,
+        ),
+      ),
+      selected: isSelected,
+      showCheckmark: false,
+      onSelected: onSelected,
+      backgroundColor: Colors.white,
+      selectedColor: AppColors.accentColor,
+      side: BorderSide(color: AppColors.cardInCardBorderColor),
+      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
+    );
+  }
+}
diff --git a/school_data_hub_flutter/lib/app_utils/logs_page.dart b/school_data_hub_flutter/lib/app_utils/logs_page.dart
deleted file mode 100644
index fbebf794..00000000
--- a/school_data_hub_flutter/lib/app_utils/logs_page.dart
+++ /dev/null
@@ -1,245 +0,0 @@
-// lib/log_viewer_page.dart
-import 'package:flutter/material.dart';
-import 'package:gap/gap.dart';
-import 'package:logging/logging.dart';
-import 'package:school_data_hub_flutter/app_utils/logger/log_service.dart';
-import 'package:school_data_hub_flutter/app_utils/logs_page/widgets/log_entry_card.dart';
-import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
-import 'package:school_data_hub_flutter/common/theme/styles.dart';
-import 'package:school_data_hub_flutter/common/widgets/generic_components/bottom_nav_bar_no_filter_button.dart';
-import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_app_bar.dart';
-import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_sliver_list.dart';
-import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_sliver_search_app_bar.dart';
-import 'package:watch_it/watch_it.dart';
-
-class LogViewerPage extends WatchingWidget {
-  const LogViewerPage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    final logService = watchIt<LogService>();
-    final logs = watchPropertyValue(
-      (LogService service) => service.filteredLogs,
-    );
-    final searchQuery = watchPropertyValue(
-      (LogService service) => service.searchQuery,
-    );
-    final showInfo = watchPropertyValue(
-      (LogService service) => service.showInfo,
-    );
-    final showWarning = watchPropertyValue(
-      (LogService service) => service.showWarning,
-    );
-    final showSevere = watchPropertyValue(
-      (LogService service) => service.showSevere,
-    );
-    final showShout = watchPropertyValue(
-      (LogService service) => service.showShout,
-    );
-
-    final searchController = createOnce(
-      () => TextEditingController(text: logService.searchQuery),
-    );
-
-    if (searchController.text != searchQuery) {
-      searchController.value = TextEditingValue(
-        text: searchQuery,
-        selection: TextSelection.collapsed(offset: searchQuery.length),
-      );
-    }
-
-    return Scaffold(
-      appBar: const GenericAppBar(
-        iconData: Icons.bug_report_outlined,
-        title: 'In-App Logs',
-      ),
-      bottomNavigationBar: const BottomNavBarNoFilterButton(),
-      body: CustomScrollView(
-        slivers: [
-          GenericSliverSearchAppBar(
-            height: 90,
-            title: _LogSearchField(
-              controller: searchController,
-              value: searchQuery,
-              onChanged: logService.updateSearchQuery,
-              onClear: () => logService.updateSearchQuery(''),
-            ),
-          ),
-          SliverToBoxAdapter(
-            child: Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-              child: _LogLevelSwitches(
-                showInfo: showInfo,
-                showWarning: showWarning,
-                showSevere: showSevere,
-                showShout: showShout,
-                onToggle: logService.setLevelVisibility,
-              ),
-            ),
-          ),
-          GenericSliverListWithEmptyListCheck<AppLog>(
-            items: logs,
-            itemBuilder: (context, log) => Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
-              child: LogEntryCard(log: log),
-            ),
-          ),
-          const SliverToBoxAdapter(child: SizedBox(height: 80)),
-        ],
-      ),
-    );
-  }
-}
-
-class _LogSearchField extends StatelessWidget {
-  const _LogSearchField({
-    required this.controller,
-    required this.value,
-    required this.onChanged,
-    required this.onClear,
-  });
-
-  final TextEditingController controller;
-  final String value;
-  final ValueChanged<String> onChanged;
-  final VoidCallback onClear;
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
-      decoration: BoxDecoration(
-        color: AppColors.canvasColor,
-        borderRadius: BorderRadius.circular(16),
-        boxShadow: const [
-          BoxShadow(color: Colors.black12, blurRadius: 6, offset: Offset(0, 2)),
-        ],
-      ),
-      child: TextField(
-        controller: controller,
-        onChanged: onChanged,
-        decoration: InputDecoration(
-          hintText: 'Protokolle durchsuchen',
-          prefixIcon: const Icon(Icons.search),
-          suffixIcon: value.isEmpty
-              ? null
-              : IconButton(
-                  icon: const Icon(Icons.close),
-                  onPressed: () {
-                    controller.clear();
-                    onClear();
-                  },
-                ),
-          border: InputBorder.none,
-        ),
-      ),
-    );
-  }
-}
-
-class _LogLevelSwitches extends StatelessWidget {
-  const _LogLevelSwitches({
-    required this.showInfo,
-    required this.showWarning,
-    required this.showSevere,
-    required this.showShout,
-    required this.onToggle,
-  });
-
-  final bool showInfo;
-  final bool showWarning;
-  final bool showSevere;
-  final bool showShout;
-  final void Function(Level level, bool value) onToggle;
-
-  @override
-  Widget build(BuildContext context) {
-    return Card(
-      color: AppColors.pupilProfileCardColor,
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
-      child: Padding(
-        padding: const EdgeInsets.all(16),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text('Log-Level anzeigen', style: AppStyles.subtitle),
-            const Gap(12),
-            Wrap(
-              spacing: 16,
-              runSpacing: 12,
-              children: [
-                _LevelSwitch(
-                  label: 'Info',
-                  value: showInfo,
-                  level: Level.INFO,
-                  onToggle: onToggle,
-                ),
-                _LevelSwitch(
-                  label: 'Warnung',
-                  value: showWarning,
-                  level: Level.WARNING,
-                  onToggle: onToggle,
-                ),
-                _LevelSwitch(
-                  label: 'Fehler',
-                  value: showSevere,
-                  level: Level.SEVERE,
-                  onToggle: onToggle,
-                ),
-                _LevelSwitch(
-                  label: 'Kritisch',
-                  value: showShout,
-                  level: Level.SHOUT,
-                  onToggle: onToggle,
-                ),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class _LevelSwitch extends StatelessWidget {
-  const _LevelSwitch({
-    required this.label,
-    required this.value,
-    required this.level,
-    required this.onToggle,
-  });
-
-  final String label;
-  final bool value;
-  final Level level;
-  final void Function(Level level, bool value) onToggle;
-
-  @override
-  Widget build(BuildContext context) {
-    return DecoratedBox(
-      decoration: BoxDecoration(
-        color: Colors.white,
-        borderRadius: BorderRadius.circular(12),
-        border: Border.all(color: AppColors.cardInCardBorderColor),
-      ),
-      child: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
-        child: Row(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Text(
-              label,
-              style: AppStyles.textLabel.copyWith(fontWeight: FontWeight.bold),
-            ),
-            const Gap(8),
-            Switch.adaptive(
-              value: value,
-              activeTrackColor: AppColors.accentColor,
-              onChanged: (newValue) => onToggle(level, newValue),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
diff --git a/school_data_hub_flutter/lib/app_utils/pdf_viewer_page.dart b/school_data_hub_flutter/lib/app_utils/pdf_viewer_page.dart
index 7743a940..1238ac6b 100644
--- a/school_data_hub_flutter/lib/app_utils/pdf_viewer_page.dart
+++ b/school_data_hub_flutter/lib/app_utils/pdf_viewer_page.dart
@@ -18,10 +18,10 @@ class PdfViewerPage extends StatelessWidget {
       ),
 
       body: PdfPreview(
-        actionBarTheme: const PdfActionBarTheme(
+        actionBarTheme: PdfActionBarTheme(
           backgroundColor: AppColors.backgroundColor,
           iconColor: Colors.white,
-          textStyle: TextStyle(color: Colors.white),
+          textStyle: const TextStyle(color: Colors.white),
         ),
         allowSharing: false,
         canChangePageFormat: false,
diff --git a/school_data_hub_flutter/lib/app_utils/pick_file_return_content_as_string.dart b/school_data_hub_flutter/lib/app_utils/pick_file_return_content_as_string.dart
index 31911eb7..3138f19b 100644
--- a/school_data_hub_flutter/lib/app_utils/pick_file_return_content_as_string.dart
+++ b/school_data_hub_flutter/lib/app_utils/pick_file_return_content_as_string.dart
@@ -2,8 +2,11 @@ import 'dart:io';
 
 import 'package:file_picker/file_picker.dart';
 
-Future<String?> pickFileReturnContentAsString() async {
-  FilePickerResult? result = await FilePicker.platform.pickFiles();
+Future<String?> fromTextFilePickerToString() async {
+  FilePickerResult? result = await FilePicker.platform.pickFiles(
+    type: FileType.custom,
+    allowedExtensions: ['txt'],
+  );
   if (result != null) {
     File file = File(result.files.single.path!);
     return await file.readAsString();
diff --git a/school_data_hub_flutter/lib/app_utils/secure_storage.dart b/school_data_hub_flutter/lib/app_utils/secure_storage.dart
index 5f14b692..3c4ec84d 100644
--- a/school_data_hub_flutter/lib/app_utils/secure_storage.dart
+++ b/school_data_hub_flutter/lib/app_utils/secure_storage.dart
@@ -1,6 +1,7 @@
 import 'dart:async';
 
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:logging/logging.dart';
 import 'package:serverpod_auth_shared_flutter/serverpod_auth_shared_flutter.dart';
 
 // Configure secure storage with platform-specific options
@@ -26,6 +27,7 @@ class HubSecureStorage extends Storage {
   factory HubSecureStorage() {
     return _instance;
   }
+  final _log = Logger('HubSecureStorage');
 
   /// Stores an int value with the specified key.
   @override
@@ -44,6 +46,7 @@ class HubSecureStorage extends Storage {
   /// Stores a string value with the specified key.
   @override
   Future<void> setString(String key, String value) async {
+    _log.info('Setting string value for key $key');
     await _secureStorage.write(key: key, value: value);
     return;
   }
diff --git a/school_data_hub_flutter/lib/app_utils/shorebird_code_push.dart b/school_data_hub_flutter/lib/app_utils/shorebird_code_push.dart
index 6c5eea01..61f327a7 100644
--- a/school_data_hub_flutter/lib/app_utils/shorebird_code_push.dart
+++ b/school_data_hub_flutter/lib/app_utils/shorebird_code_push.dart
@@ -1,8 +1,11 @@
 import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
 import 'package:logging/logging.dart';
 import 'package:school_data_hub_flutter/common/widgets/generic_components/bottom_nav_bar_no_filter_button.dart';
 import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_app_bar.dart';
+import 'package:school_data_hub_flutter/core/updater/shorebird_update_manager.dart';
 import 'package:shorebird_code_push/shorebird_code_push.dart';
+import 'package:watch_it/watch_it.dart';
 
 final _log = Logger('CheckForUpdatesPage');
 
@@ -14,7 +17,7 @@ class CheckForUpdatesPage extends StatefulWidget {
 }
 
 class _CheckForUpdatesPageState extends State<CheckForUpdatesPage> {
-  final _updater = ShorebirdUpdater();
+  final _updater = di<ShorebirdUpdateManager>().shorebirdUpdater;
   late final bool _isUpdaterAvailable;
   var _currentTrack = UpdateTrack.stable;
   var _isCheckingForUpdates = false;
@@ -176,32 +179,40 @@ class _CheckForUpdatesPageState extends State<CheckForUpdatesPage> {
 
   @override
   Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-
     return Scaffold(
       appBar: const GenericAppBar(iconData: Icons.update, title: 'OTA Update'),
-      body: Column(
-        children: [
-          if (!_isUpdaterAvailable) const _ShorebirdUnavailable(),
-          const Spacer(),
-          _CurrentPatchVersion(patch: _currentPatch),
-          const SizedBox(height: 12),
-          _TrackPicker(
-            currentTrack: _currentTrack,
-            onChanged: (track) {
-              setState(() => _currentTrack = track);
-            },
+      body: Center(
+        child: ConstrainedBox(
+          constraints: const BoxConstraints(maxWidth: 800),
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 16),
+            child: Column(
+              children: [
+                if (!_isUpdaterAvailable) const _ShorebirdUnavailable(),
+                const Spacer(),
+                _CurrentPatchVersion(patch: _currentPatch),
+                const SizedBox(height: 12),
+                _TrackPicker(
+                  currentTrack: _currentTrack,
+                  onChanged: (track) {
+                    setState(() => _currentTrack = track);
+                  },
+                ),
+                const Gap(25),
+                ElevatedButton.icon(
+                  onPressed: _isCheckingForUpdates ? null : _checkForUpdate,
+                  icon: _isCheckingForUpdates
+                      ? const _LoadingIndicator()
+                      : const Icon(Icons.refresh),
+                  label: const Text('Nach Updates suchen'),
+                ),
+                const Spacer(),
+              ],
+            ),
           ),
-          const Spacer(),
-        ],
-      ),
-      floatingActionButton: FloatingActionButton(
-        onPressed: _isCheckingForUpdates ? null : _checkForUpdate,
-        tooltip: 'Auf Updates prüfen',
-        child: _isCheckingForUpdates
-            ? const _LoadingIndicator()
-            : const Icon(Icons.refresh),
+        ),
       ),
+
       bottomNavigationBar: const BottomNavBarNoFilterButton(),
     );
   }
diff --git a/school_data_hub_flutter/lib/common/domain/filters/filters.dart b/school_data_hub_flutter/lib/common/domain/filters/filters.dart
index 51af3563..4d27f954 100644
--- a/school_data_hub_flutter/lib/common/domain/filters/filters.dart
+++ b/school_data_hub_flutter/lib/common/domain/filters/filters.dart
@@ -3,8 +3,6 @@ import 'package:school_data_hub_flutter/common/domain/filters/filters_state_mana
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
 import 'package:watch_it/watch_it.dart';
 
-final _pupilsFilter = di<PupilsFilter>();
-
 abstract class Filter<T extends Object> with ChangeNotifier {
   Filter({
     required this.name,
@@ -32,19 +30,25 @@ abstract class Filter<T extends Object> with ChangeNotifier {
   void toggle(bool isActive) {
     _isActive = isActive;
     if (isActive) {
-      di<FiltersStateManager>()
-          .setFilterState(filterState: FilterState.pupil, value: true);
+      di<FiltersStateManager>().setFilterState(
+        filterState: FilterState.pupil,
+        value: true,
+      );
     } else {
-      if (!(_pupilsFilter.groupFilters.any((filter) => filter.isActive) ||
-          _pupilsFilter.schoolGradeFilters.any((filter) => filter.isActive) ||
-          _pupilsFilter.textFilter.isActive)) {
-        di<FiltersStateManager>()
-            .setFilterState(filterState: FilterState.pupil, value: false);
+      if (!(di<PupilsFilter>().groupFilters.any((filter) => filter.isActive) ||
+          di<PupilsFilter>().schoolGradeFilters.any(
+            (filter) => filter.isActive,
+          ) ||
+          di<PupilsFilter>().textFilter.isActive)) {
+        di<FiltersStateManager>().setFilterState(
+          filterState: FilterState.pupil,
+          value: false,
+        );
       }
     }
 
     notifyListeners();
-    _pupilsFilter.refreshs();
+    di<PupilsFilter>().refreshs();
   }
 
   bool matches(T item);
diff --git a/school_data_hub_flutter/lib/common/domain/filters/filters_state_manager.dart b/school_data_hub_flutter/lib/common/domain/filters/filters_state_manager.dart
index 3212fce9..62821c1c 100644
--- a/school_data_hub_flutter/lib/common/domain/filters/filters_state_manager.dart
+++ b/school_data_hub_flutter/lib/common/domain/filters/filters_state_manager.dart
@@ -33,6 +33,7 @@ const Map<FilterState, bool> _initialFilterGlobalValues = {
 };
 
 abstract class FiltersStateManager {
+  void dispose();
   bool getFilterState(FilterState filterState);
 
   ValueListenable<bool> get filtersActive;
@@ -49,6 +50,13 @@ abstract class FiltersStateManager {
 class FiltersStateManagerImplementation implements FiltersStateManager {
   FiltersStateManagerImplementation();
 
+  void dispose() {
+    _filterStates.dispose();
+    _filtersActive.dispose();
+
+    return;
+  }
+
   void init() {
     _filterStates.value = {..._initialFilterGlobalValues};
     _filtersActive.value = false;
diff --git a/school_data_hub_flutter/lib/common/services/pdf_generation_service.dart b/school_data_hub_flutter/lib/common/services/pdf_generation_service.dart
index 24d466e1..a26d87d1 100644
--- a/school_data_hub_flutter/lib/common/services/pdf_generation_service.dart
+++ b/school_data_hub_flutter/lib/common/services/pdf_generation_service.dart
@@ -8,10 +8,10 @@ import 'package:pdf/pdf.dart';
 import 'package:pdf/widgets.dart' as pw;
 import 'package:printing/printing.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_app_bar.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/features/_attendance/domain/attendance_helper_functions.dart';
 import 'package:school_data_hub_flutter/features/_attendance/domain/attendance_manager.dart';
 import 'package:school_data_hub_flutter/features/_attendance/domain/models/attendance_values.dart';
@@ -19,8 +19,6 @@ import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy
 import 'package:watch_it/watch_it.dart';
 
 final _log = Logger('AttendancePdfGenerator');
-final _attendanceManager = di<AttendanceManager>();
-final _notificationService = di<NotificationService>();
 
 class AttendancePdfGenerator {
   /// Generates a PDF for the attendance list of a specific date
@@ -38,7 +36,7 @@ class AttendancePdfGenerator {
 
     final pdf = pw.Document();
 
-    _notificationService.setHeavyLoadingValue(true);
+    di<NotificationService>().setHeavyLoadingValue(true);
 
     // Configuration for pagination
     const int maxPupilsPerPage = 24;
@@ -94,7 +92,7 @@ class AttendancePdfGenerator {
       }
     }
 
-    _notificationService.setHeavyLoadingValue(false);
+    di<NotificationService>().setHeavyLoadingValue(false);
 
     // Get the proper directory for saving files
     final directory = await getApplicationDocumentsDirectory();
@@ -475,7 +473,7 @@ class AttendancePdfGenerator {
     PupilProxy pupil,
     DateTime targetDate,
   ) {
-    final missedSchooldaysList = _attendanceManager
+    final missedSchooldaysList = di<AttendanceManager>()
         .getPupilMissedSchooldaysProxy(pupil.pupilId);
     final missedSchoolday = missedSchooldaysList.missedSchooldays.firstWhere(
       (element) => element.schoolday?.schoolday.isSameDate(targetDate) ?? false,
@@ -577,7 +575,7 @@ class MissedSchooldaysPdfGenerator {
 
     final pdf = pw.Document();
 
-    _notificationService.setHeavyLoadingValue(true);
+    di<NotificationService>().setHeavyLoadingValue(true);
 
     // Sort pupils by missed hours (descending)
     final sortedPupils = List<PupilProxy>.from(pupils);
@@ -610,7 +608,7 @@ class MissedSchooldaysPdfGenerator {
 
       // Then add detailed pages for each pupil
       for (var pupil in sortedPupils) {
-        final missedSchooldays = _attendanceManager
+        final missedSchooldays = di<AttendanceManager>()
             .getPupilMissedSchooldaysProxy(pupil.pupilId)
             .missedSchooldays
             .where((ms) => ms.missedType != MissedType.notSet)
@@ -656,7 +654,7 @@ class MissedSchooldaysPdfGenerator {
       }
     }
 
-    _notificationService.setHeavyLoadingValue(false);
+    di<NotificationService>().setHeavyLoadingValue(false);
 
     // Get the proper directory for saving files
     final directory = await getApplicationDocumentsDirectory();
@@ -1332,15 +1330,15 @@ class _AttendancePdfViewPageState extends State<AttendancePdfViewPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: const GenericAppBar(
+      appBar: GenericAppBar(
         iconData: Icons.list_alt_rounded,
         title: 'Anwesenheitsliste PDF',
       ),
       body: PdfPreview(
-        actionBarTheme: const PdfActionBarTheme(
+        actionBarTheme: PdfActionBarTheme(
           backgroundColor: AppColors.backgroundColor,
           iconColor: Colors.white,
-          textStyle: TextStyle(color: Colors.white),
+          textStyle: const TextStyle(color: Colors.white),
         ),
         allowSharing: true,
         allowPrinting: true,
@@ -1405,15 +1403,15 @@ class _MissedSchooldaysPdfViewPageState
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: const GenericAppBar(
+      appBar: GenericAppBar(
         iconData: Icons.calendar_month_rounded,
         title: 'Fehlzeitenliste PDF',
       ),
       body: PdfPreview(
-        actionBarTheme: const PdfActionBarTheme(
+        actionBarTheme: PdfActionBarTheme(
           backgroundColor: AppColors.backgroundColor,
           iconColor: Colors.white,
-          textStyle: TextStyle(color: Colors.white),
+          textStyle: const TextStyle(color: Colors.white),
         ),
         allowSharing: true,
         allowPrinting: true,
diff --git a/school_data_hub_flutter/lib/common/theme/app_colors.dart b/school_data_hub_flutter/lib/common/theme/app_colors.dart
index 8badc7e4..12180a98 100644
--- a/school_data_hub_flutter/lib/common/theme/app_colors.dart
+++ b/school_data_hub_flutter/lib/common/theme/app_colors.dart
@@ -1,119 +1,510 @@
 import 'package:flutter/material.dart';
+import 'package:signals/signals_flutter.dart';
+
+enum AppColorSchemeKey { classic, lila, darkBlue, turquoise, blue }
+
+AppColorSchemeKey appColorSchemeKeyFromString(String? key) {
+  return AppColorSchemeKey.values.firstWhere(
+    (k) => k.name == key,
+    orElse: () => AppColorSchemeKey.classic,
+  );
+}
+
+class AppColorPalette {
+  const AppColorPalette({
+    required this.key,
+    required this.displayName,
+    required this.backgroundColor,
+    required this.interactiveColor,
+    required this.accentColor,
+    required this.canvasColor,
+    required this.gridViewColor,
+    required this.pupilProfileBackgroundColor,
+    required this.pupilProfileCardColor,
+    required this.cardInCardColor,
+    required this.cardInCardBorderColor,
+    required this.notProcessedColor,
+    required this.mainMenuCardsColor,
+    required this.selectedCardColor,
+    required this.appStyleButtonColor,
+    required this.successButtonColor,
+    required this.warningButtonColor,
+    required this.dangerButtonColor,
+    required this.cancelButtonColor,
+    required this.presentColor,
+    required this.missedColor,
+    required this.lateColor,
+    required this.homeColor,
+    required this.unexcusedCheckColor,
+    required this.contactedQuestionColor,
+    required this.contactedSuccessColor,
+    required this.contactedCalledBackColor,
+    required this.contactedFailedColor,
+    required this.goneHomeColor,
+    required this.koerperWahrnehmungMotorikColor,
+    required this.sozialEmotionalColor,
+    required this.mathematikColor,
+    required this.lernenLeistenColor,
+    required this.deutschColor,
+    required this.spracheSprechenColor,
+    required this.germanColor,
+    required this.mathColor,
+    required this.scienceColor,
+    required this.englishColor,
+    required this.artColor,
+    required this.musicColor,
+    required this.sportColor,
+    required this.religionColor,
+    required this.workBehaviourColor,
+    required this.socialColor,
+    required this.ogsColor,
+    required this.groupColor,
+    required this.schoolyearColor,
+    required this.snackBarInfoColor,
+    required this.snackBarSuccessColor,
+    required this.snackBarWarningColor,
+    required this.snackBarErrorColor,
+    required this.filterChipSelectedColor,
+    required this.filterChipUnselectedColor,
+    required this.filterChipSelectedCheckColor,
+    required this.schooldayEventReasonChipUnselectedColor,
+    required this.schooldayEventReasonChipSelectedColor,
+    required this.schooldayEventReasonChipSelectedCheckColor,
+  });
+
+  final AppColorSchemeKey key;
+  final String displayName;
+  final Color backgroundColor;
+  final Color interactiveColor;
+  final Color accentColor;
+  final Color canvasColor;
+  final Color gridViewColor;
+  final Color pupilProfileBackgroundColor;
+  final Color pupilProfileCardColor;
+  final Color cardInCardColor;
+  final Color cardInCardBorderColor;
+  final Color notProcessedColor;
+  final Color mainMenuCardsColor;
+  final Color selectedCardColor;
+  final Color appStyleButtonColor;
+  final Color successButtonColor;
+  final Color warningButtonColor;
+  final Color dangerButtonColor;
+  final Color cancelButtonColor;
+  final Color presentColor;
+  final Color missedColor;
+  final Color lateColor;
+  final Color homeColor;
+  final Color unexcusedCheckColor;
+  final Color contactedQuestionColor;
+  final Color contactedSuccessColor;
+  final Color contactedCalledBackColor;
+  final Color contactedFailedColor;
+  final Color goneHomeColor;
+  final Color koerperWahrnehmungMotorikColor;
+  final Color sozialEmotionalColor;
+  final Color mathematikColor;
+  final Color lernenLeistenColor;
+  final Color deutschColor;
+  final Color spracheSprechenColor;
+  final Color germanColor;
+  final Color mathColor;
+  final Color scienceColor;
+  final Color englishColor;
+  final Color artColor;
+  final Color musicColor;
+  final Color sportColor;
+  final Color religionColor;
+  final Color workBehaviourColor;
+  final Color socialColor;
+  final Color ogsColor;
+  final Color groupColor;
+  final Color schoolyearColor;
+  final Color snackBarInfoColor;
+  final Color snackBarSuccessColor;
+  final Color snackBarWarningColor;
+  final Color snackBarErrorColor;
+  final Color filterChipSelectedColor;
+  final Color filterChipUnselectedColor;
+  final Color filterChipSelectedCheckColor;
+  final Color schooldayEventReasonChipUnselectedColor;
+  final Color schooldayEventReasonChipSelectedColor;
+  final Color schooldayEventReasonChipSelectedCheckColor;
+
+  AppColorPalette copyWith({
+    AppColorSchemeKey? key,
+    String? displayName,
+    Color? backgroundColor,
+    Color? interactiveColor,
+    Color? accentColor,
+    Color? canvasColor,
+    Color? gridViewColor,
+    Color? pupilProfileBackgroundColor,
+    Color? pupilProfileCardColor,
+    Color? cardInCardColor,
+    Color? cardInCardBorderColor,
+    Color? notProcessedColor,
+    Color? mainMenuCardsColor,
+    Color? selectedCardColor,
+    Color? appStyleButtonColor,
+    Color? successButtonColor,
+    Color? warningButtonColor,
+    Color? dangerButtonColor,
+    Color? cancelButtonColor,
+    Color? presentColor,
+    Color? missedColor,
+    Color? lateColor,
+    Color? homeColor,
+    Color? unexcusedCheckColor,
+    Color? contactedQuestionColor,
+    Color? contactedSuccessColor,
+    Color? contactedCalledBackColor,
+    Color? contactedFailedColor,
+    Color? goneHomeColor,
+    Color? koerperWahrnehmungMotorikColor,
+    Color? sozialEmotionalColor,
+    Color? mathematikColor,
+    Color? lernenLeistenColor,
+    Color? deutschColor,
+    Color? spracheSprechenColor,
+    Color? germanColor,
+    Color? mathColor,
+    Color? scienceColor,
+    Color? englishColor,
+    Color? artColor,
+    Color? musicColor,
+    Color? sportColor,
+    Color? religionColor,
+    Color? workBehaviourColor,
+    Color? socialColor,
+    Color? ogsColor,
+    Color? groupColor,
+    Color? schoolyearColor,
+    Color? snackBarInfoColor,
+    Color? snackBarSuccessColor,
+    Color? snackBarWarningColor,
+    Color? snackBarErrorColor,
+    Color? filterChipSelectedColor,
+    Color? filterChipUnselectedColor,
+    Color? filterChipSelectedCheckColor,
+    Color? schooldayEventReasonChipUnselectedColor,
+    Color? schooldayEventReasonChipSelectedColor,
+    Color? schooldayEventReasonChipSelectedCheckColor,
+  }) {
+    return AppColorPalette(
+      key: key ?? this.key,
+      displayName: displayName ?? this.displayName,
+      backgroundColor: backgroundColor ?? this.backgroundColor,
+      interactiveColor: interactiveColor ?? this.interactiveColor,
+      accentColor: accentColor ?? this.accentColor,
+      canvasColor: canvasColor ?? this.canvasColor,
+      gridViewColor: gridViewColor ?? this.gridViewColor,
+      pupilProfileBackgroundColor:
+          pupilProfileBackgroundColor ?? this.pupilProfileBackgroundColor,
+      pupilProfileCardColor:
+          pupilProfileCardColor ?? this.pupilProfileCardColor,
+      cardInCardColor: cardInCardColor ?? this.cardInCardColor,
+      cardInCardBorderColor:
+          cardInCardBorderColor ?? this.cardInCardBorderColor,
+      notProcessedColor: notProcessedColor ?? this.notProcessedColor,
+      mainMenuCardsColor: mainMenuCardsColor ?? this.mainMenuCardsColor,
+      selectedCardColor: selectedCardColor ?? this.selectedCardColor,
+      appStyleButtonColor: appStyleButtonColor ?? this.appStyleButtonColor,
+      successButtonColor: successButtonColor ?? this.successButtonColor,
+      warningButtonColor: warningButtonColor ?? this.warningButtonColor,
+      dangerButtonColor: dangerButtonColor ?? this.dangerButtonColor,
+      cancelButtonColor: cancelButtonColor ?? this.cancelButtonColor,
+      presentColor: presentColor ?? this.presentColor,
+      missedColor: missedColor ?? this.missedColor,
+      lateColor: lateColor ?? this.lateColor,
+      homeColor: homeColor ?? this.homeColor,
+      unexcusedCheckColor: unexcusedCheckColor ?? this.unexcusedCheckColor,
+      contactedQuestionColor:
+          contactedQuestionColor ?? this.contactedQuestionColor,
+      contactedSuccessColor:
+          contactedSuccessColor ?? this.contactedSuccessColor,
+      contactedCalledBackColor:
+          contactedCalledBackColor ?? this.contactedCalledBackColor,
+      contactedFailedColor: contactedFailedColor ?? this.contactedFailedColor,
+      goneHomeColor: goneHomeColor ?? this.goneHomeColor,
+      koerperWahrnehmungMotorikColor:
+          koerperWahrnehmungMotorikColor ?? this.koerperWahrnehmungMotorikColor,
+      sozialEmotionalColor: sozialEmotionalColor ?? this.sozialEmotionalColor,
+      mathematikColor: mathematikColor ?? this.mathematikColor,
+      lernenLeistenColor: lernenLeistenColor ?? this.lernenLeistenColor,
+      deutschColor: deutschColor ?? this.deutschColor,
+      spracheSprechenColor: spracheSprechenColor ?? this.spracheSprechenColor,
+      germanColor: germanColor ?? this.germanColor,
+      mathColor: mathColor ?? this.mathColor,
+      scienceColor: scienceColor ?? this.scienceColor,
+      englishColor: englishColor ?? this.englishColor,
+      artColor: artColor ?? this.artColor,
+      musicColor: musicColor ?? this.musicColor,
+      sportColor: sportColor ?? this.sportColor,
+      religionColor: religionColor ?? this.religionColor,
+      workBehaviourColor: workBehaviourColor ?? this.workBehaviourColor,
+      socialColor: socialColor ?? this.socialColor,
+      ogsColor: ogsColor ?? this.ogsColor,
+      groupColor: groupColor ?? this.groupColor,
+      schoolyearColor: schoolyearColor ?? this.schoolyearColor,
+      snackBarInfoColor: snackBarInfoColor ?? this.snackBarInfoColor,
+      snackBarSuccessColor: snackBarSuccessColor ?? this.snackBarSuccessColor,
+      snackBarWarningColor: snackBarWarningColor ?? this.snackBarWarningColor,
+      snackBarErrorColor: snackBarErrorColor ?? this.snackBarErrorColor,
+      filterChipSelectedColor:
+          filterChipSelectedColor ?? this.filterChipSelectedColor,
+      filterChipUnselectedColor:
+          filterChipUnselectedColor ?? this.filterChipUnselectedColor,
+      filterChipSelectedCheckColor:
+          filterChipSelectedCheckColor ?? this.filterChipSelectedCheckColor,
+      schooldayEventReasonChipUnselectedColor:
+          schooldayEventReasonChipUnselectedColor ??
+          this.schooldayEventReasonChipUnselectedColor,
+      schooldayEventReasonChipSelectedColor:
+          schooldayEventReasonChipSelectedColor ??
+          this.schooldayEventReasonChipSelectedColor,
+      schooldayEventReasonChipSelectedCheckColor:
+          schooldayEventReasonChipSelectedCheckColor ??
+          this.schooldayEventReasonChipSelectedCheckColor,
+    );
+  }
+}
+
+class AppColorPalettes {
+  static const classic = AppColorPalette(
+    key: AppColorSchemeKey.classic,
+    displayName: 'standard',
+    backgroundColor: Color.fromRGBO(74, 76, 161, 1),
+    interactiveColor: Color.fromRGBO(74, 76, 161, 1),
+    accentColor: Color.fromRGBO(252, 160, 39, 1),
+    canvasColor: Color(0xfff2f2f7),
+    gridViewColor: Color.fromRGBO(252, 160, 39, 1),
+    pupilProfileBackgroundColor: Color.fromARGB(255, 215, 215, 235),
+    pupilProfileCardColor: Color(0xfff2f2f7),
+    cardInCardColor: Color.fromARGB(255, 248, 248, 255),
+    cardInCardBorderColor: Color.fromARGB(255, 195, 195, 253),
+    notProcessedColor: Color.fromARGB(255, 249, 202, 131),
+    mainMenuCardsColor: Color.fromARGB(255, 220, 220, 255),
+    selectedCardColor: Color.fromARGB(255, 255, 220, 168),
+    appStyleButtonColor: Color.fromRGBO(252, 160, 39, 1),
+    successButtonColor: Color.fromARGB(255, 139, 195, 74),
+    warningButtonColor: Color.fromARGB(255, 239, 108, 0),
+    dangerButtonColor: Color.fromARGB(255, 239, 56, 0),
+    cancelButtonColor: Color.fromARGB(255, 250, 65, 19),
+    presentColor: Color.fromRGBO(238, 238, 238, 1),
+    missedColor: Color.fromRGBO(255, 183, 77, 1),
+    lateColor: Color.fromRGBO(255, 241, 118, 1),
+    homeColor: Colors.lightBlue,
+    unexcusedCheckColor: Color.fromRGBO(239, 108, 0, 1),
+    contactedQuestionColor: Color.fromRGBO(238, 238, 238, 1),
+    contactedSuccessColor: Color.fromRGBO(139, 195, 74, 1),
+    contactedCalledBackColor: Color.fromRGBO(255, 183, 77, 1),
+    contactedFailedColor: Color.fromRGBO(239, 108, 0, 1),
+    goneHomeColor: Colors.blue,
+    koerperWahrnehmungMotorikColor: Color.fromARGB(255, 156, 76, 149),
+    sozialEmotionalColor: Color.fromARGB(255, 233, 127, 22),
+    mathematikColor: Color.fromARGB(255, 5, 118, 172),
+    lernenLeistenColor: Color.fromARGB(255, 5, 155, 88),
+    deutschColor: Color.fromARGB(255, 228, 70, 60),
+    spracheSprechenColor: Color.fromARGB(255, 244, 198, 17),
+    germanColor: Color.fromARGB(255, 151, 0, 65),
+    mathColor: Color.fromARGB(255, 204, 60, 77),
+    scienceColor: Color.fromARGB(255, 235, 108, 60),
+    englishColor: Color.fromARGB(255, 246, 173, 90),
+    artColor: Color.fromARGB(255, 251, 223, 134),
+    musicColor: Color.fromARGB(255, 231, 245, 147),
+    sportColor: Color.fromARGB(255, 176, 221, 162),
+    religionColor: Color.fromARGB(255, 114, 194, 164),
+    workBehaviourColor: Color.fromARGB(255, 67, 137, 191),
+    socialColor: Color.fromARGB(255, 94, 80, 164),
+    ogsColor: Color.fromRGBO(126, 87, 194, 1),
+    groupColor: Color.fromARGB(255, 78, 196, 82),
+    schoolyearColor: Color.fromARGB(255, 153, 92, 211),
+    snackBarInfoColor: Colors.blue,
+    snackBarSuccessColor: Colors.green,
+    snackBarWarningColor: Colors.orange,
+    snackBarErrorColor: Colors.red,
+    filterChipSelectedColor: Color.fromRGBO(74, 76, 161, 1),
+    filterChipUnselectedColor: Color.fromRGBO(138, 139, 203, 1),
+    filterChipSelectedCheckColor: Colors.green,
+    schooldayEventReasonChipUnselectedColor: Color.fromARGB(255, 248, 162, 93),
+    schooldayEventReasonChipSelectedColor: Color.fromARGB(255, 239, 137, 13),
+    schooldayEventReasonChipSelectedCheckColor: Color.fromARGB(
+      255,
+      249,
+      56,
+      56,
+    ),
+  );
+
+  static final lila = classic.copyWith(
+    key: AppColorSchemeKey.lila,
+    displayName: 'lila',
+    backgroundColor: const Color.fromARGB(255, 167, 83, 184),
+    interactiveColor: const Color.fromARGB(255, 107, 13, 126),
+    accentColor: const Color.fromARGB(255, 216, 141, 3),
+    gridViewColor: const Color.fromARGB(255, 247, 184, 68),
+  );
+
+  static final darkBlue = classic.copyWith(
+    key: AppColorSchemeKey.darkBlue,
+    displayName: 'dunkelblau',
+    backgroundColor: const Color.fromARGB(255, 40, 28, 105),
+    interactiveColor: const Color.fromARGB(255, 40, 28, 105),
+    accentColor: const Color.fromARGB(255, 255, 172, 78),
+    gridViewColor: const Color.fromARGB(255, 255, 172, 78),
+  );
+
+  static final turquoise = classic.copyWith(
+    key: AppColorSchemeKey.turquoise,
+    displayName: 'türkis',
+    backgroundColor: const Color.fromARGB(255, 110, 195, 190),
+    interactiveColor: const Color.fromARGB(255, 110, 195, 190),
+    accentColor: const Color(0xFF007A7C),
+    gridViewColor: const Color(0xFF007A7C),
+  );
+  static final blue = classic.copyWith(
+    key: AppColorSchemeKey.blue,
+    displayName: 'blau',
+    backgroundColor: const Color.fromARGB(255, 52, 159, 221),
+    interactiveColor: const Color(0xFF4FD1C5),
+    accentColor: const Color(0xFF64FFDA),
+    gridViewColor: const Color(0xFF2A4D4A),
+  );
+
+  static final Map<AppColorSchemeKey, AppColorPalette> _byKey = {
+    AppColorSchemeKey.classic: classic,
+    AppColorSchemeKey.lila: lila,
+    AppColorSchemeKey.darkBlue: darkBlue,
+    AppColorSchemeKey.turquoise: turquoise,
+    AppColorSchemeKey.blue: blue,
+  };
+
+  static Iterable<AppColorPalette> get all => _byKey.values;
+
+  static AppColorPalette byKey(AppColorSchemeKey key) => _byKey[key] ?? classic;
+}
 
 class AppColors {
+  static final Signal<AppColorPalette> _activePalette = signal(
+    AppColorPalettes.classic,
+  );
+
+  static AppColorPalette get palette => _activePalette.value;
+  static Signal<AppColorPalette> get paletteSignal => _activePalette;
+
+  static AppColorSchemeKey get activeSchemeKey => palette.key;
+
+  static List<AppColorPalette> availablePalettes() =>
+      AppColorPalettes.all.toList();
+
+  static void setPalette(AppColorSchemeKey key) {
+    _activePalette.value = AppColorPalettes.byKey(key);
+  }
+
+  static void setPaletteByKeyString(String? key) {
+    setPalette(appColorSchemeKeyFromString(key));
+  }
+
   //- COLORS
 
-  static const backgroundColor = Color.fromRGBO(74, 76, 161, 1);
-  static const interactiveColor = Color.fromRGBO(74, 76, 161, 1);
-  static const accentColor = Color.fromRGBO(252, 160, 39, 1);
-  static const canvasColor = Color(0xfff2f2f7);
-  static const gridViewColor = Color.fromRGBO(252, 160, 39, 1);
-  static const pupilProfileBackgroundColor = Color.fromARGB(255, 215, 215, 235);
-  static const pupilProfileCardColor = Color(
-    0xfff2f2f7,
-  ); // Color.fromARGB(255, 195, 195, 253);
-  static const cardInCardColor = Color.fromARGB(255, 248, 248, 255);
-  static const cardInCardBorderColor = Color.fromARGB(255, 195, 195, 253);
-  static const notProcessedColor = Color.fromARGB(255, 249, 202, 131);
-  static const mainMenuCardsColor = Color.fromARGB(255, 220, 220, 255);
-  static const selectedCardColor = Color.fromARGB(
-    255,
-    255,
-    220,
-    168,
-  ); // Color.fromARGB(255, 197, 212, 255);
+  static Color get backgroundColor => palette.backgroundColor;
+  static Color get interactiveColor => palette.interactiveColor;
+  static Color get accentColor => palette.accentColor;
+  static Color get canvasColor => palette.canvasColor;
+  static Color get gridViewColor => palette.gridViewColor;
+  static Color get pupilProfileBackgroundColor =>
+      palette.pupilProfileBackgroundColor;
+  static Color get pupilProfileCardColor => palette.pupilProfileCardColor;
+  static Color get cardInCardColor => palette.cardInCardColor;
+  static Color get cardInCardBorderColor => palette.cardInCardBorderColor;
+  static Color get notProcessedColor => palette.notProcessedColor;
+  static Color get mainMenuCardsColor => palette.mainMenuCardsColor;
+  static Color get selectedCardColor => palette.selectedCardColor;
+
   //button colors
 
-  static const appStyleButtonColor = Color.fromRGBO(252, 160, 39, 1);
-  static const successButtonColor = Color.fromARGB(255, 139, 195, 74);
-  static const warningButtonColor = Color.fromARGB(255, 239, 108, 0);
-  static const dangerButtonColor = Color.fromARGB(255, 239, 56, 0);
-  static const cancelButtonColor = Color.fromARGB(255, 250, 65, 19);
+  static Color get appStyleButtonColor => palette.appStyleButtonColor;
+  static Color get successButtonColor => palette.successButtonColor;
+  static Color get warningButtonColor => palette.warningButtonColor;
+  static Color get dangerButtonColor => palette.dangerButtonColor;
+  static Color get cancelButtonColor => palette.cancelButtonColor;
+
   //- attendance card colors
 
   // missedType dropdown
-  static const presentColor = Color.fromRGBO(238, 238, 238, 1);
-  static const missedColor = Color.fromRGBO(255, 183, 77, 1);
-  static const lateColor = Color.fromRGBO(255, 241, 118, 1);
-  static const homeColor = Colors.lightBlue;
+  static Color get presentColor => palette.presentColor;
+  static Color get missedColor => palette.missedColor;
+  static Color get lateColor => palette.lateColor;
+  static Color get homeColor => palette.homeColor;
 
   // excused checkbox
-  static const unexcusedCheckColor = Color.fromRGBO(239, 108, 0, 1);
+  static Color get unexcusedCheckColor => palette.unexcusedCheckColor;
 
   // contacted dropdown
-  static const contactedQuestionColor = Color.fromRGBO(238, 238, 238, 1);
-  static const contactedSuccessColor = Color.fromRGBO(139, 195, 74, 1);
-  static const contactedCalledBackColor = Color.fromRGBO(255, 183, 77, 1);
-  static const contactedFailedColor = Color.fromRGBO(239, 108, 0, 1);
-  static const goneHomeColor = Colors.blue;
+  static Color get contactedQuestionColor => palette.contactedQuestionColor;
+  static Color get contactedSuccessColor => palette.contactedSuccessColor;
+  static Color get contactedCalledBackColor => palette.contactedCalledBackColor;
+  static Color get contactedFailedColor => palette.contactedFailedColor;
+  static Color get goneHomeColor => palette.goneHomeColor;
 
   //- support category colors
 
-  static const koerperWahrnehmungMotorikColor = Color.fromARGB(
-    255,
-    156,
-    76,
-    149,
-  );
-  static const sozialEmotionalColor = Color.fromARGB(255, 233, 127, 22);
-  static const mathematikColor = Color.fromARGB(255, 5, 118, 172);
-  static const lernenLeistenColor = Color.fromARGB(255, 5, 155, 88);
-  static const deutschColor = Color.fromARGB(255, 228, 70, 60);
-  static const spracheSprechenColor = Color.fromARGB(255, 244, 198, 17);
+  static Color get koerperWahrnehmungMotorikColor =>
+      palette.koerperWahrnehmungMotorikColor;
+  static Color get sozialEmotionalColor => palette.sozialEmotionalColor;
+  static Color get mathematikColor => palette.mathematikColor;
+  static Color get lernenLeistenColor => palette.lernenLeistenColor;
+  static Color get deutschColor => palette.deutschColor;
+  static Color get spracheSprechenColor => palette.spracheSprechenColor;
 
   //- Competence colors
 
-  static const germanColor = Color.fromARGB(255, 151, 0, 65);
-  static const mathColor = Color.fromARGB(255, 204, 60, 77);
-  static const scienceColor = Color.fromARGB(255, 235, 108, 60);
-  static const englishColor = Color.fromARGB(255, 246, 173, 90);
-  static const artColor = Color.fromARGB(255, 251, 223, 134);
-  static const musicColor = Color.fromARGB(255, 231, 245, 147);
-  static const sportColor = Color.fromARGB(255, 176, 221, 162);
-  static const religionColor = Color.fromARGB(255, 114, 194, 164);
-  static const workBehaviourColor = Color.fromARGB(255, 67, 137, 191);
-  static const socialColor = Color.fromARGB(255, 94, 80, 164);
+  static Color get germanColor => palette.germanColor;
+  static Color get mathColor => palette.mathColor;
+  static Color get scienceColor => palette.scienceColor;
+  static Color get englishColor => palette.englishColor;
+  static Color get artColor => palette.artColor;
+  static Color get musicColor => palette.musicColor;
+  static Color get sportColor => palette.sportColor;
+  static Color get religionColor => palette.religionColor;
+  static Color get workBehaviourColor => palette.workBehaviourColor;
+  static Color get socialColor => palette.socialColor;
 
   static Color bestContrastCompetenceFontColor(Color color) {
-    switch (color) {
-      case AppColors.musicColor:
-        return const Color.fromARGB(255, 99, 179, 103);
-      case AppColors.artColor:
-        return const Color.fromARGB(255, 252, 134, 0);
+    if (color == palette.musicColor) {
+      return const Color.fromARGB(255, 99, 179, 103);
+    }
+    if (color == palette.artColor) {
+      return const Color.fromARGB(255, 252, 134, 0);
     }
     return Colors.white;
   }
 
   //- text colors
-  static const ogsColor = Color.fromRGBO(126, 87, 194, 1);
-  static const groupColor = Color.fromARGB(255, 78, 196, 82);
-  static const schoolyearColor = Color.fromARGB(255, 153, 92, 211);
+  static Color get ogsColor => palette.ogsColor;
+  static Color get groupColor => palette.groupColor;
+  static Color get schoolyearColor => palette.schoolyearColor;
 
   //- snackbars
 
-  static const snackBarInfoColor = Colors.blue;
-  static const snackBarSuccessColor = Colors.green;
-  static const snackBarWarningColor = Colors.orange;
-  static const snackBarErrorColor = Colors.red;
+  static Color get snackBarInfoColor => palette.snackBarInfoColor;
+  static Color get snackBarSuccessColor => palette.snackBarSuccessColor;
+  static Color get snackBarWarningColor => palette.snackBarWarningColor;
+  static Color get snackBarErrorColor => palette.snackBarErrorColor;
 
   //- filterchips
 
-  static const filterChipSelectedColor = Color.fromRGBO(74, 76, 161, 1);
-  static const filterChipUnselectedColor = Color.fromRGBO(138, 139, 203, 1);
-  static const filterChipSelectedCheckColor = Colors.green;
+  static Color get filterChipSelectedColor => palette.filterChipSelectedColor;
+  static Color get filterChipUnselectedColor =>
+      palette.filterChipUnselectedColor;
+  static Color get filterChipSelectedCheckColor =>
+      palette.filterChipSelectedCheckColor;
 
-  static const schooldayEventReasonChipUnselectedColor = Color.fromARGB(
-    255,
-    248,
-    162,
-    93,
-  );
-  static const Color schooldayEventReasonChipSelectedColor = Color.fromARGB(
-    255,
-    239,
-    137,
-    13,
-  );
-  static const Color schooldayEventReasonChipSelectedCheckColor =
-      Color.fromARGB(255, 249, 56, 56);
+  static Color get schooldayEventReasonChipUnselectedColor =>
+      palette.schooldayEventReasonChipUnselectedColor;
+  static Color get schooldayEventReasonChipSelectedColor =>
+      palette.schooldayEventReasonChipSelectedColor;
+  static Color get schooldayEventReasonChipSelectedCheckColor =>
+      palette.schooldayEventReasonChipSelectedCheckColor;
 }
diff --git a/school_data_hub_flutter/lib/common/theme/styles.dart b/school_data_hub_flutter/lib/common/theme/styles.dart
index 829141ae..c2d6fe4f 100644
--- a/school_data_hub_flutter/lib/common/theme/styles.dart
+++ b/school_data_hub_flutter/lib/common/theme/styles.dart
@@ -8,13 +8,13 @@ class AppStyles {
   static InputDecoration textFieldDecoration({required String labelText}) {
     return InputDecoration(
       contentPadding: const EdgeInsets.all(10),
-      border: const OutlineInputBorder(
+      border: OutlineInputBorder(
         borderSide: BorderSide(color: AppColors.backgroundColor, width: 2),
       ),
-      focusedBorder: const OutlineInputBorder(
+      focusedBorder: OutlineInputBorder(
         borderSide: BorderSide(color: AppColors.backgroundColor, width: 2),
       ),
-      labelStyle: const TextStyle(color: AppColors.backgroundColor),
+      labelStyle: TextStyle(color: AppColors.backgroundColor),
       labelText: labelText,
     );
   }
diff --git a/school_data_hub_flutter/lib/common/widgets/bottom_nav_bar_layouts.dart b/school_data_hub_flutter/lib/common/widgets/bottom_nav_bar_layouts.dart
index 0dd98bb6..086db014 100644
--- a/school_data_hub_flutter/lib/common/widgets/bottom_nav_bar_layouts.dart
+++ b/school_data_hub_flutter/lib/common/widgets/bottom_nav_bar_layouts.dart
@@ -15,10 +15,9 @@ class BottomNavBarLayout extends StatelessWidget {
     Theme(
       data: ThemeData(canvasColor: AppColors.backgroundColor),
       child: Padding(
-        padding:
-            Platform.isWindows
-                ? const EdgeInsets.only(left: 5, right: 5, bottom: 20)
-                : const EdgeInsets.only(left: 5, right: 5, bottom: 10),
+        padding: Platform.isWindows
+            ? const EdgeInsets.only(left: 5, right: 5, bottom: 20)
+            : const EdgeInsets.only(left: 5, right: 5, bottom: 10),
         child: SizedBox(
           height: kBottomNavigationBarHeight + 30,
           child: Align(
@@ -47,18 +46,16 @@ class BottomNavBarProfileLayout extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return
-    // Platform.isWindows
-    //     ?
-    Theme(
+    return Theme(
       data: ThemeData(canvasColor: AppColors.backgroundColor),
       child: Padding(
-        padding:
-            Platform.isWindows
-                ? const EdgeInsets.only(left: 5, right: 5, bottom: 20)
-                : const EdgeInsets.only(left: 5, right: 5),
+        padding: Platform.isWindows
+            ? const EdgeInsets.only(left: 0, right: 0, bottom: 10)
+            : const EdgeInsets.only(left: 0, right: 0),
         child: SizedBox(
-          height: kBottomNavigationBarHeight + 30,
+          height: Platform.isWindows
+              ? kBottomNavigationBarHeight + 20
+              : kBottomNavigationBarHeight + 30,
           child: Align(
             alignment: Alignment.bottomCenter,
             child: ConstrainedBox(
@@ -78,16 +75,3 @@ class BottomNavBarProfileLayout extends StatelessWidget {
     // : bottomNavBar;
   }
 }
-
-class BottomNavBarMobile extends StatelessWidget {
-  final Widget bottomNavBar;
-  const BottomNavBarMobile({required this.bottomNavBar, super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Theme(
-      data: ThemeData(canvasColor: AppColors.backgroundColor),
-      child: bottomNavBar,
-    );
-  }
-}
diff --git a/school_data_hub_flutter/lib/common/widgets/dialogs/confirmation_dialog.dart b/school_data_hub_flutter/lib/common/widgets/dialogs/confirmation_dialog.dart
index 0e608107..4dc77bc9 100644
--- a/school_data_hub_flutter/lib/common/widgets/dialogs/confirmation_dialog.dart
+++ b/school_data_hub_flutter/lib/common/widgets/dialogs/confirmation_dialog.dart
@@ -2,19 +2,17 @@ import 'package:flutter/material.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/theme/styles.dart';
 
-Future<bool?> confirmationDialog(
-    {required BuildContext context,
-    required String title,
-    required String message}) async {
+Future<bool?> confirmationDialog({
+  required BuildContext context,
+  required String title,
+  required String message,
+}) async {
   return showDialog<bool>(
     context: context,
     builder: (BuildContext context) {
       return AlertDialog(
-        title: Text(
-          title,
-          style: const TextStyle(fontWeight: FontWeight.bold),
-        ),
-        icon: const Icon(
+        title: Text(title, style: const TextStyle(fontWeight: FontWeight.bold)),
+        icon: Icon(
           Icons.question_mark_rounded,
           color: AppColors.backgroundColor,
           size: 50,
@@ -31,10 +29,7 @@ Future<bool?> confirmationDialog(
                     onPressed: () {
                       Navigator.of(context).pop(false);
                     }, // Add onPressed
-                    child: const Text(
-                      "NEIN",
-                      style: AppStyles.buttonTextStyle,
-                    ),
+                    child: const Text("NEIN", style: AppStyles.buttonTextStyle),
                   ),
                 ),
               ),
@@ -46,10 +41,7 @@ Future<bool?> confirmationDialog(
                     onPressed: () {
                       Navigator.of(context).pop(true);
                     }, // Add onPressed
-                    child: const Text(
-                      "JA",
-                      style: AppStyles.buttonTextStyle,
-                    ),
+                    child: const Text("JA", style: AppStyles.buttonTextStyle),
                   ),
                 ),
               ),
diff --git a/school_data_hub_flutter/lib/common/widgets/dialogs/information_dialog.dart b/school_data_hub_flutter/lib/common/widgets/dialogs/information_dialog.dart
index 9fd765c9..1c5d8c36 100644
--- a/school_data_hub_flutter/lib/common/widgets/dialogs/information_dialog.dart
+++ b/school_data_hub_flutter/lib/common/widgets/dialogs/information_dialog.dart
@@ -6,20 +6,13 @@ void informationDialog(BuildContext context, String title, String text) =>
     showDialog(
       context: context,
       builder: (context) => AlertDialog(
-        icon: const Icon(
-          Icons.info,
-          color: AppColors.backgroundColor,
-          size: 50,
-        ),
+        icon: Icon(Icons.info, color: AppColors.backgroundColor, size: 50),
         title: Text(title, style: const TextStyle(fontWeight: FontWeight.bold)),
         content: ConstrainedBox(
           constraints: const BoxConstraints(maxWidth: 300),
           child: SingleChildScrollView(
             scrollDirection: Axis.vertical,
-            child: Text(
-              text,
-              textAlign: TextAlign.center,
-            ),
+            child: Text(text, textAlign: TextAlign.center),
           ),
         ),
         actions: [
@@ -30,10 +23,7 @@ void informationDialog(BuildContext context, String title, String text) =>
               onPressed: () {
                 Navigator.of(context).pop(true);
               }, // Add onPressed
-              child: const Text(
-                "OK",
-                style: AppStyles.buttonTextStyle,
-              ),
+              child: const Text("OK", style: AppStyles.buttonTextStyle),
             ),
           ),
         ],
diff --git a/school_data_hub_flutter/lib/common/widgets/dialogs/pupil_list_dialog.dart b/school_data_hub_flutter/lib/common/widgets/dialogs/pupil_list_dialog.dart
index 6cbbdb29..749efe5f 100644
--- a/school_data_hub_flutter/lib/common/widgets/dialogs/pupil_list_dialog.dart
+++ b/school_data_hub_flutter/lib/common/widgets/dialogs/pupil_list_dialog.dart
@@ -3,7 +3,7 @@ import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_app_bar.dart';
 import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_sliver_list.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/presentation/widgets/pupil_language_card.dart';
+import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/language_content/pupil_language_card.dart';
 
 class PupilListDialog extends StatelessWidget {
   final String title;
diff --git a/school_data_hub_flutter/lib/common/widgets/dialogs/schoolday_date_picker.dart b/school_data_hub_flutter/lib/common/widgets/dialogs/schoolday_date_picker.dart
index 35e18975..b8c8679e 100644
--- a/school_data_hub_flutter/lib/common/widgets/dialogs/schoolday_date_picker.dart
+++ b/school_data_hub_flutter/lib/common/widgets/dialogs/schoolday_date_picker.dart
@@ -1,16 +1,15 @@
 import 'package:flutter/material.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/features/school_calendar/domain/school_calendar_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
-final _schoolCalendarManager = di<SchoolCalendarManager>();
-
 Future<DateTime?> selectSchooldayDate(
   BuildContext context,
   DateTime thisDate,
 ) async {
-  List<DateTime> availableDates = _schoolCalendarManager.availableDates.value;
+  List<DateTime> availableDates =
+      di<SchoolCalendarManager>().availableDates.value;
 
   bool isSelectableSchoolday(DateTime day) {
     final validDate = availableDates.any((date) => date.isSameDate(day));
@@ -26,9 +25,9 @@ Future<DateTime?> selectSchooldayDate(
     builder: (context, child) {
       return Theme(
         data: Theme.of(context).copyWith(
-          colorScheme: const ColorScheme.light(
+          colorScheme: ColorScheme.light(
             primary: AppColors.backgroundColor,
-            onPrimary: Color.fromARGB(255, 241, 241, 241),
+            onPrimary: const Color.fromARGB(255, 241, 241, 241),
             onSurface: Colors.deepPurple,
           ),
           textButtonTheme: TextButtonThemeData(
diff --git a/school_data_hub_flutter/lib/common/widgets/dialogs/short_textfield_dialog.dart b/school_data_hub_flutter/lib/common/widgets/dialogs/short_textfield_dialog.dart
index 5952df5c..ac3e7a3f 100644
--- a/school_data_hub_flutter/lib/common/widgets/dialogs/short_textfield_dialog.dart
+++ b/school_data_hub_flutter/lib/common/widgets/dialogs/short_textfield_dialog.dart
@@ -29,19 +29,19 @@ Future<String?> shortTextfieldDialog({
           obscureText: obscureText ?? false,
           decoration: InputDecoration(
             //border: InputBorder.none,
-            border: const OutlineInputBorder(
+            border: OutlineInputBorder(
               borderSide: BorderSide(
                 color: AppColors.backgroundColor,
                 width: 2,
               ),
             ),
-            focusedBorder: const OutlineInputBorder(
+            focusedBorder: OutlineInputBorder(
               borderSide: BorderSide(
                 color: AppColors.backgroundColor,
                 width: 2,
               ),
             ),
-            labelStyle: const TextStyle(color: AppColors.backgroundColor),
+            labelStyle: TextStyle(color: AppColors.backgroundColor),
             labelText: labelText,
             hintText: hintText,
           ),
diff --git a/school_data_hub_flutter/lib/common/widgets/document_image.dart b/school_data_hub_flutter/lib/common/widgets/encrypted_document_image.dart
similarity index 65%
rename from school_data_hub_flutter/lib/common/widgets/document_image.dart
rename to school_data_hub_flutter/lib/common/widgets/encrypted_document_image.dart
index 1fe9757c..49f55a8b 100644
--- a/school_data_hub_flutter/lib/common/widgets/document_image.dart
+++ b/school_data_hub_flutter/lib/common/widgets/encrypted_document_image.dart
@@ -1,13 +1,14 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/cached_image_or_download_inage.dart';
 import 'package:widget_zoom/widget_zoom.dart';
 
-class DocumentImage extends StatelessWidget {
+class EncryptedDocumentImage extends HookWidget {
   final String documentId;
 
   final double size;
-  const DocumentImage({
+  const EncryptedDocumentImage({
     super.key,
     required this.documentId,
     required this.size,
@@ -15,20 +16,23 @@ class DocumentImage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final randomPart = useMemoized(() => UniqueKey().toString(), []);
     return SizedBox(
       height: size,
       width: (21 / 30) * size,
       child: Center(
         child: WidgetZoom(
-          heroAnimationTag: documentId,
+          heroAnimationTag: '$documentId$randomPart',
           zoomWidget: FutureBuilder<Image>(
             future: cachedImageOrDownloadImage(
-                documentId: documentId, decrypt: true),
+              documentId: documentId,
+              decrypt: true,
+            ),
             builder: (context, snapshot) {
               Widget child;
               if (snapshot.connectionState == ConnectionState.waiting) {
                 // Display a loading indicator while the future is not complete
-                child = const SizedBox(
+                child = SizedBox(
                   height: 25,
                   width: 25,
                   child: CircularProgressIndicator(
@@ -38,16 +42,21 @@ class DocumentImage extends StatelessWidget {
                 );
               } else if (snapshot.hasError) {
                 // Display an error message if the future encounters an error
-                child = Text('Error: ${snapshot.error}',
-                    style: const TextStyle(color: Colors.orange));
+                child = Text(
+                  'Error: ${snapshot.error}',
+                  style: const TextStyle(color: Colors.orange),
+                );
               } else {
                 // Display the result when the future is complete
                 child = ClipRRect(
-                    borderRadius: const BorderRadius.all(Radius.circular(5)),
-                    child: snapshot.data!);
+                  borderRadius: const BorderRadius.all(Radius.circular(5)),
+                  child: snapshot.data!,
+                );
               }
               return AnimatedSwitcher(
-                  duration: const Duration(milliseconds: 300), child: child);
+                duration: const Duration(milliseconds: 300),
+                child: child,
+              );
             },
           ),
         ),
diff --git a/school_data_hub_flutter/lib/common/widgets/generic_components/generic_filter_bottom_sheet.dart b/school_data_hub_flutter/lib/common/widgets/generic_components/generic_filter_bottom_sheet.dart
index 8f04f3a5..e332fe59 100644
--- a/school_data_hub_flutter/lib/common/widgets/generic_components/generic_filter_bottom_sheet.dart
+++ b/school_data_hub_flutter/lib/common/widgets/generic_components/generic_filter_bottom_sheet.dart
@@ -15,11 +15,7 @@ class GenericFilterBottomSheet extends StatelessWidget {
           Expanded(
             child: SingleChildScrollView(
               scrollDirection: Axis.vertical,
-              child: Column(
-                children: [
-                  ...children,
-                ],
-              ),
+              child: Column(children: [...children]),
             ),
           ),
         ],
@@ -28,8 +24,10 @@ class GenericFilterBottomSheet extends StatelessWidget {
   }
 }
 
-showGenericFilterBottomSheet(
-    {required BuildContext context, required List<Widget> filterList}) {
+showGenericFilterBottomSheet({
+  required BuildContext context,
+  required List<Widget> filterList,
+}) {
   return showModalBottomSheet(
     constraints: const BoxConstraints(maxWidth: 800),
     shape: const RoundedRectangleBorder(
@@ -39,8 +37,6 @@ showGenericFilterBottomSheet(
       ),
     ),
     context: context,
-    builder: (_) => GenericFilterBottomSheet(
-      children: filterList,
-    ),
+    builder: (_) => GenericFilterBottomSheet(children: filterList),
   );
 }
diff --git a/school_data_hub_flutter/lib/common/widgets/generic_components/generic_sliver_list.dart b/school_data_hub_flutter/lib/common/widgets/generic_components/generic_sliver_list.dart
index 87017338..3b524d6a 100644
--- a/school_data_hub_flutter/lib/common/widgets/generic_components/generic_sliver_list.dart
+++ b/school_data_hub_flutter/lib/common/widgets/generic_components/generic_sliver_list.dart
@@ -17,20 +17,17 @@ class GenericSliverListWithEmptyListCheck<T> extends StatelessWidget {
             child: Center(
               child: Padding(
                 padding: EdgeInsets.all(8.0),
-                child: Text(
-                  'Keine Ergebnisse',
-                  style: TextStyle(fontSize: 18),
-                ),
+                child: Text('Keine Ergebnisse', style: TextStyle(fontSize: 18)),
               ),
             ),
           )
         : SliverList(
-            delegate: SliverChildBuilderDelegate(
-              (BuildContext context, int index) {
-                return itemBuilder(context, items[index]);
-              },
-              childCount: items.length,
-            ),
+            delegate: SliverChildBuilderDelegate((
+              BuildContext context,
+              int index,
+            ) {
+              return itemBuilder(context, items[index]);
+            }, childCount: items.length),
           );
   }
 }
diff --git a/school_data_hub_flutter/lib/common/widgets/generic_components/generic_sliver_search_app_bar.dart b/school_data_hub_flutter/lib/common/widgets/generic_components/generic_sliver_search_app_bar.dart
index 4b309909..f037f517 100644
--- a/school_data_hub_flutter/lib/common/widgets/generic_components/generic_sliver_search_app_bar.dart
+++ b/school_data_hub_flutter/lib/common/widgets/generic_components/generic_sliver_search_app_bar.dart
@@ -23,10 +23,9 @@ class GenericSliverSearchAppBar extends StatelessWidget {
       stretch: false,
       elevation: 0,
       flexibleSpace: FlexibleSpaceBar(
-        titlePadding:
-            const EdgeInsets.only(left: 5, top: 5, right: 5, bottom: 5),
+        expandedTitleScale: 1,
         collapseMode: CollapseMode.none,
-        title: title,
+        background: title,
       ),
     );
   }
diff --git a/school_data_hub_flutter/lib/common/widgets/unencrypted_image_in_card.dart b/school_data_hub_flutter/lib/common/widgets/unencrypted_image_in_card.dart
index 07cbd628..cc5f69da 100644
--- a/school_data_hub_flutter/lib/common/widgets/unencrypted_image_in_card.dart
+++ b/school_data_hub_flutter/lib/common/widgets/unencrypted_image_in_card.dart
@@ -1,26 +1,29 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/cached_image_or_download_inage.dart';
 import 'package:widget_zoom/widget_zoom.dart';
 
-class UnencryptedImageInCard extends StatelessWidget {
+class UnencryptedImageInCard extends HookWidget {
   final String cacheKey;
   final String path;
   final double size;
-  const UnencryptedImageInCard(
-      {required this.cacheKey,
-      required this.path,
-      required this.size,
-      super.key});
+  const UnencryptedImageInCard({
+    required this.cacheKey,
+    required this.path,
+    required this.size,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
+    final randomPart = useMemoized(() => UniqueKey().toString(), []);
     return SizedBox(
       height: size,
       width: (21 / 30) * size,
       child: Center(
         child: WidgetZoom(
-          heroAnimationTag: cacheKey,
+          heroAnimationTag: '$cacheKey$randomPart',
           zoomWidget: FutureBuilder<Image>(
             future: cachedPublicImageOrDownloadPublicImage(
               path: path,
@@ -30,7 +33,7 @@ class UnencryptedImageInCard extends StatelessWidget {
               Widget child;
               if (snapshot.connectionState == ConnectionState.waiting) {
                 // Display a loading indicator while the future is not complete
-                child = const SizedBox(
+                child = SizedBox(
                   height: 25,
                   width: 25,
                   child: CircularProgressIndicator(
@@ -40,16 +43,21 @@ class UnencryptedImageInCard extends StatelessWidget {
                 );
               } else if (snapshot.hasError) {
                 // Display an error message if the future encounters an error
-                child = Text('Error: ${snapshot.error}',
-                    style: const TextStyle(color: Colors.orange));
+                child = Text(
+                  'Error: ${snapshot.error}',
+                  style: const TextStyle(color: Colors.orange),
+                );
               } else {
                 // Display the result when the future is complete
                 child = ClipRRect(
-                    borderRadius: const BorderRadius.all(Radius.circular(5)),
-                    child: snapshot.data!);
+                  borderRadius: const BorderRadius.all(Radius.circular(5)),
+                  child: snapshot.data!,
+                );
               }
               return AnimatedSwitcher(
-                  duration: const Duration(milliseconds: 300), child: child);
+                duration: const Duration(milliseconds: 300),
+                child: child,
+              );
             },
           ),
         ),
diff --git a/school_data_hub_flutter/lib/core/env/env_manager.dart b/school_data_hub_flutter/lib/core/env/env_manager.dart
index 7af17d04..8331914e 100644
--- a/school_data_hub_flutter/lib/core/env/env_manager.dart
+++ b/school_data_hub_flutter/lib/core/env/env_manager.dart
@@ -6,12 +6,13 @@ import 'package:logging/logging.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:school_data_hub_flutter/app_utils/secure_storage.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
+import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/core/env/models/enums.dart';
 import 'package:school_data_hub_flutter/core/env/models/env.dart';
 import 'package:school_data_hub_flutter/core/init/init_manager.dart';
 import 'package:school_data_hub_flutter/core/models/populated_server_session_data.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_manager.dart';
+import 'package:signals/signals_flutter.dart';
 import 'package:watch_it/watch_it.dart';
 
 class EnvManager with ChangeNotifier {
@@ -25,17 +26,16 @@ class EnvManager with ChangeNotifier {
 
   /// TODO ADVICE: is this proxy authentication flag a hack or is this acceptable?
 
-  final _isAuthenticated = ValueNotifier<bool>(false);
+  final _isAuthenticated = signal(false);
 
-  /// ##  🔎 managed observable
   /// We need to observe in [MaterialApp] if a user is authenticated
   /// without accessing [HubSessionManager], because if there is not
   // an active env yet, it will still be unregistered.
-  /// So this is a workaround setting a flag here
+  /// So this is a workaround setting a flag here.
   ///
   /// **CAUTION**: Handle this value only with [HubSessionManager] every time
   /// it makes an authentication status change.
-  ValueListenable<bool> get isAuthenticated => _isAuthenticated;
+  Signal<bool> get isAuthenticated => _isAuthenticated;
 
   /// **WARNING:**
   ///
@@ -47,40 +47,39 @@ class EnvManager with ChangeNotifier {
 
   Env? _activeEnv;
 
-  /// ##  🔎 managed observable
   Env? get activeEnv => _activeEnv;
 
   Map<String, Env> _environments = {};
 
-  /// ##  🔎 managed observable
   Map<String, Env> get envs => _environments;
 
   String _defaultEnv = '';
-
-  /// ##  🔎 managed observable
   String get defaultEnv => _defaultEnv;
 
-  final _envIsReady = ValueNotifier<bool>(false);
+  final _envIsReady = signal(false);
+  Signal<bool> get envIsReady => _envIsReady;
 
-  /// ##  🔎 managed observable
-  ValueListenable<bool> get envIsReady => _envIsReady;
+  void _syncPaletteWithActiveEnv() {
+    AppColors.setPaletteByKeyString(_activeEnv?.colorSchemeKey);
+  }
 
   // Declare storage keys for the environment
 
   final String _storageKeyForEnvironments = 'environments_key';
 
-  /// ##  🔎 managed observable
-  String get storageKeyForAuthKey =>
-      '${_activeEnv!.serverName}_${_activeEnv!.runMode.name}_hub_auth_key';
+  String _storageKeyPrefix() {
+    return '${_activeEnv?.serverName}_${_activeEnv?.runMode.name}';
+  }
 
-  String get storageKeyForUserInfo =>
-      '${_activeEnv!.serverName}_${_activeEnv!.runMode.name}_hub_user_info';
+  String get storageKeyForAuthKey => '${_storageKeyPrefix()}_hub_auth_key';
+
+  String get storageKeyForUserInfo => '${_storageKeyPrefix()}_hub_user_info';
 
   String get storageKeyForPupilIdentities =>
-      '${_activeEnv!.serverName}_${_activeEnv!.runMode.name}_pupil_identities';
+      '${_storageKeyPrefix()}_pupil_identities';
 
   String get storageKeyForMatrixCredentials =>
-      '${_activeEnv!.serverName}_${_activeEnv!.runMode.name}_matrix_credentials';
+      '${_storageKeyPrefix()}_matrix_credentials';
 
   PackageInfo _packageInfo = PackageInfo(
     appName: '',
@@ -130,6 +129,19 @@ class EnvManager with ChangeNotifier {
         _populatedEnvServerData.supportCategories == false;
   }
 
+  void dispose() {
+    _isAuthenticated.dispose();
+    _envIsReady.dispose();
+    _packageInfo;
+    _populatedEnvServerData;
+    _environments;
+    _defaultEnv;
+    _storageKeyForEnvironments;
+
+    super.dispose();
+    return;
+  }
+
   Future<EnvManager> init() async {
     await firstRun();
     return this;
@@ -153,6 +165,7 @@ class EnvManager with ChangeNotifier {
 
     _activeEnv =
         environmentsMapWithDefaultServerEnv.environmentsMap[_defaultEnv];
+    _syncPaletteWithActiveEnv();
     notifyListeners();
     _log.info('Default Environment set: $_defaultEnv');
 
@@ -254,6 +267,7 @@ class EnvManager with ChangeNotifier {
     String? key,
     String? iv,
     DateTime? lastIdentitiesUpdate,
+    String? colorSchemeKey,
   }) async {
     if (_activeEnv == null) {
       _log.warning('No active environment set, cannot update it.');
@@ -266,8 +280,10 @@ class EnvManager with ChangeNotifier {
       iv: iv ?? _activeEnv!.iv,
       lastIdentitiesUpdate:
           lastIdentitiesUpdate ?? _activeEnv!.lastIdentitiesUpdate,
+      colorSchemeKey: colorSchemeKey ?? _activeEnv!.colorSchemeKey,
     );
     _environments[_activeEnv!.serverName] = _activeEnv!;
+    _syncPaletteWithActiveEnv();
     notifyListeners();
     _log.info('''Active environment updated: ${_activeEnv!.serverName}
     lastIdentitiesUpdate: ${_activeEnv!.lastIdentitiesUpdate}
@@ -298,10 +314,11 @@ class EnvManager with ChangeNotifier {
     // Reset environment-dependent managers
     // This will automatically drop all child scopes including loggedInUserScope
 
-    await InitManager.dropOldActiveEnvAndRelatedScopes();
+    await InitManager.dropAllScopes();
 
     _activeEnv = _environments[envName]!;
     _defaultEnv = envName;
+    _syncPaletteWithActiveEnv();
 
     // Log new environment details
     _log.info('[ENV] NEW active environment set:');
@@ -332,40 +349,6 @@ class EnvManager with ChangeNotifier {
       'Environment-dependent managers are ready for: ${_activeEnv!.serverName}',
     );
 
-    // // Handle matrix credentials if they exist
-    // if (await HubSecureStorage().containsKey(storageKeyForMatrixCredentials)) {
-    //   _log.info(
-    //     '[DI] Found matrix credentials for environment ${_activeEnv!.serverName}',
-    //   );
-
-    //   // Only register matrix managers if they're not already registered
-    //   final hasMatrixScope = di.hasScope(DiScope.onMatrixEnvScope.name);
-    //   _log.info(
-    //     '[DI] Environment ${_activeEnv!.serverName}: hasMatrixScope = $hasMatrixScope',
-    //   );
-
-    //   if (!hasMatrixScope) {
-    //     _log.info(
-    //       '[DI] Registering matrix managers for environment ${_activeEnv!.serverName}',
-    //     );
-    //     await InitManager.registerMatrixManagers();
-    //   } else {
-    //     _log.info(
-    //       '[DI] Matrix managers already registered, skipping registration',
-    //     );
-    //     // Ensure session configured flag is set even if skipping registration
-    //     di<HubSessionManager>().setIsMatrixSessionConfigured(true);
-    //   }
-    // } else {
-    //   _log.info(
-    //     '[DI] No matrix credentials found for environment ${_activeEnv!.serverName}',
-    //   );
-    // }
-
-    // Wait for all DI registrations to be ready
-    // _log.info('[DI] Waiting for all managers to be ready...');
-    // await di.allReady();
-
     // Set environment as ready
     _envIsReady.value = true;
 
@@ -389,27 +372,24 @@ class EnvManager with ChangeNotifier {
       'Umgebung ${_activeEnv!.serverName} aktiviert!',
     );
 
-    _log.info('[ENV] Environment switch completed successfully');
-    _log.info(
-      '[ENV] New environment has ${await _checkPupilIdentityCount()} pupil identities',
-    );
+    _log.info('Environment switch completed successfully');
   }
 
   /// Helper method to log pupil identity count
-  Future<int> _checkPupilIdentityCount() async {
-    try {
-      // We need to wait for all DI to be ready before accessing managers
-      await di.allReady();
-      // PupilIdentityManager is in the loggedInUserScope
-      if (di.isRegistered<PupilIdentityManager>()) {
-        return di<PupilIdentityManager>().availablePupilIds.length;
-      }
-      return 0;
-    } catch (e) {
-      _log.warning('Could not get pupil identity count: $e');
-    }
-    return 0;
-  }
+  // Future<int> _checkPupilIdentityCount() async {
+  //   try {
+  //     // We need to wait for all DI to be ready before accessing managers
+  //     await di.allReady();
+  //     // PupilIdentityManager is in the loggedInUserScope
+  //     if (di.isRegistered<PupilIdentityManager>()) {
+  //       return di<PupilIdentityManager>().availablePupilIds.length;
+  //     }
+  //     return 0;
+  //   } catch (e) {
+  //     _log.warning('Could not get pupil identity count: $e');
+  //   }
+  //   return 0;
+  // }
 
   /// Check for stored credentials and attempt auto-login
   Future<void> _checkAndAttemptAutoLogin() async {
@@ -432,13 +412,6 @@ class EnvManager with ChangeNotifier {
               return;
             }
 
-            // // Try to get the session manager - this will throw if not ready
-            // final sessionManager = di<HubSessionManager>();
-
-            // // The session manager should handle the auto-login
-            // // This will set the authentication status appropriately
-            // await sessionManager.initialize();
-
             _log.info('Auto-login completed successfully');
           } catch (sessionError) {
             if (sessionError.toString().contains('not ready yet')) {
@@ -514,7 +487,7 @@ class EnvManager with ChangeNotifier {
       _log.info(
         '[DI] Switching environment managers after deleting environment $deletedEnvironment',
       );
-      InitManager.dropOldActiveEnvAndRelatedScopes();
+      InitManager.dropAllScopes();
     } else {
       // if there are no environments left, delete the environments from secure storage
 
@@ -522,7 +495,7 @@ class EnvManager with ChangeNotifier {
       _log.info(
         '[DDI]Env $deletedEnvironment deleted. No environments left. Cleaning up all environment managers.',
       );
-      InitManager.dropOldActiveEnvAndRelatedScopes();
+      InitManager.dropAllScopes();
       _activeEnv = null;
 
       _defaultEnv = '';
diff --git a/school_data_hub_flutter/lib/core/env/models/env.dart b/school_data_hub_flutter/lib/core/env/models/env.dart
index 39f8f6aa..64f67c9c 100644
--- a/school_data_hub_flutter/lib/core/env/models/env.dart
+++ b/school_data_hub_flutter/lib/core/env/models/env.dart
@@ -26,6 +26,7 @@ class Env {
   final String? iv;
   final String serverUrl;
   final DateTime? lastIdentitiesUpdate;
+  final String? colorSchemeKey;
 
   Env({
     required this.serverName,
@@ -34,6 +35,7 @@ class Env {
     this.iv,
     required this.serverUrl,
     this.lastIdentitiesUpdate,
+    this.colorSchemeKey,
   });
 
   Env copyWith({
@@ -42,6 +44,7 @@ class Env {
     String? key,
     String? iv,
     DateTime? lastIdentitiesUpdate,
+    String? colorSchemeKey,
   }) => Env(
     serverName: serverName ?? this.serverName,
     runMode: runMode ?? this.runMode,
@@ -49,6 +52,7 @@ class Env {
     iv: iv ?? this.iv,
     serverUrl: this.serverUrl,
     lastIdentitiesUpdate: lastIdentitiesUpdate ?? this.lastIdentitiesUpdate,
+    colorSchemeKey: colorSchemeKey ?? this.colorSchemeKey,
   );
 
   factory Env.fromJson(Map<String, dynamic> json) => Env(
@@ -61,6 +65,7 @@ class Env {
     key: json["key"],
     iv: json["iv"],
     serverUrl: json["server_url"],
+    colorSchemeKey: json["color_scheme_key"] as String?,
   );
 
   Map<String, dynamic> toJson() => {
@@ -70,5 +75,6 @@ class Env {
     "key": key,
     "iv": iv,
     "server_url": serverUrl,
+    "color_scheme_key": colorSchemeKey,
   };
 }
diff --git a/school_data_hub_flutter/lib/core/init/init_manager.dart b/school_data_hub_flutter/lib/core/init/init_manager.dart
index dfc6efb8..23428585 100644
--- a/school_data_hub_flutter/lib/core/init/init_manager.dart
+++ b/school_data_hub_flutter/lib/core/init/init_manager.dart
@@ -15,7 +15,7 @@ import 'package:school_data_hub_flutter/features/matrix/domain/matrix_policy_man
 import 'package:school_data_hub_flutter/features/matrix/domain/models/matrix_credentials.dart';
 import 'package:watch_it/watch_it.dart';
 
-enum DiScope { onActiveEnvScope, onLoggedInUserScope, onMatrixEnvScope }
+enum InitScope { onActiveEnvScope, onAuthScope, onMatrixEnvScope }
 
 final _log = Logger('[Init][Manager]');
 
@@ -52,15 +52,14 @@ class InitManager {
   }
 
   static Future<void> pushActiveEnvScopeAndRegisterDependentManagers() async {
-    if (di.hasScope(DiScope.onActiveEnvScope.name)) {
-      _log.warning(
-        'Active environment scope already exists, skipping registration',
-      );
+    if (di.hasScope(InitScope.onActiveEnvScope.name)) {
+      _log.warning('''WARNING: 
+     [SCOPE onActiveEnvScope] already exists, skipping registration''');
       return;
     }
 
     await di.pushNewScopeAsync(
-      scopeName: DiScope.onActiveEnvScope.name,
+      scopeName: InitScope.onActiveEnvScope.name,
       dispose: () {
         _log.warning('[SCOPE] Dropping scope[activeEnvScope]');
       },
@@ -80,17 +79,17 @@ class InitManager {
   static Future<void> registerManagersDependingOnAuthedSession() async {
     _log.info('Registering managers depending on session');
 
-    if (di.hasScope(DiScope.onLoggedInUserScope.name)) {
+    if (di.hasScope(InitScope.onAuthScope.name)) {
       _log.info('[loggedInUserScope] already exists, skipping registration');
       return;
     }
 
     await di.pushNewScopeAsync(
-      scopeName: DiScope.onLoggedInUserScope.name,
+      scopeName: InitScope.onAuthScope.name,
       dispose: () {
-        _log.warning('[SCOPE] Dropping scope [loggedInUserScope]');
+        _log.warning('[SCOPE] Dropped scope [loggedInUserScope] successfully');
       },
-      init: (getIt) async {
+      init: (di) async {
         _log.info('[SCOPE] Pushing scope [loggedInUserScope]');
 
         await InitOnUserAuth.registerManagers();
@@ -99,11 +98,11 @@ class InitManager {
   }
 
   static Future<void> dropOnLoggedInUserScope() async {
-    if (di.hasScope(DiScope.onLoggedInUserScope.name)) {
+    if (di.hasScope(InitScope.onAuthScope.name)) {
       _log.info('Dropping scope [loggedInUserScope]...');
 
       await di.dropScope(
-        DiScope.onLoggedInUserScope.name,
+        InitScope.onAuthScope.name,
       ); // This will dispose the 'logged_in_user_scope'
       _log.info('[SCOPE] [loggedInUserScope] dropped successfully');
     } else {
@@ -113,24 +112,36 @@ class InitManager {
     }
   }
 
-  static Future<void> dropOldActiveEnvAndRelatedScopes() async {
-    _log.info('Dropping old [activeEnv] and related scopes...');
+  static Future<void> dropAllScopes() async {
+    _log.info('[SCOPE] Dropping old scopes...');
 
-    if (di.hasScope(DiScope.onLoggedInUserScope.name)) {
-      await di.dropScope(DiScope.onLoggedInUserScope.name);
+    if (di.hasScope(InitScope.onAuthScope.name)) {
+      await di.dropScope(InitScope.onAuthScope.name);
       _log.info('[SCOPE] [loggedInUserScope] dropped successfully');
+    } else {
+      _log.warning(
+        '[SCOPE] WARNING: [loggedInUserScope] does not exist, skipping drop operation',
+      );
     }
 
-    if (di.hasScope(DiScope.onActiveEnvScope.name)) {
-      await di.dropScope(DiScope.onActiveEnvScope.name);
+    if (di.hasScope(InitScope.onActiveEnvScope.name)) {
+      await di.dropScope(InitScope.onActiveEnvScope.name);
       _log.info('[SCOPE] [activeEnvScope] dropped successfully');
+    } else {
+      _log.severe(
+        '[SCOPE] [activeEnvScope] does not exist, skipping drop operation',
+      );
     }
 
     // Also drop matrix scope if it exists (it's environment-dependent)
-    if (di.hasScope(DiScope.onMatrixEnvScope.name)) {
+    if (di.hasScope(InitScope.onMatrixEnvScope.name)) {
       _log.info('[SCOPE] Matrix scope exists, dropping it...');
       await dropMatrixScope();
       _log.info('[SCOPE] [matrixScope] dropped successfully');
+    } else {
+      _log.warning(
+        '[SCOPE] [matrixScope] does not exist, skipping drop operation',
+      );
     }
   }
 
@@ -142,14 +153,14 @@ class InitManager {
     _log.info('Creating matrix scope and registering managers');
 
     // Drop existing matrix scope if it exists
-    if (di.hasScope(DiScope.onMatrixEnvScope.name)) {
+    if (di.hasScope(InitScope.onMatrixEnvScope.name)) {
       _log.info('Dropping existing matrix scope before creating new one');
-      await di.dropScope(DiScope.onMatrixEnvScope.name);
+      await di.dropScope(InitScope.onMatrixEnvScope.name);
       await Future.delayed(const Duration(milliseconds: 50));
     }
 
     await di.pushNewScopeAsync(
-      scopeName: DiScope.onMatrixEnvScope.name,
+      scopeName: InitScope.onMatrixEnvScope.name,
       dispose: () {
         _log.warning('[SCOPE] Dropping scope [matrixScope]');
       },
@@ -157,39 +168,52 @@ class InitManager {
         _log.info('[SCOPE] Pushing scope [matrixScope]');
 
         // Register the manager inside the matrix scope
-        getIt.registerLazySingletonAsync<MatrixPolicyManager>(() async {
-          _log.info('Registering MatrixPolicyManager in matrix scope');
-
-          // Wait for HubSessionManager to be ready (we check this inside the factory
-          // since registerLazySingletonAsync doesn't support dependsOn)
-          await di.isReady<HubSessionManager>();
-
-          final policyManager = await MatrixPolicyManager(
-            credentials.url,
-            credentials.policyToken,
-            credentials.matrixToken,
-            credentials.matrixAdmin,
-            credentials.encryptionKey,
-            credentials.encryptionIv,
-          ).init();
-
-          _log.info('Matrix managers initialized');
-
-          // Set the registration status to true after the manager is fully initialized
-          // Since we depend on HubSessionManager, it should be ready now
-          di<HubSessionManager>().changeMatrixPolicyManagerRegistrationStatus(
-            true,
-          );
-          _log.info(
-            'Matrix registration status set to true after initialization',
-          );
+        getIt.registerLazySingletonAsync<MatrixPolicyManager>(
+          () async {
+            _log.info('Registering MatrixPolicyManager in matrix scope');
+
+            // Wait for HubSessionManager to be ready (we check this inside the factory
+            // since registerLazySingletonAsync doesn't support dependsOn)
+            await di.isReady<HubSessionManager>();
+
+            final policyManager = await MatrixPolicyManager(
+              credentials.url,
+              credentials.policyToken,
+              credentials.matrixToken,
+              credentials.matrixAdmin,
+              credentials.encryptionKey,
+              credentials.encryptionIv,
+            ).init();
+
+            _log.info('Matrix managers initialized');
+
+            // Set the registration status to true after the manager is fully initialized
+            // Since we depend on HubSessionManager, it should be ready now
+            di<HubSessionManager>().changeMatrixPolicyManagerRegistrationStatus(
+              true,
+            );
+            _log.info(
+              'Matrix registration status set to true after initialization',
+            );
 
-          return policyManager;
-        });
+            return policyManager;
+          },
+          dispose: (instance) {
+            _log.info('[MATRIX POLICY MANAGER] MatrixPolicyManager disposed');
+            instance.dispose();
+          },
+        );
 
-        getIt.registerSingletonWithDependencies(() {
-          return MatrixPolicyFilterManager(getIt<MatrixPolicyManager>());
-        }, dependsOn: [MatrixPolicyManager]);
+        di.registerSingletonWithDependencies(
+          () {
+            return MatrixPolicyFilterManager(di<MatrixPolicyManager>());
+          },
+          dependsOn: [MatrixPolicyManager],
+          dispose: (instance) {
+            _log.info('[MATRIX POLICY FILTER MANAGER] disposed');
+            instance.dispose();
+          },
+        );
       },
     );
 
@@ -242,46 +266,53 @@ class InitManager {
       if (!di.isRegistered<MatrixPolicyManager>()) {
         _log.info('Registering MatrixPolicyManager async singleton lazily');
 
-        di.registerLazySingletonAsync<MatrixPolicyManager>(() async {
-          _log.info(
-            'MatrixPolicyManager called (parent scope) - initializing...',
-          );
+        di.registerLazySingletonAsync<MatrixPolicyManager>(
+          () async {
+            _log.info(
+              'MatrixPolicyManager called (parent scope) - initializing...',
+            );
+
+            // Wait for HubSessionManager to be ready
+            await di.isReady<HubSessionManager>();
+
+            // Check if matrix scope already exists and manager is registered there
+            if (di.hasScope(InitScope.onMatrixEnvScope.name)) {
+              _log.info('Matrix scope already exists, checking for manager');
+              try {
+                await di.isReady<MatrixPolicyManager>();
+                final manager = await di.getAsync<MatrixPolicyManager>();
+                _log.info('Found existing MatrixPolicyManager in matrix scope');
+                return manager;
+              } catch (e) {
+                _log.warning(
+                  'Matrix scope exists but manager not found, will create new one: $e',
+                );
+              }
+            }
 
-          // Wait for HubSessionManager to be ready
-          await di.isReady<HubSessionManager>();
-
-          // Check if matrix scope already exists and manager is registered there
-          if (di.hasScope(DiScope.onMatrixEnvScope.name)) {
-            _log.info('Matrix scope already exists, checking for manager');
-            try {
-              await di.isReady<MatrixPolicyManager>();
-              final manager = await di.getAsync<MatrixPolicyManager>();
-              _log.info('Found existing MatrixPolicyManager in matrix scope');
-              return manager;
-            } catch (e) {
-              _log.warning(
-                'Matrix scope exists but manager not found, will create new one: $e',
+            // Read credentials from storage
+            final credentials = await _readMatrixCredentialsFromStorage();
+            if (credentials == null) {
+              throw Exception(
+                'Matrix credentials not found in secure storage. '
+                'Please configure matrix environment first.',
               );
             }
-          }
 
-          // Read credentials from storage
-          final credentials = await _readMatrixCredentialsFromStorage();
-          if (credentials == null) {
-            throw Exception(
-              'Matrix credentials not found in secure storage. '
-              'Please configure matrix environment first.',
+            // Create scope and register managers, get the manager instance
+            // This will register the manager inside the matrix scope
+            final manager = await _createMatrixScopeAndRegisterManagers(
+              credentials,
             );
-          }
-
-          // Create scope and register managers, get the manager instance
-          // This will register the manager inside the matrix scope
-          final manager = await _createMatrixScopeAndRegisterManagers(
-            credentials,
-          );
-          _log.info('MatrixPolicyManager successfully initialized');
-          return manager;
-        });
+            _log.info('MatrixPolicyManager successfully initialized');
+            return manager;
+          },
+          dispose: (instance) {
+            _log.info('[MATRIX POLICY MANAGER] MatrixPolicyManager disposed');
+            instance.dispose();
+            return;
+          },
+        );
 
         _log.info('MatrixPolicyManager factory registered');
       } else {
@@ -330,19 +361,30 @@ class InitManager {
 
   static Future<void> dropMatrixScope() async {
     try {
-      final hasScope = di.hasScope(DiScope.onMatrixEnvScope.name);
+      final hasScope = di.hasScope(InitScope.onMatrixEnvScope.name);
 
       if (hasScope) {
         _log.warning('[SCOPE] Dropping scope [matrixScope]...');
-        await di.dropScope(DiScope.onMatrixEnvScope.name);
+        await di.dropScope(InitScope.onMatrixEnvScope.name);
         _log.info('[SCOPE] [matrixScope] dropped successfully');
         // Add a small delay to ensure the scope is fully dropped
         // await Future.delayed(const Duration(milliseconds: 50));
 
         // Check if scope was actually dropped
-        final scopeStillExists = di.hasScope(DiScope.onMatrixEnvScope.name);
+        final scopeStillExists = di.hasScope(InitScope.onMatrixEnvScope.name);
         if (!scopeStillExists) _log.info('Matrix scope dropped successfully!');
 
+        if (di.isRegistered<MatrixPolicyManager>()) {
+          await di.resetLazySingleton<MatrixPolicyManager>(
+            disposingFunction: (instance) {
+              _log.info(
+                '[MATRIX POLICY MANAGER] disposed during reset after scope drop',
+              );
+              instance.dispose();
+            },
+          );
+        }
+
         // Reset the registration status in HubSessionManager
         try {
           if (di.isRegistered<HubSessionManager>()) {
diff --git a/school_data_hub_flutter/lib/core/init/init_on_active_env.dart b/school_data_hub_flutter/lib/core/init/init_on_active_env.dart
index 91c02d4a..1e194af5 100644
--- a/school_data_hub_flutter/lib/core/init/init_on_active_env.dart
+++ b/school_data_hub_flutter/lib/core/init/init_on_active_env.dart
@@ -12,6 +12,7 @@ final _log = Logger('[Init][OnActiveEnv]');
 class InitOnActiveEnv {
   static Future<void> registerManagers() async {
     _log.info('Registering managers on active environment scope');
+
     di.registerSingletonWithDependencies<HubAuthKeyManager>(() {
       return HubAuthKeyManager(
         storageKeyForAuthKey: di<EnvManager>().storageKeyForAuthKey,
@@ -41,11 +42,13 @@ class InitOnActiveEnv {
         // this will initialize the session manager and load the stored user info
         // it returns a bool
         await sessionManager.initialize();
+
         _log.info('[SESSION] HubSessionManager initialized');
+
         return sessionManager;
       },
       dependsOn: [EnvManager, Client],
-      dispose: (param) => param.dispose(),
+      dispose: (hubSessionManager) => hubSessionManager.dispose(),
     );
 
     // Register BottomNavManager in active environment scope so it's always available
diff --git a/school_data_hub_flutter/lib/core/init/init_on_user_auth.dart b/school_data_hub_flutter/lib/core/init/init_on_user_auth.dart
index 0ed05b8a..89ba9d52 100644
--- a/school_data_hub_flutter/lib/core/init/init_on_user_auth.dart
+++ b/school_data_hub_flutter/lib/core/init/init_on_user_auth.dart
@@ -21,7 +21,7 @@ import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupil_filt
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter_impl.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_manager.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/school/domain/school_data_manager.dart';
 import 'package:school_data_hub_flutter/features/school_calendar/domain/school_calendar_manager.dart';
 import 'package:school_data_hub_flutter/features/school_lists/domain/filters/school_list_filter_manager.dart';
@@ -40,8 +40,9 @@ class InitOnUserAuth {
       di<EnvManager>().storageKeyForMatrixCredentials,
     )) {
       _log.info(' Matrix credentials found');
+
       // Only register matrix managers if they're not already registered
-      if (!di.hasScope(DiScope.onMatrixEnvScope.name)) {
+      if (!di.hasScope(InitScope.onMatrixEnvScope.name)) {
         await InitManager.registerMatrixManagers();
       } else {
         _log.info(' Matrix managers already registered, skipping registration');
@@ -51,140 +52,277 @@ class InitOnUserAuth {
     } else {
       _log.info(' No matrix credentials found');
     }
-    di.registerSingletonAsync<PupilIdentityManager>(() async {
-      final pupilIdentityManager = PupilIdentityManager();
+    di.registerSingletonAsync<PupilIdentityManager>(
+      () async {
+        final pupilIdentityManager = PupilIdentityManager();
 
-      await pupilIdentityManager.init();
+        await pupilIdentityManager.init();
 
-      _log.info('[PUPIL IDENTITY MANAGER] PupilIdentityManager initialized');
+        _log.info('[PUPIL IDENTITY MANAGER] PupilIdentityManager initialized');
 
-      return pupilIdentityManager;
-    });
+        return pupilIdentityManager;
+      },
+      dispose: (instance) {
+        _log.info('[PUPIL IDENTITY MANAGER] PupilIdentityManager disposed');
+        instance.dispose();
+        return;
+      },
+    );
 
-    di.registerSingletonAsync<SchoolCalendarManager>(() async {
-      final schoolCalendarManager = SchoolCalendarManager();
+    di.registerSingletonAsync<SchoolCalendarManager>(
+      () async {
+        final schoolCalendarManager = SchoolCalendarManager();
 
-      await schoolCalendarManager.init();
+        await schoolCalendarManager.init();
 
-      _log.info('[SCHOOL CALENDAR MANAGER] SchoolCalendarManager initialized');
+        _log.info(
+          '[SCHOOL CALENDAR MANAGER] SchoolCalendarManager initialized',
+        );
 
-      return schoolCalendarManager;
-    });
+        return schoolCalendarManager;
+      },
+      dispose: (instance) {
+        _log.info('[SCHOOL CALENDAR MANAGER] SchoolCalendarManager disposed');
+        instance.dispose();
+        return;
+      },
+    );
 
-    di.registerSingletonAsync<SupportCategoryManager>(() async {
-      final supportCategoryManager = SupportCategoryManager();
+    di.registerSingletonAsync<SupportCategoryManager>(
+      () async {
+        final supportCategoryManager = SupportCategoryManager();
 
-      await supportCategoryManager.init();
+        await supportCategoryManager.init();
 
-      _log.info(
-        '[SUPPORT CATEGORY MANAGER] SupportCategoryManager initialized',
-      );
+        _log.info(
+          '[SUPPORT CATEGORY MANAGER] SupportCategoryManager initialized',
+        );
 
-      return supportCategoryManager;
-    });
+        return supportCategoryManager;
+      },
+      dispose: (instance) {
+        _log.info('[SUPPORT CATEGORY MANAGER] SupportCategoryManager disposed');
+        instance.dispose();
+        return;
+      },
+    );
 
-    di.registerSingletonAsync<PupilManager>(() async {
-      final pupilManager = PupilManager();
+    di.registerSingletonAsync<PupilProxyManager>(
+      () async {
+        final pupilManager = PupilProxyManager();
 
-      await pupilManager.init();
+        await pupilManager.init();
 
-      _log.info('[PUPIL MANAGER] PupilManager initialized');
+        _log.info('[PUPIL MANAGER] PupilManager initialized');
 
-      return pupilManager;
-    }, dependsOn: [PupilIdentityManager, HubSessionManager]);
+        return pupilManager;
+      },
+      dependsOn: [PupilIdentityManager, HubSessionManager],
+      dispose: (instance) {
+        _log.info('[PUPIL MANAGER] PupilManager disposed');
+        instance.dispose();
+        return;
+      },
+    );
 
     di.registerSingletonWithDependencies<LearningSupportManager>(
       () => LearningSupportManager(),
-      dependsOn: [PupilManager, SchoolCalendarManager, SupportCategoryManager],
+      dependsOn: [
+        PupilProxyManager,
+        SchoolCalendarManager,
+        SupportCategoryManager,
+      ],
+      dispose: (instance) {
+        _log.info('[LEARNING SUPPORT MANAGER] LearningSupportManager disposed');
+        instance.dispose();
+        return;
+      },
     );
 
-    di.registerSingletonAsync<BookManager>(() async {
-      final bookManager = BookManager();
-      await bookManager.init();
-      _log.info('[BOOK MANAGER] BookManager initialized');
-      return bookManager;
-    }, dependsOn: []);
+    di.registerSingletonAsync<BookManager>(
+      () async {
+        final bookManager = BookManager();
+        await bookManager.init();
+        _log.info('[BOOK MANAGER] BookManager initialized');
+        return bookManager;
+      },
+      dependsOn: [],
+      dispose: (instance) {
+        _log.info('[BOOK MANAGER] BookManager disposed');
+        instance.dispose();
+        return;
+      },
+    );
 
-    di.registerSingletonAsync<SchoolDataMainManager>(() async {
-      final schoolDataManager = SchoolDataMainManager();
-      await schoolDataManager.init();
-      _log.info('[SCHOOL DATA MAIN MANAGER] SchoolDataMainManager initialized');
-      return schoolDataManager;
-    }, dependsOn: []);
+    di.registerSingletonAsync<SchoolDataMainManager>(
+      () async {
+        final schoolDataManager = SchoolDataMainManager();
+        await schoolDataManager.init();
+        _log.info(
+          '[SCHOOL DATA MAIN MANAGER] SchoolDataMainManager initialized',
+        );
+        return schoolDataManager;
+      },
+      dependsOn: [],
+      dispose: (instance) {
+        _log.info('[SCHOOL DATA MAIN MANAGER] SchoolDataMainManager disposed');
+        instance.dispose();
+        return;
+      },
+    );
 
-    di.registerSingletonAsync<WorkbookManager>(() async {
-      final workbookManager = WorkbookManager();
-      await workbookManager.init();
-      _log.info('[WORKBOOK MANAGER] WorkbookManager initialized');
-      return workbookManager;
-    }, dependsOn: [HubSessionManager, PupilManager]);
+    di.registerSingletonAsync<WorkbookManager>(
+      () async {
+        final workbookManager = WorkbookManager();
+        await workbookManager.init();
+        _log.info('[WORKBOOK MANAGER] WorkbookManager initialized');
+        return workbookManager;
+      },
+      dependsOn: [HubSessionManager, PupilProxyManager],
+      dispose: (instance) {
+        _log.info('[WORKBOOK MANAGER] WorkbookManager disposed');
+        instance.dispose();
+        return;
+      },
+    );
 
-    di.registerSingletonAsync<CompetenceManager>(() async {
-      final competenceManager = CompetenceManager();
+    di.registerSingletonAsync<CompetenceManager>(
+      () async {
+        final competenceManager = CompetenceManager();
 
-      await competenceManager.init();
+        await competenceManager.init();
 
-      _log.info('[COMPETENCE MANAGER] CompetenceManager initialized');
+        _log.info('[COMPETENCE MANAGER] CompetenceManager initialized');
 
-      return competenceManager;
-    });
+        return competenceManager;
+      },
+      dispose: (instance) {
+        _log.info('[COMPETENCE MANAGER] CompetenceManager disposed');
+        instance.dispose();
+        return;
+      },
+    );
 
-    di.registerSingletonWithDependencies<CompetenceFilterManager>(() {
-      return CompetenceFilterManager();
-    }, dependsOn: [CompetenceManager]);
+    di.registerSingletonWithDependencies<CompetenceFilterManager>(
+      () {
+        return CompetenceFilterManager();
+      },
+      dependsOn: [CompetenceManager],
+      dispose: (instance) {
+        _log.info(
+          '[COMPETENCE FILTER MANAGER] CompetenceFilterManager disposed',
+        );
+        instance.dispose();
+        return;
+      },
+    );
 
-    di.registerSingletonAsync<AuthorizationManager>(() async {
-      final authorizationManager = AuthorizationManager();
-      await authorizationManager.init();
-      _log.info('[AUTHORIZATION MANAGER] AuthorizationManager initialized');
-      return authorizationManager;
-    }, dependsOn: [HubSessionManager]);
+    di.registerSingletonAsync<AuthorizationManager>(
+      () async {
+        final authorizationManager = AuthorizationManager();
+        await authorizationManager.init();
+        _log.info('[AUTHORIZATION MANAGER] AuthorizationManager initialized');
+        return authorizationManager;
+      },
+      dependsOn: [HubSessionManager],
+      dispose: (instance) {
+        _log.info('[AUTHORIZATION MANAGER] AuthorizationManager disposed');
+        instance.dispose();
+        return;
+      },
+    );
+    di.registerSingletonWithDependencies<AuthorizationFilterManager>(
+      () => AuthorizationFilterManager(),
+      dependsOn: [AuthorizationManager],
+      dispose: (instance) {
+        _log.info(
+          '[AUTHORIZATION FILTER MANAGER] AuthorizationFilterManager disposed',
+        );
+        instance.dispose();
+        return;
+      },
+    );
 
     di.registerSingletonWithDependencies<PupilAuthorizationFilterManager>(
       () => PupilAuthorizationFilterManager(),
       dependsOn: [AuthorizationManager],
-    );
-
-    di.registerSingletonWithDependencies<AuthorizationFilterManager>(
-      () {
-        final authorizationFilterManager = AuthorizationFilterManager();
-        return authorizationFilterManager.init();
+      dispose: (instance) {
+        _log.info(
+          '[PUPIL AUTHORIZATION FILTER MANAGER] PupilAuthorizationFilterManager disposed',
+        );
+        instance.dispose();
+        return;
       },
-      dispose: (instance) => instance.dispose(),
-      dependsOn: [AuthorizationManager],
     );
 
     di.registerSingletonWithDependencies<PupilFilterManager>(
       () => PupilFilterManager(),
-      dependsOn: [PupilManager],
+      dispose: (instance) {
+        _log.info('[PUPILS FILTER] PupilFilterManager disposed');
+        instance.dispose();
+        return;
+      },
+      dependsOn: [PupilProxyManager],
     );
 
     di.registerSingleton<FiltersStateManager>(
       FiltersStateManagerImplementation(),
+      dispose: (instance) {
+        _log.info('[FILTERS STATE MANAGER] FiltersStateManager disposed');
+        instance.dispose();
+        return;
+      },
     );
 
     di.registerSingletonWithDependencies<LearningSupportFilterManager>(
       () => LearningSupportFilterManager(),
-      dependsOn: [PupilManager, PupilFilterManager],
+      dependsOn: [PupilProxyManager, PupilFilterManager],
+      dispose: (instance) {
+        _log.info(
+          '[LEARNING SUPPORT FILTER MANAGER] LearningSupportFilterManager disposed',
+        );
+        instance.dispose();
+        return;
+      },
     );
 
     di.registerSingletonWithDependencies<SchooldayEventManager>(
       () => SchooldayEventManager(),
-      dependsOn: [SchoolCalendarManager, PupilManager],
+      dependsOn: [SchoolCalendarManager, PupilProxyManager],
+      dispose: (instance) {
+        _log.info('[SCHOOLDAY EVENT MANAGER] SchooldayEventManager disposed');
+        instance.dispose();
+        return;
+      },
     );
 
-    di.registerSingletonWithDependencies<SchooldayEventFilterManager>(() {
-      final schooldayEventFilterManager = SchooldayEventFilterManager();
+    di.registerSingletonWithDependencies<SchooldayEventFilterManager>(
+      () {
+        final schooldayEventFilterManager = SchooldayEventFilterManager();
 
-      _log.info(
-        '[SCHOOLDAY EVENT FILTER MANAGER] SchooldayEventFilterManager initialized',
-      );
-      return schooldayEventFilterManager;
-    }, dependsOn: [PupilManager, PupilFilterManager, SchooldayEventManager]);
+        _log.info(
+          '[SCHOOLDAY EVENT FILTER MANAGER] SchooldayEventFilterManager initialized',
+        );
+        return schooldayEventFilterManager;
+      },
+      dispose: (instance) {
+        _log.info(
+          '[SCHOOLDAY EVENT FILTER MANAGER] SchooldayEventFilterManager disposed',
+        );
+        instance.dispose();
+        return;
+      },
+      dependsOn: [PupilProxyManager, PupilFilterManager, SchooldayEventManager],
+    );
 
     di.registerSingletonWithDependencies<AttendanceManager>(
       () => AttendanceManager(),
-      dependsOn: [PupilManager, SchoolCalendarManager],
+      dependsOn: [PupilProxyManager, SchoolCalendarManager],
+      dispose: (instance) {
+        _log.info('[ATTENDANCE MANAGER] AttendanceManager disposed');
+        instance.dispose();
+        return;
+      },
     );
 
     di.registerSingletonWithDependencies<AttendancePupilFilterManager>(
@@ -197,11 +335,15 @@ class InitOnUserAuth {
     );
 
     di.registerSingletonWithDependencies<PupilsFilter>(
-      () => PupilsFilterImplementation(di<PupilManager>()),
-      dispose: (instance) => instance.dispose(),
+      () => PupilsFilterImplementation(di<PupilProxyManager>()),
+      dispose: (instance) {
+        instance.dispose();
+        _log.info('[PUPILS FILTER] PupilsFilterImplementation disposed');
+        return;
+      },
       dependsOn: [
-        PupilManager,
-        PupilIdentityManager,
+        PupilProxyManager,
+
         PupilFilterManager,
         LearningSupportFilterManager,
         SchooldayEventFilterManager,
@@ -209,28 +351,54 @@ class InitOnUserAuth {
       ],
     );
 
-    di.registerSingletonAsync<SchoolListManager>(() async {
-      final schoolListManager = SchoolListManager();
-      await schoolListManager.init();
-      _log.info('[SCHOOL LIST MANAGER] SchoolListManager initialized');
-      return schoolListManager;
-    }, dependsOn: [HubSessionManager, PupilManager]);
-
-    di.registerSingletonWithDependencies<SchoolListFilterManager>(() {
-      final schoolListFilterManager = SchoolListFilterManager();
-      schoolListFilterManager.init();
-      _log.info(
-        '[SCHOOL LIST FILTER MANAGER] SchoolListFilterManager initialized',
-      );
-      return schoolListFilterManager;
-    }, dependsOn: [PupilsFilter, SchoolListManager]);
-
-    di.registerSingletonAsync<UserManager>(() async {
-      final userManager = UserManager();
-      await userManager.init();
-      _log.info('[USER MANAGER] UserManager initialized');
-      return userManager;
-    }, dependsOn: [HubSessionManager]);
+    di.registerSingletonAsync<SchoolListManager>(
+      () async {
+        final schoolListManager = SchoolListManager();
+        await schoolListManager.init();
+        _log.info('[SCHOOL LIST MANAGER] SchoolListManager initialized');
+        return schoolListManager;
+      },
+      dispose: (instance) {
+        _log.info('[SCHOOL LIST MANAGER] SchoolListManager disposed');
+        instance.dispose();
+        return;
+      },
+      dependsOn: [HubSessionManager, PupilProxyManager],
+    );
+
+    di.registerSingletonWithDependencies<SchoolListFilterManager>(
+      () {
+        final schoolListFilterManager = SchoolListFilterManager();
+        schoolListFilterManager.init();
+        _log.info(
+          '[SCHOOL LIST FILTER MANAGER] SchoolListFilterManager initialized',
+        );
+        return schoolListFilterManager;
+      },
+      dispose: (instance) {
+        _log.info(
+          '[SCHOOL LIST FILTER MANAGER] SchoolListFilterManager disposed',
+        );
+        instance.dispose();
+        return;
+      },
+      dependsOn: [PupilsFilter, SchoolListManager],
+    );
+
+    di.registerSingletonAsync<UserManager>(
+      () async {
+        final userManager = UserManager();
+        await userManager.init();
+        _log.info('[USER MANAGER] UserManager initialized');
+        return userManager;
+      },
+      dispose: (instance) {
+        _log.info('[USER MANAGER] UserManager disposed');
+        instance.dispose();
+        return;
+      },
+      dependsOn: [HubSessionManager],
+    );
 
     di.registerSingletonAsync<TimetableApiService>(() async {
       final timetableApiService = TimetableApiService();
@@ -238,12 +406,20 @@ class InitOnUserAuth {
       return timetableApiService;
     });
 
-    di.registerSingletonAsync<TimetableManager>(() async {
-      final timetableManager = TimetableManager();
-      await timetableManager.init();
-      _log.info('[TIMETABLE MANAGER] TimetableManager initialized');
-      return timetableManager;
-    }, dependsOn: [HubSessionManager, TimetableApiService]);
+    di.registerSingletonAsync<TimetableManager>(
+      () async {
+        final timetableManager = TimetableManager();
+        await timetableManager.init();
+        _log.info('[TIMETABLE MANAGER] TimetableManager initialized');
+        return timetableManager;
+      },
+      dispose: (instance) {
+        _log.info('[TIMETABLE MANAGER] TimetableManager disposed');
+        instance.dispose();
+        return;
+      },
+      dependsOn: [HubSessionManager, TimetableApiService],
+    );
 
     _log.info('Managers depending on authentication are being initialized...');
   }
diff --git a/school_data_hub_flutter/lib/core/models/datetime_extensions.dart b/school_data_hub_flutter/lib/core/models/datetime_extensions.dart
new file mode 100644
index 00000000..413253ee
--- /dev/null
+++ b/school_data_hub_flutter/lib/core/models/datetime_extensions.dart
@@ -0,0 +1,96 @@
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+
+extension DateOnlyParsing on String {
+  /// WARNING:We are hacking the utc time to be 2 hours ahead of the local time.
+  /// because otherwise the date will be thrown one day back in our local timezone.
+  DateTime toDateOnlyUtc() {
+    final parsed = DateTime.parse(this).add(const Duration(hours: 2));
+    return DateTime.utc(parsed.year, parsed.month, parsed.day);
+  }
+
+  /// Try to parse a date-only string to UTC midnight; returns null on failure.
+  DateTime? tryToDateOnlyUtc() {
+    final parsed = DateTime.tryParse(this)?.add(const Duration(hours: 2));
+    if (parsed == null) return null;
+    return DateTime.utc(parsed.year, parsed.month, parsed.day);
+  }
+}
+
+extension DateHubExtension on DateTime {
+  /// Ensure UTC without double converting.
+  DateTime toUtcSafe() => isUtc ? this : toUtc();
+
+  /// Ensure local without double converting.
+  DateTime toLocalSafe() => isUtc ? toLocal() : this;
+
+  bool isSameDate(DateTime other) =>
+      year == other.year && month == other.month && day == other.day;
+
+  bool isBeforeDate(DateTime other) =>
+      year == other.year && month == other.month && day < other.day ||
+      year == other.year && month < other.month ||
+      year < other.year;
+
+  bool isAfterDate(DateTime other) =>
+      year == other.year && month == other.month && day > other.day ||
+      year == other.year && month > other.month ||
+      year > other.year;
+
+  /// UI: localized date (dd.MM.yyyy) using local time.
+  String formatDateForUser() {
+    final date = toLocalSafe();
+    final dateFormat = DateFormat('dd.MM.yyyy');
+    return dateFormat.format(date);
+  }
+
+  /// Serialization: date portion, defaults to UTC normalization.
+  String formatDateForJson({bool normalizeUtc = true}) {
+    final date = normalizeUtc ? toUtcSafe() : this;
+    final dateFormat = DateFormat('yyyy-MM-dd');
+    return dateFormat.format(date);
+  }
+
+  /// UI: date + time (dd.MM.yyyy HH:mm) in local time.
+  String formatDateAndTimeForUser() {
+    final date = toLocalSafe();
+    final dateFormat = DateFormat('dd.MM.yyyy HH:mm');
+    final formattedDate = dateFormat.format(date);
+    return '${formattedDate} Uhr';
+  }
+
+  /// UI: time only (HH:mm) in local time.
+  String formatTimeForUser() {
+    final date = toLocalSafe();
+    final timeFormat = DateFormat('HH:mm');
+    return timeFormat.format(date);
+  }
+
+  /// UI: weekday + date in local time (German locale by default).
+  String formatWithWeekday({String locale = 'de_DE'}) {
+    final date = toLocalSafe();
+    final dateFormat = DateFormat('EEEE, dd.MM.yyyy', locale);
+    return dateFormat.format(date);
+  }
+
+  /// Server: normalize to UTC for transport/storage.
+  DateTime formatToUtcForServer() => toUtcSafe();
+
+  /// Start of day in local time.
+  DateTime startOfDayLocal() {
+    final local = toLocalSafe();
+    return DateTime(local.year, local.month, local.day);
+  }
+
+  /// Start of day in UTC.
+  DateTime startOfDayUtc() {
+    final utc = toUtcSafe();
+    return DateTime.utc(utc.year, utc.month, utc.day);
+  }
+
+  String asWeekdayName(BuildContext context) {
+    final locale = Localizations.localeOf(context).toString();
+    final dateFormat = DateFormat('EEEE', locale);
+    return dateFormat.format(toLocalSafe());
+  }
+}
diff --git a/school_data_hub_flutter/lib/core/session/hub_session_helper.dart b/school_data_hub_flutter/lib/core/session/hub_session_helper.dart
index c6e49e7d..d8398150 100644
--- a/school_data_hub_flutter/lib/core/session/hub_session_helper.dart
+++ b/school_data_hub_flutter/lib/core/session/hub_session_helper.dart
@@ -3,7 +3,7 @@ import 'package:logging/logging.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
 import 'package:school_data_hub_flutter/core/env/env_manager.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_helper.dart';
 import 'package:watch_it/watch_it.dart';
 
 final _log = Logger('SessionHelper');
@@ -28,12 +28,14 @@ class SessionHelper {
   static Future<void> logoutAndDeleteAllInstanceData() async {
     // TODO: Check if we really considered everything here
     _log.info('Deleting all instance data...');
-    await di<PupilIdentityManager>().deleteAllPupilIdentities();
-
-    await di<EnvManager>().deleteEnv();
+    await PupilIdentityHelper.deletePupilIdentitiesForEnv(
+      di<EnvManager>().storageKeyForPupilIdentities,
+    );
 
     await di<HubSessionManager>().signOutDevice();
 
+    await di<EnvManager>().deleteEnv();
+
     final cacheManager = di<DefaultCacheManager>();
 
     await cacheManager.emptyCache();
diff --git a/school_data_hub_flutter/lib/core/session/hub_session_manager.dart b/school_data_hub_flutter/lib/core/session/hub_session_manager.dart
index 7d809c3e..938358f0 100644
--- a/school_data_hub_flutter/lib/core/session/hub_session_manager.dart
+++ b/school_data_hub_flutter/lib/core/session/hub_session_manager.dart
@@ -232,8 +232,9 @@ class HubSessionManager with ChangeNotifier {
   /// Signs the user out from the current device.
   /// Returns true if successful.
   Future<bool> signOutDevice() async {
-    di.popScope();
     final signOut = await _signOut(allDevices: false);
+    await di.dropScope(InitScope.onAuthScope.name);
+
     return signOut;
   }
 
diff --git a/school_data_hub_flutter/lib/core/session/serverpod_connectivity_monitor.dart b/school_data_hub_flutter/lib/core/session/serverpod_connectivity_monitor.dart
index 943c872a..70931201 100644
--- a/school_data_hub_flutter/lib/core/session/serverpod_connectivity_monitor.dart
+++ b/school_data_hub_flutter/lib/core/session/serverpod_connectivity_monitor.dart
@@ -1,24 +1,22 @@
 import 'dart:async';
 
 import 'package:connectivity_plus/connectivity_plus.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
+import 'package:signals/signals_flutter.dart';
 import 'package:watch_it/watch_it.dart';
 
-final _notificationService = di<NotificationService>();
-
 /// Copied from [FlutterConnectivityMonitor] in the serverpod package
 /// and added a ValueNotifier to the class to be able to observe it with watch_it
 /// Concrete implementation of [ConnectivityMonitor] for use with Flutter.
 class ServerpodConnectivityMonitor extends ConnectivityMonitor {
   late StreamSubscription<List<ConnectivityResult>> _connectivitySubscription;
   bool _receivedFirstEvent = false;
-
+  final _notificationService = di<NotificationService>();
   // value notifier to observe with watch_it
-  final ValueNotifier<bool> _isConnected = ValueNotifier(false);
-  ValueListenable<bool> get isConnected => _isConnected;
+  final Signal<bool> _isConnected = signal(false);
+  Signal<bool> get isConnected => _isConnected;
 
   /// Creates a new connectivity monitor.
   ServerpodConnectivityMonitor() {
@@ -27,18 +25,23 @@ class ServerpodConnectivityMonitor extends ConnectivityMonitor {
     var connectionTime = DateTime.now().toUtc();
 
     // Start listening to connection status changes.
-    _connectivitySubscription =
-        Connectivity().onConnectivityChanged.listen((event) {
+    _connectivitySubscription = Connectivity().onConnectivityChanged.listen((
+      event,
+    ) {
       final bool hasConnectivity =
           !(event.length == 1 && event.first == ConnectivityResult.none);
       if (hasConnectivity != _isConnected.value) {
         _isConnected.value = hasConnectivity;
         if (hasConnectivity) {
           _notificationService.showSnackBar(
-              NotificationType.info, 'Mit dem Internet verbunden');
+            NotificationType.info,
+            'Mit dem Internet verbunden',
+          );
         } else {
           _notificationService.showSnackBar(
-              NotificationType.error, 'Keine Internetverbindung');
+            NotificationType.error,
+            'Keine Internetverbindung',
+          );
         }
       }
 
@@ -46,8 +49,9 @@ class ServerpodConnectivityMonitor extends ConnectivityMonitor {
         // Skip the first event if it happens immediately on launch as it may
         // not be correct on some platforms.
         _receivedFirstEvent = true;
-        var durationSinceStart =
-            DateTime.now().toUtc().difference(connectionTime);
+        var durationSinceStart = DateTime.now().toUtc().difference(
+          connectionTime,
+        );
         if (!hasConnectivity && durationSinceStart < warmupDuration) {
           return;
         }
diff --git a/school_data_hub_flutter/lib/core/updater/shorebird_update_manager.dart b/school_data_hub_flutter/lib/core/updater/shorebird_update_manager.dart
index c2e7ddb3..4dc6dd99 100644
--- a/school_data_hub_flutter/lib/core/updater/shorebird_update_manager.dart
+++ b/school_data_hub_flutter/lib/core/updater/shorebird_update_manager.dart
@@ -2,7 +2,9 @@ import 'dart:async';
 
 import 'package:flutter/foundation.dart';
 import 'package:logging/logging.dart';
+import 'package:school_data_hub_flutter/common/services/notification_service.dart';
 import 'package:shorebird_code_push/shorebird_code_push.dart';
+import 'package:watch_it/watch_it.dart';
 
 /// Update status with additional context
 enum UpdateManagerStatus {
@@ -21,7 +23,7 @@ class ShorebirdUpdateManager extends ChangeNotifier {
   static final _log = Logger('ShorebirdUpdateManager');
 
   final ShorebirdUpdater _updater = ShorebirdUpdater();
-
+  ShorebirdUpdater get shorebirdUpdater => _updater;
   // Status tracking
   UpdateManagerStatus _status = UpdateManagerStatus.idle;
   UpdateTrack _currentTrack = UpdateTrack.stable;
@@ -76,6 +78,20 @@ class ShorebirdUpdateManager extends ChangeNotifier {
         _startAutoCheck();
       }
 
+      final updateAvailable = await checkForUpdates();
+      if (updateAvailable) {
+        di<NotificationService>().showSnackBar(
+          NotificationType.info,
+          'Ein Update wird heruntergeladen...',
+        );
+        _setStatus(UpdateManagerStatus.updateAvailable);
+        await _updater.update(track: _currentTrack);
+
+        di<NotificationService>().showInformationDialog(
+          'Ein Update ist verfügbar. Bitte installieren Sie es, um die neueste Version der App zu verwenden.',
+        );
+      }
+
       _log.info('ShorebirdUpdateManager initialized successfully');
     } catch (error, stackTrace) {
       _log.severe(
@@ -95,7 +111,7 @@ class ShorebirdUpdateManager extends ChangeNotifier {
   }
 
   /// Check for updates manually
-  Future<bool> checkForUpdate({UpdateTrack? track}) async {
+  Future<bool> checkForUpdates({UpdateTrack? track}) async {
     if (!_updater.isAvailable) {
       _log.warning('Cannot check for updates: Shorebird not available');
       return false;
@@ -121,10 +137,15 @@ class ShorebirdUpdateManager extends ChangeNotifier {
           _log.info('Update available');
           _updateAvailable = true;
           _setStatus(UpdateManagerStatus.updateAvailable);
+          await _updater.update(track: _currentTrack);
+
           return true;
 
         case UpdateStatus.restartRequired:
           _log.info('Restart required to apply update');
+          di<NotificationService>().showInformationDialog(
+            'Ein Update wurde installiert. Bitte starten Sie die App neu, um die neueste Version der App zu verwenden.',
+          );
           _setStatus(UpdateManagerStatus.restartRequired);
           return false;
 
@@ -281,7 +302,7 @@ class ShorebirdUpdateManager extends ChangeNotifier {
       if (_status == UpdateManagerStatus.idle ||
           _status == UpdateManagerStatus.upToDate) {
         _log.fine('Auto-checking for updates');
-        checkForUpdate();
+        checkForUpdates();
       }
     });
 
diff --git a/school_data_hub_flutter/lib/core/updater/update_manager_example.dart b/school_data_hub_flutter/lib/core/updater/update_manager_example.dart
index 8d950238..4c77406e 100644
--- a/school_data_hub_flutter/lib/core/updater/update_manager_example.dart
+++ b/school_data_hub_flutter/lib/core/updater/update_manager_example.dart
@@ -18,19 +18,17 @@ class _UpdateManagerExampleState extends State<UpdateManagerExample> {
   void initState() {
     super.initState();
     _updateManager = di<ShorebirdUpdateManager>();
-    
+
     // Optional: Check for updates when the page loads
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      _updateManager.checkForUpdate();
+      _updateManager.checkForUpdates();
     });
   }
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      appBar: AppBar(
-        title: const Text('Update Manager'),
-      ),
+      appBar: AppBar(title: const Text('Update Manager')),
       body: const Padding(
         padding: EdgeInsets.all(16.0),
         child: Column(
@@ -38,27 +36,21 @@ class _UpdateManagerExampleState extends State<UpdateManagerExample> {
           children: [
             Text(
               'App Update Status',
-              style: TextStyle(
-                fontSize: 24,
-                fontWeight: FontWeight.bold,
-              ),
+              style: TextStyle(fontSize: 24, fontWeight: FontWeight.bold),
             ),
             SizedBox(height: 16),
-            
+
             // The update status widget handles all the UI
             UpdateStatusWidget(),
-            
+
             SizedBox(height: 24),
-            
+
             Text(
               'Auto-update Settings',
-              style: TextStyle(
-                fontSize: 18,
-                fontWeight: FontWeight.bold,
-              ),
+              style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
             ),
             SizedBox(height: 8),
-            
+
             _AutoUpdateSettings(),
           ],
         ),
@@ -88,13 +80,15 @@ class _AutoUpdateSettings extends WatchingWidget {
           children: [
             SwitchListTile(
               title: const Text('Auto-check for updates'),
-              subtitle: const Text('Automatically check for updates in the background'),
+              subtitle: const Text(
+                'Automatically check for updates in the background',
+              ),
               value: autoCheckEnabled,
               onChanged: (value) {
                 updateManager.setAutoCheckEnabled(value);
               },
             ),
-            
+
             if (autoCheckEnabled) ...[
               const Divider(),
               ListTile(
diff --git a/school_data_hub_flutter/lib/core/updater/update_status_widget.dart b/school_data_hub_flutter/lib/core/updater/update_status_widget.dart
index 36bb2083..e45558da 100644
--- a/school_data_hub_flutter/lib/core/updater/update_status_widget.dart
+++ b/school_data_hub_flutter/lib/core/updater/update_status_widget.dart
@@ -120,10 +120,9 @@ class UpdateStatusWidget extends WatchingWidget {
             Row(
               children: [
                 ElevatedButton(
-                  onPressed:
-                      status == UpdateManagerStatus.checking
-                          ? null
-                          : () => updateManager.checkForUpdate(),
+                  onPressed: status == UpdateManagerStatus.checking
+                      ? null
+                      : () => updateManager.checkForUpdates(),
                   child: const Text('Check for Updates'),
                 ),
 
@@ -194,28 +193,27 @@ class UpdateStatusWidget extends WatchingWidget {
   void _showRestartDialog(BuildContext context) {
     showDialog(
       context: context,
-      builder:
-          (context) => AlertDialog(
-            title: const Text('Restart Required'),
-            content: const Text(
-              'An update has been downloaded and is ready to be applied. '
-              'Please restart the app to apply the update.',
-            ),
-            actions: [
-              TextButton(
-                onPressed: () => Navigator.of(context).pop(),
-                child: const Text('Later'),
-              ),
-              ElevatedButton(
-                onPressed: () {
-                  Navigator.of(context).pop();
-                  // You could add app restart logic here if needed
-                  // For now, user needs to manually restart
-                },
-                child: const Text('OK'),
-              ),
-            ],
+      builder: (context) => AlertDialog(
+        title: const Text('Restart Required'),
+        content: const Text(
+          'An update has been downloaded and is ready to be applied. '
+          'Please restart the app to apply the update.',
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(),
+            child: const Text('Later'),
+          ),
+          ElevatedButton(
+            onPressed: () {
+              Navigator.of(context).pop();
+              // You could add app restart logic here if needed
+              // For now, user needs to manually restart
+            },
+            child: const Text('OK'),
           ),
+        ],
+      ),
     );
   }
 }
diff --git a/school_data_hub_flutter/lib/features/_attendance/domain/attendance_helper_functions.dart b/school_data_hub_flutter/lib/features/_attendance/domain/attendance_helper_functions.dart
index a90581e1..da8a49a5 100644
--- a/school_data_hub_flutter/lib/features/_attendance/domain/attendance_helper_functions.dart
+++ b/school_data_hub_flutter/lib/features/_attendance/domain/attendance_helper_functions.dart
@@ -1,12 +1,12 @@
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/schoolday_date_picker.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/features/_attendance/domain/attendance_manager.dart';
 import 'package:school_data_hub_flutter/features/_attendance/domain/models/attendance_values.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/school_calendar/domain/school_calendar_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
@@ -15,7 +15,7 @@ class AttendanceHelper {
   static SchoolCalendarManager get _schoolCalendarManager =>
       di<SchoolCalendarManager>();
   static AttendanceManager get _attendanceManager => di<AttendanceManager>();
-  static PupilManager get _pupilManager => di<PupilManager>();
+  static PupilProxyManager get _pupilManager => di<PupilProxyManager>();
   // static int? getMissedSchooldayIndex(PupilProxy pupil, DateTime date) {
   //   final int? foundMissedSchooldayIndex = pupil.missedSchooldays?.indexWhere(
   //       (datematch) => (datematch.schoolday!.schoolday.isSameDate(date)));
diff --git a/school_data_hub_flutter/lib/features/_attendance/domain/attendance_manager.dart b/school_data_hub_flutter/lib/features/_attendance/domain/attendance_manager.dart
index 10e9a922..1da0da98 100644
--- a/school_data_hub_flutter/lib/features/_attendance/domain/attendance_manager.dart
+++ b/school_data_hub_flutter/lib/features/_attendance/domain/attendance_manager.dart
@@ -4,19 +4,18 @@ import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 import 'package:logging/logging.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 import 'package:school_data_hub_flutter/features/_attendance/data/attendance_api_service.dart';
 import 'package:school_data_hub_flutter/features/_attendance/domain/models/pupil_missed_classes_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/school_calendar/domain/school_calendar_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
 class AttendanceManager with ChangeNotifier {
   // Lazy getters to avoid accessing dependencies during construction
-  PupilManager get _pupilManager => di<PupilManager>();
+  PupilProxyManager get _pupilManager => di<PupilProxyManager>();
   SchoolCalendarManager get _schoolCalendarManager =>
       di<SchoolCalendarManager>();
   NotificationService get _notificationService => di<NotificationService>();
@@ -45,6 +44,17 @@ class AttendanceManager with ChangeNotifier {
     init();
   }
 
+  void dispose() {
+    _closeStreamSubscription();
+
+    _pupilMissedSchooldaysMap.clear();
+
+    _missedSchooldays.dispose();
+
+    super.dispose();
+    return;
+  }
+
   Future<void> init() async {
     // we must have a proxy object for every pupil because we need to
     // watch them in the UI unconditionally (even if there are no entries)
@@ -60,11 +70,10 @@ class AttendanceManager with ChangeNotifier {
   //- Getters
 
   MissedSchoolday? getPupilMissedSchooldayOnDate(int pupilId, DateTime date) {
+    // Using toUtc would make the comparison fail because the date is in the local timezone
     return _pupilMissedSchooldaysMap[pupilId]!.missedSchooldays
         .firstWhereOrNull(
-          (element) => element.schoolday!.schoolday.isSameDate(
-            date.formatToUtcForServer(),
-          ),
+          (element) => element.schoolday!.schoolday.isSameDate(date),
         );
   }
 
@@ -164,15 +173,21 @@ class AttendanceManager with ChangeNotifier {
           (event) {
             switch (event.operation) {
               case 'add':
-                _log.fine('add missedSchoolday ${event.missedSchoolday}');
+                _log.fine(
+                  '[STREAM]add missedSchoolday ${event.missedSchoolday}',
+                );
                 updateMissedSchooldayInCollections(event.missedSchoolday);
                 break;
               case 'update':
-                _log.fine('update missedSchoolday ${event.missedSchoolday}');
+                _log.fine(
+                  '[STREAM] update missedSchoolday ${event.missedSchoolday}',
+                );
                 updateMissedSchooldayInCollections(event.missedSchoolday);
                 break;
               case 'delete':
-                _log.fine('delete missedSchoolday ${event.missedSchoolday}');
+                _log.fine(
+                  '[STREAM] delete missedSchoolday ${event.missedSchoolday}',
+                );
                 removeMissedSchooldayFromCollections(
                   event.missedSchoolday.pupilId,
                   event.missedSchoolday.schoolday!.schoolday,
@@ -196,7 +211,7 @@ class AttendanceManager with ChangeNotifier {
                 'Der Server konnte nicht gefunden werden. Bitte überprüfen Sie Ihre Internetverbindung und versuchen Sie es erneut.',
               );
             } else {
-              _notificationService.showSnackBar(
+              _log.severe(
                 NotificationType.error,
                 'Ein unbekannter Fehler ist aufgetreten: $errorString',
               );
@@ -223,11 +238,6 @@ class AttendanceManager with ChangeNotifier {
     _missedSchooldaySubscription = null;
   }
 
-  @override
-  void dispose() {
-    _closeStreamSubscription();
-    super.dispose();
-  }
   //- CRUD operantions
 
   void fetchAllPupilMissedSchooldayes() async {
@@ -480,34 +490,34 @@ class AttendanceManager with ChangeNotifier {
     return;
   }
 
-  Future<void> postManyMissedSchooldayes(
-    id,
-    startdate,
-    enddate,
-    missedType,
-  ) async {
+  Future<void> postManyMissedSchooldays({
+    required int id,
+    required DateTime startdate,
+    required DateTime enddate,
+    required MissedType missedType,
+    String? comment,
+  }) async {
     List<MissedSchoolday> missedSchooldays = [];
 
-    final PupilProxy pupil = _pupilManager.allPupils.firstWhere(
-      (pupil) => pupil.internalId == id,
-    );
-
     final List<DateTime> validSchooldays =
         _schoolCalendarManager.availableDates.value;
 
     for (DateTime validSchoolday in validSchooldays) {
       // if the date is the same as the startdate or enddate or in between
-      if (validSchoolday.isSameDate(startdate.toUtc()) ||
-          validSchoolday.isSameDate(enddate.toUtc()) ||
-          (validSchoolday.isAfterDate(startdate.toUtc()) &&
-              validSchoolday.isBeforeDate(enddate.toUtc()))) {
+
+      // TODO: For now, we are not transforming the dates to UTC,
+      // because this will cause it becoming a different day
+      if (validSchoolday.isSameDate(startdate) ||
+          validSchoolday.isSameDate(enddate) ||
+          (validSchoolday.isAfterDate(startdate) &&
+              validSchoolday.isBeforeDate(enddate))) {
         final schoolday = _schoolCalendarManager.getSchooldayByDate(
           validSchoolday,
         );
         missedSchooldays.add(
           MissedSchoolday(
             createdBy: _sessionManager.signedInUser!.userName!,
-            pupilId: pupil.pupilId,
+            pupilId: id,
             schoolday: schoolday,
             missedType: missedType,
             unexcused: false,
@@ -517,7 +527,7 @@ class AttendanceManager with ChangeNotifier {
             minutesLate: null,
             writtenExcuse: false,
             modifiedBy: null,
-            comment: null,
+            comment: comment,
             schooldayId: schoolday!.id!,
           ),
         );
diff --git a/school_data_hub_flutter/lib/features/_attendance/domain/filters/attendance_pupil_filter.dart b/school_data_hub_flutter/lib/features/_attendance/domain/filters/attendance_pupil_filter.dart
index 01aa7f4d..9f4721f3 100644
--- a/school_data_hub_flutter/lib/features/_attendance/domain/filters/attendance_pupil_filter.dart
+++ b/school_data_hub_flutter/lib/features/_attendance/domain/filters/attendance_pupil_filter.dart
@@ -1,8 +1,8 @@
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/domain/filters/filters_state_manager.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/features/_attendance/domain/attendance_manager.dart';
 import 'package:school_data_hub_flutter/features/_attendance/domain/models/enums.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
@@ -37,6 +37,9 @@ class AttendancePupilFilterManager {
 
   void dispose() {
     _attendanceManager.missedSchooldays.removeListener(refreshPupilsFilter);
+    _attendancePupilFilterState.dispose();
+
+    return;
   }
 
   void setAttendancePupilFilter({
diff --git a/school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/attendance_list_page.dart b/school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/attendance_list_page.dart
index a12a66ad..36f83a27 100644
--- a/school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/attendance_list_page.dart
+++ b/school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/attendance_list_page.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:logging/logging.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_sliver_list.dart';
diff --git a/school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/widgets/atendance_list_card.dart b/school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/widgets/atendance_list_card.dart
index a2750296..e5deaadf 100644
--- a/school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/widgets/atendance_list_card.dart
+++ b/school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/widgets/atendance_list_card.dart
@@ -4,10 +4,10 @@ import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/long_textfield_dialog.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/features/_attendance/domain/attendance_helper_functions.dart';
 import 'package:school_data_hub_flutter/features/_attendance/domain/attendance_manager.dart';
 import 'package:school_data_hub_flutter/features/_attendance/domain/models/attendance_values.dart';
@@ -293,7 +293,7 @@ class AttendanceCard extends WatchingWidget {
                                   Container(
                                     width: 25.0,
                                     height: 25.0,
-                                    decoration: const BoxDecoration(
+                                    decoration: BoxDecoration(
                                       color: AppColors.unexcusedCheckColor,
                                       shape: BoxShape.circle,
                                     ),
@@ -331,7 +331,7 @@ class AttendanceCard extends WatchingWidget {
                                   Container(
                                     width: 25.0,
                                     height: 25.0,
-                                    decoration: const BoxDecoration(
+                                    decoration: BoxDecoration(
                                       color: AppColors.homeColor,
                                       shape: BoxShape.circle,
                                     ),
@@ -595,7 +595,7 @@ class AttendanceCard extends WatchingWidget {
                                 Container(
                                   width: 20.0,
                                   height: 20.0,
-                                  decoration: const BoxDecoration(
+                                  decoration: BoxDecoration(
                                     color: AppColors.unexcusedCheckColor,
                                     shape: BoxShape.circle,
                                   ),
@@ -737,7 +737,7 @@ class AttendanceCard extends WatchingWidget {
                                 Container(
                                   width: 20.0,
                                   height: 20.0,
-                                  decoration: const BoxDecoration(
+                                  decoration: BoxDecoration(
                                     color: AppColors.homeColor,
                                     shape: BoxShape.circle,
                                   ),
diff --git a/school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/widgets/attendance_dropdown_menu_items.dart b/school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/widgets/attendance_dropdown_menu_items.dart
index 1bdba7b9..300af95e 100644
--- a/school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/widgets/attendance_dropdown_menu_items.dart
+++ b/school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/widgets/attendance_dropdown_menu_items.dart
@@ -9,7 +9,7 @@ List<DropdownMenuItem<MissedType>> missedTypeMenuItems = [
       child: Container(
         width: 30.0,
         height: 30.0,
-        decoration: const BoxDecoration(
+        decoration: BoxDecoration(
           color: AppColors.presentColor,
           shape: BoxShape.circle,
         ),
@@ -28,7 +28,7 @@ List<DropdownMenuItem<MissedType>> missedTypeMenuItems = [
       child: Container(
         width: 30.0,
         height: 30.0,
-        decoration: const BoxDecoration(
+        decoration: BoxDecoration(
           color: AppColors.lateColor,
           shape: BoxShape.circle,
         ),
@@ -47,7 +47,7 @@ List<DropdownMenuItem<MissedType>> missedTypeMenuItems = [
       child: Container(
         width: 30.0,
         height: 30.0,
-        decoration: const BoxDecoration(
+        decoration: BoxDecoration(
           color: AppColors.missedColor,
           shape: BoxShape.circle,
         ),
@@ -69,7 +69,7 @@ List<DropdownMenuItem<ContactedType>> dropdownContactedMenuItems = [
       child: Container(
         width: 30.0,
         height: 30.0,
-        decoration: const BoxDecoration(
+        decoration: BoxDecoration(
           color: AppColors.contactedQuestionColor,
           shape: BoxShape.circle,
         ),
@@ -88,7 +88,7 @@ List<DropdownMenuItem<ContactedType>> dropdownContactedMenuItems = [
       child: Container(
         width: 30.0,
         height: 30.0,
-        decoration: const BoxDecoration(
+        decoration: BoxDecoration(
           color: AppColors.contactedSuccessColor, // Colors.green[100],
           shape: BoxShape.circle,
         ),
@@ -101,7 +101,7 @@ List<DropdownMenuItem<ContactedType>> dropdownContactedMenuItems = [
       child: Container(
         width: 30.0,
         height: 30.0,
-        decoration: const BoxDecoration(
+        decoration: BoxDecoration(
           color: AppColors.contactedCalledBackColor,
           shape: BoxShape.circle,
         ),
@@ -116,7 +116,7 @@ List<DropdownMenuItem<ContactedType>> dropdownContactedMenuItems = [
       child: Container(
         width: 30.0,
         height: 30.0,
-        decoration: const BoxDecoration(
+        decoration: BoxDecoration(
           color: AppColors.contactedFailedColor,
           shape: BoxShape.circle,
         ),
diff --git a/school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/widgets/attendance_list_search_bar.dart b/school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/widgets/attendance_list_search_bar.dart
index 663a6471..f56e83ac 100644
--- a/school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/widgets/attendance_list_search_bar.dart
+++ b/school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/widgets/attendance_list_search_bar.dart
@@ -43,7 +43,7 @@ class AttendanceListSearchBar extends WatchingWidget {
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
-                  const Icon(
+                  Icon(
                     Icons.people_alt_rounded,
                     color: AppColors.backgroundColor,
                   ),
diff --git a/school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/widgets/dialogues/multiple_entries_dialog.dart b/school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/widgets/dialogues/multiple_entries_dialog.dart
index 10096240..3917446e 100644
--- a/school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/widgets/dialogues/multiple_entries_dialog.dart
+++ b/school_data_hub_flutter/lib/features/_attendance/presentation/attendance_page/widgets/dialogues/multiple_entries_dialog.dart
@@ -1,258 +1,286 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/theme/styles.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/schoolday_date_picker.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/features/_attendance/domain/attendance_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
 import 'package:school_data_hub_flutter/features/school_calendar/domain/school_calendar_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
-final GlobalKey<FormState> _missedDatesformKey = GlobalKey<FormState>();
-
-// based on https://mobikul.com/creating-stateful-dialog-form-in-flutter/
-
 Future<void> createMissedSchooldayList(
   BuildContext context,
   PupilProxy pupil,
 ) async {
-  final _attendanceManager = di<AttendanceManager>();
-  final _schoolCalendarManager = di<SchoolCalendarManager>();
-  final DateTime thisDate = _schoolCalendarManager.thisDate.value;
+  final schoolCalendarManager = di<SchoolCalendarManager>();
+  final DateTime thisDate = schoolCalendarManager.thisDate.value;
   return await showDialog(
     context: context,
     builder: (context) {
-      // final schoolCalendarManager = di<SchooldayManager>();
-      // schoolCalendarManager.setStartDate(thisDate);
-      // schoolCalendarManager.setEndDate(thisDate);
-      MissedType dialogdropdownValue = MissedType.missed;
-      DateTime startDate = thisDate;
-      DateTime endDate = thisDate;
+      return _MultipleEntriesDialogContent(pupil: pupil, initialDate: thisDate);
+    },
+  );
+}
 
-      return StatefulBuilder(
-        builder: (context, setState) {
-          return AlertDialog(
-            content: Form(
-              key: _missedDatesformKey,
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Padding(
-                    padding: const EdgeInsets.all(8.0),
-                    child: DropdownButtonHideUnderline(
-                      child: DropdownButton<MissedType>(
-                        onTap: () {
-                          FocusManager.instance.primaryFocus!.unfocus();
-                        },
-                        value: dialogdropdownValue,
-                        items: [
-                          DropdownMenuItem(
-                            value: MissedType.missed,
-                            child: Container(
-                              width: 40.0,
-                              height: 40.0,
-                              decoration: BoxDecoration(
-                                color: Colors.orange[300],
-                                shape: BoxShape.circle,
-                              ),
-                              child: const Center(
-                                child: Text(
-                                  "F",
-                                  textAlign: TextAlign.center,
-                                  style: TextStyle(
-                                    color: Colors.black,
-                                    fontWeight: FontWeight.bold,
-                                    fontSize: 24,
-                                  ),
-                                ),
-                              ),
-                            ),
-                          ),
-                          DropdownMenuItem(
-                            value: MissedType.home,
-                            child: Container(
-                              width: 40.0,
-                              height: 40.0,
-                              decoration: const BoxDecoration(
-                                color: Colors.lightBlue,
-                                shape: BoxShape.circle,
-                              ),
-                              child: const Center(
-                                child: Text(
-                                  "H",
-                                  textAlign: TextAlign.center,
-                                  style: TextStyle(
-                                    color: Colors.black,
-                                    fontWeight: FontWeight.bold,
-                                    fontSize: 24,
-                                  ),
-                                ),
-                              ),
-                            ),
-                          ),
-                        ],
-                        onChanged: (newvalue) {
-                          setState(() {
-                            dialogdropdownValue = newvalue!;
-                          });
-                        },
-                      ),
-                    ),
-                  ),
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      const Text(
-                        'von',
-                        style: TextStyle(
-                          fontSize: 22,
-                          fontWeight: FontWeight.bold,
+class _MultipleEntriesDialogContent extends StatefulWidget {
+  final PupilProxy pupil;
+  final DateTime initialDate;
+
+  const _MultipleEntriesDialogContent({
+    required this.pupil,
+    required this.initialDate,
+  });
+
+  @override
+  State<_MultipleEntriesDialogContent> createState() =>
+      _MultipleEntriesDialogContentState();
+}
+
+class _MultipleEntriesDialogContentState
+    extends State<_MultipleEntriesDialogContent> {
+  final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
+  late MissedType _dialogdropdownValue;
+  late DateTime _startDate;
+  late DateTime _endDate;
+  late final TextEditingController _commentController;
+  final _attendanceManager = di<AttendanceManager>();
+
+  @override
+  void initState() {
+    super.initState();
+    _dialogdropdownValue = MissedType.missed;
+    _startDate = widget.initialDate;
+    _endDate = widget.initialDate;
+    _commentController = TextEditingController();
+  }
+
+  @override
+  void dispose() {
+    _commentController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      content: Form(
+        key: _formKey,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            Padding(
+              padding: const EdgeInsets.all(8.0),
+              child: DropdownButtonHideUnderline(
+                child: DropdownButton<MissedType>(
+                  onTap: () {
+                    FocusManager.instance.primaryFocus!.unfocus();
+                  },
+                  value: _dialogdropdownValue,
+                  items: [
+                    DropdownMenuItem(
+                      value: MissedType.missed,
+                      child: Container(
+                        width: 40.0,
+                        height: 40.0,
+                        decoration: BoxDecoration(
+                          color: Colors.orange[300],
+                          shape: BoxShape.circle,
                         ),
-                      ),
-                      const Gap(15),
-                      InkWell(
-                        onTap: () async {
-                          final DateTime? date = await selectSchooldayDate(
-                            context,
-                            thisDate,
-                          );
-                          if (date != null) {
-                            setState(() {
-                              startDate = date;
-                            });
-                          }
-                        },
-                        child: Text(
-                          startDate.formatDateForUser(),
-                          style: const TextStyle(
-                            color: AppColors.interactiveColor,
-                            fontWeight: FontWeight.bold,
-                            fontSize: 22,
+                        child: const Center(
+                          child: Text(
+                            "F",
+                            textAlign: TextAlign.center,
+                            style: TextStyle(
+                              color: Colors.black,
+                              fontWeight: FontWeight.bold,
+                              fontSize: 24,
+                            ),
                           ),
                         ),
                       ),
-                      const Gap(5),
-                      IconButton(
-                        onPressed: () async {
-                          final DateTime? date = await selectSchooldayDate(
-                            context,
-                            thisDate,
-                          );
-                          if (date != null) {
-                            setState(() {
-                              startDate = date;
-                            });
-                          }
-                        },
-                        icon: const Icon(
-                          Icons.calendar_today,
-                          color: AppColors.interactiveColor,
-                        ),
-                      ),
-                    ],
-                  ),
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      const Text(
-                        'bis',
-                        style: TextStyle(
-                          fontSize: 22,
-                          fontWeight: FontWeight.bold,
+                    ),
+                    DropdownMenuItem(
+                      value: MissedType.home,
+                      child: Container(
+                        width: 40.0,
+                        height: 40.0,
+                        decoration: const BoxDecoration(
+                          color: Colors.lightBlue,
+                          shape: BoxShape.circle,
                         ),
-                      ),
-                      const Gap(15),
-                      InkWell(
-                        onTap: () async {
-                          final DateTime? date = await selectSchooldayDate(
-                            context,
-                            thisDate,
-                          );
-                          if (date != null) {
-                            setState(() {
-                              endDate = date;
-                            });
-                          }
-                        },
-                        child: Text(
-                          endDate.formatDateForUser(),
-                          style: const TextStyle(
-                            color: AppColors.interactiveColor,
-                            fontWeight: FontWeight.bold,
-                            fontSize: 22,
+                        child: const Center(
+                          child: Text(
+                            "H",
+                            textAlign: TextAlign.center,
+                            style: TextStyle(
+                              color: Colors.black,
+                              fontWeight: FontWeight.bold,
+                              fontSize: 24,
+                            ),
                           ),
                         ),
                       ),
-                      const Gap(5),
-                      IconButton(
-                        onPressed: () async {
-                          final DateTime? date = await selectSchooldayDate(
-                            context,
-                            thisDate,
-                          );
-                          if (date != null) {
-                            setState(() {
-                              endDate = date;
-                            });
-                          }
-                        },
-                        icon: const Icon(
-                          Icons.calendar_today,
-                          color: AppColors.interactiveColor,
-                        ),
-                      ),
-                    ],
-                  ),
-                ],
+                    ),
+                  ],
+                  onChanged: (newvalue) {
+                    setState(() {
+                      _dialogdropdownValue = newvalue!;
+                    });
+                  },
+                ),
               ),
             ),
-            title: const Text(
-              'Mehrere Einträge',
-              style: TextStyle(fontWeight: FontWeight.bold),
-              textAlign: TextAlign.center,
+            Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                const Text(
+                  'von',
+                  style: TextStyle(fontSize: 22, fontWeight: FontWeight.bold),
+                ),
+                const Gap(15),
+                InkWell(
+                  onTap: () async {
+                    final DateTime? date = await selectSchooldayDate(
+                      context,
+                      widget.initialDate,
+                    );
+                    if (date != null) {
+                      setState(() {
+                        _startDate = date;
+                      });
+                    }
+                  },
+                  child: Text(
+                    _startDate.formatDateForUser(),
+                    style: TextStyle(
+                      color: AppColors.interactiveColor,
+                      fontWeight: FontWeight.bold,
+                      fontSize: 22,
+                    ),
+                  ),
+                ),
+                const Gap(5),
+                IconButton(
+                  onPressed: () async {
+                    final DateTime? date = await selectSchooldayDate(
+                      context,
+                      widget.initialDate,
+                    );
+                    if (date != null) {
+                      setState(() {
+                        _startDate = date;
+                      });
+                    }
+                  },
+                  icon: Icon(
+                    Icons.calendar_today,
+                    color: AppColors.interactiveColor,
+                  ),
+                ),
+              ],
             ),
-            actions: <Widget>[
-              Padding(
-                padding: const EdgeInsets.all(5.0),
-                child: ElevatedButton(
-                  style: AppStyles.cancelButtonStyle,
-                  onPressed: () {
-                    if (_missedDatesformKey.currentState!.validate()) {
-                      // Do something like updating SharedPreferences or User Settings etc.
-                      Navigator.of(context).pop();
+            Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                const Text(
+                  'bis',
+                  style: TextStyle(fontSize: 22, fontWeight: FontWeight.bold),
+                ),
+                const Gap(15),
+                InkWell(
+                  onTap: () async {
+                    final DateTime? date = await selectSchooldayDate(
+                      context,
+                      widget.initialDate,
+                    );
+                    if (date != null) {
+                      setState(() {
+                        _endDate = date;
+                      });
                     }
-                  }, // Add onPressed
-                  child: const Text(
-                    "ABBRECHEN",
-                    style: AppStyles.buttonTextStyle,
+                  },
+                  child: Text(
+                    _endDate.formatDateForUser(),
+                    style: TextStyle(
+                      color: AppColors.interactiveColor,
+                      fontWeight: FontWeight.bold,
+                      fontSize: 22,
+                    ),
                   ),
                 ),
-              ),
-              Padding(
-                padding: const EdgeInsets.all(5.0),
-                child: ElevatedButton(
-                  style: AppStyles.successButtonStyle,
-                  onPressed: () {
-                    if (_missedDatesformKey.currentState!.validate()) {
-                      _attendanceManager.postManyMissedSchooldayes(
-                        pupil.internalId,
-                        startDate,
-                        endDate,
-                        dialogdropdownValue,
-                      );
-                      _missedDatesformKey.currentState!.reset();
-                      Navigator.of(context).pop();
+                const Gap(5),
+                IconButton(
+                  onPressed: () async {
+                    final DateTime? date = await selectSchooldayDate(
+                      context,
+                      widget.initialDate,
+                    );
+                    if (date != null) {
+                      setState(() {
+                        _endDate = date;
+                      });
                     }
-                  }, // Add onPressed
-                  child: const Text("OK", style: AppStyles.buttonTextStyle),
+                  },
+                  icon: Icon(
+                    Icons.calendar_today,
+                    color: AppColors.interactiveColor,
+                  ),
                 ),
+              ],
+            ),
+            const Gap(15),
+            TextFormField(
+              controller: _commentController,
+              decoration: const InputDecoration(
+                labelText: 'Kommentar (optional)',
+                border: OutlineInputBorder(),
               ),
-            ],
-          );
-        },
-      );
-    },
-  );
+              maxLines: 3,
+            ),
+          ],
+        ),
+      ),
+      title: const Text(
+        'Mehrere Einträge',
+        style: TextStyle(fontWeight: FontWeight.bold),
+        textAlign: TextAlign.center,
+      ),
+      actions: <Widget>[
+        Padding(
+          padding: const EdgeInsets.all(5.0),
+          child: ElevatedButton(
+            style: AppStyles.cancelButtonStyle,
+            onPressed: () {
+              Navigator.of(context).pop();
+            },
+            child: const Text("ABBRECHEN", style: AppStyles.buttonTextStyle),
+          ),
+        ),
+        Padding(
+          padding: const EdgeInsets.all(5.0),
+          child: ElevatedButton(
+            style: AppStyles.successButtonStyle,
+            onPressed: () {
+              if (_formKey.currentState!.validate()) {
+                _attendanceManager.postManyMissedSchooldays(
+                  id: widget.pupil.pupilId,
+                  startdate: _startDate,
+                  enddate: _endDate,
+                  missedType: _dialogdropdownValue,
+                  comment: _commentController.text.trim().isEmpty
+                      ? null
+                      : _commentController.text.trim(),
+                );
+                _formKey.currentState!.reset();
+                Navigator.of(context).pop();
+              }
+            },
+            child: const Text("OK", style: AppStyles.buttonTextStyle),
+          ),
+        ),
+      ],
+    );
+  }
 }
diff --git a/school_data_hub_flutter/lib/features/_attendance/presentation/missed_classes_pupil_list_page/missed_classes_pupil_list_page.dart b/school_data_hub_flutter/lib/features/_attendance/presentation/missed_classes_pupil_list_page/missed_classes_pupil_list_page.dart
index 62132934..109bfe89 100644
--- a/school_data_hub_flutter/lib/features/_attendance/presentation/missed_classes_pupil_list_page/missed_classes_pupil_list_page.dart
+++ b/school_data_hub_flutter/lib/features/_attendance/presentation/missed_classes_pupil_list_page/missed_classes_pupil_list_page.dart
@@ -9,7 +9,7 @@ import 'package:school_data_hub_flutter/features/_attendance/presentation/missed
 import 'package:school_data_hub_flutter/features/_attendance/presentation/missed_classes_pupil_list_page/widgets/missed_classes_pupil_list_searchbar.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
 class MissedSchooldayesPupilListPage extends WatchingWidget {
@@ -26,7 +26,7 @@ class MissedSchooldayesPupilListPage extends WatchingWidget {
         title: 'Fehlzeiten',
       ),
       body: RefreshIndicator(
-        onRefresh: () async => di<PupilManager>().fetchAllPupils(),
+        onRefresh: () async => di<PupilProxyManager>().fetchAllPupils(),
         child: Center(
           child: ConstrainedBox(
             constraints: const BoxConstraints(maxWidth: 700),
diff --git a/school_data_hub_flutter/lib/features/_attendance/presentation/missed_classes_pupil_list_page/widgets/missed_classes_badges_info_dialog.dart b/school_data_hub_flutter/lib/features/_attendance/presentation/missed_classes_pupil_list_page/widgets/missed_classes_badges_info_dialog.dart
index ba0b66c2..8b4fb347 100644
--- a/school_data_hub_flutter/lib/features/_attendance/presentation/missed_classes_pupil_list_page/widgets/missed_classes_badges_info_dialog.dart
+++ b/school_data_hub_flutter/lib/features/_attendance/presentation/missed_classes_pupil_list_page/widgets/missed_classes_badges_info_dialog.dart
@@ -90,7 +90,7 @@ void missedSchooldaysBadgesInformationDialog(
                   Container(
                     width: 25.0,
                     height: 25.0,
-                    decoration: const BoxDecoration(
+                    decoration: BoxDecoration(
                       color:
                           AppColors.contactedSuccessColor, // Colors.green[100],
                       shape: BoxShape.circle,
@@ -116,7 +116,7 @@ void missedSchooldaysBadgesInformationDialog(
                   Container(
                     width: 25.0,
                     height: 25.0,
-                    decoration: const BoxDecoration(
+                    decoration: BoxDecoration(
                       color: AppColors.contactedCalledBackColor,
                       shape: BoxShape.circle,
                     ),
@@ -143,7 +143,7 @@ void missedSchooldaysBadgesInformationDialog(
                   Container(
                     width: 25.0,
                     height: 25.0,
-                    decoration: const BoxDecoration(
+                    decoration: BoxDecoration(
                       color: AppColors.contactedFailedColor,
                       shape: BoxShape.circle,
                     ),
diff --git a/school_data_hub_flutter/lib/features/_attendance/presentation/missed_classes_pupil_list_page/widgets/missed_classes_pupil_list_card.dart b/school_data_hub_flutter/lib/features/_attendance/presentation/missed_classes_pupil_list_page/widgets/missed_classes_pupil_list_card.dart
index bdce91c3..a2539b3b 100644
--- a/school_data_hub_flutter/lib/features/_attendance/presentation/missed_classes_pupil_list_page/widgets/missed_classes_pupil_list_card.dart
+++ b/school_data_hub_flutter/lib/features/_attendance/presentation/missed_classes_pupil_list_page/widgets/missed_classes_pupil_list_card.dart
@@ -11,7 +11,7 @@ import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/pupil_profile_page.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_navigation.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/widgets/avatar.dart';
-import 'package:school_data_hub_flutter/features/pupil/presentation/widgets/pupil_profile_attendance_content.dart';
+import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/attendance_content/pupil_profile_attendance_content.dart';
 import 'package:watch_it/watch_it.dart';
 
 class MissedClassesPupilListCard extends WatchingStatefulWidget {
diff --git a/school_data_hub_flutter/lib/features/_attendance/presentation/missed_classes_pupil_list_page/widgets/missed_classes_pupil_list_searchbar.dart b/school_data_hub_flutter/lib/features/_attendance/presentation/missed_classes_pupil_list_page/widgets/missed_classes_pupil_list_searchbar.dart
index 1487c3f2..1a4a4a36 100644
--- a/school_data_hub_flutter/lib/features/_attendance/presentation/missed_classes_pupil_list_page/widgets/missed_classes_pupil_list_searchbar.dart
+++ b/school_data_hub_flutter/lib/features/_attendance/presentation/missed_classes_pupil_list_page/widgets/missed_classes_pupil_list_searchbar.dart
@@ -37,7 +37,7 @@ class AttendanceRankingListSearchbar extends WatchingWidget {
                 child: Row(
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
-                    const Icon(
+                    Icon(
                       Icons.people_alt_rounded,
                       color: AppColors.backgroundColor,
                     ),
diff --git a/school_data_hub_flutter/lib/features/_attendance/presentation/widgets/attendance_badges.dart b/school_data_hub_flutter/lib/features/_attendance/presentation/widgets/attendance_badges.dart
index b5b5957c..a42f943e 100644
--- a/school_data_hub_flutter/lib/features/_attendance/presentation/widgets/attendance_badges.dart
+++ b/school_data_hub_flutter/lib/features/_attendance/presentation/widgets/attendance_badges.dart
@@ -38,7 +38,7 @@ Widget contactedDayBadge(contacted) {
         child: Container(
           width: 25.0,
           height: 25.0,
-          decoration: BoxDecoration(
+        decoration: BoxDecoration(
             color:
                 contacted == ContactedType.contacted
                     ? AppColors.contactedSuccessColor
@@ -69,7 +69,7 @@ Widget returnedBadge(returned) {
       child: Container(
         width: 25.0,
         height: 25.0,
-        decoration: const BoxDecoration(
+        decoration: BoxDecoration(
           color: AppColors.goneHomeColor,
           shape: BoxShape.circle,
         ),
@@ -98,7 +98,7 @@ Widget excusedBadge(excused) {
       child: Container(
         width: 25.0,
         height: 25.0,
-        decoration: const BoxDecoration(
+        decoration: BoxDecoration(
           color: AppColors.unexcusedCheckColor,
           shape: BoxShape.circle,
         ),
@@ -148,7 +148,7 @@ Widget missedTypeBadge(missedtype) {
       child: Container(
         width: 25.0,
         height: 25.0,
-        decoration: const BoxDecoration(
+        decoration: BoxDecoration(
           color: AppColors.missedColor,
           shape: BoxShape.circle,
         ),
@@ -171,7 +171,7 @@ Widget missedTypeBadge(missedtype) {
       child: Container(
         width: 25.0,
         height: 25.0,
-        decoration: const BoxDecoration(
+        decoration: BoxDecoration(
           color: AppColors.lateColor,
           shape: BoxShape.circle,
         ),
@@ -194,7 +194,7 @@ Widget missedTypeBadge(missedtype) {
       child: Container(
         width: 25.0,
         height: 25.0,
-        decoration: const BoxDecoration(
+        decoration: BoxDecoration(
           color: AppColors.presentColor,
           shape: BoxShape.circle,
         ),
@@ -217,7 +217,7 @@ Widget missedTypeBadge(missedtype) {
       child: Container(
         width: 25.0,
         height: 25.0,
-        decoration: const BoxDecoration(
+        decoration: BoxDecoration(
           color: AppColors.homeColor,
           shape: BoxShape.circle,
         ),
diff --git a/school_data_hub_flutter/lib/features/_attendance/presentation/widgets/missed_classes_badges_info_dialog.dart b/school_data_hub_flutter/lib/features/_attendance/presentation/widgets/missed_classes_badges_info_dialog.dart
index ba0b66c2..8b4fb347 100644
--- a/school_data_hub_flutter/lib/features/_attendance/presentation/widgets/missed_classes_badges_info_dialog.dart
+++ b/school_data_hub_flutter/lib/features/_attendance/presentation/widgets/missed_classes_badges_info_dialog.dart
@@ -90,7 +90,7 @@ void missedSchooldaysBadgesInformationDialog(
                   Container(
                     width: 25.0,
                     height: 25.0,
-                    decoration: const BoxDecoration(
+                    decoration: BoxDecoration(
                       color:
                           AppColors.contactedSuccessColor, // Colors.green[100],
                       shape: BoxShape.circle,
@@ -116,7 +116,7 @@ void missedSchooldaysBadgesInformationDialog(
                   Container(
                     width: 25.0,
                     height: 25.0,
-                    decoration: const BoxDecoration(
+                    decoration: BoxDecoration(
                       color: AppColors.contactedCalledBackColor,
                       shape: BoxShape.circle,
                     ),
@@ -143,7 +143,7 @@ void missedSchooldaysBadgesInformationDialog(
                   Container(
                     width: 25.0,
                     height: 25.0,
-                    decoration: const BoxDecoration(
+                    decoration: BoxDecoration(
                       color: AppColors.contactedFailedColor,
                       shape: BoxShape.circle,
                     ),
diff --git a/school_data_hub_flutter/lib/features/_schoolday_events/data/schoolday_event_api_service.dart b/school_data_hub_flutter/lib/features/_schoolday_events/data/schoolday_event_api_service.dart
index e25c3564..a8a154ca 100644
--- a/school_data_hub_flutter/lib/features/_schoolday_events/data/schoolday_event_api_service.dart
+++ b/school_data_hub_flutter/lib/features/_schoolday_events/data/schoolday_event_api_service.dart
@@ -3,11 +3,11 @@ import 'dart:io';
 import 'package:logging/logging.dart';
 import 'package:path/path.dart' as p;
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/domain/models/nullable_records.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
 final _log = Logger('SchooldayEventApiService');
@@ -24,14 +24,15 @@ class SchooldayEventApiService {
     int schooldayId,
     DateTime dateTime,
     SchooldayEventType type,
-    String reason,
-  ) async {
+    String reason, {
+    String? eventTime,
+  }) async {
     final userName = _hubSessionManager.userName!;
     _notificationService.apiRunning(true);
-    final pupil = di<PupilManager>().getPupilByPupilId(pupilId);
+    final pupil = di<PupilProxyManager>().getPupilByPupilId(pupilId);
     final tutor = pupil?.groupTutor;
     try {
-      final event = await _client.schooldayEvent.createSchooldayEvent(
+      var event = await _client.schooldayEvent.createSchooldayEvent(
         pupilNameAndGroup: pupilName,
         dateTimeAsString: dateTime.formatDateForUser(),
         pupilId: pupilId,
@@ -42,6 +43,13 @@ class SchooldayEventApiService {
         tutor: tutor ?? '',
       );
 
+      if (eventTime != null) {
+        event = await updateSchooldayEvent(
+          schooldayEvent: event,
+          eventTime: eventTime,
+        );
+      }
+
       _notificationService.apiRunning(false);
 
       return event;
@@ -77,11 +85,11 @@ class SchooldayEventApiService {
     SchooldayEventType? type,
     String? reason,
     bool? processed,
-    //String? file,
     NullableStringRecord? processedBy,
     NullableDateTimeRecord? processedAt,
     int? schooldayId,
     NullableStringRecord? comment,
+    String? eventTime,
   }) async {
     bool changedProcessedStatus = false;
     // if the schooldayEvent is patched as processed,
@@ -115,8 +123,11 @@ class SchooldayEventApiService {
           ? processedAt.value
           : schooldayEvent.processedAt,
       comment: comment != null ? comment.value : schooldayEvent.comment,
+      eventTime: eventTime ?? schooldayEvent.eventTime,
     );
-    final pupil = di<PupilManager>().getPupilByPupilId(schooldayEvent.pupilId)!;
+    final pupil = di<PupilProxyManager>().getPupilByPupilId(
+      schooldayEvent.pupilId,
+    )!;
     try {
       _notificationService.apiRunning(true);
       final updatedSchooldayEvent = await _client.schooldayEvent
diff --git a/school_data_hub_flutter/lib/features/_schoolday_events/domain/filters/schoolday_event_filter_manager.dart b/school_data_hub_flutter/lib/features/_schoolday_events/domain/filters/schoolday_event_filter_manager.dart
index d5059868..b1a46399 100644
--- a/school_data_hub_flutter/lib/features/_schoolday_events/domain/filters/schoolday_event_filter_manager.dart
+++ b/school_data_hub_flutter/lib/features/_schoolday_events/domain/filters/schoolday_event_filter_manager.dart
@@ -33,6 +33,12 @@ class SchooldayEventFilterManager {
 
   SchooldayEventFilterManager();
 
+  void dispose() {
+    _schooldayEventsFilterState.dispose();
+    _pupilIdsWithFilteredSchooldayEvents.dispose();
+    return;
+  }
+
   void resetFilters() {
     _schooldayEventsFilterState.value = {...initialSchooldayEventFilterValues};
     _filtersStateManager.setFilterState(
diff --git a/school_data_hub_flutter/lib/features/_schoolday_events/domain/schoolday_event_helper_functions.dart b/school_data_hub_flutter/lib/features/_schoolday_events/domain/schoolday_event_helper_functions.dart
index c321fc16..8c1d414d 100644
--- a/school_data_hub_flutter/lib/features/_schoolday_events/domain/schoolday_event_helper_functions.dart
+++ b/school_data_hub_flutter/lib/features/_schoolday_events/domain/schoolday_event_helper_functions.dart
@@ -1,5 +1,5 @@
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 import 'package:school_data_hub_flutter/features/_schoolday_events/domain/filters/schoolday_event_filter_manager.dart';
 import 'package:school_data_hub_flutter/features/_schoolday_events/domain/models/schoolday_event_enums.dart';
diff --git a/school_data_hub_flutter/lib/features/_schoolday_events/domain/schoolday_event_manager.dart b/school_data_hub_flutter/lib/features/_schoolday_events/domain/schoolday_event_manager.dart
index 5ed75ecd..450233f2 100644
--- a/school_data_hub_flutter/lib/features/_schoolday_events/domain/schoolday_event_manager.dart
+++ b/school_data_hub_flutter/lib/features/_schoolday_events/domain/schoolday_event_manager.dart
@@ -9,7 +9,7 @@ import 'package:school_data_hub_flutter/common/domain/models/nullable_records.da
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
 import 'package:school_data_hub_flutter/features/_schoolday_events/data/schoolday_event_api_service.dart';
 import 'package:school_data_hub_flutter/features/_schoolday_events/domain/models/pupil_schoolday_events_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
 class SchooldayEventManager with ChangeNotifier {
@@ -19,7 +19,7 @@ class SchooldayEventManager with ChangeNotifier {
 
   final _notificationService = di<NotificationService>();
 
-  final _pupilManager = di<PupilManager>();
+  final _pupilManager = di<PupilProxyManager>();
 
   final _schooldayEventApiService = SchooldayEventApiService();
 
@@ -33,6 +33,14 @@ class SchooldayEventManager with ChangeNotifier {
   SchooldayEventManager() {
     init();
   }
+  @override
+  void dispose() {
+    _pupilManager.removeListener(_updatePupilProxies);
+    _pupilSchooldayEventsMap.clear();
+    _schooldayEventsMap.clear();
+    super.dispose();
+    return;
+  }
 
   Future<void> init() async {
     _pupilManager.addListener(_updatePupilProxies);
@@ -51,12 +59,6 @@ class SchooldayEventManager with ChangeNotifier {
     }
   }
 
-  @override
-  void dispose() {
-    _pupilManager.removeListener(_updatePupilProxies);
-    super.dispose();
-  }
-
   //- Getters
 
   PupilSchooldayEventsProxy getPupilSchooldayEventsProxy(int pupilId) {
@@ -116,16 +118,18 @@ class SchooldayEventManager with ChangeNotifier {
     int schooldayId,
     DateTime dateTime,
     SchooldayEventType type,
-    String reason,
-  ) async {
+    String reason, {
+    String? eventTime,
+  }) async {
     final SchooldayEvent
     schooldayEvent = await _schooldayEventApiService.postSchooldayEvent(
-      '${di<PupilManager>().getPupilByPupilId(pupilId)!.firstName} (${di<PupilManager>().getPupilByPupilId(pupilId)!.group})',
+      '${di<PupilProxyManager>().getPupilByPupilId(pupilId)!.firstName} (${di<PupilProxyManager>().getPupilByPupilId(pupilId)!.group})',
       pupilId,
       schooldayId,
       dateTime,
       type,
       reason,
+      eventTime: eventTime,
     );
 
     _updateSchooldayEventCollections(schooldayEvent);
@@ -165,6 +169,7 @@ class SchooldayEventManager with ChangeNotifier {
     NullableDateTimeRecord? processedAt,
     int? schooldayId,
     NullableStringRecord? comment,
+    String? eventTime,
   }) async {
     String? cacheKey;
     if (processed == false && eventToUpdate.processedDocumentId != null) {
@@ -181,6 +186,7 @@ class SchooldayEventManager with ChangeNotifier {
           schooldayId: schooldayId,
           type: schoolEventType,
           comment: comment,
+          eventTime: eventTime,
         );
 
     _updateSchooldayEventCollections(schooldayEvent);
diff --git a/school_data_hub_flutter/lib/features/_schoolday_events/presentation/new_schoolday_event_page/new_schoolday_event_page.dart b/school_data_hub_flutter/lib/features/_schoolday_events/presentation/new_schoolday_event_page/new_schoolday_event_page.dart
index d050a625..a8afd970 100644
--- a/school_data_hub_flutter/lib/features/_schoolday_events/presentation/new_schoolday_event_page/new_schoolday_event_page.dart
+++ b/school_data_hub_flutter/lib/features/_schoolday_events/presentation/new_schoolday_event_page/new_schoolday_event_page.dart
@@ -3,7 +3,7 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/theme/styles.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/information_dialog.dart';
@@ -57,6 +57,7 @@ class NewSchooldayEventPage extends WatchingWidget {
     required bool admonitionInfo,
     required bool transitionAdvice,
     required bool other,
+    required String eventTime,
   }) async {
     Set<String> schooldayEventReason = {};
     String schooldayEventReasons = '';
@@ -134,6 +135,7 @@ class NewSchooldayEventPage extends WatchingWidget {
       thisDate,
       schooldayEventType,
       schooldayEventReasons,
+      eventTime: eventTime,
     );
   }
 
@@ -145,6 +147,10 @@ class NewSchooldayEventPage extends WatchingWidget {
     final thisDate = createOnce(
       () => ValueNotifier<DateTime>(_schoolCalendarManager.thisDate.value),
     );
+    final now = DateTime.now();
+    final defaultTime =
+        '${now.hour.toString().padLeft(2, '0')}:${now.minute.toString().padLeft(2, '0')}';
+    final eventTime = createOnce(() => ValueNotifier<String>(defaultTime));
     final violenceAgainstPupils = createOnce(() => ValueNotifier<bool>(false));
     final violenceAgainstTeacher = createOnce(() => ValueNotifier<bool>(false));
     final violenceAgainstThings = createOnce(() => ValueNotifier<bool>(false));
@@ -244,7 +250,7 @@ class NewSchooldayEventPage extends WatchingWidget {
                           thisDate.value = newDate;
                         }
                       },
-                      icon: const Icon(
+                      icon: Icon(
                         Icons.calendar_today_rounded,
                         color: AppColors.interactiveColor,
                       ),
@@ -269,6 +275,79 @@ class NewSchooldayEventPage extends WatchingWidget {
                   ],
                 ),
                 const Gap(5),
+                const Row(
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    Text(
+                      'Uhrzeit',
+                      style: TextStyle(
+                        fontSize: 25,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                  ],
+                ),
+                Row(
+                  children: [
+                    IconButton(
+                      onPressed: () async {
+                        final TimeOfDay? picked = await showTimePicker(
+                          context: context,
+                          initialTime: TimeOfDay(
+                            hour: int.parse(eventTime.value.split(':')[0]),
+                            minute: int.parse(eventTime.value.split(':')[1]),
+                          ),
+                          builder: (BuildContext context, Widget? child) {
+                            return MediaQuery(
+                              data: MediaQuery.of(
+                                context,
+                              ).copyWith(alwaysUse24HourFormat: true),
+                              child: child!,
+                            );
+                          },
+                        );
+                        if (picked != null) {
+                          eventTime.value =
+                              '${picked.hour.toString().padLeft(2, '0')}:${picked.minute.toString().padLeft(2, '0')}';
+                        }
+                      },
+                      icon: Icon(
+                        Icons.access_time_rounded,
+                        color: AppColors.interactiveColor,
+                      ),
+                    ),
+                    InkWell(
+                      onTap: () async {
+                        final TimeOfDay? picked = await showTimePicker(
+                          context: context,
+                          initialTime: TimeOfDay(
+                            hour: int.parse(eventTime.value.split(':')[0]),
+                            minute: int.parse(eventTime.value.split(':')[1]),
+                          ),
+                          builder: (BuildContext context, Widget? child) {
+                            return MediaQuery(
+                              data: MediaQuery.of(
+                                context,
+                              ).copyWith(alwaysUse24HourFormat: true),
+                              child: child!,
+                            );
+                          },
+                        );
+                        if (picked != null) {
+                          eventTime.value =
+                              '${picked.hour.toString().padLeft(2, '0')}:${picked.minute.toString().padLeft(2, '0')}';
+                        }
+                      },
+                      child: Text(
+                        watch(eventTime).value,
+                        style: AppStyles.title.copyWith(
+                          color: AppColors.interactiveColor,
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+                const Gap(5),
                 const Text(
                   'Grund',
                   style: TextStyle(fontWeight: FontWeight.bold, fontSize: 25),
@@ -480,7 +559,7 @@ class NewSchooldayEventPage extends WatchingWidget {
                       );
                       return;
                     }
-                    unawaited(
+                      unawaited(
                       postSchooldayEvent(
                         schooldayEventType: schooldayEventType,
                         thisDate: thisDate.value,
@@ -499,6 +578,7 @@ class NewSchooldayEventPage extends WatchingWidget {
                         admonitionInfo: admonitionInfo.value,
                         transitionAdvice: transitionAdvice.value,
                         other: other.value,
+                        eventTime: eventTime.value,
                       ),
                     );
                     Navigator.pop(context);
diff --git a/school_data_hub_flutter/lib/features/_schoolday_events/presentation/schoolday_event_list_page/widgets/pupil_schoolday_event_card.dart b/school_data_hub_flutter/lib/features/_schoolday_events/presentation/schoolday_event_list_page/widgets/pupil_schoolday_event_card.dart
index 18429445..9bbc2527 100644
--- a/school_data_hub_flutter/lib/features/_schoolday_events/presentation/schoolday_event_list_page/widgets/pupil_schoolday_event_card.dart
+++ b/school_data_hub_flutter/lib/features/_schoolday_events/presentation/schoolday_event_list_page/widgets/pupil_schoolday_event_card.dart
@@ -4,13 +4,13 @@ import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/app_utils/create_and_crop_image_file.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/schoolday_date_picker.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/short_textfield_dialog.dart';
-import 'package:school_data_hub_flutter/common/widgets/document_image.dart';
+import 'package:school_data_hub_flutter/common/widgets/encrypted_document_image.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_helper.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 import 'package:school_data_hub_flutter/features/_schoolday_events/domain/schoolday_event_manager.dart';
@@ -49,7 +49,7 @@ class PupilSchooldayEventCard extends StatelessWidget {
                 )
               : Border.all(
                   color: AppColors
-                      .cardInCardBorderColor, // Specify the color of the border here
+                      .backgroundColor, // Specify the color of the border here
                   width: 2,
                 ),
           borderRadius: BorderRadius.circular(10),
@@ -98,7 +98,7 @@ class PupilSchooldayEventCard extends StatelessWidget {
                                         schooldayEvent.schoolday!.schoolday
                                             .formatDateForUser(),
 
-                                        style: const TextStyle(
+                                        style: TextStyle(
                                           color: AppColors.interactiveColor,
                                           fontWeight: FontWeight.bold,
                                           fontSize: 20,
@@ -114,6 +114,69 @@ class PupilSchooldayEventCard extends StatelessWidget {
                                         fontSize: 20,
                                       ),
                                     ),
+                              const Gap(10),
+                              isAuthorized
+                                  ? InkWell(
+                                      onTap: () async {
+                                        final eventTime =
+                                            schooldayEvent.eventTime ?? '00:00';
+                                        final TimeOfDay?
+                                        picked = await showTimePicker(
+                                          context: context,
+                                          initialTime: TimeOfDay(
+                                            hour: int.parse(
+                                              eventTime.split(':')[0],
+                                            ),
+                                            minute: int.parse(
+                                              eventTime.split(':')[1],
+                                            ),
+                                          ),
+                                          builder:
+                                              (
+                                                BuildContext context,
+                                                Widget? child,
+                                              ) {
+                                                return MediaQuery(
+                                                  data: MediaQuery.of(context)
+                                                      .copyWith(
+                                                        alwaysUse24HourFormat:
+                                                            true,
+                                                      ),
+                                                  child: child!,
+                                                );
+                                              },
+                                        );
+                                        if (picked != null) {
+                                          final newEventTime =
+                                              '${picked.hour.toString().padLeft(2, '0')}:${picked.minute.toString().padLeft(2, '0')}';
+                                          await _schooldayEventManager
+                                              .updateSchooldayEvent(
+                                                eventToUpdate: schooldayEvent,
+                                                eventTime: newEventTime,
+                                              );
+                                          _notificationService.showSnackBar(
+                                            NotificationType.success,
+                                            'Uhrzeit erfolgreich geändert!',
+                                          );
+                                        }
+                                      },
+                                      child: Text(
+                                        schooldayEvent.eventTime ?? '--:--',
+                                        style: TextStyle(
+                                          color: AppColors.interactiveColor,
+                                          fontWeight: FontWeight.bold,
+                                          fontSize: 20,
+                                        ),
+                                      ),
+                                    )
+                                  : Text(
+                                      schooldayEvent.eventTime ?? '--:--',
+                                      style: const TextStyle(
+                                        color: Colors.black,
+                                        fontWeight: FontWeight.bold,
+                                        fontSize: 20,
+                                      ),
+                                    ),
                               const Gap(5),
                               InkWell(
                                 onLongPress: () {
@@ -204,7 +267,7 @@ class PupilSchooldayEventCard extends StatelessWidget {
                                     },
                                     child: Text(
                                       schooldayEvent.createdBy,
-                                      style: const TextStyle(
+                                      style: TextStyle(
                                         fontWeight: FontWeight.bold,
                                         fontSize: 18,
                                         color: AppColors.backgroundColor,
@@ -272,7 +335,7 @@ class PupilSchooldayEventCard extends StatelessWidget {
                             );
                           },
                           child: schooldayEvent.processedDocumentId != null
-                              ? DocumentImage(
+                              ? EncryptedDocumentImage(
                                   documentId: schooldayEvent
                                       .processedDocument!
                                       .documentId,
@@ -334,7 +397,7 @@ class PupilSchooldayEventCard extends StatelessWidget {
                           );
                         },
                         child: schooldayEvent.document != null
-                            ? DocumentImage(
+                            ? EncryptedDocumentImage(
                                 documentId: schooldayEvent.document!.documentId,
                                 size: 70,
                               )
@@ -394,7 +457,7 @@ class PupilSchooldayEventCard extends StatelessWidget {
                               schooldayEvent.processed
                                   ? 'Bearbeitet von'
                                   : 'Nicht bearbeitet',
-                              style: const TextStyle(
+                              style: TextStyle(
                                 fontSize: 16,
                                 color: AppColors.backgroundColor,
                               ),
@@ -426,7 +489,7 @@ class PupilSchooldayEventCard extends StatelessWidget {
                                     },
                                     child: Text(
                                       schooldayEvent.processedBy!,
-                                      style: const TextStyle(
+                                      style: TextStyle(
                                         fontSize: 18,
                                         fontWeight: FontWeight.bold,
                                         color: AppColors.interactiveColor,
@@ -461,7 +524,7 @@ class PupilSchooldayEventCard extends StatelessWidget {
                                     },
                                     child: Text(
                                       'am ${schooldayEvent.processedAt!.formatDateForUser()}',
-                                      style: const TextStyle(
+                                      style: TextStyle(
                                         fontWeight: FontWeight.bold,
                                         fontSize: 18,
                                         color: AppColors.interactiveColor,
@@ -507,7 +570,7 @@ class PupilSchooldayEventCard extends StatelessWidget {
                       },
                       child: Text(
                         schooldayEvent.comment ?? 'Kommentar hinzufügen',
-                        style: const TextStyle(
+                        style: TextStyle(
                           fontSize: 16,
                           color: AppColors.interactiveColor,
                         ),
diff --git a/school_data_hub_flutter/lib/features/_schoolday_events/presentation/schoolday_event_list_page/widgets/pupil_schoolday_events_list.dart b/school_data_hub_flutter/lib/features/_schoolday_events/presentation/schoolday_event_list_page/widgets/pupil_schoolday_events_list.dart
index a72e64a0..bb61c124 100644
--- a/school_data_hub_flutter/lib/features/_schoolday_events/presentation/schoolday_event_list_page/widgets/pupil_schoolday_events_list.dart
+++ b/school_data_hub_flutter/lib/features/_schoolday_events/presentation/schoolday_event_list_page/widgets/pupil_schoolday_events_list.dart
@@ -41,27 +41,22 @@ class PupilSchooldayEventsList extends WatchingWidget {
           ),
         Padding(
           padding: const EdgeInsets.only(top: 10.0),
-          child: Container(
-            padding: const EdgeInsets.symmetric(horizontal: 12),
-            //margin: const EdgeInsets.only(bottom: 16),
-            width: double.infinity,
-            child: ElevatedButton(
-              style: AppStyles.actionButtonStyle,
-              onPressed: () async {
-                Navigator.of(context).push(
-                  MaterialPageRoute(
-                    builder: (ctx) =>
-                        NewSchooldayEventPage(pupilId: pupil.pupilId),
-                  ),
-                );
-              },
-              child: const Text(
-                "NEUES EREIGNIS",
-                style: TextStyle(
-                  fontSize: 17.0,
-                  color: Colors.white,
-                  fontWeight: FontWeight.bold,
+          child: ElevatedButton(
+            style: AppStyles.actionButtonStyle,
+            onPressed: () async {
+              Navigator.of(context).push(
+                MaterialPageRoute(
+                  builder: (ctx) =>
+                      NewSchooldayEventPage(pupilId: pupil.pupilId),
                 ),
+              );
+            },
+            child: const Text(
+              "NEUES EREIGNIS",
+              style: TextStyle(
+                fontSize: 17.0,
+                color: Colors.white,
+                fontWeight: FontWeight.bold,
               ),
             ),
           ),
diff --git a/school_data_hub_flutter/lib/features/_schoolday_events/presentation/schoolday_event_list_page/widgets/schoolday_event_pupil_list_card/schoolday_event_pupil_list_card.dart b/school_data_hub_flutter/lib/features/_schoolday_events/presentation/schoolday_event_list_page/widgets/schoolday_event_pupil_list_card/schoolday_event_pupil_list_card.dart
index f1e15c6b..9e7b647e 100644
--- a/school_data_hub_flutter/lib/features/_schoolday_events/presentation/schoolday_event_list_page/widgets/schoolday_event_pupil_list_card/schoolday_event_pupil_list_card.dart
+++ b/school_data_hub_flutter/lib/features/_schoolday_events/presentation/schoolday_event_list_page/widgets/schoolday_event_pupil_list_card/schoolday_event_pupil_list_card.dart
@@ -1,20 +1,20 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/custom_expansion_tile/custom_expansion_tile.dart';
 import 'package:school_data_hub_flutter/common/widgets/custom_expansion_tile/custom_expansion_tile_content.dart';
 import 'package:school_data_hub_flutter/common/widgets/custom_expansion_tile/custom_expansion_tile_switch.dart';
-import 'package:school_data_hub_flutter/features/app_main_navigation/domain/main_menu_bottom_nav_manager.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/pupil_profile_page.dart';
-import 'package:school_data_hub_flutter/features/pupil/presentation/widgets/avatar.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/features/_schoolday_events/domain/filters/schoolday_event_filter_manager.dart';
 import 'package:school_data_hub_flutter/features/_schoolday_events/domain/schoolday_event_helper_functions.dart';
 import 'package:school_data_hub_flutter/features/_schoolday_events/domain/schoolday_event_manager.dart';
 import 'package:school_data_hub_flutter/features/_schoolday_events/presentation/schoolday_event_list_page/widgets/pupil_schoolday_events_list.dart';
 import 'package:school_data_hub_flutter/features/_schoolday_events/presentation/schoolday_event_list_page/widgets/schoolday_event_pupil_list_card/widgets/schoolday_event_pupil_stats.dart';
+import 'package:school_data_hub_flutter/features/app_main_navigation/domain/main_menu_bottom_nav_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
+import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/pupil_profile_page.dart';
+import 'package:school_data_hub_flutter/features/pupil/presentation/widgets/avatar.dart';
 import 'package:watch_it/watch_it.dart';
 
 class SchooldayEventPupilListCard extends WatchingStatefulWidget {
@@ -86,46 +86,20 @@ class _SchooldayEventListCardState extends State<SchooldayEventPupilListCard> {
                                   ),
                                 );
                               },
-                              child: Text(
-                                pupil.firstName,
-                                style: const TextStyle(
-                                  fontSize: 18,
-                                  fontWeight: FontWeight.bold,
-                                ),
-                              ),
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                    Row(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Expanded(
-                          child: SingleChildScrollView(
-                            scrollDirection: Axis.horizontal,
-                            child: InkWell(
-                              onTap: () {
-                                // Navigator.of(context).push(MaterialPageRoute(
-                                //   builder: (ctx) => PupilProfilePage(
-                                //     pupil: pupil,
-                                //   ),
-                                // ));
-                              },
                               child: Row(
                                 children: [
+                                  Text(
+                                    pupil.firstName,
+                                    style: const TextStyle(
+                                      fontSize: 18,
+                                      fontWeight: FontWeight.bold,
+                                    ),
+                                  ),
+                                  const Gap(10),
                                   Text(
                                     pupil.lastName,
                                     style: const TextStyle(fontSize: 18),
                                   ),
-                                  if (pupil.family != null) ...[
-                                    const Gap(10),
-                                    const Icon(
-                                      Icons.group,
-                                      size: 25,
-                                      color: AppColors.backgroundColor,
-                                    ),
-                                  ],
                                 ],
                               ),
                             ),
@@ -133,9 +107,14 @@ class _SchooldayEventListCardState extends State<SchooldayEventPupilListCard> {
                         ),
                       ],
                     ),
+                    const Gap(10),
                     Row(
                       children: [
-                        const Text('zuletzt:'),
+                        Text(
+                          schooldayEvents.isNotEmpty
+                              ? 'zuletzt:'
+                              : 'keine Ereignisse',
+                        ),
                         const Gap(10),
                         if (schooldayEvents.isNotEmpty)
                           Text(
@@ -149,6 +128,7 @@ class _SchooldayEventListCardState extends State<SchooldayEventPupilListCard> {
                           ),
                       ],
                     ),
+                    const Gap(10),
                     Row(
                       mainAxisAlignment: MainAxisAlignment.end,
                       children: [
diff --git a/school_data_hub_flutter/lib/features/_schoolday_events/presentation/schoolday_event_list_page/widgets/schoolday_event_type_icon.dart b/school_data_hub_flutter/lib/features/_schoolday_events/presentation/schoolday_event_list_page/widgets/schoolday_event_type_icon.dart
index 84ef9197..3859698f 100644
--- a/school_data_hub_flutter/lib/features/_schoolday_events/presentation/schoolday_event_list_page/widgets/schoolday_event_type_icon.dart
+++ b/school_data_hub_flutter/lib/features/_schoolday_events/presentation/schoolday_event_list_page/widgets/schoolday_event_type_icon.dart
@@ -35,17 +35,16 @@ class SchooldayEventTypeIcon extends StatelessWidget {
                   fontWeight: FontWeight.bold)),
         ]);
       case SchooldayEventType.otherEvent:
-        return const Icon(Icons.assignment_rounded,
-            color: AppColors.backgroundColor);
+        return Icon(Icons.assignment_rounded, color: AppColors.backgroundColor);
       case SchooldayEventType.notSet:
         return Image.asset('assets/choose.png');
       case SchooldayEventType.admonitionAndBanned:
-        return const Row(mainAxisSize: MainAxisSize.min, children: [
-          Icon(
+        return Row(mainAxisSize: MainAxisSize.min, children: [
+          const Icon(
             Icons.sim_card_alert_rounded,
             color: Colors.red,
           ),
-          Gap(5),
+          const Gap(5),
           Icon(
             Icons.home,
             color: AppColors.accentColor,
diff --git a/school_data_hub_flutter/lib/features/_schoolday_events/presentation/schoolday_event_list_page/widgets/searchbar/schoolday_event_stats_row.dart b/school_data_hub_flutter/lib/features/_schoolday_events/presentation/schoolday_event_list_page/widgets/searchbar/schoolday_event_stats_row.dart
index 4bb45572..60a9066f 100644
--- a/school_data_hub_flutter/lib/features/_schoolday_events/presentation/schoolday_event_list_page/widgets/searchbar/schoolday_event_stats_row.dart
+++ b/school_data_hub_flutter/lib/features/_schoolday_events/presentation/schoolday_event_list_page/widgets/searchbar/schoolday_event_stats_row.dart
@@ -18,7 +18,7 @@ class SchooldayEventStats extends WatchingWidget {
     final filteredPupils = watchValue((PupilsFilter x) => x.filteredPupils);
     return Row(
       children: [
-        const Icon(
+        Icon(
           Icons.people_alt_rounded,
           color: AppColors.backgroundColor,
         ),
diff --git a/school_data_hub_flutter/lib/features/app_entry_point/entry_point/entry_point_controller.dart b/school_data_hub_flutter/lib/features/app_entry_point/entry_point/entry_point_controller.dart
index acd0913b..acbd797b 100644
--- a/school_data_hub_flutter/lib/features/app_entry_point/entry_point/entry_point_controller.dart
+++ b/school_data_hub_flutter/lib/features/app_entry_point/entry_point/entry_point_controller.dart
@@ -2,7 +2,6 @@ import 'dart:io';
 
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
-
 import 'package:school_data_hub_flutter/app_utils/scanner.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
 import 'package:school_data_hub_flutter/core/env/env_manager.dart';
@@ -10,9 +9,6 @@ import 'package:school_data_hub_flutter/features/app_entry_point/entry_point/ent
 import 'package:school_data_hub_flutter/l10n/app_localizations.dart';
 import 'package:watch_it/watch_it.dart';
 
-final _envManager = di<EnvManager>();
-final _notificationService = di<NotificationService>();
-
 class EntryPoint extends StatefulWidget {
   const EntryPoint({super.key});
 
@@ -21,23 +17,30 @@ class EntryPoint extends StatefulWidget {
 }
 
 class EntryPointController extends State<EntryPoint> {
-  scanEnv(BuildContext context) async {
+  final _envManager = di<EnvManager>();
+  final _notificationService = di<NotificationService>();
+
+  Future<void> scanEnv(BuildContext context) async {
     final locale = AppLocalizations.of(context)!;
-    final String? scanResponse =
-        await qrScanner(context: context, overlayText: locale.scanSchoolId);
+    final String? scanResponse = await qrScanner(
+      context: context,
+      overlayText: locale.scanSchoolId,
+    );
     if (scanResponse != null) {
       _envManager.importNewEnv(scanResponse);
 
       return;
     } else {
       _notificationService.showSnackBar(
-          NotificationType.warning, 'Keine Daten gescannt');
+        NotificationType.warning,
+        'Keine Daten gescannt',
+      );
       return;
     }
   }
 
   Future<void> importEnvFromTxt() async {
-    FilePickerResult? result =await FilePicker.platform.pickFiles();
+    FilePickerResult? result = await FilePicker.platform.pickFiles();
     if (result != null) {
       File file = File(result.files.single.path!);
       String rawTextResult = await file.readAsString();
@@ -49,8 +52,6 @@ class EntryPointController extends State<EntryPoint> {
 
   @override
   Widget build(BuildContext context) {
-    return EntryPointPage(
-      controller: this,
-    );
+    return EntryPointPage(controller: this);
   }
 }
diff --git a/school_data_hub_flutter/lib/features/app_entry_point/error_page.dart b/school_data_hub_flutter/lib/features/app_entry_point/error_page.dart
index d1b1b1cd..872c9b52 100644
--- a/school_data_hub_flutter/lib/features/app_entry_point/error_page.dart
+++ b/school_data_hub_flutter/lib/features/app_entry_point/error_page.dart
@@ -13,7 +13,7 @@ class ErrorPage extends StatelessWidget {
       body: Container(
         height: MediaQuery.of(context).size.height,
         width: MediaQuery.of(context).size.width,
-        decoration: const BoxDecoration(
+        decoration: BoxDecoration(
           color: AppColors.backgroundColor,
         ),
         child: Center(
@@ -40,7 +40,7 @@ class ErrorPage extends StatelessWidget {
                   ),
                 ),
                 const Gap(30),
-                const Text(
+                Text(
                   "Ein Fehler ist aufgetreten!",
                   style: TextStyle(
                     color: AppColors.accentColor,
@@ -55,11 +55,13 @@ class ErrorPage extends StatelessWidget {
                       child: SingleChildScrollView(
                         child: Padding(
                           padding: const EdgeInsets.symmetric(horizontal: 15.0),
-                          child: Text(error,
-                              style: const TextStyle(
-                                color: Colors.white,
-                                fontSize: 18,
-                              )),
+                          child: Text(
+                            error,
+                            style: const TextStyle(
+                              color: Colors.white,
+                              fontSize: 18,
+                            ),
+                          ),
                         ),
                       ),
                     ),
diff --git a/school_data_hub_flutter/lib/features/app_entry_point/loading_page.dart b/school_data_hub_flutter/lib/features/app_entry_point/loading_page.dart
index 9e0f65f1..2bac099b 100644
--- a/school_data_hub_flutter/lib/features/app_entry_point/loading_page.dart
+++ b/school_data_hub_flutter/lib/features/app_entry_point/loading_page.dart
@@ -36,7 +36,7 @@ class LoadingPageState extends State<LoadingPage> {
         child: Container(
           width: double.infinity,
           height: double.infinity,
-          decoration: const BoxDecoration(color: AppColors.backgroundColor),
+          decoration: BoxDecoration(color: AppColors.backgroundColor),
           child: LayoutBuilder(
             builder: (context, constraints) {
               final double maxContentWidth = constraints.maxWidth >= 600
diff --git a/school_data_hub_flutter/lib/features/app_entry_point/login_page/login_page.dart b/school_data_hub_flutter/lib/features/app_entry_point/login_page/login_page.dart
index 803e0d5a..0af132b4 100644
--- a/school_data_hub_flutter/lib/features/app_entry_point/login_page/login_page.dart
+++ b/school_data_hub_flutter/lib/features/app_entry_point/login_page/login_page.dart
@@ -14,6 +14,7 @@ import 'package:school_data_hub_flutter/features/app_entry_point/login_page/logi
 import 'package:school_data_hub_flutter/features/app_entry_point/login_page/widgets/environments_dropdown.dart';
 import 'package:school_data_hub_flutter/features/app_main_navigation/widgets/landing_bottom_nav_bar.dart';
 import 'package:school_data_hub_flutter/l10n/app_localizations.dart';
+import 'package:signals/signals_flutter.dart';
 import 'package:watch_it/watch_it.dart';
 
 class LoginPage extends WatchingWidget {
@@ -32,8 +33,8 @@ class LoginPage extends WatchingWidget {
           : snackbar(context, value.type, value.message),
     );
 
-    final bool isAuthenticated = watchValue(
-      (EnvManager x) => x.isAuthenticated,
+    final bool isAuthenticated = di<EnvManager>().isAuthenticated.watch(
+      context,
     );
 
     final locale = AppLocalizations.of(context)!;
@@ -42,7 +43,7 @@ class LoginPage extends WatchingWidget {
     //FocusScopeNode currentFocus = FocusScope.of(context);
 
     return (isAuthenticated)
-        ? MainMenuBottomNavigation()
+        ? const MainMenuBottomNavigation()
         : Scaffold(
             resizeToAvoidBottomInset: true,
             body: Container(
@@ -67,9 +68,7 @@ class LoginPage extends WatchingWidget {
                               height: 250,
                               width: 250,
                               child: Image(
-                                image: AssetImage(
-                                  'assets/schuldaten_hub_logo.png',
-                                ),
+                                image: AssetImage('assets/foreground.png'),
                               ),
                             ),
                       const Gap(20),
@@ -148,7 +147,7 @@ class LoginPage extends WatchingWidget {
                                 filled: true,
                                 fillColor: Colors.white,
                                 labelText: locale.password,
-                                labelStyle: const TextStyle(
+                                labelStyle: TextStyle(
                                   color: AppColors.backgroundColor,
                                 ),
                               ),
diff --git a/school_data_hub_flutter/lib/features/app_entry_point/no_connection_page.dart b/school_data_hub_flutter/lib/features/app_entry_point/no_connection_page.dart
index 38b9352d..2ed00c76 100644
--- a/school_data_hub_flutter/lib/features/app_entry_point/no_connection_page.dart
+++ b/school_data_hub_flutter/lib/features/app_entry_point/no_connection_page.dart
@@ -11,10 +11,10 @@ class NoConnectionPage extends StatelessWidget {
       body: Container(
         height: MediaQuery.of(context).size.height,
         width: MediaQuery.of(context).size.width,
-        decoration: const BoxDecoration(
+        decoration: BoxDecoration(
           color: AppColors.backgroundColor,
         ),
-        child: const Center(
+        child: Center(
           child: SizedBox(
             height: 500,
             width: 600,
@@ -22,14 +22,14 @@ class NoConnectionPage extends StatelessWidget {
               mainAxisAlignment: MainAxisAlignment.center,
               crossAxisAlignment: CrossAxisAlignment.center,
               children: [
-                SizedBox(
+                const SizedBox(
                   height: 300,
                   width: 300,
                   child: Image(
                     image: AssetImage('assets/foreground.png'),
                   ),
                 ),
-                Text(
+                const Text(
                   "Schuldaten App",
                   style: TextStyle(
                     color: Colors.white,
@@ -37,12 +37,15 @@ class NoConnectionPage extends StatelessWidget {
                     fontSize: 30,
                   ),
                 ),
-                Gap(30),
-                Text('Keine Internetverbindung!',
-                    style: TextStyle(
-                        color: Colors.white,
-                        fontSize: 25,
-                        fontWeight: FontWeight.bold)),
+                const Gap(30),
+                const Text(
+                  'Keine Internetverbindung!',
+                  style: TextStyle(
+                    color: Colors.white,
+                    fontSize: 25,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
               ],
             ),
           ),
diff --git a/school_data_hub_flutter/lib/features/app_main_navigation/domain/main_menu_bottom_nav_manager.dart b/school_data_hub_flutter/lib/features/app_main_navigation/domain/main_menu_bottom_nav_manager.dart
index de1a539a..2575d8a7 100644
--- a/school_data_hub_flutter/lib/features/app_main_navigation/domain/main_menu_bottom_nav_manager.dart
+++ b/school_data_hub_flutter/lib/features/app_main_navigation/domain/main_menu_bottom_nav_manager.dart
@@ -11,11 +11,11 @@ class BottomNavManager {
     _bottomNavState.value = 0;
   }
 
-  setBottomNavPage(int index) {
+  void setBottomNavPage(int index) {
     _bottomNavState.value = index;
   }
 
-  setPupilProfileNavPage(int index) {
+  void setPupilProfileNavPage(int index) {
     _pupilProfileNavState.value = index;
   }
 }
diff --git a/school_data_hub_flutter/lib/features/app_main_navigation/learn_resources_menu_page.dart b/school_data_hub_flutter/lib/features/app_main_navigation/learn_resources_menu_page.dart
index 116a2274..763b6748 100644
--- a/school_data_hub_flutter/lib/features/app_main_navigation/learn_resources_menu_page.dart
+++ b/school_data_hub_flutter/lib/features/app_main_navigation/learn_resources_menu_page.dart
@@ -48,10 +48,10 @@ class LearnResourcesMenuPage extends StatelessWidget {
                     shape: RoundedRectangleBorder(
                       borderRadius: BorderRadius.circular(15.0),
                     ),
-                    child: Column(
+                        child: Column(
                       mainAxisAlignment: MainAxisAlignment.center,
                       children: [
-                        const Icon(
+                        Icon(
                           Icons.lightbulb,
                           size: 50,
                           color: AppColors.gridViewColor,
@@ -87,7 +87,7 @@ class LearnResourcesMenuPage extends StatelessWidget {
                     child: Column(
                       mainAxisAlignment: MainAxisAlignment.center,
                       children: [
-                        const Icon(
+                        Icon(
                           Icons.support_rounded,
                           size: 50,
                           color: AppColors.gridViewColor,
@@ -124,7 +124,7 @@ class LearnResourcesMenuPage extends StatelessWidget {
                       child: Column(
                         mainAxisAlignment: MainAxisAlignment.center,
                         children: [
-                          const Icon(
+                          Icon(
                             Icons.note_alt,
                             size: 50,
                             color: AppColors.gridViewColor,
@@ -161,7 +161,7 @@ class LearnResourcesMenuPage extends StatelessWidget {
                     child: Column(
                       mainAxisAlignment: MainAxisAlignment.center,
                       children: [
-                        const Icon(
+                        Icon(
                           Icons.book,
                           size: 50,
                           color: AppColors.gridViewColor,
diff --git a/school_data_hub_flutter/lib/features/app_main_navigation/school_lists_page.dart b/school_data_hub_flutter/lib/features/app_main_navigation/school_lists_page.dart
index d278faa7..52f1d677 100644
--- a/school_data_hub_flutter/lib/features/app_main_navigation/school_lists_page.dart
+++ b/school_data_hub_flutter/lib/features/app_main_navigation/school_lists_page.dart
@@ -34,7 +34,7 @@ class SchoolListsMenuPage extends StatelessWidget {
             children: [
               MainMenuButton(
                   destinationPage: const SchoolListsPage(),
-                  buttonIcon: const Icon(
+                  buttonIcon: Icon(
                     Icons.rule,
                     size: 50,
                     color: AppColors.gridViewColor,
@@ -42,7 +42,7 @@ class SchoolListsMenuPage extends StatelessWidget {
                   buttonText: locale.lists),
               MainMenuButton(
                   destinationPage: const AuthorizationsListPage(),
-                  buttonIcon: const Icon(
+                  buttonIcon: Icon(
                     Icons.fact_check_rounded,
                     size: 50,
                     color: AppColors.gridViewColor,
diff --git a/school_data_hub_flutter/lib/features/app_main_navigation/tools_page.dart b/school_data_hub_flutter/lib/features/app_main_navigation/tools_page.dart
index 9508859c..fc2c1a21 100644
--- a/school_data_hub_flutter/lib/features/app_main_navigation/tools_page.dart
+++ b/school_data_hub_flutter/lib/features/app_main_navigation/tools_page.dart
@@ -1,6 +1,5 @@
 import 'dart:io';
 
-import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_flutter/app_utils/pick_file_return_content_as_string.dart';
@@ -11,13 +10,16 @@ import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dial
 import 'package:school_data_hub_flutter/common/widgets/dialogs/short_textfield_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_app_bar.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/models/enums.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_helper.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_manager.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/birthdays_page.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_identity_stream_page/pupil_identity_stream_page.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/select_pupils_list_page/select_pupils_list_page.dart';
 import 'package:school_data_hub_flutter/features/statistics/chart_page/chart_page_controller.dart';
 import 'package:school_data_hub_flutter/features/statistics/statistics_page/controller/statistics.dart';
+import 'package:school_data_hub_flutter/features/timetable/presentation/sliver_dashboard_page/sliver_dashboard_page.dart';
 import 'package:school_data_hub_flutter/features/timetable/presentation/timetable_page/timetable_page.dart';
 import 'package:watch_it/watch_it.dart';
 
@@ -28,20 +30,21 @@ class ToolsPage extends WatchingWidget {
   HubSessionManager get _hubSessionManager => di<HubSessionManager>();
 
   void importUnencryptedPupilIdentitySourceFile(String function) async {
-    final fileContent = await pickFileReturnContentAsString();
-    FilePickerResult? result = await FilePicker.platform.pickFiles();
-    if (result == null || fileContent == null) {
+    final fileContent = await fromTextFilePickerToString();
+
+    if (fileContent == null) {
       // User canceled the picker
       return;
     }
 
     if (function == 'update_backend') {
-      _pupilIdentityManager.updateBackendPupilsWithSchoolPupilIdentitySource(
+      _pupilIdentityManager.updateServerFromPupilIdentityExternalSource(
         fileContent,
       );
     } else if (function == 'pupil_identities') {
       _pupilIdentityManager.updatePupilIdentitiesFromUnencryptedSource(
-        identitiesInStringLines: fileContent,
+        updateTimestamp: null,
+        pupilIdentityTextLines: fileContent,
       );
     }
   }
@@ -135,7 +138,7 @@ class ToolsPage extends WatchingWidget {
                       pupilIds = await Navigator.of(context).push(
                         MaterialPageRoute(
                           builder: (ctx) => SelectPupilsListPage(
-                            selectablePupils: di<PupilManager>()
+                            selectablePupils: di<PupilProxyManager>()
                                 .getPupilsFromInternalIds(
                                   di<PupilIdentityManager>().availablePupilIds,
                                 ),
@@ -145,10 +148,10 @@ class ToolsPage extends WatchingWidget {
                       if (pupilIds == null || pupilIds.isEmpty) {
                         return;
                       }
-                      final internalIds = di<PupilManager>()
+                      final internalIds = di<PupilProxyManager>()
                           .getInternalIdsFromPupilIds(pupilIds);
                       final String encryptedPupilIdentities =
-                          await di<PupilIdentityManager>()
+                          await PupilIdentityHelper()
                               .generateEncryptedPupilIdentitiesTransferString(
                                 internalIds,
                               );
@@ -246,6 +249,22 @@ class ToolsPage extends WatchingWidget {
                     const Gap(16),
                   ],
 
+                  _buildToolButton(
+                    onPressed: () async {
+                      Navigator.of(context).push(
+                        MaterialPageRoute(
+                          builder: (context) => const DashboardPage(),
+                        ),
+                      );
+                    },
+                    icon: Icons.schedule,
+                    title: 'Sliver Dashboard',
+                    subtitle: 'Timetables und Lerngruppen verwalten',
+                    color: Colors.green[700]!,
+                  ),
+
+                  const Gap(16),
+
                   // Desktop-only section
                   if (Platform.isWindows || Platform.isMacOS) ...[
                     _buildSectionHeader('Desktop Tools'),
@@ -256,7 +275,7 @@ class ToolsPage extends WatchingWidget {
                           context: context,
                           title: 'Datenbank aus SchiLD importieren',
                           message:
-                              'Achtung! Nicht mehr vorhandene SchülerInnen auf dem Server werden gelöscht. Fortfahren?',
+                              'Achtung! Nicht mehr vorhandene SchülerInnen auf dem Server werden deaktiviert. Fortfahren?',
                         );
                         if (confirm == true) {
                           importUnencryptedPupilIdentitySourceFile(
diff --git a/school_data_hub_flutter/lib/features/app_main_navigation/widgets/landing_bottom_nav_bar.dart b/school_data_hub_flutter/lib/features/app_main_navigation/widgets/landing_bottom_nav_bar.dart
index 90bd4ec1..18105a61 100644
--- a/school_data_hub_flutter/lib/features/app_main_navigation/widgets/landing_bottom_nav_bar.dart
+++ b/school_data_hub_flutter/lib/features/app_main_navigation/widgets/landing_bottom_nav_bar.dart
@@ -14,6 +14,7 @@ import 'package:school_data_hub_flutter/features/app_main_navigation/pupil_lists
 import 'package:school_data_hub_flutter/features/app_main_navigation/school_lists_page.dart';
 import 'package:school_data_hub_flutter/features/app_main_navigation/tools_page.dart';
 import 'package:school_data_hub_flutter/features/app_settings/settings_page/settings_page.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_helper.dart';
 import 'package:school_data_hub_flutter/l10n/app_localizations.dart';
 import 'package:watch_it/watch_it.dart';
 
@@ -39,10 +40,10 @@ class _MainMenuBottomNavigationState extends State<MainMenuBottomNavigation> {
 
   void showHeavyLoadingOverlay(BuildContext context) {
     overlayEntry = OverlayEntry(
-      builder: (context) => const Stack(
+      builder: (context) => Stack(
         fit: StackFit.expand,
         children: [
-          ModalBarrier(
+          const ModalBarrier(
             dismissible: false,
             color: Color.fromARGB(
               108,
@@ -58,7 +59,7 @@ class _MainMenuBottomNavigationState extends State<MainMenuBottomNavigation> {
                 mainAxisSize: MainAxisSize.min,
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
-                  Text(
+                  const Text(
                     'Bitte warten...', // Your text here
                     style: TextStyle(
                       color: Colors.white, // Text color
@@ -66,7 +67,7 @@ class _MainMenuBottomNavigationState extends State<MainMenuBottomNavigation> {
                       fontWeight: FontWeight.bold,
                     ),
                   ),
-                  SizedBox(height: 16),
+                  const SizedBox(height: 16),
                   CircularProgressIndicator(color: AppColors.interactiveColor),
                 ],
               ),
@@ -198,7 +199,10 @@ class _MainMenuBottomNavigationState extends State<MainMenuBottomNavigation> {
           }),
         );
       }
+      await di.allReady();
+      PupilIdentityHelper.checkForOutdatedPupilIdentities();
     });
+
     return Scaffold(
       backgroundColor: AppColors.canvasColor,
       body: PageView(
@@ -265,7 +269,7 @@ void showInstanceLoadingOverlay(BuildContext context) {
     builder: (context) => Stack(
       fit: StackFit.expand,
       children: [
-        const ModalBarrier(
+        ModalBarrier(
           dismissible: false,
           color: AppColors.backgroundColor, // Colors.black.withOpacity(0.3)
         ), // Background color
@@ -313,7 +317,7 @@ void showInstanceLoadingOverlay(BuildContext context) {
                   ),
                 ),
                 const SizedBox(height: 16),
-                const CircularProgressIndicator(color: AppColors.accentColor),
+                CircularProgressIndicator(color: AppColors.accentColor),
               ],
             ),
           ),
diff --git a/school_data_hub_flutter/lib/features/app_main_navigation/widgets/pupil_lists_buttons.dart b/school_data_hub_flutter/lib/features/app_main_navigation/widgets/pupil_lists_buttons.dart
index 86b5348a..81cc9d4d 100644
--- a/school_data_hub_flutter/lib/features/app_main_navigation/widgets/pupil_lists_buttons.dart
+++ b/school_data_hub_flutter/lib/features/app_main_navigation/widgets/pupil_lists_buttons.dart
@@ -9,8 +9,8 @@ import 'package:school_data_hub_flutter/features/learning/presentation/pupil_com
 import 'package:school_data_hub_flutter/features/learning_support/presentation/learning_support_list_page/learning_support_list_page.dart';
 import 'package:school_data_hub_flutter/features/matrix/users/presentation/matrix_users_list_page/matrix_users_list_page.dart';
 import 'package:school_data_hub_flutter/features/matrix/users/presentation/pupil_matrix_contacts_list_page/pupils_matrix_contacts_list_page.dart';
-import 'package:school_data_hub_flutter/features/ogs/ogs_list_page.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/_credit/credit_list_page/credit_list_page.dart';
+import 'package:school_data_hub_flutter/features/pupil/presentation/after_school_care/after_school_care_list_page.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/family_language_lessons_page/family_language_lessons_list_page.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/religion_page/religion_list_page.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/special_info_page/special_info_list_page.dart';
@@ -38,7 +38,7 @@ class PupilListButtons extends WatchingWidget {
       children: [
         MainMenuButton(
           destinationPage: const SchooldayEventListPage(),
-          buttonIcon: const Icon(
+          buttonIcon: Icon(
             Icons.warning_rounded,
             size: 50,
             color: AppColors.gridViewColor,
@@ -47,7 +47,7 @@ class PupilListButtons extends WatchingWidget {
         ),
         MainMenuButton(
           destinationPage: const MissedSchooldayesPupilListPage(),
-          buttonIcon: const Icon(
+          buttonIcon: Icon(
             Icons.calendar_month_rounded,
             size: 50,
             color: AppColors.gridViewColor,
@@ -56,7 +56,7 @@ class PupilListButtons extends WatchingWidget {
         ),
         MainMenuButton(
           destinationPage: const AttendanceListPage(),
-          buttonIcon: const Icon(
+          buttonIcon: Icon(
             Icons.event_available_rounded,
             size: 50,
             color: AppColors.gridViewColor,
@@ -65,7 +65,7 @@ class PupilListButtons extends WatchingWidget {
         ),
         MainMenuButton(
           destinationPage: const CreditListPage(),
-          buttonIcon: const Icon(
+          buttonIcon: Icon(
             Icons.attach_money_rounded,
             size: 50,
             color: AppColors.gridViewColor,
@@ -75,7 +75,7 @@ class PupilListButtons extends WatchingWidget {
         if (isReady)
           MainMenuButton(
             destinationPage: const LearningPupilListPage(),
-            buttonIcon: const Icon(
+            buttonIcon: Icon(
               Icons.lightbulb,
               size: 50,
               color: AppColors.gridViewColor,
@@ -84,7 +84,7 @@ class PupilListButtons extends WatchingWidget {
           ),
         MainMenuButton(
           destinationPage: const LearningSupportListPage(),
-          buttonIcon: const Icon(
+          buttonIcon: Icon(
             Icons.support_rounded,
             size: 50,
             color: AppColors.gridViewColor,
@@ -93,16 +93,16 @@ class PupilListButtons extends WatchingWidget {
         ),
         MainMenuButton(
           destinationPage: const SpecialInfoListPage(),
-          buttonIcon: const Icon(
+          buttonIcon: Icon(
             Icons.emergency_rounded,
             size: 50,
             color: AppColors.gridViewColor,
           ),
           buttonText: locale.specialInfo,
         ),
-        const MainMenuButton(
+        MainMenuButton(
           destinationPage: const ReligionListPage(),
-          buttonIcon: const Row(
+          buttonIcon: Row(
             mainAxisAlignment: MainAxisAlignment.center,
             crossAxisAlignment: CrossAxisAlignment.end,
             children: [
@@ -120,9 +120,9 @@ class PupilListButtons extends WatchingWidget {
           ),
           buttonText: 'Reli-Unterricht',
         ),
-        const MainMenuButton(
+        MainMenuButton(
           destinationPage: const FamilyLanguageLessonsListPage(),
-          buttonIcon: const Row(
+          buttonIcon: Row(
             mainAxisAlignment: MainAxisAlignment.center,
             crossAxisAlignment: CrossAxisAlignment.end,
             children: [
@@ -139,7 +139,7 @@ class PupilListButtons extends WatchingWidget {
           destinationPage: const OgsListPage(),
           buttonIcon: Text(
             locale.allDayCare,
-            style: const TextStyle(
+            style: TextStyle(
               fontSize: 35,
               color: AppColors.gridViewColor,
               fontWeight: FontWeight.bold,
@@ -150,14 +150,14 @@ class PupilListButtons extends WatchingWidget {
         if (matrixSessionConfigured)
           MainMenuButton(
             destinationPage: const MatrixUsersListPage(),
-            buttonIcon: const Icon(
+            buttonIcon: Icon(
               Icons.chat_rounded,
               size: 50,
               color: AppColors.gridViewColor,
             ),
             buttonText: locale.matrixRooms,
           ),
-        const MainMenuButton(
+        MainMenuButton(
           destinationPage: PupilsMatrixContactsListPage(),
           buttonIcon: Icon(
             Icons.group,
diff --git a/school_data_hub_flutter/lib/features/app_settings/settings_page/dialogs/change_env_dialog.dart b/school_data_hub_flutter/lib/features/app_settings/settings_page/dialogs/change_env_dialog.dart
index 50e4a28d..cdb6378b 100644
--- a/school_data_hub_flutter/lib/features/app_settings/settings_page/dialogs/change_env_dialog.dart
+++ b/school_data_hub_flutter/lib/features/app_settings/settings_page/dialogs/change_env_dialog.dart
@@ -35,7 +35,7 @@ Future<bool?> changeEnvironmentDialog({required BuildContext context}) async {
                     TextButton(
                       child: Text(
                         envs[index].serverName,
-                        style: const TextStyle(
+                        style: TextStyle(
                           fontSize: 20,
                           color: AppColors.interactiveColor,
                         ),
@@ -77,7 +77,7 @@ Future<bool?> changeEnvironmentDialog({required BuildContext context}) async {
                     ),
                     const Gap(10),
                     _envManager.activeEnv?.serverName == envs[index].serverName
-                        ? const Icon(
+                        ? Icon(
                             Icons.check,
                             color: Colors.green,
                             weight: 20,
diff --git a/school_data_hub_flutter/lib/features/app_settings/settings_page/settings_page.dart b/school_data_hub_flutter/lib/features/app_settings/settings_page/settings_page.dart
index 7ec22bf5..b4481e6d 100644
--- a/school_data_hub_flutter/lib/features/app_settings/settings_page/settings_page.dart
+++ b/school_data_hub_flutter/lib/features/app_settings/settings_page/settings_page.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_settings_ui/flutter_settings_ui.dart';
-import 'package:school_data_hub_flutter/app_utils/logs_page.dart';
+import 'package:school_data_hub_flutter/app_utils/logger/presentation/logs_page/logs_page.dart';
 import 'package:school_data_hub_flutter/app_utils/shorebird_code_push.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/theme/styles.dart';
@@ -11,6 +11,7 @@ import 'package:school_data_hub_flutter/features/app_settings/settings_page/widg
 import 'package:school_data_hub_flutter/features/app_settings/settings_page/widgets/settings_admin_section.dart';
 import 'package:school_data_hub_flutter/features/app_settings/settings_page/widgets/settings_session_section.dart';
 import 'package:school_data_hub_flutter/l10n/app_localizations.dart';
+import 'package:signals/signals_flutter.dart';
 import 'package:watch_it/watch_it.dart';
 
 class SettingsPage extends StatelessWidget {
@@ -18,6 +19,7 @@ class SettingsPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    AppColors.paletteSignal.watch(context);
     final locale = AppLocalizations.of(context)!;
 
     final envManager = di<EnvManager>();
@@ -69,9 +71,7 @@ class SettingsPage extends StatelessWidget {
                     leading: const Icon(Icons.bug_report_rounded),
                     title: const Text('Logs'),
                     onPressed: (context) => Navigator.of(context).push(
-                      MaterialPageRoute(
-                        builder: (ctx) => const LogViewerPage(),
-                      ),
+                      MaterialPageRoute(builder: (ctx) => LogViewerPage()),
                     ),
                   ),
                   SettingsTile.navigation(
diff --git a/school_data_hub_flutter/lib/features/app_settings/settings_page/widgets/settings_account_section.dart b/school_data_hub_flutter/lib/features/app_settings/settings_page/widgets/settings_account_section.dart
index 749fc03a..6b6dd9e8 100644
--- a/school_data_hub_flutter/lib/features/app_settings/settings_page/widgets/settings_account_section.dart
+++ b/school_data_hub_flutter/lib/features/app_settings/settings_page/widgets/settings_account_section.dart
@@ -19,6 +19,7 @@ class SettingsAccountSection extends AbstractSettingsSection with WatchItMixin {
     )!.userInfo!.userName!;
     final isTester = di<HubSessionManager>().user!.userFlags.isTester;
     final isAdmin = di<HubSessionManager>().isAdmin;
+    final int userCredit = di<HubSessionManager>().userCredit ?? 0;
     return SettingsSection(
       title: const Text(
         'Konto',
@@ -81,6 +82,14 @@ class SettingsAccountSection extends AbstractSettingsSection with WatchItMixin {
           value: const Text('App wird zurückgesetzt!'),
           //onPressed:
         ),
+        SettingsTile.navigation(
+          leading: const Icon(Icons.attach_money_rounded),
+          title: const Text('Guthaben'),
+          value: Text(
+            userCredit.toString(),
+            style: const TextStyle(fontWeight: FontWeight.bold),
+          ),
+        ),
       ],
     );
   }
diff --git a/school_data_hub_flutter/lib/features/app_settings/settings_page/widgets/settings_admin_section.dart b/school_data_hub_flutter/lib/features/app_settings/settings_page/widgets/settings_admin_section.dart
index 65eddefd..31b94f56 100644
--- a/school_data_hub_flutter/lib/features/app_settings/settings_page/widgets/settings_admin_section.dart
+++ b/school_data_hub_flutter/lib/features/app_settings/settings_page/widgets/settings_admin_section.dart
@@ -14,7 +14,6 @@ import 'package:school_data_hub_flutter/features/learning_support/domain/learnin
 import 'package:school_data_hub_flutter/features/learning_support/domain/support_category_manager.dart';
 import 'package:school_data_hub_flutter/features/matrix/domain/matrix_policy_manager.dart';
 import 'package:school_data_hub_flutter/features/matrix/presentation/set_matrix_environment_page/set_matrix_environment_controller.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
 import 'package:school_data_hub_flutter/features/school/presentation/edit_school_data_page/edit_school_data_page.dart';
 import 'package:school_data_hub_flutter/features/school_calendar/presentation/new_school_semester_page/new_school_semester_page.dart';
 import 'package:school_data_hub_flutter/features/school_calendar/presentation/new_school_semester_page/schooldays_calendar_page/schooldays_calendar_page.dart';
@@ -233,15 +232,6 @@ class SettingsAdminSection extends AbstractSettingsSection with WatchItMixin {
           leading: const Icon(Icons.compare_arrows_rounded),
           title: const Text('Förderstufen aus Datei importieren'),
 
-          //onPressed:
-        ),
-        SettingsTile.navigation(
-          onPressed: (context) async {
-            await di<PupilManager>().importPupilDataFromJson();
-          },
-          leading: const Icon(Icons.compare_arrows_rounded),
-          title: const Text('Kinderdaten aus Datei importieren'),
-
           //onPressed:
         ),
       ],
diff --git a/school_data_hub_flutter/lib/features/app_settings/settings_page/widgets/settings_session_section.dart b/school_data_hub_flutter/lib/features/app_settings/settings_page/widgets/settings_session_section.dart
index 8654088f..14ddfc9c 100644
--- a/school_data_hub_flutter/lib/features/app_settings/settings_page/widgets/settings_session_section.dart
+++ b/school_data_hub_flutter/lib/features/app_settings/settings_page/widgets/settings_session_section.dart
@@ -3,16 +3,18 @@ import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 import 'package:flutter_settings_ui/flutter_settings_ui.dart';
 import 'package:gap/gap.dart';
 import 'package:logging/logging.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
+import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
 import 'package:school_data_hub_flutter/core/env/env_manager.dart';
 import 'package:school_data_hub_flutter/core/init/init_manager.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_helper.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 import 'package:school_data_hub_flutter/features/app_entry_point/login_page/login_controller.dart';
 import 'package:school_data_hub_flutter/features/app_settings/settings_page/dialogs/change_env_dialog.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_helper_functions.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_helper.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_manager.dart';
 import 'package:school_data_hub_flutter/l10n/app_localizations.dart';
 import 'package:watch_it/watch_it.dart';
 
@@ -23,15 +25,104 @@ class SettingsSessionSection extends AbstractSettingsSection with WatchItMixin {
 
   @override
   Widget build(BuildContext context) {
-    di.allReady();
+    callOnce((BuildContext context) async {
+      await di.allReady();
+    });
+
     final serverName = watchPropertyValue((EnvManager x) => x.activeEnv);
     final _cacheManager = di<DefaultCacheManager>();
 
+    final pupilIdentityManager = di.isRegistered<PupilIdentityManager>()
+        ? di<PupilIdentityManager>()
+        : null;
+    final remoteUpdate = pupilIdentityManager?.remoteLastIdentitiesUpdate.value;
+
     final _notificationService = di<NotificationService>();
 
     final locale = AppLocalizations.of(context)!;
     final _hubSessionManager = di<HubSessionManager>();
-    final int userCredit = _hubSessionManager.userCredit ?? 0;
+
+    final activeEnv = serverName;
+    final activeSchemeKey = appColorSchemeKeyFromString(
+      activeEnv?.colorSchemeKey,
+    );
+    final palettes = AppColors.availablePalettes();
+    final currentPalette = palettes.firstWhere(
+      (palette) => palette.key == activeSchemeKey,
+      orElse: () => palettes.first,
+    );
+
+    Future<void> _openColorSchemePicker() async {
+      var tempSelection = activeSchemeKey;
+      final selected = await showDialog<AppColorSchemeKey>(
+        context: context,
+        builder: (ctx) => StatefulBuilder(
+          builder: (ctx, setState) => AlertDialog(
+            title: const Text(
+              'Farbschema wählen',
+              style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
+            ),
+            content: SizedBox(
+              width: 360,
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: palettes
+                    .map(
+                      (palette) => RadioListTile<AppColorSchemeKey>(
+                        value: palette.key,
+                        // ignore: deprecated_member_use
+                        groupValue: tempSelection,
+                        // ignore: deprecated_member_use
+                        onChanged: (value) {
+                          if (value == null) return;
+                          setState(() {
+                            tempSelection = value;
+                          });
+                        },
+                        title: Row(
+                          children: [
+                            ClipRRect(
+                              borderRadius: BorderRadius.circular(10),
+                              child: Container(
+                                color: palette.backgroundColor,
+                                width: 20,
+                                height: 20,
+                              ),
+                            ),
+                            const Gap(10),
+                            Text(palette.displayName),
+                          ],
+                        ),
+                      ),
+                    )
+                    .toList(),
+              ),
+            ),
+            actions: [
+              TextButton(
+                onPressed: () => Navigator.of(ctx).pop(),
+                child: const Text('Abbrechen'),
+              ),
+              TextButton(
+                onPressed: () => Navigator.of(ctx).pop(tempSelection),
+                child: const Text('Speichern'),
+              ),
+            ],
+          ),
+        ),
+      );
+
+      if (selected == null) {
+        return;
+      }
+
+      await di<EnvManager>().updateActiveEnv(colorSchemeKey: selected.name);
+      AppColors.setPalette(selected);
+      _notificationService.showSnackBar(
+        NotificationType.success,
+        'Farbschema aktualisiert',
+      );
+    }
 
     return SettingsSection(
       title: Text(
@@ -46,6 +137,13 @@ class SettingsSessionSection extends AbstractSettingsSection with WatchItMixin {
           value: Text(serverName!.serverName),
           trailing: null,
         ),
+        SettingsTile.navigation(
+          onPressed: (context) => _openColorSchemePicker(),
+          leading: const Icon(Icons.color_lens_outlined),
+          title: const Text('Farbschema'),
+          value: Text(currentPalette.displayName),
+          trailing: null,
+        ),
         if (_hubSessionManager.isAdmin)
           SettingsTile.navigation(
             onPressed: (context) => changeEnvironmentDialog(context: context),
@@ -55,26 +153,6 @@ class SettingsSessionSection extends AbstractSettingsSection with WatchItMixin {
             trailing: null,
           ),
 
-        SettingsTile.navigation(
-          leading: const Icon(Icons.perm_identity_rounded),
-          title: const Text('Personenbezogene Daten vom:'),
-          value: Text(
-            di<EnvManager>().activeEnv?.lastIdentitiesUpdate
-                    ?.formatDateForUser() ??
-                'unbekannt',
-          ),
-          trailing: null,
-        ),
-
-        SettingsTile.navigation(
-          leading: const Icon(Icons.attach_money_rounded),
-          title: const Text('Guthaben'),
-          value: Text(
-            userCredit.toString(),
-            style: const TextStyle(fontWeight: FontWeight.bold),
-          ),
-        ),
-
         SettingsTile.navigation(
           onPressed: (context) async {
             final confirm = await confirmationDialog(
@@ -97,6 +175,34 @@ class SettingsSessionSection extends AbstractSettingsSection with WatchItMixin {
 
           //onPressed:
         ),
+        SettingsTile.navigation(
+          leading: const Icon(Icons.perm_identity_rounded),
+          title: const Text('Lokale Daten vom:'),
+          value: Text(
+            '${di<EnvManager>().activeEnv?.lastIdentitiesUpdate?.formatDateAndTimeForUser() ?? 'Keine Daten'} ',
+            style: TextStyle(
+              fontWeight: FontWeight.bold,
+              color:
+                  di<EnvManager>().activeEnv?.lastIdentitiesUpdate ==
+                          remoteUpdate ||
+                      remoteUpdate != null &&
+                          di<EnvManager>().activeEnv?.lastIdentitiesUpdate !=
+                              null &&
+                          (di<EnvManager>().activeEnv?.lastIdentitiesUpdate!
+                                  .isAfter(remoteUpdate) ==
+                              true)
+                  ? Colors.green
+                  : Colors.red,
+            ),
+          ),
+          trailing: null,
+        ),
+        SettingsTile.navigation(
+          leading: const Icon(Icons.perm_identity_rounded),
+          title: const Text('Aktuelleste Daten vom:'),
+          value: Text('${remoteUpdate?.formatDateAndTimeForUser()}'),
+          trailing: null,
+        ),
         SettingsTile.navigation(
           leading: const Row(
             children: [
@@ -141,7 +247,7 @@ class SettingsSessionSection extends AbstractSettingsSection with WatchItMixin {
               _log.warning(
                 '[DI] Env deleted, calling [unregisterMaagersDependentOnEnv] from the settings section!',
               );
-              InitManager.dropOldActiveEnvAndRelatedScopes();
+              InitManager.dropAllScopes();
               _notificationService.showSnackBar(
                 NotificationType.success,
                 'Instanz-ID-Schlüssel gelöscht',
diff --git a/school_data_hub_flutter/lib/features/authorizations/domain/authorization_manager.dart b/school_data_hub_flutter/lib/features/authorizations/domain/authorization_manager.dart
index 9a30b7f6..b37f7202 100644
--- a/school_data_hub_flutter/lib/features/authorizations/domain/authorization_manager.dart
+++ b/school_data_hub_flutter/lib/features/authorizations/domain/authorization_manager.dart
@@ -28,6 +28,13 @@ class AuthorizationManager with ChangeNotifier {
 
   AuthorizationManager();
 
+  void dispose() {
+    _authorizations.dispose();
+    _authorizationsMap.clear();
+    super.dispose();
+    return;
+  }
+
   Future<AuthorizationManager> init() async {
     _notificationService.showSnackBar(
       NotificationType.success,
@@ -112,13 +119,12 @@ class AuthorizationManager with ChangeNotifier {
     ({MemberOperation operation, List<int> pupilIds})? membersToUpdate,
   }) async {
     final updatedAuth = await ClientHelper.apiCall(
-      call:
-          () => _authorizationApiService.updateAuthorization(
-            authId,
-            name,
-            description,
-            membersToUpdate,
-          ),
+      call: () => _authorizationApiService.updateAuthorization(
+        authId,
+        name,
+        description,
+        membersToUpdate,
+      ),
     );
     if (updatedAuth == null) {
       return;
@@ -155,10 +161,9 @@ class AuthorizationManager with ChangeNotifier {
     ({bool? value})? status,
     String? comment,
   }) async {
-    final pupilAuth =
-        _authorizationsMap[authorizationId]!.authorizedPupils!
-            .where((element) => element.pupilId == pupilId)
-            .first;
+    final pupilAuth = _authorizationsMap[authorizationId]!.authorizedPupils!
+        .where((element) => element.pupilId == pupilId)
+        .first;
     final pupilAuthUpdate = pupilAuth.copyWith(
       status: status != null ? status.value : pupilAuth.status,
       comment: comment ?? pupilAuth.comment,
@@ -208,8 +213,9 @@ class AuthorizationManager with ChangeNotifier {
 
   //- diese Funktion hat keinen API-Call
   Authorization getAuthorization(int authId) {
-    final Authorization authorizations =
-        _authorizations.value.where((element) => element.id == authId).first;
+    final Authorization authorizations = _authorizations.value
+        .where((element) => element.id == authId)
+        .first;
 
     return authorizations;
   }
@@ -246,15 +252,13 @@ class AuthorizationManager with ChangeNotifier {
     List<PupilProxy> filteredPupils,
   ) {
     final Authorization authorization = _authorizationsMap[authorizationId]!;
-    final List<PupilProxy> listedPupils =
-        filteredPupils
-            .where(
-              (pupil) => authorization.authorizedPupils!.any(
-                (authorization) =>
-                    authorization.authorizationId == authorizationId,
-              ),
-            )
-            .toList();
+    final List<PupilProxy> listedPupils = filteredPupils
+        .where(
+          (pupil) => authorization.authorizedPupils!.any(
+            (authorization) => authorization.authorizationId == authorizationId,
+          ),
+        )
+        .toList();
 
     return listedPupils;
   }
diff --git a/school_data_hub_flutter/lib/features/authorizations/domain/filters/authorization_filter_manager.dart b/school_data_hub_flutter/lib/features/authorizations/domain/filters/authorization_filter_manager.dart
index 5813b9a2..b11b0659 100644
--- a/school_data_hub_flutter/lib/features/authorizations/domain/filters/authorization_filter_manager.dart
+++ b/school_data_hub_flutter/lib/features/authorizations/domain/filters/authorization_filter_manager.dart
@@ -17,8 +17,12 @@ class AuthorizationFilterManager {
 
   String _currentSearchText = '';
   void dispose() {
-    _authorizationManager.authorizations
-        .removeListener(_onAuthorizationsChanged);
+    _authorizationManager.authorizations.removeListener(
+      _onAuthorizationsChanged,
+    );
+    _filterState.dispose();
+    _filteredAuthorizations.dispose();
+    return;
   }
 
   AuthorizationFilterManager init() {
@@ -43,7 +47,9 @@ class AuthorizationFilterManager {
     _filterState.value = false;
     _filteredAuthorizations.value = _authorizationManager.authorizations.value;
     _filtersStateManager.setFilterState(
-        filterState: FilterState.authorization, value: false);
+      filterState: FilterState.authorization,
+      value: false,
+    );
   }
 
   onSearchText(String text) {
diff --git a/school_data_hub_flutter/lib/features/authorizations/domain/filters/pupil_authorization_filter_manager.dart b/school_data_hub_flutter/lib/features/authorizations/domain/filters/pupil_authorization_filter_manager.dart
index 5158edb1..8b48dd89 100644
--- a/school_data_hub_flutter/lib/features/authorizations/domain/filters/pupil_authorization_filter_manager.dart
+++ b/school_data_hub_flutter/lib/features/authorizations/domain/filters/pupil_authorization_filter_manager.dart
@@ -9,7 +9,7 @@ import 'package:watch_it/watch_it.dart';
 
 typedef AuthorizationFilterRecord = ({
   AuthorizationFilter authorizationFilter,
-  bool value
+  bool value,
 });
 
 // class AuthorizationFilter extends Filter<PupilProxy> {
@@ -126,7 +126,7 @@ enum AuthorizationFilter {
   no,
   nullResponse,
   commentResponse,
-  fileResponse
+  fileResponse,
 }
 
 Map<AuthorizationFilter, bool> initialPupilAuthorizationFilterValues = {
@@ -140,22 +140,30 @@ Map<AuthorizationFilter, bool> initialPupilAuthorizationFilterValues = {
 class PupilAuthorizationFilterManager {
   final _pupilAuthorizationFilterState =
       ValueNotifier<Map<AuthorizationFilter, bool>>(
-          initialPupilAuthorizationFilterValues);
+        initialPupilAuthorizationFilterValues,
+      );
   ValueListenable<Map<AuthorizationFilter, bool>>
-      get authorizationFilterState => _pupilAuthorizationFilterState;
+  get authorizationFilterState => _pupilAuthorizationFilterState;
 
   PupilAuthorizationFilterManager();
+  void dispose() {
+    _pupilAuthorizationFilterState.dispose();
+    return;
+  }
 
-  resetFilters() {
+  void resetFilters() {
     _pupilAuthorizationFilterState.value = {
-      ...initialPupilAuthorizationFilterValues
+      ...initialPupilAuthorizationFilterValues,
     };
-    di<FiltersStateManager>()
-        .setFilterState(filterState: FilterState.pupil, value: false);
+    di<FiltersStateManager>().setFilterState(
+      filterState: FilterState.pupil,
+      value: false,
+    );
   }
 
-  void setFilter(
-      {required List<AuthorizationFilterRecord> authorizationFilters}) {
+  void setFilter({
+    required List<AuthorizationFilterRecord> authorizationFilters,
+  }) {
     for (AuthorizationFilterRecord record in authorizationFilters) {
       _pupilAuthorizationFilterState.value = {
         ..._pupilAuthorizationFilterState.value,
@@ -164,12 +172,15 @@ class PupilAuthorizationFilterManager {
     }
 
     final authorizationFilterStateEqualsInitialValues = const MapEquality()
-        .equals(_pupilAuthorizationFilterState.value,
-            initialPupilAuthorizationFilterValues);
+        .equals(
+          _pupilAuthorizationFilterState.value,
+          initialPupilAuthorizationFilterValues,
+        );
 
     di<FiltersStateManager>().setFilterState(
-        filterState: FilterState.pupil,
-        value: !authorizationFilterStateEqualsInitialValues);
+      filterState: FilterState.pupil,
+      value: !authorizationFilterStateEqualsInitialValues,
+    );
 
     di<PupilsFilter>().refreshs();
   }
@@ -180,32 +191,32 @@ class PupilAuthorizationFilterManager {
     List<PupilAuthorization> filteredPupilAuthorizations = [];
     bool filterIsOn = false;
     for (PupilAuthorization pupilAuthorization in pupilAuthorizations) {
-      if (activeFilters
-              .pupilFilterState.value[PupilFilter.authorizationPositive]! &&
+      if (activeFilters.pupilFilterState.value[PupilFilter
+              .authorizationPositive]! &&
           pupilAuthorization.status != true) {
         filterIsOn = true;
         continue;
       }
-      if (activeFilters
-              .pupilFilterState.value[PupilFilter.authorizationNegative]! &&
+      if (activeFilters.pupilFilterState.value[PupilFilter
+              .authorizationNegative]! &&
           pupilAuthorization.status != false) {
         filterIsOn = true;
         continue;
       }
-      if (activeFilters
-              .pupilFilterState.value[PupilFilter.authorizationNoValue]! &&
+      if (activeFilters.pupilFilterState.value[PupilFilter
+              .authorizationNoValue]! &&
           pupilAuthorization.status != null) {
         filterIsOn = true;
         continue;
       }
-      if (activeFilters
-              .pupilFilterState.value[PupilFilter.authorizationComment]! &&
+      if (activeFilters.pupilFilterState.value[PupilFilter
+              .authorizationComment]! &&
           pupilAuthorization.comment == null) {
         filterIsOn = true;
         continue;
       }
-      if (activeFilters
-              .pupilFilterState.value[PupilFilter.authorizationNoFile]! &&
+      if (activeFilters.pupilFilterState.value[PupilFilter
+              .authorizationNoFile]! &&
           pupilAuthorization.fileId != null) {
         filterIsOn = true;
         continue;
@@ -214,8 +225,10 @@ class PupilAuthorizationFilterManager {
       filteredPupilAuthorizations.add(pupilAuthorization);
     }
     if (filterIsOn) {
-      di<FiltersStateManager>()
-          .setFilterState(filterState: FilterState.pupil, value: true);
+      di<FiltersStateManager>().setFilterState(
+        filterState: FilterState.pupil,
+        value: true,
+      );
     }
 
     return filteredPupilAuthorizations;
diff --git a/school_data_hub_flutter/lib/features/authorizations/presentation/authorization_pupils_page/authorization_pupils_page.dart b/school_data_hub_flutter/lib/features/authorizations/presentation/authorization_pupils_page/authorization_pupils_page.dart
index b66198c6..e7287836 100644
--- a/school_data_hub_flutter/lib/features/authorizations/presentation/authorization_pupils_page/authorization_pupils_page.dart
+++ b/school_data_hub_flutter/lib/features/authorizations/presentation/authorization_pupils_page/authorization_pupils_page.dart
@@ -11,7 +11,7 @@ import 'package:school_data_hub_flutter/features/authorizations/presentation/aut
 import 'package:school_data_hub_flutter/features/authorizations/presentation/authorization_pupils_page/widgets/authorization_pupils_bottom_navbar.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
 class AuthorizationPupilsPage extends WatchingWidget {
@@ -21,32 +21,34 @@ class AuthorizationPupilsPage extends WatchingWidget {
 
   @override
   Widget build(BuildContext context) {
-    final _pupilManager = di<PupilManager>();
-    final _pupilAuthorizationFilterManager = di<PupilAuthorizationFilterManager>();
+    final _pupilManager = di<PupilProxyManager>();
+    final _pupilAuthorizationFilterManager =
+        di<PupilAuthorizationFilterManager>();
     // final filters = watchValue((PupilFilterManager x) => x.filterState);
 
-    final thisAuthorization =
-        watchValue((AuthorizationManager x) => x.authorizations).firstWhere(
-            (authorization) => authorization.id == this.authorization.id);
+    final thisAuthorization = watchValue(
+      (AuthorizationManager x) => x.authorizations,
+    ).firstWhere((authorization) => authorization.id == this.authorization.id);
 
     final filteredPupils = watchValue((PupilsFilter x) => x.filteredPupils);
 
     final List<PupilAuthorization> pupilAuthorizations =
         _pupilAuthorizationFilterManager
             .applyAuthorizationFiltersToPupilAuthorizations(
-                thisAuthorization.authorizedPupils!);
+              thisAuthorization.authorizedPupils!,
+            );
 
     List<PupilProxy> pupilsInList = filteredPupils
-        .where((pupil) => pupilAuthorizations
-            .any((pupilAuth) => pupilAuth.pupilId == pupil.pupilId))
+        .where(
+          (pupil) => pupilAuthorizations.any(
+            (pupilAuth) => pupilAuth.pupilId == pupil.pupilId,
+          ),
+        )
         .toList();
 
     return Scaffold(
       backgroundColor: AppColors.canvasColor,
-      appBar: GenericAppBar(
-        iconData: Icons.list,
-        title: authorization.name,
-      ),
+      appBar: GenericAppBar(iconData: Icons.list, title: authorization.name),
       body: RefreshIndicator(
         onRefresh: () async => di<AuthorizationManager>().fetchAuthorizations(),
         child: Center(
@@ -58,8 +60,9 @@ class AuthorizationPupilsPage extends WatchingWidget {
                   const SliverGap(5),
                   GenericSliverSearchAppBar(
                     height: 110,
-                    title:
-                        AuthorizationPupilListSearchBar(pupils: pupilsInList),
+                    title: AuthorizationPupilListSearchBar(
+                      pupils: pupilsInList,
+                    ),
                   ),
                   pupilsInList.isEmpty
                       ? const SliverToBoxAdapter(
@@ -78,7 +81,9 @@ class AuthorizationPupilsPage extends WatchingWidget {
                             (BuildContext context, int index) {
                               // Your list view items go here
                               return AuthorizationPupilCard(
-                                  pupilsInList[index].pupilId, authorization);
+                                pupilsInList[index].pupilId,
+                                authorization,
+                              );
                             },
                             childCount: pupilsInList
                                 .length, // Adjust this based on your data
@@ -92,8 +97,9 @@ class AuthorizationPupilsPage extends WatchingWidget {
       ),
       bottomNavigationBar: AuthorizationPupilsBottomNavBar(
         authorization: authorization,
-        pupilsInAuthorization:
-            _pupilManager.getPupilIdsFromPupils(pupilsInList),
+        pupilsInAuthorization: _pupilManager.getPupilIdsFromPupils(
+          pupilsInList,
+        ),
       ),
     );
   }
diff --git a/school_data_hub_flutter/lib/features/authorizations/presentation/authorization_pupils_page/widgets/authorization_pupil_card.dart b/school_data_hub_flutter/lib/features/authorizations/presentation/authorization_pupils_page/widgets/authorization_pupil_card.dart
index aa08b22e..761ef94f 100644
--- a/school_data_hub_flutter/lib/features/authorizations/presentation/authorization_pupils_page/widgets/authorization_pupil_card.dart
+++ b/school_data_hub_flutter/lib/features/authorizations/presentation/authorization_pupils_page/widgets/authorization_pupil_card.dart
@@ -3,16 +3,16 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
+import 'package:school_data_hub_flutter/app_utils/create_and_crop_image_file.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/custom_checkbox_either_or.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/long_textfield_dialog.dart';
-import 'package:school_data_hub_flutter/common/widgets/document_image.dart';
-import 'package:school_data_hub_flutter/app_utils/create_and_crop_image_file.dart';
+import 'package:school_data_hub_flutter/common/widgets/encrypted_document_image.dart';
 import 'package:school_data_hub_flutter/features/app_main_navigation/domain/main_menu_bottom_nav_manager.dart';
 import 'package:school_data_hub_flutter/features/authorizations/domain/authorization_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/pupil_profile_page.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/widgets/avatar.dart';
 import 'package:watch_it/watch_it.dart';
@@ -23,7 +23,7 @@ class AuthorizationPupilCard extends WatchingWidget {
   const AuthorizationPupilCard(this.pupilId, this.authorization, {super.key});
   @override
   Widget build(BuildContext context) {
-    final _pupilManager = di<PupilManager>();
+    final _pupilManager = di<PupilProxyManager>();
     final _authorizationManager = di<AuthorizationManager>();
     final PupilProxy pupil = _pupilManager.getPupilByPupilId(pupilId)!;
 
@@ -187,7 +187,7 @@ class AuthorizationPupilCard extends WatchingWidget {
                             );
                       },
                       child: pupilAuthorization.fileId != null
-                          ? DocumentImage(
+                          ? EncryptedDocumentImage(
                               documentId: pupilAuthorization.file!.documentId,
                               size: 70,
                             )
@@ -246,7 +246,7 @@ class AuthorizationPupilCard extends WatchingWidget {
                       pupilAuthorization.comment != null
                           ? pupilAuthorization.comment!
                           : 'kein Kommentar',
-                      style: const TextStyle(color: AppColors.backgroundColor),
+                      style: TextStyle(color: AppColors.backgroundColor),
                       textAlign: TextAlign.left,
                       maxLines: 3,
                       softWrap: true,
diff --git a/school_data_hub_flutter/lib/features/authorizations/presentation/authorization_pupils_page/widgets/authorization_pupil_list_searchbar.dart b/school_data_hub_flutter/lib/features/authorizations/presentation/authorization_pupils_page/widgets/authorization_pupil_list_searchbar.dart
index 338fb74c..29a81189 100644
--- a/school_data_hub_flutter/lib/features/authorizations/presentation/authorization_pupils_page/widgets/authorization_pupil_list_searchbar.dart
+++ b/school_data_hub_flutter/lib/features/authorizations/presentation/authorization_pupils_page/widgets/authorization_pupil_list_searchbar.dart
@@ -31,7 +31,7 @@ class AuthorizationPupilListSearchBar extends WatchingWidget {
             child: Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                const Icon(
+                Icon(
                   Icons.people_alt_rounded,
                   color: AppColors.backgroundColor,
                 ),
diff --git a/school_data_hub_flutter/lib/features/authorizations/presentation/authorization_pupils_page/widgets/authorization_pupils_bottom_navbar.dart b/school_data_hub_flutter/lib/features/authorizations/presentation/authorization_pupils_page/widgets/authorization_pupils_bottom_navbar.dart
index 35c3e115..24f9484d 100644
--- a/school_data_hub_flutter/lib/features/authorizations/presentation/authorization_pupils_page/widgets/authorization_pupils_bottom_navbar.dart
+++ b/school_data_hub_flutter/lib/features/authorizations/presentation/authorization_pupils_page/widgets/authorization_pupils_bottom_navbar.dart
@@ -9,7 +9,7 @@ import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 import 'package:school_data_hub_flutter/features/authorizations/domain/authorization_manager.dart';
 import 'package:school_data_hub_flutter/features/authorizations/presentation/authorization_pupils_page/widgets/authorization_pupils_filter_bottom_sheet.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/select_pupils_list_page/select_pupils_list_page.dart';
 import 'package:watch_it/watch_it.dart';
 
@@ -17,17 +17,19 @@ class AuthorizationPupilsBottomNavBar extends WatchingWidget {
   final Authorization authorization;
 
   final List<int> pupilsInAuthorization;
-  const AuthorizationPupilsBottomNavBar(
-      {required this.pupilsInAuthorization,
-      required this.authorization,
-      super.key});
+  const AuthorizationPupilsBottomNavBar({
+    required this.pupilsInAuthorization,
+    required this.authorization,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
     final _hubSessionManager = di<HubSessionManager>();
     final _authorizationManager = di<AuthorizationManager>();
-    final filtersActive =
-        watchValue((FiltersStateManager x) => x.filtersActive);
+    final filtersActive = watchValue(
+      (FiltersStateManager x) => x.filtersActive,
+    );
     return BottomNavBarLayout(
       bottomNavBar: BottomAppBar(
         height: 60,
@@ -41,10 +43,7 @@ class AuthorizationPupilsBottomNavBar extends WatchingWidget {
               const Spacer(),
               IconButton(
                 tooltip: 'zurück',
-                icon: const Icon(
-                  Icons.arrow_back,
-                  size: 35,
-                ),
+                icon: const Icon(Icons.arrow_back, size: 35),
                 onPressed: () {
                   Navigator.pop(context);
                 },
@@ -53,27 +52,32 @@ class AuthorizationPupilsBottomNavBar extends WatchingWidget {
                   _hubSessionManager.isAdmin) ...[
                 const Gap(AppPaddings.bottomNavBarButtonGap),
                 IconButton(
-                    tooltip: 'Kinder hinzufügen',
-                    icon: const Icon(Icons.add, color: Colors.white, size: 30),
-                    onPressed: () async {
-                      final List<int>? selectedPupilIds =
-                          await Navigator.of(context).push(MaterialPageRoute(
-                        builder: (ctx) => SelectPupilsListPage(
-                            selectablePupils: di<PupilManager>()
-                                .getPupilsNotListed(pupilsInAuthorization)),
-                      ));
-                      if (selectedPupilIds == null) {
-                        return;
-                      }
-                      if (selectedPupilIds.isNotEmpty) {
-                        _authorizationManager.updateAuthorization(
-                            authId: authorization.id!,
-                            membersToUpdate: (
-                              operation: MemberOperation.add,
-                              pupilIds: selectedPupilIds
-                            ));
-                      }
-                    })
+                  tooltip: 'Kinder hinzufügen',
+                  icon: const Icon(Icons.add, color: Colors.white, size: 30),
+                  onPressed: () async {
+                    final List<int>? selectedPupilIds =
+                        await Navigator.of(context).push(
+                          MaterialPageRoute(
+                            builder: (ctx) => SelectPupilsListPage(
+                              selectablePupils: di<PupilProxyManager>()
+                                  .getPupilsNotListed(pupilsInAuthorization),
+                            ),
+                          ),
+                        );
+                    if (selectedPupilIds == null) {
+                      return;
+                    }
+                    if (selectedPupilIds.isNotEmpty) {
+                      _authorizationManager.updateAuthorization(
+                        authId: authorization.id!,
+                        membersToUpdate: (
+                          operation: MemberOperation.add,
+                          pupilIds: selectedPupilIds,
+                        ),
+                      );
+                    }
+                  },
+                ),
               ],
               const Gap(AppPaddings.bottomNavBarButtonGap),
               InkWell(
@@ -87,7 +91,7 @@ class AuthorizationPupilsBottomNavBar extends WatchingWidget {
                   size: 30,
                 ),
               ),
-              const Gap(15)
+              const Gap(15),
             ],
           ),
         ),
@@ -97,10 +101,11 @@ class AuthorizationPupilsBottomNavBar extends WatchingWidget {
 }
 
 BottomAppBar authorizationPupilsBottomNavBar(
-    BuildContext context,
-    Authorization authorization,
-    bool filtersOn,
-    List<int> pupilsInAuthorization) {
+  BuildContext context,
+  Authorization authorization,
+  bool filtersOn,
+  List<int> pupilsInAuthorization,
+) {
   final _authorizationManager = di<AuthorizationManager>();
   return BottomAppBar(
     padding: const EdgeInsets.all(9),
@@ -113,10 +118,7 @@ BottomAppBar authorizationPupilsBottomNavBar(
           const Spacer(),
           IconButton(
             tooltip: 'zurück',
-            icon: const Icon(
-              Icons.arrow_back,
-              size: 35,
-            ),
+            icon: const Icon(Icons.arrow_back, size: 35),
             onPressed: () {
               Navigator.pop(context);
             },
@@ -128,23 +130,28 @@ BottomAppBar authorizationPupilsBottomNavBar(
                   icon: const Icon(Icons.add, color: Colors.white, size: 30),
                   onPressed: () async {
                     final List<int>? selectedPupilIds =
-                        await Navigator.of(context).push(MaterialPageRoute(
-                      builder: (ctx) => SelectPupilsListPage(
-                          selectablePupils: di<PupilManager>()
-                              .getPupilsNotListed(pupilsInAuthorization)),
-                    ));
+                        await Navigator.of(context).push(
+                          MaterialPageRoute(
+                            builder: (ctx) => SelectPupilsListPage(
+                              selectablePupils: di<PupilProxyManager>()
+                                  .getPupilsNotListed(pupilsInAuthorization),
+                            ),
+                          ),
+                        );
                     if (selectedPupilIds == null) {
                       return;
                     }
                     if (selectedPupilIds.isNotEmpty) {
                       _authorizationManager.updateAuthorization(
-                          authId: authorization.id!,
-                          membersToUpdate: (
-                            operation: MemberOperation.add,
-                            pupilIds: selectedPupilIds
-                          ));
+                        authId: authorization.id!,
+                        membersToUpdate: (
+                          operation: MemberOperation.add,
+                          pupilIds: selectedPupilIds,
+                        ),
+                      );
                     }
-                  })
+                  },
+                )
               : const SizedBox.shrink(),
           const Gap(10),
           InkWell(
@@ -156,7 +163,7 @@ BottomAppBar authorizationPupilsBottomNavBar(
               size: 30,
             ),
           ),
-          const Gap(10)
+          const Gap(10),
         ],
       ),
     ),
diff --git a/school_data_hub_flutter/lib/features/authorizations/presentation/authorizations_list_page/widgets/authorization_card.dart b/school_data_hub_flutter/lib/features/authorizations/presentation/authorizations_list_page/widgets/authorization_card.dart
index 144be63a..fababe6a 100644
--- a/school_data_hub_flutter/lib/features/authorizations/presentation/authorizations_list_page/widgets/authorization_card.dart
+++ b/school_data_hub_flutter/lib/features/authorizations/presentation/authorizations_list_page/widgets/authorization_card.dart
@@ -44,10 +44,11 @@ class AuthorizationCard extends WatchingWidget {
                 children: [
                   Text(
                     authorization.name,
-                    style: const TextStyle(
-                        fontSize: 20,
-                        fontWeight: FontWeight.bold,
-                        color: AppColors.interactiveColor),
+                    style: TextStyle(
+                      fontSize: 20,
+                      fontWeight: FontWeight.bold,
+                      color: AppColors.interactiveColor,
+                    ),
                   ),
                   const Gap(5),
                   SizedBox(
diff --git a/school_data_hub_flutter/lib/features/authorizations/presentation/authorizations_list_page/widgets/authorization_list_stats_row.dart b/school_data_hub_flutter/lib/features/authorizations/presentation/authorizations_list_page/widgets/authorization_list_stats_row.dart
index eaf17d86..5d16c9f5 100644
--- a/school_data_hub_flutter/lib/features/authorizations/presentation/authorizations_list_page/widgets/authorization_list_stats_row.dart
+++ b/school_data_hub_flutter/lib/features/authorizations/presentation/authorizations_list_page/widgets/authorization_list_stats_row.dart
@@ -12,7 +12,7 @@ Widget authorizationStatsRow(Authorization authorization) {
       (stats['yes'] ?? 0) + (stats['no'] ?? 0) + (stats['null'] ?? 0);
   return Row(
     children: [
-      const Icon(
+      Icon(
         Icons.people_alt_rounded,
         color: AppColors.backgroundColor,
       ),
@@ -54,7 +54,7 @@ Widget authorizationStatsRow(Authorization authorization) {
         ),
       ),
       const Gap(10),
-      const Icon(
+      Icon(
         Icons.question_mark_rounded,
         color: AppColors.accentColor,
       ),
@@ -68,7 +68,7 @@ Widget authorizationStatsRow(Authorization authorization) {
         ),
       ),
       const Gap(10),
-      const Icon(
+      Icon(
         Icons.create,
         color: AppColors.backgroundColor,
       ),
diff --git a/school_data_hub_flutter/lib/features/authorizations/presentation/new_authorization_page/new_authorization_page.dart b/school_data_hub_flutter/lib/features/authorizations/presentation/new_authorization_page/new_authorization_page.dart
index ee3ea952..76d4725f 100644
--- a/school_data_hub_flutter/lib/features/authorizations/presentation/new_authorization_page/new_authorization_page.dart
+++ b/school_data_hub_flutter/lib/features/authorizations/presentation/new_authorization_page/new_authorization_page.dart
@@ -4,7 +4,7 @@ import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/theme/styles.dart';
 import 'package:school_data_hub_flutter/features/authorizations/domain/authorization_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/pupil_profile_page.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/select_pupils_list_page/select_pupils_list_page.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/widgets/avatar.dart';
@@ -24,7 +24,7 @@ class NewAuthorizationPageState extends State<NewAuthorizationPage> {
       TextEditingController();
 
   Set<int> pupilIds = {};
-  PupilManager get _pupilManager => di<PupilManager>();
+  PupilProxyManager get _pupilManager => di<PupilProxyManager>();
   AuthorizationManager get _authorizationManager => di<AuthorizationManager>();
 
   void postNewAuthorization() async {
@@ -32,13 +32,17 @@ class NewAuthorizationPageState extends State<NewAuthorizationPage> {
     String text2 = authorizationDescriptionController.text;
 
     await _authorizationManager.postAuthorizationWithPupils(
-        text1, text2, pupilIds.toList());
+      text1,
+      text2,
+      pupilIds.toList(),
+    );
   }
 
   @override
   Widget build(BuildContext context) {
-    List<PupilProxy> pupilsFromIds =
-        _pupilManager.getPupilsFromPupilIds(pupilIds.toList());
+    List<PupilProxy> pupilsFromIds = _pupilManager.getPupilsFromPupilIds(
+      pupilIds.toList(),
+    );
     return Scaffold(
       appBar: AppBar(
         automaticallyImplyLeading: false,
@@ -49,10 +53,7 @@ class NewAuthorizationPageState extends State<NewAuthorizationPage> {
           children: [
             Icon(Icons.fact_check_rounded, size: 25, color: Colors.white),
             Gap(10),
-            Text(
-              'Neue Nachweis-Liste',
-              style: AppStyles.appBarTextStyle,
-            ),
+            Text('Neue Nachweis-Liste', style: AppStyles.appBarTextStyle),
           ],
         ),
       ),
@@ -68,15 +69,19 @@ class NewAuthorizationPageState extends State<NewAuthorizationPage> {
                   minLines: 1,
                   maxLines: 3,
                   controller: authorizationNameController,
-                  decoration: const InputDecoration(
+                  decoration: InputDecoration(
                     contentPadding: EdgeInsets.all(10),
                     border: OutlineInputBorder(
                       borderSide: BorderSide(
-                          color: AppColors.backgroundColor, width: 2),
+                        color: AppColors.backgroundColor,
+                        width: 2,
+                      ),
                     ),
                     focusedBorder: OutlineInputBorder(
                       borderSide: BorderSide(
-                          color: AppColors.backgroundColor, width: 2),
+                        color: AppColors.backgroundColor,
+                        width: 2,
+                      ),
                     ),
                     labelStyle: TextStyle(color: AppColors.backgroundColor),
                     labelText: 'Name der Liste',
@@ -87,15 +92,19 @@ class NewAuthorizationPageState extends State<NewAuthorizationPage> {
                   minLines: 1,
                   maxLines: 3,
                   controller: authorizationDescriptionController,
-                  decoration: const InputDecoration(
+                  decoration: InputDecoration(
                     contentPadding: EdgeInsets.all(10),
                     border: OutlineInputBorder(
                       borderSide: BorderSide(
-                          color: AppColors.backgroundColor, width: 2),
+                        color: AppColors.backgroundColor,
+                        width: 2,
+                      ),
                     ),
                     focusedBorder: OutlineInputBorder(
                       borderSide: BorderSide(
-                          color: AppColors.backgroundColor, width: 2),
+                        color: AppColors.backgroundColor,
+                        width: 2,
+                      ),
                     ),
                     labelStyle: TextStyle(color: AppColors.backgroundColor),
                     labelText: 'Kurze Beschreibung der Liste',
@@ -106,15 +115,19 @@ class NewAuthorizationPageState extends State<NewAuthorizationPage> {
                   children: [
                     const Text(
                       'Ausgewählte Kinder:',
-                      style:
-                          TextStyle(fontSize: 16, fontWeight: FontWeight.bold),
+                      style: TextStyle(
+                        fontSize: 16,
+                        fontWeight: FontWeight.bold,
+                      ),
                     ),
                     const Gap(10),
                     Text(
                       pupilsFromIds.length.toString(),
                       style: const TextStyle(
-                          fontSize: 18, fontWeight: FontWeight.bold),
-                    )
+                        fontSize: 18,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
                   ],
                 ),
                 if (pupilIds.isEmpty) const Gap(30),
@@ -125,104 +138,117 @@ class NewAuthorizationPageState extends State<NewAuthorizationPage> {
                           child: SingleChildScrollView(
                             scrollDirection: Axis.vertical,
                             child: ListView.builder(
-                                padding:
-                                    const EdgeInsets.only(top: 5, bottom: 15),
-                                shrinkWrap: true,
-                                physics: const NeverScrollableScrollPhysics(),
-                                itemCount: pupilsFromIds.length,
-                                itemBuilder: (context, int index) {
-                                  PupilProxy listedPupil = pupilsFromIds[index];
-                                  return Column(
-                                    children: [
-                                      // const Gap(5),
-                                      InkWell(
-                                        onLongPress: () {
-                                          setState(() {
-                                            pupilIds
-                                                .remove(listedPupil.internalId);
-                                          });
-                                        },
-                                        onTap: () {
-                                          Navigator.of(context)
-                                              .push(MaterialPageRoute(
+                              padding: const EdgeInsets.only(
+                                top: 5,
+                                bottom: 15,
+                              ),
+                              shrinkWrap: true,
+                              physics: const NeverScrollableScrollPhysics(),
+                              itemCount: pupilsFromIds.length,
+                              itemBuilder: (context, int index) {
+                                PupilProxy listedPupil = pupilsFromIds[index];
+                                return Column(
+                                  children: [
+                                    // const Gap(5),
+                                    InkWell(
+                                      onLongPress: () {
+                                        setState(() {
+                                          pupilIds.remove(
+                                            listedPupil.internalId,
+                                          );
+                                        });
+                                      },
+                                      onTap: () {
+                                        Navigator.of(context).push(
+                                          MaterialPageRoute(
                                             builder: (ctx) => PupilProfilePage(
                                               pupil: listedPupil,
                                             ),
-                                          ));
-                                        },
-                                        child: Card(
-                                          child: Padding(
-                                            padding: const EdgeInsets.all(8.0),
-                                            child: Row(
-                                              children: [
-                                                AvatarWithBadges(
-                                                    pupil: listedPupil,
-                                                    size: 50),
-                                                const Gap(10),
-                                                Column(
-                                                  mainAxisAlignment:
-                                                      MainAxisAlignment.start,
-                                                  crossAxisAlignment:
-                                                      CrossAxisAlignment.start,
-                                                  children: [
-                                                    Text(
-                                                      listedPupil.firstName,
-                                                      style: const TextStyle(
-                                                          fontWeight:
-                                                              FontWeight.bold,
-                                                          fontSize: 18),
-                                                    ),
-                                                    //const Gap(10),
-                                                    Text(
-                                                      listedPupil.lastName,
-                                                      style: const TextStyle(),
+                                          ),
+                                        );
+                                      },
+                                      child: Card(
+                                        child: Padding(
+                                          padding: const EdgeInsets.all(8.0),
+                                          child: Row(
+                                            children: [
+                                              AvatarWithBadges(
+                                                pupil: listedPupil,
+                                                size: 50,
+                                              ),
+                                              const Gap(10),
+                                              Column(
+                                                mainAxisAlignment:
+                                                    MainAxisAlignment.start,
+                                                crossAxisAlignment:
+                                                    CrossAxisAlignment.start,
+                                                children: [
+                                                  Text(
+                                                    listedPupil.firstName,
+                                                    style: const TextStyle(
+                                                      fontWeight:
+                                                          FontWeight.bold,
+                                                      fontSize: 18,
                                                     ),
-                                                  ],
-                                                ),
-                                                const Spacer(),
-                                                Column(
-                                                  children: [
-                                                    Text(
-                                                      listedPupil.group,
-                                                      style: const TextStyle(
-                                                          fontWeight:
-                                                              FontWeight.bold,
-                                                          color: AppColors
-                                                              .groupColor,
-                                                          fontSize: 18),
+                                                  ),
+                                                  //const Gap(10),
+                                                  Text(
+                                                    listedPupil.lastName,
+                                                    style: const TextStyle(),
+                                                  ),
+                                                ],
+                                              ),
+                                              const Spacer(),
+                                              Column(
+                                                children: [
+                                                  Text(
+                                                    listedPupil.group,
+                                                    style: TextStyle(
+                                                      fontWeight:
+                                                          FontWeight.bold,
+                                                      color:
+                                                          AppColors.groupColor,
+                                                      fontSize: 18,
                                                     ),
-                                                    Text(
-                                                      listedPupil
-                                                          .schoolGrade.name,
-                                                      style: const TextStyle(
-                                                          fontWeight:
-                                                              FontWeight.bold,
-                                                          color: AppColors
-                                                              .schoolyearColor,
-                                                          fontSize: 18),
+                                                  ),
+                                                  Text(
+                                                    listedPupil
+                                                        .schoolGrade
+                                                        .name,
+                                                    style: TextStyle(
+                                                      fontWeight:
+                                                          FontWeight.bold,
+                                                      color: AppColors
+                                                          .schoolyearColor,
+                                                      fontSize: 18,
                                                     ),
-                                                  ],
-                                                ),
-                                                const Gap(15),
-                                              ],
-                                            ),
+                                                  ),
+                                                ],
+                                              ),
+                                              const Gap(15),
+                                            ],
                                           ),
                                         ),
                                       ),
-                                    ],
-                                  );
-                                }),
+                                    ),
+                                  ],
+                                );
+                              },
+                            ),
                           ),
                         ),
                       )
                     : const Row(
                         mainAxisAlignment: MainAxisAlignment.center,
                         children: [
-                          Text('Keine Kinder ausgewählt!',
-                              style: TextStyle(
-                                  fontSize: 18,
-                                  color: Color.fromARGB(255, 91, 91, 91),
-                                  fontWeight: FontWeight.bold)),
+                          Text(
+                            'Keine Kinder ausgewählt!',
+                            style: TextStyle(
+                              fontSize: 18,
+                              color: Color.fromARGB(255, 91, 91, 91),
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ),
                         ],
                       ),
                 if (pupilIds.isEmpty) const Spacer(),
@@ -230,12 +256,15 @@ class NewAuthorizationPageState extends State<NewAuthorizationPage> {
                   style: AppStyles.actionButtonStyle,
                   onPressed: () async {
                     final List<int> selectedPupilIds =
-                        await Navigator.of(context).push(MaterialPageRoute(
-                              builder: (ctx) => SelectPupilsListPage(
-                                  selectablePupils: _pupilManager
-                                      .getPupilsNotListed(pupilIds.toList())),
-                            )) ??
-                            [];
+                        await Navigator.of(context).push(
+                          MaterialPageRoute(
+                            builder: (ctx) => SelectPupilsListPage(
+                              selectablePupils: _pupilManager
+                                  .getPupilsNotListed(pupilIds.toList()),
+                            ),
+                          ),
+                        ) ??
+                        [];
                     if (selectedPupilIds.isNotEmpty) {
                       setState(() {
                         pupilIds.addAll(selectedPupilIds.toSet());
@@ -254,10 +283,7 @@ class NewAuthorizationPageState extends State<NewAuthorizationPage> {
                     postNewAuthorization();
                     Navigator.pop(context);
                   },
-                  child: const Text(
-                    'SENDEN',
-                    style: AppStyles.buttonTextStyle,
-                  ),
+                  child: const Text('SENDEN', style: AppStyles.buttonTextStyle),
                 ),
                 const Gap(15),
                 ElevatedButton(
diff --git a/school_data_hub_flutter/lib/features/books/domain/book_helper.dart b/school_data_hub_flutter/lib/features/books/domain/book_helper.dart
index 476500b5..2b9ba1ed 100644
--- a/school_data_hub_flutter/lib/features/books/domain/book_helper.dart
+++ b/school_data_hub_flutter/lib/features/books/domain/book_helper.dart
@@ -1,5 +1,5 @@
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
 enum BookBorrowStatus { since2Weeks, since3Weeks, since5weeks }
@@ -9,19 +9,19 @@ class BookHelpers {
     required int libraryBookId,
   }) {
     // Get all pupil book lendings
-    final allPupilBookLendings =
-        di<PupilManager>().allPupils
-            .map((pupil) => pupil.pupilBookLendings ?? <PupilBookLending>[])
-            .expand((element) => element)
-            .toList();
+    final allPupilBookLendings = di<PupilProxyManager>().allPupils
+        .map((pupil) => pupil.pupilBookLendings ?? <PupilBookLending>[])
+        .expand((element) => element)
+        .toList();
 
     // Filter by libraryId
-    final pupilBookLendingsLinkedToLibraryBook =
-        allPupilBookLendings.where((pupilBook) {
-          final match = pupilBook.libraryBookId == libraryBookId;
+    final pupilBookLendingsLinkedToLibraryBook = allPupilBookLendings.where((
+      pupilBook,
+    ) {
+      final match = pupilBook.libraryBookId == libraryBookId;
 
-          return match;
-        }).toList();
+      return match;
+    }).toList();
 
     pupilBookLendingsLinkedToLibraryBook.sort(
       (a, b) => b.lentAt.compareTo(a.lentAt),
diff --git a/school_data_hub_flutter/lib/features/books/domain/book_manager.dart b/school_data_hub_flutter/lib/features/books/domain/book_manager.dart
index 1c5b02ae..75c73419 100644
--- a/school_data_hub_flutter/lib/features/books/domain/book_manager.dart
+++ b/school_data_hub_flutter/lib/features/books/domain/book_manager.dart
@@ -43,6 +43,17 @@ class BookManager {
 
   BookManager();
 
+  void dispose() {
+    _libraryBookProxies.dispose();
+    _isbnLibraryBooksMap.dispose();
+    _locations.dispose();
+    _bookTags.dispose();
+    _lastSelectedLocation.dispose();
+    _searchResults.dispose();
+    _bookStats.dispose();
+
+    return;
+  }
   //  final session = di<HubSessionManager>().credentials.value;
 
   int _currentPage = 1;
diff --git a/school_data_hub_flutter/lib/features/books/presentation/book_list_page/widgets/book_card.dart b/school_data_hub_flutter/lib/features/books/presentation/book_list_page/widgets/book_card.dart
index c943c5ad..a66b04f8 100644
--- a/school_data_hub_flutter/lib/features/books/presentation/book_list_page/widgets/book_card.dart
+++ b/school_data_hub_flutter/lib/features/books/presentation/book_list_page/widgets/book_card.dart
@@ -247,7 +247,7 @@ class BookCard extends WatchingWidget {
                       },
                       child: Text(
                         bookProxy.description,
-                        style: const TextStyle(
+                        style: TextStyle(
                           fontSize: 14,
                           color: AppColors.interactiveColor,
                         ),
diff --git a/school_data_hub_flutter/lib/features/books/presentation/book_list_page/widgets/book_pupil_card.dart b/school_data_hub_flutter/lib/features/books/presentation/book_list_page/widgets/book_pupil_card.dart
index 646ce5e4..92ea08a9 100644
--- a/school_data_hub_flutter/lib/features/books/presentation/book_list_page/widgets/book_pupil_card.dart
+++ b/school_data_hub_flutter/lib/features/books/presentation/book_list_page/widgets/book_pupil_card.dart
@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/long_textfield_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/growth_dropdown.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/features/app_main_navigation/domain/main_menu_bottom_nav_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/pupil_profile_page.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/widgets/avatar.dart';
 import 'package:watch_it/watch_it.dart';
@@ -19,7 +19,7 @@ class BookLendingPupilCard extends WatchingWidget {
   @override
   Widget build(BuildContext context) {
     final pupil = watch<PupilProxy>(
-      di<PupilManager>().getPupilByPupilId(passedPupilBook.pupilId)!,
+      di<PupilProxyManager>().getPupilByPupilId(passedPupilBook.pupilId)!,
     );
     final watchedPupilBook = pupil.pupilBookLendings?.firstWhere(
       (element) => element.lendingId == passedPupilBook.lendingId,
diff --git a/school_data_hub_flutter/lib/features/books/presentation/book_list_page/widgets/pupil_book_card.dart b/school_data_hub_flutter/lib/features/books/presentation/book_list_page/widgets/pupil_book_card.dart
index 2cc7a95c..a722f15c 100644
--- a/school_data_hub_flutter/lib/features/books/presentation/book_list_page/widgets/pupil_book_card.dart
+++ b/school_data_hub_flutter/lib/features/books/presentation/book_list_page/widgets/pupil_book_card.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/information_dialog.dart';
 import 'package:school_data_hub_flutter/app_utils/create_and_crop_image_file.dart';
diff --git a/school_data_hub_flutter/lib/features/books/presentation/book_search_form/book_search_form_page.dart b/school_data_hub_flutter/lib/features/books/presentation/book_search_form/book_search_form_page.dart
index f3cacb1c..6012c278 100644
--- a/school_data_hub_flutter/lib/features/books/presentation/book_search_form/book_search_form_page.dart
+++ b/school_data_hub_flutter/lib/features/books/presentation/book_search_form/book_search_form_page.dart
@@ -170,7 +170,7 @@ class _BookSearchFormPageState extends State<BookSearchFormPage> {
                                               });
                                             }
                                           },
-                                          icon: const Icon(
+                                          icon: Icon(
                                             Icons.add,
                                             color: AppColors.interactiveColor,
                                           ),
@@ -204,7 +204,7 @@ class _BookSearchFormPageState extends State<BookSearchFormPage> {
                                             .withValues(alpha: 0.2),
                                         checkmarkColor:
                                             AppColors.interactiveColor,
-                                        deleteIcon: const Icon(
+                                        deleteIcon: Icon(
                                           Icons.close,
                                           size: 18,
                                           color: AppColors.interactiveColor,
@@ -297,7 +297,7 @@ class _BookSearchFormPageState extends State<BookSearchFormPage> {
                       Padding(
                         padding: const EdgeInsets.all(8.0),
                         child: DropdownButtonFormField<BorrowedStatus>(
-                          value: BorrowedStatus.all,
+                          initialValue: BorrowedStatus.all,
                           decoration: InputDecoration(
                             fillColor: Colors.white,
                             filled: true,
diff --git a/school_data_hub_flutter/lib/features/books/presentation/book_search_form/select_book_tags_page.dart b/school_data_hub_flutter/lib/features/books/presentation/book_search_form/select_book_tags_page.dart
index aeaf5152..59c17c71 100644
--- a/school_data_hub_flutter/lib/features/books/presentation/book_search_form/select_book_tags_page.dart
+++ b/school_data_hub_flutter/lib/features/books/presentation/book_search_form/select_book_tags_page.dart
@@ -33,7 +33,7 @@ class SelectBookTagsPage extends WatchingWidget {
             onPressed: () {
               Navigator.of(context).pop(selectedTags.value);
             },
-            child: const Text(
+            child: Text(
               'Fertig',
               style: TextStyle(
                 color: AppColors.interactiveColor,
@@ -117,9 +117,9 @@ class SelectBookTagsPage extends WatchingWidget {
                             selectedColor: AppColors.interactiveColor
                                 .withValues(alpha: 0.2),
                             checkmarkColor: AppColors.interactiveColor,
-                            avatar:
+                                avatar:
                                 isSelected
-                                    ? const Icon(
+                                    ? Icon(
                                       Icons.check,
                                       color: AppColors.successButtonColor,
                                       size: 18,
diff --git a/school_data_hub_flutter/lib/features/books/presentation/book_search_page/book_search_result_card.dart b/school_data_hub_flutter/lib/features/books/presentation/book_search_page/book_search_result_card.dart
index d9c05c81..61889973 100644
--- a/school_data_hub_flutter/lib/features/books/presentation/book_search_page/book_search_result_card.dart
+++ b/school_data_hub_flutter/lib/features/books/presentation/book_search_page/book_search_result_card.dart
@@ -197,7 +197,7 @@ class SearchResultBookCard extends WatchingWidget {
                       },
                       child: Text(
                         bookProxy.description,
-                        style: const TextStyle(
+                        style: TextStyle(
                           fontSize: 14,
                           color: AppColors.interactiveColor,
                         ),
diff --git a/school_data_hub_flutter/lib/features/books/presentation/book_tag_management_page/book_tag_management_controller.dart b/school_data_hub_flutter/lib/features/books/presentation/book_tag_management_page/book_tag_management_controller.dart
index e6f07e13..ec91e4e4 100644
--- a/school_data_hub_flutter/lib/features/books/presentation/book_tag_management_page/book_tag_management_controller.dart
+++ b/school_data_hub_flutter/lib/features/books/presentation/book_tag_management_page/book_tag_management_controller.dart
@@ -30,9 +30,9 @@ class BookTagManagementController extends State<BookTagManagement> {
   Future<void> createNewTag(BuildContext context) async {
     final String? newTagName = await shortTextfieldDialog(
       context: context,
-      title: 'Neues Buch-Tag erstellen',
-      labelText: 'Tag-Name',
-      hintText: 'Name des neuen Tags eingeben',
+      title: 'Neues Schlagwort erstellen',
+      labelText: 'Schlagwort',
+      hintText: 'Schlagwort eingeben',
     );
 
     if (newTagName != null && newTagName.trim().isNotEmpty) {
diff --git a/school_data_hub_flutter/lib/features/books/presentation/book_tag_management_page/book_tag_management_page.dart b/school_data_hub_flutter/lib/features/books/presentation/book_tag_management_page/book_tag_management_page.dart
index e9677707..9c989b99 100644
--- a/school_data_hub_flutter/lib/features/books/presentation/book_tag_management_page/book_tag_management_page.dart
+++ b/school_data_hub_flutter/lib/features/books/presentation/book_tag_management_page/book_tag_management_page.dart
@@ -13,8 +13,8 @@ class BookTagManagementPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: const GenericAppBar(
-        iconData: Icons.label,
-        title: 'Buch-Tags verwalten',
+        iconData: Icons.bookmark,
+        title: 'Schlagwörter verwalten',
       ),
       body: Padding(
         padding: const EdgeInsets.all(16.0),
@@ -22,7 +22,7 @@ class BookTagManagementPage extends StatelessWidget {
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
             const Text(
-              'Verfügbare Buch-Tags',
+              'Verfügbare Schlagwörter',
               style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
             ),
             const Gap(16),
diff --git a/school_data_hub_flutter/lib/features/books/presentation/books_main_menu_page/books_main_menu_page.dart b/school_data_hub_flutter/lib/features/books/presentation/books_main_menu_page/books_main_menu_page.dart
index 6f5cce38..8b34356b 100644
--- a/school_data_hub_flutter/lib/features/books/presentation/books_main_menu_page/books_main_menu_page.dart
+++ b/school_data_hub_flutter/lib/features/books/presentation/books_main_menu_page/books_main_menu_page.dart
@@ -26,7 +26,10 @@ class BooksMainMenuPage extends WatchingWidget {
 
     return Scaffold(
       backgroundColor: AppColors.canvasColor,
-      appBar: const GenericAppBar(iconData: Icons.lightbulb, title: 'Bücher'),
+      appBar: const GenericAppBar(
+        iconData: Icons.book_rounded,
+        title: 'Bücherei',
+      ),
       body: Center(
         child: SizedBox(
           width: 380,
@@ -42,7 +45,7 @@ class BooksMainMenuPage extends WatchingWidget {
                       builder: (ctx) => const BookTagManagement(),
                     ),
                   );
-                }),
+                }, icon: Icons.bookmark),
                 // const SizedBox(height: 20),
                 // _buildButton(context, "Ausgeliehene Bücher", () {
                 //   Navigator.of(context).push(
@@ -52,7 +55,7 @@ class BooksMainMenuPage extends WatchingWidget {
                 const SizedBox(height: 5),
                 _buildButton(context, "Buch erfassen", () async {
                   await _showNewBookDialog(context);
-                }),
+                }, icon: Icons.qr_code_scanner),
                 const SizedBox(height: 5),
                 _buildButton(context, "Bücher suchen", () {
                   Navigator.of(context).push(
@@ -60,7 +63,7 @@ class BooksMainMenuPage extends WatchingWidget {
                       builder: (ctx) => const BookSearchFormPage(),
                     ),
                   );
-                }),
+                }, icon: Icons.search),
               ],
             ),
           ),
@@ -135,7 +138,12 @@ class BooksMainMenuPage extends WatchingWidget {
     );
   }
 
-  Widget _buildButton(BuildContext context, String label, VoidCallback onTap) {
+  Widget _buildButton(
+    BuildContext context,
+    String label,
+    VoidCallback onTap, {
+    IconData? icon,
+  }) {
     return Padding(
       padding: const EdgeInsets.all(4.0),
       child: InkWell(
@@ -149,13 +157,22 @@ class BooksMainMenuPage extends WatchingWidget {
             width: double.infinity,
             padding: const EdgeInsets.symmetric(vertical: 20),
             alignment: Alignment.center,
-            child: Text(
-              label,
-              style: const TextStyle(
-                color: Colors.white,
-                fontWeight: FontWeight.bold,
-                fontSize: 18,
-              ),
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                if (icon != null) ...[
+                  Icon(icon, size: 24, color: Colors.white),
+                  const Gap(10),
+                ],
+                Text(
+                  label,
+                  style: const TextStyle(
+                    color: Colors.white,
+                    fontWeight: FontWeight.bold,
+                    fontSize: 18,
+                  ),
+                ),
+              ],
             ),
           ),
         ),
diff --git a/school_data_hub_flutter/lib/features/books/presentation/edit_book_page/edit_book_page.dart b/school_data_hub_flutter/lib/features/books/presentation/edit_book_page/edit_book_page.dart
index 9f43b422..2607a17a 100644
--- a/school_data_hub_flutter/lib/features/books/presentation/edit_book_page/edit_book_page.dart
+++ b/school_data_hub_flutter/lib/features/books/presentation/edit_book_page/edit_book_page.dart
@@ -89,7 +89,7 @@ class EditBookPage extends StatelessWidget {
                                 labelText: 'Lesestufe',
                               ),
                               items: controller.readingLevelDropdownItems,
-                              value: ReadingLevel.fromString(
+                              initialValue: ReadingLevel.fromString(
                                 controller.readingLevel,
                               ),
                               onChanged: (value) => controller
@@ -108,7 +108,8 @@ class EditBookPage extends StatelessWidget {
                                               labelText: 'Ablageort',
                                             ),
                                         items: controller.locationDropdownItems,
-                                        value: controller.selectedLocation,
+                                        initialValue:
+                                            controller.selectedLocation,
                                         onChanged: (value) => controller
                                             .onChangedLocationDropDown(value!),
                                       ),
@@ -117,7 +118,7 @@ class EditBookPage extends StatelessWidget {
                                   const Gap(10),
                                   InkWell(
                                     onTap: () => controller.addLocation(),
-                                    child: const Icon(
+                                    child: Icon(
                                       Icons.add,
                                       color: AppColors.interactiveColor,
                                     ),
@@ -180,7 +181,7 @@ class EditBookPage extends StatelessWidget {
                         const Gap(10),
                         InkWell(
                           onTap: () => controller.createNewTag(context),
-                          child: const Icon(
+                          child: Icon(
                             Icons.add,
                             color: AppColors.interactiveColor,
                             size: 20,
@@ -189,7 +190,7 @@ class EditBookPage extends StatelessWidget {
                         const Gap(5),
                         InkWell(
                           onTap: () => controller.openTagManagement(context),
-                          child: const Icon(
+                          child: Icon(
                             Icons.settings,
                             color: AppColors.interactiveColor,
                             size: 20,
diff --git a/school_data_hub_flutter/lib/features/books/presentation/new_book_page/new_book_page.dart b/school_data_hub_flutter/lib/features/books/presentation/new_book_page/new_book_page.dart
index dad25558..4be6f38d 100644
--- a/school_data_hub_flutter/lib/features/books/presentation/new_book_page/new_book_page.dart
+++ b/school_data_hub_flutter/lib/features/books/presentation/new_book_page/new_book_page.dart
@@ -51,12 +51,13 @@ class NewBookPage extends StatelessWidget {
                               ClipRRect(
                                 borderRadius: BorderRadius.circular(10.0),
                                 child:
-                                // TODO: Repair when image loading is implemented
-                                UnencryptedImageInCard(
-                                  path: controller.imagePath!,
-                                  cacheKey: controller.widget.isbn.toString(),
-                                  size: 220,
-                                ),
+                                    // TODO: Repair when image loading is implemented
+                                    UnencryptedImageInCard(
+                                      path: controller.imagePath!,
+                                      cacheKey: controller.widget.isbn
+                                          .toString(),
+                                      size: 220,
+                                    ),
                               ),
                             ],
                           ),
@@ -97,35 +98,36 @@ class NewBookPage extends StatelessWidget {
                                 labelText: 'Lesestufe',
                               ),
                               items: controller.readingLevelDropdownItems,
-                              value: ReadingLevel.fromString(
+                              initialValue: ReadingLevel.fromString(
                                 controller.readingLevel,
                               ),
-                              onChanged:
-                                  (value) => controller
-                                      .onChangedReadingLevelDropDown(value),
+                              onChanged: (value) => controller
+                                  .onChangedReadingLevelDropDown(value),
                             ),
                             const Gap(20),
                             Row(
                               children: [
                                 Expanded(
-                                  child: DropdownButtonFormField<
-                                    LibraryBookLocation
-                                  >(
-                                    decoration: AppStyles.textFieldDecoration(
-                                      labelText: 'Ablageort',
-                                    ),
-                                    items: controller.locationDropdownItems,
-                                    value: controller.lastLocationValue,
-                                    onChanged:
-                                        (value) => controller
+                                  child:
+                                      DropdownButtonFormField<
+                                        LibraryBookLocation
+                                      >(
+                                        decoration:
+                                            AppStyles.textFieldDecoration(
+                                              labelText: 'Ablageort',
+                                            ),
+                                        items: controller.locationDropdownItems,
+                                        initialValue:
+                                            controller.lastLocationValue,
+                                        onChanged: (value) => controller
                                             .onChangedLocationDropDown(value!),
-                                  ),
+                                      ),
                                 ),
                                 if (_hubSessionManager.isAdmin) ...[
                                   const Gap(10),
                                   InkWell(
                                     onTap: () => controller.addLocation(),
-                                    child: const Icon(
+                                    child: Icon(
                                       Icons.add,
                                       color: AppColors.interactiveColor,
                                     ),
@@ -188,7 +190,7 @@ class NewBookPage extends StatelessWidget {
                         const Gap(10),
                         InkWell(
                           onTap: () => controller.createNewTag(context),
-                          child: const Icon(
+                          child: Icon(
                             Icons.add,
                             color: AppColors.interactiveColor,
                             size: 20,
@@ -197,7 +199,7 @@ class NewBookPage extends StatelessWidget {
                         const Gap(5),
                         InkWell(
                           onTap: () => controller.openTagManagement(context),
-                          child: const Icon(
+                          child: Icon(
                             Icons.settings,
                             color: AppColors.interactiveColor,
                             size: 20,
@@ -210,16 +212,15 @@ class NewBookPage extends StatelessWidget {
                   Wrap(
                     spacing: 5,
                     runSpacing: 5,
-                    children:
-                        controller.bookTagSelection.entries.map((entry) {
-                          return ThemedFilterChip(
-                            label: entry.key.name,
-                            selected: entry.value,
-                            onSelected: (bool selected) {
-                              controller.switchBookTagSelection(entry.key);
-                            },
-                          );
-                        }).toList(),
+                    children: controller.bookTagSelection.entries.map((entry) {
+                      return ThemedFilterChip(
+                        label: entry.key.name,
+                        selected: entry.value,
+                        onSelected: (bool selected) {
+                          controller.switchBookTagSelection(entry.key);
+                        },
+                      );
+                    }).toList(),
                   ),
                   const Gap(30),
                   ...<Widget>[
diff --git a/school_data_hub_flutter/lib/features/books/presentation/widgets/pupil_book_card.dart b/school_data_hub_flutter/lib/features/books/presentation/widgets/pupil_book_card.dart
index 02b03797..a51043fd 100644
--- a/school_data_hub_flutter/lib/features/books/presentation/widgets/pupil_book_card.dart
+++ b/school_data_hub_flutter/lib/features/books/presentation/widgets/pupil_book_card.dart
@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/theme/styles.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
@@ -9,10 +8,11 @@ import 'package:school_data_hub_flutter/common/widgets/dialogs/information_dialo
 import 'package:school_data_hub_flutter/common/widgets/dialogs/long_textfield_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/growth_dropdown.dart';
 import 'package:school_data_hub_flutter/common/widgets/unencrypted_image_in_card.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 import 'package:school_data_hub_flutter/features/books/domain/book_manager.dart';
 import 'package:school_data_hub_flutter/features/books/domain/models/library_book_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
 class PupilBookLendingCard extends StatelessWidget {
@@ -30,7 +30,7 @@ class PupilBookLendingCard extends StatelessWidget {
       pupilBookLending.libraryBookId,
     )!;
     void updatepupilBookRating(int rating) {
-      di<PupilManager>().updatePupilBookLending(
+      di<PupilProxyManager>().updatePupilBookLending(
         pupilBookLending: pupilBookLending,
         score: (value: rating),
       );
@@ -39,6 +39,7 @@ class PupilBookLendingCard extends StatelessWidget {
     return ClipRRect(
       borderRadius: BorderRadius.circular(20),
       child: Card(
+        color: AppColors.cardInCardColor,
         child: InkWell(
           onLongPress: () async {
             if (pupilBookLending.lentBy != di<HubSessionManager>().userName ||
@@ -56,7 +57,7 @@ class PupilBookLendingCard extends StatelessWidget {
               message: 'Ausleihe von "${book.title}" wirklich löschen?',
             );
             if (result == true) {
-              di<PupilManager>().deletePupilBook(
+              di<PupilProxyManager>().deletePupilBook(
                 lendingId: pupilBookLending.lendingId,
               );
             }
@@ -190,7 +191,7 @@ class PupilBookLendingCard extends StatelessWidget {
                       parentContext: context,
                     );
                     if (status == null) return;
-                    await di<PupilManager>().updatePupilBookLending(
+                    await di<PupilProxyManager>().updatePupilBookLending(
                       pupilBookLending: pupilBookLending,
                       status: (value: status),
                     );
@@ -215,7 +216,7 @@ class PupilBookLendingCard extends StatelessWidget {
                               pupilBookLending.status == '')
                           ? 'Kein Eintrag - Tippen zum Bearbeiten'
                           : pupilBookLending.status!,
-                      style: const TextStyle(
+                      style: TextStyle(
                         fontSize: 16,
                         color: AppColors.interactiveColor,
                       ),
@@ -243,7 +244,7 @@ class PupilBookLendingCard extends StatelessWidget {
                                     'Buch "${book.title}" wirklich zurückgeben?',
                               );
                               if (result!) {
-                                di<PupilManager>().returnLibraryBook(
+                                di<PupilProxyManager>().returnLibraryBook(
                                   pupilBookLending: pupilBookLending,
                                 );
                               }
diff --git a/school_data_hub_flutter/lib/features/learning/domain/competence_helper.dart b/school_data_hub_flutter/lib/features/learning/domain/competence_helper.dart
index 88e659b6..1da8df08 100644
--- a/school_data_hub_flutter/lib/features/learning/domain/competence_helper.dart
+++ b/school_data_hub_flutter/lib/features/learning/domain/competence_helper.dart
@@ -6,7 +6,7 @@ import 'package:school_data_hub_flutter/features/learning/domain/competence_mana
 import 'package:school_data_hub_flutter/features/learning/domain/enums.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupil_filter_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
 class CompetenceHelper {
@@ -207,7 +207,9 @@ class CompetenceHelper {
   getCompetenceChecksMappedTopublicIdsForThisPupil(int pupilId) {
     final Map<int, List<CompetenceCheck>> competenceChecksMap = {};
 
-    final PupilProxy pupil = di<PupilManager>().getPupilByPupilId(pupilId)!;
+    final PupilProxy pupil = di<PupilProxyManager>().getPupilByPupilId(
+      pupilId,
+    )!;
     if (pupil.competenceChecks == null || pupil.competenceChecks!.isEmpty) {
       return {};
     }
diff --git a/school_data_hub_flutter/lib/features/learning/domain/competence_manager.dart b/school_data_hub_flutter/lib/features/learning/domain/competence_manager.dart
index 381a33f0..c8a9ca3c 100644
--- a/school_data_hub_flutter/lib/features/learning/domain/competence_manager.dart
+++ b/school_data_hub_flutter/lib/features/learning/domain/competence_manager.dart
@@ -12,7 +12,7 @@ import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 import 'package:school_data_hub_flutter/features/learning/data/competence_check_api_service.dart';
 import 'package:school_data_hub_flutter/features/learning/domain/competence_helper.dart';
 import 'package:school_data_hub_flutter/features/learning/domain/filters/competence_filter_manager.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
 class CompetenceManager {
@@ -37,6 +37,12 @@ class CompetenceManager {
   }
 
   CompetenceManager();
+  void dispose() {
+    _competences.dispose();
+
+    return;
+  }
+
   Future<CompetenceManager> init() async {
     await firstFetchCompetences();
 
@@ -52,8 +58,8 @@ class CompetenceManager {
   //- the CompetenceFilterManager is not registered in the di yet
 
   Future<void> firstFetchCompetences() async {
-    final List<Competence> competences =
-        await _client.competence.getAllCompetences();
+    final List<Competence> competences = await _client.competence
+        .getAllCompetences();
     if (competences.isNotEmpty) {
       //- Do we need to sort the competences here?
       //   competences.sort((a, b) => a.publicId.compareTo(b.publicId));
@@ -78,8 +84,8 @@ class CompetenceManager {
   }
 
   Future<void> fetchCompetences() async {
-    final List<Competence> competences =
-        await _client.competence.getAllCompetences();
+    final List<Competence> competences = await _client.competence
+        .getAllCompetences();
 
     final sortedCompetences = CompetenceHelper.sortCompetences(competences);
     _competences.value = sortedCompetences;
@@ -183,10 +189,9 @@ class CompetenceManager {
     final competenceListIndex = _competences.value.indexWhere(
       (element) => element.publicId == publicId,
     );
-    final competence =
-        competenceListIndex != -1
-            ? _competences.value[competenceListIndex]
-            : null;
+    final competence = competenceListIndex != -1
+        ? _competences.value[competenceListIndex]
+        : null;
     if (competence == null) {
       _notificationService.showSnackBar(
         NotificationType.error,
@@ -266,7 +271,7 @@ class CompetenceManager {
     if (updatedPupilData == null) {
       return;
     }
-    di<PupilManager>().updatePupilProxyWithPupilData(updatedPupilData);
+    di<PupilProxyManager>().updatePupilProxyWithPupilData(updatedPupilData);
 
     _notificationService.showSnackBar(
       NotificationType.success,
@@ -276,6 +281,24 @@ class CompetenceManager {
     return;
   }
 
+  Future<void> postCompetenceGoal({
+    required int pupilId,
+    required int competenceId,
+    required String description,
+    required List<String> strategies,
+  }) async {
+    // TODO: Implement backend call when available
+    // Currently there is no endpoint for posting a competence goal
+    // We would need something like _client.competence.postCompetenceGoal(...)
+
+    _notificationService.showSnackBar(
+      NotificationType.warning,
+      'Speichern nicht möglich: Backend-Endpunkt fehlt (CompetenceGoal)',
+    );
+
+    return;
+  }
+
   Future<void> updateCompetenceCheck({
     required String competenceCheckId,
     ({int value})? score,
@@ -294,7 +317,7 @@ class CompetenceManager {
           competenceComment: competenceComment,
           valueFactor: valueFactor,
         );
-    di<PupilManager>().updatePupilProxyWithPupilData(updatedPupilData);
+    di<PupilProxyManager>().updatePupilProxyWithPupilData(updatedPupilData);
 
     _notificationService.showSnackBar(
       NotificationType.success,
@@ -313,7 +336,7 @@ class CompetenceManager {
       'Kompetenzcheck gelöscht',
     );
 
-    di<PupilManager>().updatePupilProxyWithPupilData(pupilData);
+    di<PupilProxyManager>().updatePupilProxyWithPupilData(pupilData);
 
     return;
   }
@@ -326,7 +349,7 @@ class CompetenceManager {
     final createdBy = di<HubSessionManager>().userName;
     final updatedPupilData = await _competenceCheckApiService
         .addFileToCompetenceCheck(competenceCheckId, encryptedFile, createdBy!);
-    di<PupilManager>().updatePupilProxyWithPupilData(updatedPupilData);
+    di<PupilProxyManager>().updatePupilProxyWithPupilData(updatedPupilData);
 
     _notificationService.showSnackBar(
       NotificationType.success,
@@ -342,7 +365,7 @@ class CompetenceManager {
   }) async {
     final updatedPupilData = await _competenceCheckApiService
         .removeFileFromCompetenceCheck(competenceCheckId, fileId);
-    di<PupilManager>().updatePupilProxyWithPupilData(updatedPupilData);
+    di<PupilProxyManager>().updatePupilProxyWithPupilData(updatedPupilData);
   }
 
   Competence findCompetenceById(int competenceId) {
diff --git a/school_data_hub_flutter/lib/features/learning/domain/filters/competence_filter_manager.dart b/school_data_hub_flutter/lib/features/learning/domain/filters/competence_filter_manager.dart
index a023f8d1..6bc96f75 100644
--- a/school_data_hub_flutter/lib/features/learning/domain/filters/competence_filter_manager.dart
+++ b/school_data_hub_flutter/lib/features/learning/domain/filters/competence_filter_manager.dart
@@ -25,6 +25,13 @@ class CompetenceFilterManager {
     _filteredCompetences.value = _competenceManager.competences.value;
   }
 
+  void dispose() {
+    _filterState.dispose();
+    _filteredCompetences.dispose();
+    _filtersOn.dispose();
+    return;
+  }
+
   refreshFilteredCompetences(List<Competence> competences) {
     _filteredCompetences.value = competences;
     _log.info('refreshed filtered competences');
diff --git a/school_data_hub_flutter/lib/features/learning/presentation/competence_list_page/widgets/common_competence_card.dart b/school_data_hub_flutter/lib/features/learning/presentation/competence_list_page/widgets/common_competence_card.dart
index 0367754c..635235c4 100644
--- a/school_data_hub_flutter/lib/features/learning/presentation/competence_list_page/widgets/common_competence_card.dart
+++ b/school_data_hub_flutter/lib/features/learning/presentation/competence_list_page/widgets/common_competence_card.dart
@@ -10,40 +10,43 @@ import 'package:watch_it/watch_it.dart';
 class CommonCompetenceCard extends WatchingStatefulWidget {
   final Color competenceBackgroundColor;
   final Function({int? competenceId, Competence? competence})
-      navigateToNewOrPatchCompetencePage;
+  navigateToNewOrPatchCompetencePage;
   final Competence competence;
   final List<Widget> children;
-  const CommonCompetenceCard(
-      {required this.competence,
-      required this.competenceBackgroundColor,
-      required this.navigateToNewOrPatchCompetencePage,
-      required this.children,
-      super.key});
+  const CommonCompetenceCard({
+    required this.competence,
+    required this.competenceBackgroundColor,
+    required this.navigateToNewOrPatchCompetencePage,
+    required this.children,
+    super.key,
+  });
 
   @override
   State<CommonCompetenceCard> createState() => _CommonCompetenceCardState();
 }
 
 class _CommonCompetenceCardState extends State<CommonCompetenceCard> {
-  void _onReorder(int oldIndex, int newIndex) {
-    setState(() {
-      if (newIndex > oldIndex) {
-        newIndex -= 1;
-      }
-      final item = widget.children.removeAt(oldIndex);
-      widget.children.insert(newIndex, item);
-    });
-  }
+  // void _onReorder(int oldIndex, int newIndex) {
+  //   setState(() {
+  //     if (newIndex > oldIndex) {
+  //       newIndex -= 1;
+  //     }
+  //     final item = widget.children.removeAt(oldIndex);
+  //     widget.children.insert(newIndex, item);
+  //   });
+  // }
 
   @override
   Widget build(BuildContext context) {
     final childrenController = createOnce<CustomExpansionTileController>(
-        () => CustomExpansionTileController());
+      () => CustomExpansionTileController(),
+    );
     // final childrenController = useCustomExpansionTileController();
 
     return Padding(
       padding: EdgeInsets.symmetric(
-          vertical: widget.competence.parentCompetence == null ? 3 : 0),
+        vertical: widget.competence.parentCompetence == null ? 3 : 0,
+      ),
       child: Card(
         color: widget.competenceBackgroundColor,
         elevation: 0,
@@ -62,10 +65,12 @@ class _CommonCompetenceCardState extends State<CommonCompetenceCard> {
                   Expanded(
                     child: InkWell(
                       onTap: () => widget.navigateToNewOrPatchCompetencePage(
-                          competence: widget.competence),
+                        competence: widget.competence,
+                      ),
                       onLongPress: () =>
                           widget.navigateToNewOrPatchCompetencePage(
-                              competenceId: widget.competence.publicId),
+                            competenceId: widget.competence.publicId,
+                          ),
                       child: Text(
                         widget.competence.name,
                         maxLines: 4,
@@ -73,7 +78,8 @@ class _CommonCompetenceCardState extends State<CommonCompetenceCard> {
                         textAlign: TextAlign.start,
                         style: TextStyle(
                           color: AppColors.bestContrastCompetenceFontColor(
-                              widget.competenceBackgroundColor),
+                            widget.competenceBackgroundColor,
+                          ),
                           fontWeight: FontWeight.bold,
                           fontSize: widget.competence.parentCompetence == null
                               ? 20
diff --git a/school_data_hub_flutter/lib/features/learning/presentation/multi_pupil_competence_check_page/multi_pupil_competence_check_page.dart b/school_data_hub_flutter/lib/features/learning/presentation/multi_pupil_competence_check_page/multi_pupil_competence_check_page.dart
index 229b66c5..e57a9770 100644
--- a/school_data_hub_flutter/lib/features/learning/presentation/multi_pupil_competence_check_page/multi_pupil_competence_check_page.dart
+++ b/school_data_hub_flutter/lib/features/learning/presentation/multi_pupil_competence_check_page/multi_pupil_competence_check_page.dart
@@ -8,7 +8,7 @@ import 'package:school_data_hub_flutter/features/learning/presentation/multi_pup
 import 'package:school_data_hub_flutter/features/learning/presentation/multi_pupil_competence_check_page/widgets/competence_parents_names_widget.dart';
 import 'package:school_data_hub_flutter/features/learning/presentation/multi_pupil_competence_check_page/widgets/multi_pupil_competence_check_card.dart';
 import 'package:school_data_hub_flutter/features/learning/presentation/multi_pupil_competence_check_page/widgets/multi_pupil_competence_check_page_bottom_navbar.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/_credit/credit_list_page/widgets/credit_list_searchbar.dart';
 import 'package:watch_it/watch_it.dart';
 
@@ -27,7 +27,7 @@ class MultiPupilCompetenceCheckPage extends StatelessWidget {
         iconData: Icons.group_add_rounded,
       ),
       body: RefreshIndicator(
-        onRefresh: () async => di<PupilManager>().fetchAllPupils(),
+        onRefresh: () async => di<PupilProxyManager>().fetchAllPupils(),
         child: Center(
           child: ConstrainedBox(
             constraints: const BoxConstraints(maxWidth: 800),
@@ -38,7 +38,8 @@ class MultiPupilCompetenceCheckPage extends StatelessWidget {
                   child: Container(
                     decoration: BoxDecoration(
                       color: CompetenceHelper.getCompetenceColor(
-                          competence.publicId),
+                        competence.publicId,
+                      ),
                       borderRadius: BorderRadius.circular(10),
                     ),
                     child: Padding(
@@ -54,7 +55,8 @@ class MultiPupilCompetenceCheckPage extends StatelessWidget {
                                   competenceId: competence.publicId,
                                   categoryColor:
                                       CompetenceHelper.getCompetenceColor(
-                                          competence.publicId),
+                                        competence.publicId,
+                                      ),
                                 ),
                               ],
                             ),
@@ -73,13 +75,14 @@ class MultiPupilCompetenceCheckPage extends StatelessWidget {
                         title: CreditListSearchBar(pupils: filteredPupils),
                       ),
                       GenericSliverListWithEmptyListCheck(
-                          items: filteredPupils,
-                          itemBuilder: (_, pupil) =>
-                              MultiPupilCompetenceCheckCard(
-                                passedPupil: pupil,
-                                groupId: viewModel.groupId,
-                                competenceId: competence.publicId,
-                              )),
+                        items: filteredPupils,
+                        itemBuilder: (_, pupil) =>
+                            MultiPupilCompetenceCheckCard(
+                              passedPupil: pupil,
+                              groupId: viewModel.groupId,
+                              competenceId: competence.publicId,
+                            ),
+                      ),
                     ],
                   ),
                 ),
diff --git a/school_data_hub_flutter/lib/features/learning/presentation/multi_pupil_competence_check_page/widgets/multi_pupil_competence_check_card.dart b/school_data_hub_flutter/lib/features/learning/presentation/multi_pupil_competence_check_page/widgets/multi_pupil_competence_check_card.dart
index 97dae436..173e38a8 100644
--- a/school_data_hub_flutter/lib/features/learning/presentation/multi_pupil_competence_check_page/widgets/multi_pupil_competence_check_card.dart
+++ b/school_data_hub_flutter/lib/features/learning/presentation/multi_pupil_competence_check_page/widgets/multi_pupil_competence_check_card.dart
@@ -6,7 +6,7 @@ import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/long_textfield_dialog.dart';
-import 'package:school_data_hub_flutter/common/widgets/document_image.dart';
+import 'package:school_data_hub_flutter/common/widgets/encrypted_document_image.dart';
 import 'package:school_data_hub_flutter/common/widgets/growth_dropdown.dart';
 import 'package:school_data_hub_flutter/app_utils/create_and_crop_image_file.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_helper.dart';
@@ -230,7 +230,7 @@ class MultiPupilCompetenceCheckCard extends WatchingWidget {
                                     //             competenceCheck.checkId,
                                     //         fileId: file.fileId);
                                   },
-                                  child: DocumentImage(
+                                  child: EncryptedDocumentImage(
                                     documentId: file.documentId,
                                     size: 70,
                                   ),
@@ -302,7 +302,7 @@ class MultiPupilCompetenceCheckCard extends WatchingWidget {
                       }
                     }
                   },
-                  child: const Text(
+                  child: Text(
                     'Kommentar:',
                     style: TextStyle(
                       fontSize: 16,
diff --git a/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/learning_pupil_list_page.dart b/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/learning_pupil_list_page.dart
index 0bd47d37..73b60c62 100644
--- a/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/learning_pupil_list_page.dart
+++ b/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/learning_pupil_list_page.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:gap/gap.dart';
 import 'package:school_data_hub_flutter/common/domain/filters/filters_state_manager.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_app_bar.dart';
@@ -10,7 +9,7 @@ import 'package:school_data_hub_flutter/features/learning/presentation/pupil_com
 import 'package:school_data_hub_flutter/features/learning/presentation/pupil_competence_list_page/widgets/pupil_competence_list_search_bar.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
 class LearningPupilListPage extends WatchingWidget {
@@ -29,15 +28,14 @@ class LearningPupilListPage extends WatchingWidget {
         title: 'Lernen',
       ),
       body: RefreshIndicator(
-        onRefresh: () async => di<PupilManager>().updatePupilList(pupils),
+        onRefresh: () async => di<PupilProxyManager>().updatePupilList(pupils),
         child: Center(
           child: ConstrainedBox(
             constraints: const BoxConstraints(maxWidth: 700),
             child: CustomScrollView(
               slivers: [
-                const SliverGap(5),
                 GenericSliverSearchAppBar(
-                  height: 160,
+                  height: 180,
                   title: PupilCompetenceListSearchBar(
                     pupils: pupils,
                     filtersOn: filtersOn,
diff --git a/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/learning_list_card/learning_list_card.dart b/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/learning_list_card/learning_list_card.dart
index e7303d64..ffb800b2 100644
--- a/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/learning_list_card/learning_list_card.dart
+++ b/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/learning_list_card/learning_list_card.dart
@@ -70,160 +70,184 @@ class LearningListCard extends WatchingWidget {
                   mainAxisAlignment: MainAxisAlignment.start,
                   crossAxisAlignment: CrossAxisAlignment.end,
                   children: [
-                    const Gap(5),
-                    Column(
+                    const Gap(10),
+                    Row(
                       children: [
-                        Row(
-                          children: [
-                            Expanded(
-                              child: SingleChildScrollView(
-                                scrollDirection: Axis.horizontal,
-                                child: InkWell(
-                                  onTap: () {
-                                    di<BottomNavManager>()
-                                        .setPupilProfileNavPage(
-                                          ProfileNavigationState.learning.value,
-                                        );
-                                    Navigator.of(context).push(
-                                      MaterialPageRoute(
-                                        builder: (ctx) =>
-                                            PupilProfilePage(pupil: pupil),
-                                      ),
-                                    );
-                                  },
-                                  child: Row(
-                                    children: [
-                                      Text(
-                                        pupil.firstName,
-                                        overflow: TextOverflow.fade,
-                                        softWrap: false,
-                                        textAlign: TextAlign.left,
-                                        style: const TextStyle(
-                                          color: Colors.black,
-                                          fontWeight: FontWeight.bold,
-                                          fontSize: 18,
-                                        ),
-                                      ),
-                                      const Gap(5),
-                                      Text(
-                                        pupil.lastName,
-                                        overflow: TextOverflow.fade,
-                                        softWrap: false,
-                                        textAlign: TextAlign.left,
-                                        style: const TextStyle(
-                                          color: Colors.black,
-                                          fontWeight: FontWeight.normal,
-                                          fontSize: 18,
-                                        ),
-                                      ),
-                                    ],
+                        Expanded(
+                          child: SingleChildScrollView(
+                            scrollDirection: Axis.horizontal,
+                            child: InkWell(
+                              onTap: () {
+                                di<BottomNavManager>().setPupilProfileNavPage(
+                                  ProfileNavigationState.learning.value,
+                                );
+                                Navigator.of(context).push(
+                                  MaterialPageRoute(
+                                    builder: (ctx) =>
+                                        PupilProfilePage(pupil: pupil),
                                   ),
-                                ),
+                                );
+                              },
+                              child: Row(
+                                children: [
+                                  Text(
+                                    pupil.firstName,
+                                    overflow: TextOverflow.fade,
+                                    softWrap: false,
+                                    textAlign: TextAlign.left,
+                                    style: const TextStyle(
+                                      color: Colors.black,
+                                      fontWeight: FontWeight.bold,
+                                      fontSize: 18,
+                                    ),
+                                  ),
+                                  const Gap(5),
+                                  Text(
+                                    pupil.lastName,
+                                    overflow: TextOverflow.fade,
+                                    softWrap: false,
+                                    textAlign: TextAlign.left,
+                                    style: const TextStyle(
+                                      color: Colors.black,
+                                      fontWeight: FontWeight.normal,
+                                      fontSize: 18,
+                                    ),
+                                  ),
+                                ],
                               ),
                             ),
-                          ],
+                          ),
                         ),
                       ],
                     ),
 
                     const Gap(5),
-                    Column(
+                    Row(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
-                        if (selectedContent ==
-                            SelectedContent.competenceStatuses) ...[
-                          CustomExpansionTileSwitch(
-                            includeSwitch: true,
-                            switchColor: AppColors.interactiveColor,
-                            customExpansionTileController:
-                                expansionTileController,
-                            expansionSwitchWidget: CompetenceChecksBadges(
-                              pupil: pupil,
+                        Column(
+                          mainAxisAlignment: MainAxisAlignment.start,
+                          children: [
+                            Row(
+                              children: [
+                                Icon(
+                                  Icons.book,
+                                  size: 30,
+                                  color: AppColors.interactiveColor,
+                                ),
+                                const Gap(5),
+                                const Text(
+                                  'Gelesen: ',
+                                  style: TextStyle(
+                                    fontSize: 16,
+                                    fontWeight: FontWeight.bold,
+                                  ),
+                                ),
+                              ],
                             ),
-                          ),
-                          Row(
-                            crossAxisAlignment: CrossAxisAlignment.center,
-                            children: [
-                              const Text('Items dokumentiert: '),
-                              const Gap(5),
-                              Text(
-                                '$totalCompetencesChecked/$totalCompetencesToReport',
-                                style: const TextStyle(
-                                  fontSize: 12,
-                                  fontWeight: FontWeight.bold,
-                                  color: AppColors.backgroundColor,
+                          ],
+                        ),
+                        Column(
+                          children: [
+                            if (selectedContent ==
+                                SelectedContent.competenceStatuses) ...[
+                              CustomExpansionTileSwitch(
+                                includeSwitch: true,
+                                switchColor: AppColors.interactiveColor,
+                                customExpansionTileController:
+                                    expansionTileController,
+                                expansionSwitchWidget: CompetenceChecksBadges(
+                                  pupil: pupil,
                                 ),
                               ),
-                            ],
-                          ),
-                        ],
-                        if (selectedContent ==
-                            SelectedContent.competenceGoals) ...[
-                          CustomExpansionTileSwitch(
-                            customExpansionTileController:
-                                expansionTileController,
-                            expansionSwitchWidget: const Text(
-                              'Lernziele sind noch nicht implementiert',
-                            ),
-                          ),
-                        ],
-                        if (selectedContent == SelectedContent.workbooks) ...[
-                          CustomExpansionTileSwitch(
-                            customExpansionTileController:
-                                expansionTileController,
-                            expansionSwitchWidget: WorkbooksInfoSwitch(
-                              pupil: pupil,
-                            ),
-                            includeSwitch: true,
-                            switchColor: AppColors.interactiveColor,
-                          ),
-                        ],
-                        if (selectedContent == SelectedContent.books) ...[
-                          CustomExpansionTileSwitch(
-                            customExpansionTileController:
-                                expansionTileController,
-                            expansionSwitchWidget: Row(
-                              mainAxisSize: MainAxisSize.min,
-                              children: [
-                                const Gap(10),
-
-                                Column(
-                                  children: [
-                                    Text(
-                                      totalLendings.toString(),
-                                      style: const TextStyle(
-                                        fontSize: 20,
-                                        fontWeight: FontWeight.bold,
-                                        color: Colors.green,
-                                      ),
+                              Row(
+                                crossAxisAlignment: CrossAxisAlignment.center,
+                                children: [
+                                  const Text('Items dokumentiert: '),
+                                  const Gap(5),
+                                  Text(
+                                    '$totalCompetencesChecked/$totalCompetencesToReport',
+                                    style: TextStyle(
+                                      fontSize: 12,
+                                      fontWeight: FontWeight.bold,
+                                      color: AppColors.backgroundColor,
                                     ),
-                                    const Text(
-                                      'gesamt',
-                                      style: TextStyle(fontSize: 10),
-                                    ),
-                                  ],
+                                  ),
+                                ],
+                              ),
+                            ],
+                            if (selectedContent ==
+                                SelectedContent.competenceGoals) ...[
+                              CustomExpansionTileSwitch(
+                                customExpansionTileController:
+                                    expansionTileController,
+                                expansionSwitchWidget: const Text(
+                                  'Lernziele sind noch nicht implementiert',
+                                ),
+                              ),
+                            ],
+                            if (selectedContent ==
+                                SelectedContent.workbooks) ...[
+                              CustomExpansionTileSwitch(
+                                customExpansionTileController:
+                                    expansionTileController,
+                                expansionSwitchWidget: WorkbooksInfoSwitch(
+                                  pupil: pupil,
                                 ),
-                                const Gap(10),
-                                Column(
+                                includeSwitch: true,
+                                switchColor: AppColors.interactiveColor,
+                              ),
+                            ],
+                            if (selectedContent == SelectedContent.books) ...[
+                              CustomExpansionTileSwitch(
+                                customExpansionTileController:
+                                    expansionTileController,
+                                expansionSwitchWidget: Row(
+                                  mainAxisSize: MainAxisSize.min,
                                   children: [
-                                    Text(
-                                      notReturnedLendings.toString(),
-                                      style: const TextStyle(
-                                        fontSize: 20,
-                                        fontWeight: FontWeight.bold,
-                                        color: Colors.orange,
-                                      ),
+                                    const Gap(10),
+
+                                    Column(
+                                      children: [
+                                        Text(
+                                          totalLendings.toString(),
+                                          style: const TextStyle(
+                                            fontSize: 35,
+                                            fontWeight: FontWeight.bold,
+                                            color: Colors.green,
+                                          ),
+                                        ),
+                                        const Text(
+                                          'gesamt',
+                                          style: TextStyle(fontSize: 10),
+                                        ),
+                                      ],
                                     ),
-                                    const Text(
-                                      'aktiv',
-                                      style: TextStyle(fontSize: 10),
+                                    const Gap(10),
+                                    Column(
+                                      children: [
+                                        Text(
+                                          notReturnedLendings.toString(),
+                                          style: const TextStyle(
+                                            fontSize: 35,
+                                            fontWeight: FontWeight.bold,
+                                            color: Colors.orange,
+                                          ),
+                                        ),
+                                        const Text(
+                                          'aktiv',
+                                          style: TextStyle(fontSize: 10),
+                                        ),
+                                      ],
                                     ),
+                                    const Gap(15),
                                   ],
                                 ),
-                                const Gap(15),
-                              ],
-                            ),
-                          ),
-                        ],
+                              ),
+                            ],
+                          ],
+                        ),
                       ],
                     ),
                   ],
diff --git a/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_competence_checks/competence_check_card.dart b/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_competence_checks/competence_check_card.dart
index 2c1295e4..15b0a0d8 100644
--- a/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_competence_checks/competence_check_card.dart
+++ b/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_competence_checks/competence_check_card.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
@@ -11,7 +11,7 @@ import 'package:school_data_hub_flutter/common/widgets/dialogs/information_dialo
 import 'package:school_data_hub_flutter/common/widgets/dialogs/long_textfield_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/schoolday_date_picker.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/short_textfield_dialog.dart';
-import 'package:school_data_hub_flutter/common/widgets/document_image.dart';
+import 'package:school_data_hub_flutter/common/widgets/encrypted_document_image.dart';
 import 'package:school_data_hub_flutter/common/widgets/growth_dropdown.dart';
 import 'package:school_data_hub_flutter/app_utils/create_and_crop_image_file.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_helper.dart';
@@ -54,10 +54,7 @@ class CompetenceCheckCard extends StatelessWidget {
           color: AppColors.cardInCardColor,
           shape: RoundedRectangleBorder(
             borderRadius: BorderRadius.circular(10),
-            side: const BorderSide(
-              color: AppColors.cardInCardBorderColor,
-              width: 2,
-            ),
+            side: BorderSide(color: AppColors.cardInCardBorderColor, width: 2),
           ),
           child: Padding(
             padding: const EdgeInsets.all(10),
@@ -83,7 +80,7 @@ class CompetenceCheckCard extends StatelessWidget {
                             },
                             child: Text(
                               competenceCheck.createdAt.formatDateForUser(),
-                              style: const TextStyle(
+                              style: TextStyle(
                                 color: AppColors.interactiveColor,
                                 fontWeight: FontWeight.bold,
                                 fontSize: 20,
@@ -123,7 +120,7 @@ class CompetenceCheckCard extends StatelessWidget {
                             },
                             child: Text(
                               competenceCheck.createdBy,
-                              style: const TextStyle(
+                              style: TextStyle(
                                 fontWeight: FontWeight.bold,
                                 fontSize: 18,
                                 color: AppColors.backgroundColor,
@@ -220,7 +217,7 @@ class CompetenceCheckCard extends StatelessWidget {
                               child: Row(
                                 mainAxisSize: MainAxisSize.min,
                                 children: [
-                                  const Text(
+                                  Text(
                                     'x',
                                     style: TextStyle(
                                       fontSize: 14,
@@ -233,7 +230,7 @@ class CompetenceCheckCard extends StatelessWidget {
                                     competenceCheck.valueFactor.toStringAsFixed(
                                       1,
                                     ),
-                                    style: const TextStyle(
+                                    style: TextStyle(
                                       fontSize: 16,
                                       fontWeight: FontWeight.bold,
                                       color: AppColors.interactiveColor,
@@ -263,7 +260,7 @@ class CompetenceCheckCard extends StatelessWidget {
                             child: Row(
                               mainAxisSize: MainAxisSize.min,
                               children: [
-                                const Text(
+                                Text(
                                   'x',
                                   style: TextStyle(
                                     fontSize: 14,
@@ -276,7 +273,7 @@ class CompetenceCheckCard extends StatelessWidget {
                                   competenceCheck.valueFactor.toStringAsFixed(
                                     1,
                                   ),
-                                  style: const TextStyle(
+                                  style: TextStyle(
                                     fontSize: 16,
                                     fontWeight: FontWeight.bold,
                                     color: AppColors.backgroundColor,
@@ -355,7 +352,7 @@ class CompetenceCheckCard extends StatelessWidget {
                                       fileId: file.documentId,
                                     );
                               },
-                              child: DocumentImage(
+                              child: EncryptedDocumentImage(
                                 documentId: file.documentId,
                                 size: 70,
                               ),
@@ -387,7 +384,7 @@ class CompetenceCheckCard extends StatelessWidget {
                           }
                         }
                       },
-                      child: const Text(
+                      child: Text(
                         'Kommentar:',
                         style: TextStyle(
                           fontSize: 16,
diff --git a/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_competence_goals/competence_goal_card.dart b/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_competence_goals/competence_goal_card.dart
index 89778ced..0461c1f0 100644
--- a/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_competence_goals/competence_goal_card.dart
+++ b/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_competence_goals/competence_goal_card.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/features/learning/domain/competence_helper.dart';
 import 'package:school_data_hub_flutter/features/learning/domain/competence_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
diff --git a/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_competence_goals/dialogs/add_competence_goal_dialog.dart b/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_competence_goals/dialogs/add_competence_goal_dialog.dart
new file mode 100644
index 00000000..9fa1134a
--- /dev/null
+++ b/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_competence_goals/dialogs/add_competence_goal_dialog.dart
@@ -0,0 +1,164 @@
+import 'package:flutter/material.dart';
+import 'package:gap/gap.dart';
+import 'package:school_data_hub_client/school_data_hub_client.dart';
+import 'package:school_data_hub_flutter/features/learning/domain/competence_manager.dart';
+import 'package:watch_it/watch_it.dart';
+
+class AddCompetenceGoalDialog extends WatchingStatefulWidget {
+  final int pupilId;
+  const AddCompetenceGoalDialog({required this.pupilId, super.key});
+
+  @override
+  State<AddCompetenceGoalDialog> createState() =>
+      _AddCompetenceGoalDialogState();
+}
+
+class _AddCompetenceGoalDialogState extends State<AddCompetenceGoalDialog> {
+  final _formKey = GlobalKey<FormState>();
+  final TextEditingController _descriptionController = TextEditingController();
+  final TextEditingController _strategiesController = TextEditingController();
+
+  Competence? _selectedCompetence;
+  List<String> _strategies = [];
+
+  @override
+  void dispose() {
+    _descriptionController.dispose();
+    _strategiesController.dispose();
+    super.dispose();
+  }
+
+  void _addStrategy() {
+    if (_strategiesController.text.isNotEmpty) {
+      setState(() {
+        _strategies.add(_strategiesController.text);
+        _strategiesController.clear();
+      });
+    }
+  }
+
+  void _removeStrategy(int index) {
+    setState(() {
+      _strategies.removeAt(index);
+    });
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final competences = watchValue((CompetenceManager x) => x.competences);
+
+    return AlertDialog(
+      title: const Text('Neues Lernziel'),
+      content: SizedBox(
+        width: 600,
+        child: Form(
+          key: _formKey,
+          child: SingleChildScrollView(
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                DropdownButtonFormField<Competence>(
+                  decoration: const InputDecoration(labelText: 'Kompetenz'),
+                  items: competences.map((c) {
+                    return DropdownMenuItem(
+                      value: c,
+                      child: Text(
+                        c.name.length > 50
+                            ? '${c.name.substring(0, 50)}...'
+                            : c.name,
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                    );
+                  }).toList(),
+                  onChanged: (val) {
+                    setState(() {
+                      _selectedCompetence = val;
+                    });
+                  },
+                  validator: (val) =>
+                      val == null ? 'Bitte eine Kompetenz wählen' : null,
+                  isExpanded: true,
+                ),
+                const Gap(15),
+                TextFormField(
+                  controller: _descriptionController,
+                  decoration: const InputDecoration(
+                    labelText: 'Zielbeschreibung',
+                  ),
+                  validator: (val) => val == null || val.isEmpty
+                      ? 'Bitte eine Beschreibung eingeben'
+                      : null,
+                  maxLines: 3,
+                ),
+                const Gap(15),
+                Row(
+                  children: [
+                    Expanded(
+                      child: TextFormField(
+                        controller: _strategiesController,
+                        decoration: const InputDecoration(
+                          labelText: 'Strategie hinzufügen',
+                        ),
+                        onFieldSubmitted: (_) => _addStrategy(),
+                      ),
+                    ),
+                    IconButton(
+                      icon: const Icon(Icons.add_circle),
+                      onPressed: _addStrategy,
+                    ),
+                  ],
+                ),
+                const Gap(10),
+                if (_strategies.isNotEmpty)
+                  Container(
+                    height: 100,
+                    decoration: BoxDecoration(
+                      border: Border.all(color: Colors.grey),
+                      borderRadius: BorderRadius.circular(4),
+                    ),
+                    child: ListView.builder(
+                      shrinkWrap: true,
+                      itemCount: _strategies.length,
+                      itemBuilder: (context, index) {
+                        return ListTile(
+                          title: Text(_strategies[index]),
+                          trailing: IconButton(
+                            icon: const Icon(Icons.delete, color: Colors.red),
+                            onPressed: () => _removeStrategy(index),
+                          ),
+                          dense: true,
+                        );
+                      },
+                    ),
+                  ),
+              ],
+            ),
+          ),
+        ),
+      ),
+      actions: [
+        TextButton(
+          onPressed: () => Navigator.of(context).pop(),
+          child: const Text('Abbrechen'),
+        ),
+        ElevatedButton(
+          onPressed: () async {
+            if (_formKey.currentState!.validate() &&
+                _selectedCompetence != null) {
+              await di<CompetenceManager>().postCompetenceGoal(
+                pupilId: widget.pupilId,
+                competenceId: _selectedCompetence!.publicId,
+                description: _descriptionController.text,
+                strategies: _strategies,
+              );
+              if (context.mounted) {
+                Navigator.of(context).pop();
+              }
+            }
+          },
+          child: const Text('Speichern'),
+        ),
+      ],
+    );
+  }
+}
diff --git a/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_competence_list_bottom_navbar.dart b/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_competence_list_bottom_navbar.dart
index 3b104494..fbfb2c6f 100644
--- a/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_competence_list_bottom_navbar.dart
+++ b/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_competence_list_bottom_navbar.dart
@@ -3,6 +3,7 @@ import 'package:gap/gap.dart';
 import 'package:school_data_hub_flutter/common/domain/filters/filters_state_manager.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/bottom_nav_bar_layouts.dart';
+import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 import 'package:school_data_hub_flutter/features/learning/presentation/select_competence_page/select_competence_view_model.dart';
 import 'package:school_data_hub_flutter/features/learning_support/presentation/learning_support_list_page/widgets/learning_support_list_filter_bottom_sheet.dart';
 import 'package:watch_it/watch_it.dart';
@@ -26,22 +27,22 @@ class PupilCompetenceListBottomNavBar extends StatelessWidget {
               const Spacer(),
               InkWell(
                 onTap: () => Navigator.pop(context),
-                child: const Icon(
-                  Icons.arrow_back,
-                  size: 30,
-                ),
+                child: const Icon(Icons.arrow_back, size: 30),
               ),
-              const Gap(30),
-              InkWell(
-                onTap: () {
-                  Navigator.of(context).push(MaterialPageRoute(
-                      builder: (ctx) => const SelectCompetence()));
-                },
-                child: const Icon(
-                  Icons.add_a_photo_rounded,
-                  size: 30,
+
+              if (di<HubSessionManager>().isAdmin) ...[
+                const Gap(30),
+                InkWell(
+                  onTap: () {
+                    Navigator.of(context).push(
+                      MaterialPageRoute(
+                        builder: (ctx) => const SelectCompetence(),
+                      ),
+                    );
+                  },
+                  child: const Icon(Icons.add_a_photo_rounded, size: 30),
                 ),
-              ),
+              ],
               const Gap(30),
               InkWell(
                 onTap: () => showLearningSupportFilterBottomSheet(context),
@@ -52,7 +53,7 @@ class PupilCompetenceListBottomNavBar extends StatelessWidget {
                   size: 30,
                 ),
               ),
-              const Gap(15)
+              const Gap(15),
             ],
           ),
         ),
diff --git a/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_competence_list_search_bar.dart b/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_competence_list_search_bar.dart
index 902b1f62..3752d60b 100644
--- a/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_competence_list_search_bar.dart
+++ b/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_competence_list_search_bar.dart
@@ -27,7 +27,7 @@ class PupilCompetenceListSearchBar extends StatelessWidget {
         borderRadius: BorderRadius.circular(5.0),
       ),
       child: Column(
-        mainAxisAlignment: MainAxisAlignment.end,
+        // mainAxisAlignment: MainAxisAlignment.end,
         children: [
           const Gap(5),
           Padding(
@@ -39,7 +39,7 @@ class PupilCompetenceListSearchBar extends StatelessWidget {
                 child: Row(
                   crossAxisAlignment: CrossAxisAlignment.center,
                   children: [
-                    const Icon(
+                    Icon(
                       Icons.people_alt_rounded,
                       color: AppColors.backgroundColor,
                     ),
diff --git a/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_learning_content/pupil_learning_content_books.dart b/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_learning_content/pupil_learning_content_books.dart
index b358a75e..81c7fb3b 100644
--- a/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_learning_content/pupil_learning_content_books.dart
+++ b/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_learning_content/pupil_learning_content_books.dart
@@ -9,7 +9,7 @@ import 'package:school_data_hub_flutter/common/theme/styles.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/short_textfield_dialog.dart';
 import 'package:school_data_hub_flutter/features/books/presentation/widgets/pupil_book_card.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
 class PupilLearningContentBooks extends StatelessWidget {
@@ -56,7 +56,7 @@ class PupilLearningContentBooks extends StatelessWidget {
               );
             }
             if (bookId != null) {
-              di<PupilManager>().postPupilBookLending(
+              di<PupilProxyManager>().postPupilBookLending(
                 pupilId: pupil.pupilId,
                 libraryId: bookId,
               );
@@ -91,7 +91,7 @@ class PupilLearningContentBooks extends StatelessWidget {
             },
           ),
         ],
-        const Gap(10),
+        const Gap(5),
       ],
     );
   }
diff --git a/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_learning_content/pupil_learning_content_competence_goals.dart b/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_learning_content/pupil_learning_content_competence_goals.dart
index 8434f5d5..da771036 100644
--- a/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_learning_content/pupil_learning_content_competence_goals.dart
+++ b/school_data_hub_flutter/lib/features/learning/presentation/pupil_competence_list_page/widgets/pupil_learning_content/pupil_learning_content_competence_goals.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_flutter/common/theme/styles.dart';
+import 'package:school_data_hub_flutter/features/learning/presentation/pupil_competence_list_page/widgets/pupil_competence_goals/dialogs/add_competence_goal_dialog.dart';
 import 'package:school_data_hub_flutter/features/learning/presentation/pupil_competence_list_page/widgets/pupil_learning_content/pupil_learning_goals_widget.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
 
@@ -28,7 +29,14 @@ class PupilLearningContentCompetenceGoals extends StatelessWidget {
             Expanded(
               child: ElevatedButton(
                 style: AppStyles.actionButtonStyle,
-                onPressed: () async {},
+                onPressed: () async {
+                  await showDialog(
+                    context: context,
+                    builder: (context) {
+                      return AddCompetenceGoalDialog(pupilId: pupil.pupilId);
+                    },
+                  );
+                },
                 child: const Text(
                   "NEUES LERNZIEL",
                   style: AppStyles.buttonTextStyle,
diff --git a/school_data_hub_flutter/lib/features/learning/presentation/widgets/competence_check_comment.dart b/school_data_hub_flutter/lib/features/learning/presentation/widgets/competence_check_comment.dart
index 7607ac05..733ac0f4 100644
--- a/school_data_hub_flutter/lib/features/learning/presentation/widgets/competence_check_comment.dart
+++ b/school_data_hub_flutter/lib/features/learning/presentation/widgets/competence_check_comment.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/features/learning/domain/competence_helper.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
 
diff --git a/school_data_hub_flutter/lib/features/learning/presentation/widgets/pupil_learning_content_expansion_tile_nav_bar.dart b/school_data_hub_flutter/lib/features/learning/presentation/widgets/pupil_learning_content_expansion_tile_nav_bar.dart
index dca5cd81..7f98b824 100644
--- a/school_data_hub_flutter/lib/features/learning/presentation/widgets/pupil_learning_content_expansion_tile_nav_bar.dart
+++ b/school_data_hub_flutter/lib/features/learning/presentation/widgets/pupil_learning_content_expansion_tile_nav_bar.dart
@@ -94,11 +94,11 @@ class PupilLearningContentNavBar extends WatchingWidget {
                   IconButton(
                     isSelected:
                         selectedContent == SelectedContent.competenceStatuses,
-                    icon: const Icon(
+                    icon: Icon(
                       Icons.lightbulb,
                       color: AppColors.interactiveColor,
                     ),
-                    selectedIcon: const Icon(
+                    selectedIcon: Icon(
                       Icons.lightbulb,
                       color: AppColors.accentColor,
                     ),
@@ -132,11 +132,11 @@ class PupilLearningContentNavBar extends WatchingWidget {
                   IconButton(
                     isSelected:
                         selectedContent == SelectedContent.competenceGoals,
-                    icon: const Icon(
+                    icon: Icon(
                       Icons.emoji_nature_rounded,
                       color: AppColors.interactiveColor,
                     ),
-                    selectedIcon: const Icon(
+                    selectedIcon: Icon(
                       Icons.emoji_nature_rounded,
                       color: AppColors.accentColor,
                     ),
@@ -167,11 +167,11 @@ class PupilLearningContentNavBar extends WatchingWidget {
                 children: [
                   IconButton(
                     isSelected: selectedContent == SelectedContent.workbooks,
-                    icon: const Icon(
+                    icon: Icon(
                       Icons.note_alt,
                       color: AppColors.interactiveColor,
                     ),
-                    selectedIcon: const Icon(
+                    selectedIcon: Icon(
                       Icons.note_alt,
                       color: AppColors.accentColor,
                     ),
@@ -201,11 +201,11 @@ class PupilLearningContentNavBar extends WatchingWidget {
               children: [
                 IconButton(
                   isSelected: selectedContent == SelectedContent.books,
-                  icon: const Icon(
+                  icon: Icon(
                     Icons.book,
                     color: AppColors.interactiveColor,
                   ),
-                  selectedIcon: const Icon(
+                  selectedIcon: Icon(
                     Icons.book,
                     color: AppColors.accentColor,
                   ),
diff --git a/school_data_hub_flutter/lib/features/learning_support/domain/filters/learning_support_filter_manager.dart b/school_data_hub_flutter/lib/features/learning_support/domain/filters/learning_support_filter_manager.dart
index fdb0ffb0..34c31e3a 100644
--- a/school_data_hub_flutter/lib/features/learning_support/domain/filters/learning_support_filter_manager.dart
+++ b/school_data_hub_flutter/lib/features/learning_support/domain/filters/learning_support_filter_manager.dart
@@ -7,7 +7,7 @@ import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupil_filt
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupil_filter_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_helper_functions.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_helper.dart';
 import 'package:watch_it/watch_it.dart';
 
 typedef SupportLevelFilterRecord = ({SupportLevelType filter, bool value});
@@ -20,12 +20,14 @@ class LearningSupportFilterManager {
   SupportCategoryManager get _learningSupportManager =>
       di<SupportCategoryManager>();
   final _supportLevelFilterState = ValueNotifier<Map<SupportLevelType, bool>>(
-      initialSupportLevelFilterValues);
+    initialSupportLevelFilterValues,
+  );
   ValueListenable<Map<SupportLevelType, bool>> get supportLevelFilterState =>
       _supportLevelFilterState;
 
-  final _supportAreaFiltersState =
-      ValueNotifier<Map<SupportArea, bool>>(initialSupportAreaFilterValues);
+  final _supportAreaFiltersState = ValueNotifier<Map<SupportArea, bool>>(
+    initialSupportAreaFilterValues,
+  );
   ValueListenable<Map<SupportArea, bool>> get supportAreaFilterState =>
       _supportAreaFiltersState;
   bool get supportLevelFiltersActive =>
@@ -35,8 +37,15 @@ class LearningSupportFilterManager {
       _supportAreaFiltersState.value.containsValue(true);
   LearningSupportFilterManager();
 
-  void setSupportLevelFilter(
-      {required List<SupportLevelFilterRecord> supportLevelFilterRecords}) {
+  void dispose() {
+    _supportLevelFilterState.dispose();
+    _supportAreaFiltersState.dispose();
+    return;
+  }
+
+  void setSupportLevelFilter({
+    required List<SupportLevelFilterRecord> supportLevelFilterRecords,
+  }) {
     for (final record in supportLevelFilterRecords) {
       _supportLevelFilterState.value = {
         ..._supportLevelFilterState.value,
@@ -48,10 +57,14 @@ class LearningSupportFilterManager {
 
     if (supportLevelFilterStateEqualsInitialState) {
       _filtersStateManager.setFilterState(
-          filterState: FilterState.pupilLegacy, value: false);
+        filterState: FilterState.pupilLegacy,
+        value: false,
+      );
     } else {
       _filtersStateManager.setFilterState(
-          filterState: FilterState.pupilLegacy, value: true);
+        filterState: FilterState.pupilLegacy,
+        value: true,
+      );
     }
     _pupilsFilter.refreshs();
   }
@@ -59,8 +72,9 @@ class LearningSupportFilterManager {
   // We pass a list of [SupportAreaFilterRecord] to this function
   // because we want to be able to set multiple filters at once
   // in the case of filters that are mutually exclusive
-  void setSupportAreaFilter(
-      {required List<SupportAreaFilterRecord> supportAreaFilterRecords}) {
+  void setSupportAreaFilter({
+    required List<SupportAreaFilterRecord> supportAreaFilterRecords,
+  }) {
     for (final record in supportAreaFilterRecords) {
       _supportAreaFiltersState.value = {
         ..._supportAreaFiltersState.value,
@@ -68,14 +82,20 @@ class LearningSupportFilterManager {
       };
     }
     final bool pupilFilterStateEqualsInitialState = const MapEquality().equals(
-        _pupilFilterManager.pupilFilterState.value, initialPupilFilterValues);
+      _pupilFilterManager.pupilFilterState.value,
+      initialPupilFilterValues,
+    );
 
     if (pupilFilterStateEqualsInitialState) {
       _filtersStateManager.setFilterState(
-          filterState: FilterState.pupilLegacy, value: false);
+        filterState: FilterState.pupilLegacy,
+        value: false,
+      );
     } else {
       _filtersStateManager.setFilterState(
-          filterState: FilterState.pupilLegacy, value: true);
+        filterState: FilterState.pupilLegacy,
+        value: true,
+      );
     }
 
     _pupilsFilter.refreshs();
@@ -159,10 +179,12 @@ class LearningSupportFilterManager {
       }
 
       if (activeFilters[SupportLevelType.migrationSupport]! &&
-          PupilHelper.hasLanguageSupport(pupil.migrationSupportEnds) != true) {
+          PupilProxyHelper.hasLanguageSupport(pupil.migrationSupportEnds) !=
+              true) {
         isMatched = false;
       } else if (activeFilters[SupportLevelType.migrationSupport]! &&
-          PupilHelper.hasLanguageSupport(pupil.migrationSupportEnds) == true) {
+          PupilProxyHelper.hasLanguageSupport(pupil.migrationSupportEnds) ==
+              true) {
         isMatched = true;
         complementaryFilter = true;
       }
@@ -178,66 +200,78 @@ class LearningSupportFilterManager {
 
     if (pupil.supportCategoryStatuses != null) {
       if (activeFilters[SupportArea.motorics]! &&
-          pupil.supportCategoryStatuses!.any((element) =>
-              _learningSupportManager
-                  .getRootSupportCategory(element.supportCategoryId)
-                  .categoryId ==
-              SupportArea.motorics.value)) {
+          pupil.supportCategoryStatuses!.any(
+            (element) =>
+                _learningSupportManager
+                    .getRootSupportCategory(element.supportCategoryId)
+                    .categoryId ==
+                SupportArea.motorics.value,
+          )) {
         return true;
       }
 
       // emotions filter
 
       if (activeFilters[SupportArea.emotions]! &&
-          pupil.supportCategoryStatuses!.any((element) =>
-              _learningSupportManager
-                  .getRootSupportCategory(element.supportCategoryId)
-                  .categoryId ==
-              SupportArea.emotions.value)) {
+          pupil.supportCategoryStatuses!.any(
+            (element) =>
+                _learningSupportManager
+                    .getRootSupportCategory(element.supportCategoryId)
+                    .categoryId ==
+                SupportArea.emotions.value,
+          )) {
         return true;
       }
 
       // math filter
 
       if (activeFilters[SupportArea.math] == true &&
-          pupil.supportCategoryStatuses!.any((element) =>
-              _learningSupportManager
-                  .getRootSupportCategory(element.supportCategoryId)
-                  .categoryId ==
-              SupportArea.math.value)) {
+          pupil.supportCategoryStatuses!.any(
+            (element) =>
+                _learningSupportManager
+                    .getRootSupportCategory(element.supportCategoryId)
+                    .categoryId ==
+                SupportArea.math.value,
+          )) {
         return true;
       }
 
       // learning filter
 
       if (activeFilters[SupportArea.learning] == true &&
-          pupil.supportCategoryStatuses!.any((element) =>
-              _learningSupportManager
-                  .getRootSupportCategory(element.supportCategoryId)
-                  .categoryId ==
-              SupportArea.learning.value)) {
+          pupil.supportCategoryStatuses!.any(
+            (element) =>
+                _learningSupportManager
+                    .getRootSupportCategory(element.supportCategoryId)
+                    .categoryId ==
+                SupportArea.learning.value,
+          )) {
         return true;
       }
 
       // German language filter
 
       if (activeFilters[SupportArea.german] == true &&
-          pupil.supportCategoryStatuses!.any((element) =>
-              _learningSupportManager
-                  .getRootSupportCategory(element.supportCategoryId)
-                  .categoryId ==
-              SupportArea.german.value)) {
+          pupil.supportCategoryStatuses!.any(
+            (element) =>
+                _learningSupportManager
+                    .getRootSupportCategory(element.supportCategoryId)
+                    .categoryId ==
+                SupportArea.german.value,
+          )) {
         return true;
       }
 
       // Language filter
 
       if (activeFilters[SupportArea.language] == true &&
-          pupil.supportCategoryStatuses!.any((element) =>
-              _learningSupportManager
-                  .getRootSupportCategory(element.supportCategoryId)
-                  .categoryId ==
-              SupportArea.language.value)) {
+          pupil.supportCategoryStatuses!.any(
+            (element) =>
+                _learningSupportManager
+                    .getRootSupportCategory(element.supportCategoryId)
+                    .categoryId ==
+                SupportArea.language.value,
+          )) {
         return true;
       }
     }
diff --git a/school_data_hub_flutter/lib/features/learning_support/domain/learning_support_manager.dart b/school_data_hub_flutter/lib/features/learning_support/domain/learning_support_manager.dart
index f9adb38d..3657fe37 100644
--- a/school_data_hub_flutter/lib/features/learning_support/domain/learning_support_manager.dart
+++ b/school_data_hub_flutter/lib/features/learning_support/domain/learning_support_manager.dart
@@ -10,7 +10,7 @@ import 'package:school_data_hub_flutter/common/services/notification_service.dar
 import 'package:school_data_hub_flutter/core/client/client_helper.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 import 'package:school_data_hub_flutter/features/learning_support/data/learning_support_api_service.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/school_calendar/domain/school_calendar_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
@@ -21,13 +21,18 @@ class LearningSupportManager with ChangeNotifier {
 
   final _learningSupportApiService = LearningSupportApiService();
 
-  final _pupilManager = di<PupilManager>();
+  final _pupilManager = di<PupilProxyManager>();
 
   final _hubSessionManager = di<HubSessionManager>();
 
   final _notificationService = di<NotificationService>();
 
   //- OBSERVABLES -//
+  void dispose() {
+    _learningSupportPlans.dispose();
+    super.dispose();
+    return;
+  }
 
   final _learningSupportPlans =
       ValueNotifier<Map<int, List<LearningSupportPlan>>>({});
@@ -105,7 +110,7 @@ class LearningSupportManager with ChangeNotifier {
   }
 
   LearningSupportPlan? getCurrentLearningSupportPlan(int pupilId) {
-    return di<PupilManager>()
+    return di<PupilProxyManager>()
         .getPupilByPupilId(pupilId)!
         .learningSupportPlans
         ?.firstWhereOrNull(
diff --git a/school_data_hub_flutter/lib/features/learning_support/domain/support_category_manager.dart b/school_data_hub_flutter/lib/features/learning_support/domain/support_category_manager.dart
index 0fffc108..b1743251 100644
--- a/school_data_hub_flutter/lib/features/learning_support/domain/support_category_manager.dart
+++ b/school_data_hub_flutter/lib/features/learning_support/domain/support_category_manager.dart
@@ -11,7 +11,7 @@ import 'package:school_data_hub_flutter/core/env/env_manager.dart';
 import 'package:school_data_hub_flutter/features/learning_support/data/learning_support_api_service.dart';
 import 'package:school_data_hub_flutter/features/learning_support/domain/learning_support_helper.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
 class SupportCategoryManager with ChangeNotifier {
@@ -35,6 +35,12 @@ class SupportCategoryManager with ChangeNotifier {
 
   SupportCategoryManager();
 
+  void dispose() {
+    _supportCategories.dispose();
+
+    super.dispose();
+  }
+
   Future<SupportCategoryManager> init() async {
     await fetchSupportCategories();
     return this;
@@ -66,7 +72,7 @@ class SupportCategoryManager with ChangeNotifier {
   List<SupportGoal> getGoalsForSupportCategory(int categoryId) {
     List<SupportGoal> goals = [];
 
-    final List<PupilProxy> pupils = di<PupilManager>().allPupils;
+    final List<PupilProxy> pupils = di<PupilProxyManager>().allPupils;
     for (PupilProxy pupil in pupils) {
       for (SupportGoal goal in pupil.supportGoals!) {
         if (goal.supportCategoryId == categoryId) {
diff --git a/school_data_hub_flutter/lib/features/learning_support/presentation/learning_support_list_page/learning_support_list_page.dart b/school_data_hub_flutter/lib/features/learning_support/presentation/learning_support_list_page/learning_support_list_page.dart
index 0c9ad497..f6c6f88b 100644
--- a/school_data_hub_flutter/lib/features/learning_support/presentation/learning_support_list_page/learning_support_list_page.dart
+++ b/school_data_hub_flutter/lib/features/learning_support/presentation/learning_support_list_page/learning_support_list_page.dart
@@ -10,7 +10,7 @@ import 'package:school_data_hub_flutter/features/learning_support/presentation/l
 import 'package:school_data_hub_flutter/features/learning_support/presentation/learning_support_list_page/widgets/learning_support_list_search_bar.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
 class LearningSupportListPage extends WatchingWidget {
@@ -18,7 +18,7 @@ class LearningSupportListPage extends WatchingWidget {
 
   @override
   Widget build(BuildContext context) {
-    final _pupilManager = di<PupilManager>();
+    final _pupilManager = di<PupilProxyManager>();
     bool filtersOn = watchValue((FiltersStateManager x) => x.filtersActive);
     // These come from the PupilFilterManager
 
@@ -26,7 +26,9 @@ class LearningSupportListPage extends WatchingWidget {
     return Scaffold(
       backgroundColor: AppColors.canvasColor,
       appBar: const GenericAppBar(
-          iconData: Icons.support_rounded, title: 'Förderung'),
+        iconData: Icons.support_rounded,
+        title: 'Förderung',
+      ),
       body: RefreshIndicator(
         onRefresh: () async => _pupilManager.updatePupilList(pupils),
         child: Center(
@@ -38,18 +40,22 @@ class LearningSupportListPage extends WatchingWidget {
                 GenericSliverSearchAppBar(
                   height: 110,
                   title: LearningSupportListSearchBar(
-                      pupils: pupils, filtersOn: filtersOn),
+                    pupils: pupils,
+                    filtersOn: filtersOn,
+                  ),
                 ),
                 GenericSliverListWithEmptyListCheck(
-                    items: pupils,
-                    itemBuilder: (_, pupil) => LearningSupportCard(pupil)),
+                  items: pupils,
+                  itemBuilder: (_, pupil) => LearningSupportCard(pupil),
+                ),
               ],
             ),
           ),
         ),
       ),
-      bottomNavigationBar:
-          LearningSupportListPageBottomNavBar(filtersOn: filtersOn),
+      bottomNavigationBar: LearningSupportListPageBottomNavBar(
+        filtersOn: filtersOn,
+      ),
     );
   }
 }
diff --git a/school_data_hub_flutter/lib/features/learning_support/presentation/learning_support_list_page/widgets/learning_support_list_card.dart b/school_data_hub_flutter/lib/features/learning_support/presentation/learning_support_list_page/widgets/learning_support_list_card.dart
index 4265a5ee..6fe9bf7e 100644
--- a/school_data_hub_flutter/lib/features/learning_support/presentation/learning_support_list_page/widgets/learning_support_list_card.dart
+++ b/school_data_hub_flutter/lib/features/learning_support/presentation/learning_support_list_page/widgets/learning_support_list_card.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/custom_expansion_tile/custom_expansion_tile.dart';
 import 'package:school_data_hub_flutter/common/widgets/custom_expansion_tile/custom_expansion_tile_content.dart';
@@ -109,33 +109,7 @@ class _LearningSupportCardState extends State<LearningSupportCard> {
                         ),
                       ],
                     ),
-                    Wrap(
-                      children: [
-                        const Text('ärztl. U.: '),
-                        Text(
-                          LearningSupportHelper.preschoolRevision(
-                            pupil.preSchoolMedical?.preschoolMedicalStatus,
-                          ),
-                          style: const TextStyle(
-                            fontWeight: FontWeight.bold,
-                            fontSize: 14,
-                          ),
-                        ),
-                      ],
-                    ),
-                    Wrap(
-                      children: [
-                        const Text('Kindergartenbesuch: '),
-                        Text(
-                          pupil.kindergardenInfo?.attendedMonths.toString() ??
-                              'Kein Eintrag',
-                          style: const TextStyle(
-                            fontWeight: FontWeight.bold,
-                            fontSize: 14,
-                          ),
-                        ),
-                      ],
-                    ),
+
                     if (pupil.migrationSupportEnds != null)
                       Wrap(
                         children: [
@@ -191,7 +165,7 @@ class _LearningSupportCardState extends State<LearningSupportCard> {
                                   ? '🌈'
                                   : pupil.latestSupportLevel!.level.toString()
                             : '0',
-                        style: const TextStyle(
+                        style: TextStyle(
                           fontSize: 23,
                           fontWeight: FontWeight.bold,
                           color: AppColors.backgroundColor,
@@ -204,7 +178,7 @@ class _LearningSupportCardState extends State<LearningSupportCard> {
                                 ? '${pupil.specialNeeds!.substring(0, 2)} ${pupil.specialNeeds!.substring(2, 4)}'
                                 : pupil.specialNeeds!.substring(0, 2)
                           : '',
-                      style: const TextStyle(
+                      style: TextStyle(
                         fontWeight: FontWeight.bold,
                         fontSize: 18,
                         color: AppColors.groupColor,
diff --git a/school_data_hub_flutter/lib/features/learning_support/presentation/learning_support_list_page/widgets/learning_support_list_search_bar.dart b/school_data_hub_flutter/lib/features/learning_support/presentation/learning_support_list_page/widgets/learning_support_list_search_bar.dart
index baf7395e..fc6fd6d3 100644
--- a/school_data_hub_flutter/lib/features/learning_support/presentation/learning_support_list_page/widgets/learning_support_list_search_bar.dart
+++ b/school_data_hub_flutter/lib/features/learning_support/presentation/learning_support_list_page/widgets/learning_support_list_search_bar.dart
@@ -36,7 +36,7 @@ class LearningSupportListSearchBar extends StatelessWidget {
                 scrollDirection: Axis.horizontal,
                 child: Row(
                   children: [
-                    const Icon(
+                    Icon(
                       Icons.people_alt_rounded,
                       color: AppColors.backgroundColor,
                     ),
diff --git a/school_data_hub_flutter/lib/features/learning_support/presentation/learning_support_list_page/widgets/support_goals_list.dart b/school_data_hub_flutter/lib/features/learning_support/presentation/learning_support_list_page/widgets/support_goals_list.dart
index 82dc3434..8316e0fe 100644
--- a/school_data_hub_flutter/lib/features/learning_support/presentation/learning_support_list_page/widgets/support_goals_list.dart
+++ b/school_data_hub_flutter/lib/features/learning_support/presentation/learning_support_list_page/widgets/support_goals_list.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
+import 'package:school_data_hub_flutter/features/learning_support/domain/learning_support_helper.dart';
 import 'package:school_data_hub_flutter/features/learning_support/presentation/widgets/support_goal/support_goal_card.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
 
@@ -12,6 +13,41 @@ class SupportGoalsList extends StatelessWidget {
     return Column(
       children: [
         const Gap(5),
+        Row(
+          children: [
+            Wrap(
+              children: [
+                const Text('ärztl. U.: '),
+                Text(
+                  LearningSupportHelper.preschoolRevision(
+                    pupil.preSchoolMedical?.preschoolMedicalStatus,
+                  ),
+                  style: const TextStyle(
+                    fontWeight: FontWeight.bold,
+                    fontSize: 14,
+                  ),
+                ),
+              ],
+            ),
+          ],
+        ),
+        Row(
+          children: [
+            Wrap(
+              children: [
+                const Text('Kindergartenbesuch: '),
+                Text(
+                  pupil.kindergardenInfo?.attendedMonths.toString() ??
+                      'Kein Eintrag',
+                  style: const TextStyle(
+                    fontWeight: FontWeight.bold,
+                    fontSize: 14,
+                  ),
+                ),
+              ],
+            ),
+          ],
+        ),
         const Row(
           children: [
             Text(
@@ -23,23 +59,20 @@ class SupportGoalsList extends StatelessWidget {
         const Gap(10),
         pupil.supportGoals != null
             ? pupil.supportGoals!.isNotEmpty
-                ? ListView.builder(
-                    padding: const EdgeInsets.all(0),
-                    shrinkWrap: true,
-                    physics: const NeverScrollableScrollPhysics(),
-                    itemCount: pupil.supportGoals!.length,
-                    itemBuilder: (context, int index) {
-                      return SupportGoalCard(pupil: pupil, goalIndex: index);
-                    })
-                : const Column(
-                    children: [
-                      Text('Noch keine Förderziele festgelegt!'),
-                    ],
-                  )
+                  ? ListView.builder(
+                      padding: const EdgeInsets.all(0),
+                      shrinkWrap: true,
+                      physics: const NeverScrollableScrollPhysics(),
+                      itemCount: pupil.supportGoals!.length,
+                      itemBuilder: (context, int index) {
+                        return SupportGoalCard(pupil: pupil, goalIndex: index);
+                      },
+                    )
+                  : const Column(
+                      children: [Text('Noch keine Förderziele festgelegt!')],
+                    )
             : const Column(
-                children: [
-                  Text('Noch keine Förderziele festgelegt!'),
-                ],
+                children: [Text('Noch keine Förderziele festgelegt!')],
               ),
         const Gap(10),
       ],
diff --git a/school_data_hub_flutter/lib/features/learning_support/presentation/new_learning_support_plan/new_learning_support_plan_page.dart b/school_data_hub_flutter/lib/features/learning_support/presentation/new_learning_support_plan/new_learning_support_plan_page.dart
index 9a554240..f094f074 100644
--- a/school_data_hub_flutter/lib/features/learning_support/presentation/new_learning_support_plan/new_learning_support_plan_page.dart
+++ b/school_data_hub_flutter/lib/features/learning_support/presentation/new_learning_support_plan/new_learning_support_plan_page.dart
@@ -136,7 +136,7 @@ class NewLearningSupportPlanPage extends WatchingWidget {
                         ),
                         child: Row(
                           children: [
-                            const Icon(
+                            Icon(
                               Icons.info_outline,
                               color: AppColors.backgroundColor,
                               size: 16,
@@ -229,19 +229,19 @@ class NewLearningSupportPlanPage extends WatchingWidget {
                     maxLines: 4,
                     decoration: InputDecoration(
                       contentPadding: const EdgeInsets.all(10),
-                      border: const OutlineInputBorder(
+                      border: OutlineInputBorder(
                         borderSide: BorderSide(
                           color: AppColors.backgroundColor,
                           width: 2,
                         ),
                       ),
-                      focusedBorder: const OutlineInputBorder(
+                      focusedBorder: OutlineInputBorder(
                         borderSide: BorderSide(
                           color: AppColors.backgroundColor,
                           width: 2,
                         ),
                       ),
-                      labelStyle: const TextStyle(
+                      labelStyle: TextStyle(
                         color: AppColors.backgroundColor,
                       ),
                       labelText: 'Kommentar',
@@ -259,19 +259,19 @@ class NewLearningSupportPlanPage extends WatchingWidget {
                     controller: controller.socialPedagogueController,
                     decoration: InputDecoration(
                       contentPadding: const EdgeInsets.all(10),
-                      border: const OutlineInputBorder(
+                      border: OutlineInputBorder(
                         borderSide: BorderSide(
                           color: AppColors.backgroundColor,
                           width: 2,
                         ),
                       ),
-                      focusedBorder: const OutlineInputBorder(
+                      focusedBorder: OutlineInputBorder(
                         borderSide: BorderSide(
                           color: AppColors.backgroundColor,
                           width: 2,
                         ),
                       ),
-                      labelStyle: const TextStyle(
+                      labelStyle: TextStyle(
                         color: AppColors.backgroundColor,
                       ),
                       labelText: 'Sozialpädagoge',
@@ -290,13 +290,13 @@ class NewLearningSupportPlanPage extends WatchingWidget {
                     maxLines: 3,
                     decoration: InputDecoration(
                       contentPadding: const EdgeInsets.all(10),
-                      border: const OutlineInputBorder(
+                      border: OutlineInputBorder(
                         borderSide: BorderSide(
                           color: AppColors.backgroundColor,
                           width: 2,
                         ),
                       ),
-                      focusedBorder: const OutlineInputBorder(
+                      focusedBorder: OutlineInputBorder(
                         borderSide: BorderSide(
                           color: AppColors.backgroundColor,
                           width: 2,
@@ -319,19 +319,19 @@ class NewLearningSupportPlanPage extends WatchingWidget {
                     maxLines: 4,
                     decoration: InputDecoration(
                       contentPadding: const EdgeInsets.all(10),
-                      border: const OutlineInputBorder(
+                      border: OutlineInputBorder(
                         borderSide: BorderSide(
                           color: AppColors.backgroundColor,
                           width: 2,
                         ),
                       ),
-                      focusedBorder: const OutlineInputBorder(
+                      focusedBorder: OutlineInputBorder(
                         borderSide: BorderSide(
                           color: AppColors.backgroundColor,
                           width: 2,
                         ),
                       ),
-                      labelStyle: const TextStyle(
+                      labelStyle: TextStyle(
                         color: AppColors.backgroundColor,
                       ),
                       labelText: 'Stärkenbeschreibung',
@@ -350,19 +350,19 @@ class NewLearningSupportPlanPage extends WatchingWidget {
                     maxLines: 4,
                     decoration: InputDecoration(
                       contentPadding: const EdgeInsets.all(10),
-                      border: const OutlineInputBorder(
+                      border: OutlineInputBorder(
                         borderSide: BorderSide(
                           color: AppColors.backgroundColor,
                           width: 2,
                         ),
                       ),
-                      focusedBorder: const OutlineInputBorder(
+                      focusedBorder: OutlineInputBorder(
                         borderSide: BorderSide(
                           color: AppColors.backgroundColor,
                           width: 2,
                         ),
                       ),
-                      labelStyle: const TextStyle(
+                      labelStyle: TextStyle(
                         color: AppColors.backgroundColor,
                       ),
                       labelText: 'Problembeschreibung',
diff --git a/school_data_hub_flutter/lib/features/learning_support/presentation/new_support_category_status_page/new_support_category_status_page.dart b/school_data_hub_flutter/lib/features/learning_support/presentation/new_support_category_status_page/new_support_category_status_page.dart
index a806e7db..0ed6b817 100644
--- a/school_data_hub_flutter/lib/features/learning_support/presentation/new_support_category_status_page/new_support_category_status_page.dart
+++ b/school_data_hub_flutter/lib/features/learning_support/presentation/new_support_category_status_page/new_support_category_status_page.dart
@@ -9,7 +9,7 @@ import 'package:school_data_hub_flutter/features/learning_support/presentation/s
 import 'package:school_data_hub_flutter/features/learning_support/presentation/widgets/dialogs/goal_examples_dialog.dart';
 import 'package:school_data_hub_flutter/features/learning_support/presentation/widgets/support_category_parents_names.dart';
 import 'package:school_data_hub_flutter/features/learning_support/presentation/widgets/support_category_widgets/support_category_status_dropdown.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
 class NewSupportCategoryStatusPage extends StatelessWidget {
@@ -18,7 +18,7 @@ class NewSupportCategoryStatusPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final _pupilManager = di<PupilManager>();
+    final _pupilManager = di<PupilProxyManager>();
     final _learningSupportPlanManager = di<LearningSupportManager>();
     final _supportCategoryManager = di<SupportCategoryManager>();
     return Theme(
@@ -65,94 +65,91 @@ class NewSupportCategoryStatusPage extends StatelessWidget {
                         controller.goalCategoryId == null ||
                                 controller.goalCategoryId == 0
                             ? ElevatedButton(
-                              style: ElevatedButton.styleFrom(
-                                shape: RoundedRectangleBorder(
-                                  borderRadius: BorderRadius.circular(10.0),
-                                ),
-                                backgroundColor: AppColors.backgroundColor,
-                                minimumSize: const Size.fromHeight(60),
-                              ),
-                              onPressed: () async {
-                                final int? categoryId = await Navigator.of(
-                                  context,
-                                ).push(
-                                  MaterialPageRoute(
-                                    builder:
-                                        (ctx) => SelectSupportCategory(
-                                          pupil:
-                                              _pupilManager.getPupilByPupilId(
-                                                controller.widget.pupilId,
-                                              )!,
-                                          elementType:
-                                              controller.widget.elementType,
-                                        ),
+                                style: ElevatedButton.styleFrom(
+                                  shape: RoundedRectangleBorder(
+                                    borderRadius: BorderRadius.circular(10.0),
                                   ),
-                                );
-                                if (categoryId == null) {
-                                  return;
-                                }
-                                controller.setGoalCategoryId(categoryId);
-                              },
-                              child: const Text(
-                                'KATEGORIE AUSWÄHLEN',
-                                style: AppStyles.buttonTextStyle,
-                              ),
-                            )
-                            : InkWell(
-                              child: Container(
-                                decoration: BoxDecoration(
-                                  borderRadius: BorderRadius.circular(5.0),
-                                  color: _supportCategoryManager
-                                      .getCategoryColor(
-                                        controller.goalCategoryId!,
+                                  backgroundColor: AppColors.backgroundColor,
+                                  minimumSize: const Size.fromHeight(60),
+                                ),
+                                onPressed: () async {
+                                  final int?
+                                  categoryId = await Navigator.of(context).push(
+                                    MaterialPageRoute(
+                                      builder: (ctx) => SelectSupportCategory(
+                                        pupil: _pupilManager.getPupilByPupilId(
+                                          controller.widget.pupilId,
+                                        )!,
+                                        elementType:
+                                            controller.widget.elementType,
                                       ),
+                                    ),
+                                  );
+                                  if (categoryId == null) {
+                                    return;
+                                  }
+                                  controller.setGoalCategoryId(categoryId);
+                                },
+                                child: const Text(
+                                  'KATEGORIE AUSWÄHLEN',
+                                  style: AppStyles.buttonTextStyle,
                                 ),
-                                child: Padding(
-                                  padding: const EdgeInsets.only(
-                                    top: 5.0,
-                                    bottom: 8,
+                              )
+                            : InkWell(
+                                child: Container(
+                                  decoration: BoxDecoration(
+                                    borderRadius: BorderRadius.circular(5.0),
+                                    color: _supportCategoryManager
+                                        .getCategoryColor(
+                                          controller.goalCategoryId!,
+                                        ),
                                   ),
-                                  child: Wrap(
-                                    crossAxisAlignment:
-                                        WrapCrossAlignment.center,
-                                    children: [
-                                      ...categoryTreeAncestorsNames(
-                                        categoryId: controller.goalCategoryId!,
-                                        categoryColor:
-                                            Colors
-                                                .white, //locator<LearningSupportManager>().getCategoryColor(controller.goalCategoryId!),
-                                      ),
-                                    ],
+                                  child: Padding(
+                                    padding: const EdgeInsets.only(
+                                      top: 5.0,
+                                      bottom: 8,
+                                    ),
+                                    child: Wrap(
+                                      crossAxisAlignment:
+                                          WrapCrossAlignment.center,
+                                      children: [
+                                        ...categoryTreeAncestorsNames(
+                                          categoryId:
+                                              controller.goalCategoryId!,
+                                          categoryColor: Colors
+                                              .white, //locator<LearningSupportManager>().getCategoryColor(controller.goalCategoryId!),
+                                        ),
+                                      ],
+                                    ),
                                   ),
                                 ),
                               ),
-                            ),
                         const Gap(5),
                         controller.goalCategoryId == null
                             ? const SizedBox.shrink()
                             : controller.goalCategoryId == 0
                             ? const SizedBox.shrink()
                             : Row(
-                              children: [
-                                Flexible(
-                                  child: Text(
-                                    _supportCategoryManager
-                                        .getSupportCategory(
-                                          controller.goalCategoryId!,
-                                        )
-                                        .name,
-                                    style: TextStyle(
-                                      fontSize: 20,
-                                      color: _supportCategoryManager
-                                          .getCategoryColor(
+                                children: [
+                                  Flexible(
+                                    child: Text(
+                                      _supportCategoryManager
+                                          .getSupportCategory(
                                             controller.goalCategoryId!,
-                                          ),
-                                      fontWeight: FontWeight.bold,
+                                          )
+                                          .name,
+                                      style: TextStyle(
+                                        fontSize: 20,
+                                        color: _supportCategoryManager
+                                            .getCategoryColor(
+                                              controller.goalCategoryId!,
+                                            ),
+                                        fontWeight: FontWeight.bold,
+                                      ),
                                     ),
                                   ),
-                                ),
-                              ],
-                            ),
+                                ],
+                              ),
                         const Gap(5),
                         Row(
                           crossAxisAlignment: CrossAxisAlignment.start,
@@ -204,9 +201,9 @@ class NewSupportCategoryStatusPage extends StatelessWidget {
                           decoration: AppStyles.textFieldDecoration(
                             labelText:
                                 (controller.widget.appBarTitle ==
-                                        'Neues Förderziel')
-                                    ? 'Hilfen für das Erreichen des Zieles'
-                                    : 'Beschreibung des Ist-Zustandes',
+                                    'Neues Förderziel')
+                                ? 'Hilfen für das Erreichen des Zieles'
+                                : 'Beschreibung des Ist-Zustandes',
                           ),
                         ),
                         const Gap(20),
@@ -301,10 +298,9 @@ class NewSupportCategoryStatusPage extends StatelessWidget {
                                   pupilId: controller.widget.pupilId,
                                   supportCategoryId: controller.goalCategoryId!,
                                   status: controller.categoryStatusValue,
-                                  comment:
-                                      controller
-                                          .strategiesTextField2Controller
-                                          .text,
+                                  comment: controller
+                                      .strategiesTextField2Controller
+                                      .text,
                                 );
                           }
                           Navigator.pop(context);
diff --git a/school_data_hub_flutter/lib/features/learning_support/presentation/new_support_goal_page/new_support_goal_page.dart b/school_data_hub_flutter/lib/features/learning_support/presentation/new_support_goal_page/new_support_goal_page.dart
index 69d7cd37..eea33568 100644
--- a/school_data_hub_flutter/lib/features/learning_support/presentation/new_support_goal_page/new_support_goal_page.dart
+++ b/school_data_hub_flutter/lib/features/learning_support/presentation/new_support_goal_page/new_support_goal_page.dart
@@ -7,7 +7,7 @@ import 'package:school_data_hub_flutter/features/learning_support/presentation/n
 import 'package:school_data_hub_flutter/features/learning_support/presentation/select_support_category_page/controller/select_support_category_controller.dart';
 import 'package:school_data_hub_flutter/features/learning_support/presentation/widgets/support_category_parents_names.dart';
 import 'package:school_data_hub_flutter/features/learning_support/presentation/widgets/support_category_widgets/support_category_status_dropdown.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
 class NewSupportGoalPage extends StatelessWidget {
@@ -16,7 +16,7 @@ class NewSupportGoalPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final _pupilManager = di<PupilManager>();
+    final _pupilManager = di<PupilProxyManager>();
     final _learningSupportManager = di<SupportCategoryManager>();
     return Theme(
       data: ThemeData(
@@ -41,12 +41,14 @@ class NewSupportGoalPage extends StatelessWidget {
                   children: <Widget>[
                     const Row(
                       children: [
-                        Text('Förderkategorie',
-                            style: TextStyle(
-                              fontSize: 20,
-                              color: Colors.black,
-                              fontWeight: FontWeight.bold,
-                            )),
+                        Text(
+                          'Förderkategorie',
+                          style: TextStyle(
+                            fontSize: 20,
+                            color: Colors.black,
+                            fontWeight: FontWeight.bold,
+                          ),
+                        ),
                       ],
                     ),
                     const Gap(10),
@@ -54,21 +56,25 @@ class NewSupportGoalPage extends StatelessWidget {
                             controller.goalCategoryId == 0
                         ? ElevatedButton(
                             style: ElevatedButton.styleFrom(
-                                shape: RoundedRectangleBorder(
-                                  borderRadius: BorderRadius.circular(10.0),
-                                ),
-                                backgroundColor: AppColors.backgroundColor,
-                                minimumSize: const Size.fromHeight(60)),
+                              shape: RoundedRectangleBorder(
+                                borderRadius: BorderRadius.circular(10.0),
+                              ),
+                              backgroundColor: AppColors.backgroundColor,
+                              minimumSize: const Size.fromHeight(60),
+                            ),
                             onPressed: () async {
-                              final int? categoryId = await Navigator.of(
-                                      context)
-                                  .push(MaterialPageRoute(
+                              final int? categoryId =
+                                  await Navigator.of(context).push(
+                                    MaterialPageRoute(
                                       builder: (ctx) => SelectSupportCategory(
-                                          pupil:
-                                              _pupilManager.getPupilByPupilId(
-                                                  controller.widget.pupilId)!,
-                                          elementType:
-                                              controller.widget.elementType)));
+                                        pupil: _pupilManager.getPupilByPupilId(
+                                          controller.widget.pupilId,
+                                        )!,
+                                        elementType:
+                                            controller.widget.elementType,
+                                      ),
+                                    ),
+                                  );
                               if (categoryId == null) {
                                 return;
                               }
@@ -85,8 +91,10 @@ class NewSupportGoalPage extends StatelessWidget {
                                 ),
                               ),
                               child: Padding(
-                                padding:
-                                    const EdgeInsets.only(top: 5.0, bottom: 8),
+                                padding: const EdgeInsets.only(
+                                  top: 5.0,
+                                  bottom: 8,
+                                ),
                                 child: Wrap(
                                   crossAxisAlignment: WrapCrossAlignment.center,
                                   alignment: WrapAlignment.center,
@@ -95,7 +103,8 @@ class NewSupportGoalPage extends StatelessWidget {
                                       categoryId: controller.goalCategoryId!,
                                       categoryColor: _learningSupportManager
                                           .getCategoryColor(
-                                              controller.goalCategoryId!),
+                                            controller.goalCategoryId!,
+                                          ),
                                     ),
                                   ],
                                 ),
@@ -106,40 +115,42 @@ class NewSupportGoalPage extends StatelessWidget {
                     controller.goalCategoryId == null
                         ? const SizedBox.shrink()
                         : controller.goalCategoryId == 0
-                            ? const SizedBox.shrink()
-                            : Row(
-                                children: [
-                                  Flexible(
-                                    child: Text(
-                                      _learningSupportManager
-                                          .getSupportCategory(
-                                              controller.goalCategoryId!)
-                                          .name,
-                                      style: TextStyle(
-                                        fontSize: 20,
-                                        color: _learningSupportManager
-                                            .getCategoryColor(
-                                                controller.goalCategoryId!),
-                                        fontWeight: FontWeight.bold,
-                                      ),
-                                    ),
+                        ? const SizedBox.shrink()
+                        : Row(
+                            children: [
+                              Flexible(
+                                child: Text(
+                                  _learningSupportManager
+                                      .getSupportCategory(
+                                        controller.goalCategoryId!,
+                                      )
+                                      .name,
+                                  style: TextStyle(
+                                    fontSize: 20,
+                                    color: _learningSupportManager
+                                        .getCategoryColor(
+                                          controller.goalCategoryId!,
+                                        ),
+                                    fontWeight: FontWeight.bold,
                                   ),
-                                ],
+                                ),
                               ),
+                            ],
+                          ),
                     const Gap(15),
                     Row(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
                         Text(
-                            (controller.widget.appBarTitle ==
-                                    'Neues Förderziel')
-                                ? 'Förderziel'
-                                : 'Status',
-                            style: const TextStyle(
-                              fontSize: 20,
-                              color: Colors.black,
-                              fontWeight: FontWeight.bold,
-                            )),
+                          (controller.widget.appBarTitle == 'Neues Förderziel')
+                              ? 'Förderziel'
+                              : 'Status',
+                          style: const TextStyle(
+                            fontSize: 20,
+                            color: Colors.black,
+                            fontWeight: FontWeight.bold,
+                          ),
+                        ),
                       ],
                     ),
                     const Gap(10),
@@ -150,17 +161,20 @@ class NewSupportGoalPage extends StatelessWidget {
                         maxLines: 3,
                         controller: controller.descriptionTextFieldController,
                         decoration: AppStyles.textFieldDecoration(
-                            labelText: 'Beschreibung des Zieles'),
+                          labelText: 'Beschreibung des Zieles',
+                        ),
                       ),
                       const Gap(20),
                       const Row(
                         children: [
-                          Text('Strategien',
-                              style: TextStyle(
-                                fontSize: 20,
-                                color: Colors.black,
-                                fontWeight: FontWeight.bold,
-                              )),
+                          Text(
+                            'Strategien',
+                            style: TextStyle(
+                              fontSize: 20,
+                              color: Colors.black,
+                              fontWeight: FontWeight.bold,
+                            ),
+                          ),
                         ],
                       ),
                       const Gap(10),
@@ -170,10 +184,12 @@ class NewSupportGoalPage extends StatelessWidget {
                       maxLines: 4,
                       controller: controller.strategiesTextField2Controller,
                       decoration: AppStyles.textFieldDecoration(
-                          labelText: (controller.widget.appBarTitle ==
-                                  'Neues Förderziel')
-                              ? 'Hilfen für das Erreichen des Zieles'
-                              : 'Beschreibung des Status'),
+                        labelText:
+                            (controller.widget.appBarTitle ==
+                                'Neues Förderziel')
+                            ? 'Hilfen für das Erreichen des Zieles'
+                            : 'Beschreibung des Status',
+                      ),
                     ),
                     const Gap(20),
                     if (controller.widget.appBarTitle != 'Neues Förderziel')
@@ -189,8 +205,9 @@ class NewSupportGoalPage extends StatelessWidget {
                             child: DropdownButtonHideUnderline(
                               child: DropdownButton<int>(
                                 icon: const Visibility(
-                                    visible: false,
-                                    child: Icon(Icons.arrow_downward)),
+                                  visible: false,
+                                  child: Icon(Icons.arrow_downward),
+                                ),
                                 onTap: () {
                                   FocusManager.instance.primaryFocus!.unfocus();
                                 },
@@ -201,17 +218,18 @@ class NewSupportGoalPage extends StatelessWidget {
                                 },
                               ),
                             ),
-                          )
+                          ),
                         ],
                       ),
                     const Padding(padding: EdgeInsets.symmetric(vertical: 40)),
                     ElevatedButton(
                       style: ElevatedButton.styleFrom(
-                          shape: RoundedRectangleBorder(
-                            borderRadius: BorderRadius.circular(10.0),
-                          ),
-                          backgroundColor: Colors.amber[800],
-                          minimumSize: const Size.fromHeight(60)),
+                        shape: RoundedRectangleBorder(
+                          borderRadius: BorderRadius.circular(10.0),
+                        ),
+                        backgroundColor: Colors.amber[800],
+                        minimumSize: const Size.fromHeight(60),
+                      ),
                       onPressed: () {
                         if (controller.widget.appBarTitle ==
                             'Neues Förderziel') {
@@ -235,12 +253,12 @@ class NewSupportGoalPage extends StatelessWidget {
                     const Gap(15),
                     ElevatedButton(
                       style: ElevatedButton.styleFrom(
-                          shape: RoundedRectangleBorder(
-                            borderRadius: BorderRadius.circular(10.0),
-                          ),
-                          backgroundColor:
-                              const Color.fromARGB(255, 235, 67, 67),
-                          minimumSize: const Size.fromHeight(60)),
+                        shape: RoundedRectangleBorder(
+                          borderRadius: BorderRadius.circular(10.0),
+                        ),
+                        backgroundColor: const Color.fromARGB(255, 235, 67, 67),
+                        minimumSize: const Size.fromHeight(60),
+                      ),
                       onPressed: () {
                         Navigator.pop(context);
                       },
diff --git a/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/dialogs/preschool_revision_dialog.dart b/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/dialogs/preschool_revision_dialog.dart
index 07617d66..86eda2c9 100644
--- a/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/dialogs/preschool_revision_dialog.dart
+++ b/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/dialogs/preschool_revision_dialog.dart
@@ -66,7 +66,7 @@ Future<void> preschoolRevisionDialog(
                   const Gap(16),
                   // Dropdown
                   DropdownButtonFormField<PreSchoolMedicalStatus>(
-                    value: dialogdropdownValue,
+                    initialValue: dialogdropdownValue,
                     decoration: const InputDecoration(
                       labelText: 'Status der Eingangsuntersuchung',
                       border: OutlineInputBorder(),
@@ -116,7 +116,7 @@ Future<void> preschoolRevisionDialog(
             actions: <Widget>[
               TextButton(
                 onPressed: () => Navigator.of(context).pop(),
-                child: const Text(
+                child: Text(
                   'ABBRECHEN',
                   style: TextStyle(
                     color: AppColors.accentColor,
diff --git a/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/dialogs/support_level_dialog.dart b/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/dialogs/support_level_dialog.dart
index c823f47b..be07f47a 100644
--- a/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/dialogs/support_level_dialog.dart
+++ b/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/dialogs/support_level_dialog.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
@@ -136,7 +136,7 @@ Future<void> supportLevelDialog(
                     },
                     child: Text(
                       selectedDate.formatDateForUser(),
-                      style: const TextStyle(
+                      style: TextStyle(
                         color: AppColors.backgroundColor,
                         fontWeight: FontWeight.bold,
                         fontSize: 18,
@@ -170,7 +170,7 @@ Future<void> supportLevelDialog(
               Padding(
                 padding: const EdgeInsets.all(15.0),
                 child: InkWell(
-                  child: const Text(
+                  child: Text(
                     'ABBRECHEN',
                     style: TextStyle(
                       color: AppColors.accentColor,
@@ -186,7 +186,7 @@ Future<void> supportLevelDialog(
               Padding(
                 padding: const EdgeInsets.all(15.0),
                 child: InkWell(
-                  child: const Text(
+                  child: Text(
                     'OK',
                     style: TextStyle(
                       color: AppColors.accentColor,
diff --git a/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/support_catagory_status/support_category_statuses_list.dart b/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/support_catagory_status/support_category_statuses_list.dart
index 5fc8854b..084a0d6b 100644
--- a/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/support_catagory_status/support_category_statuses_list.dart
+++ b/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/support_catagory_status/support_category_statuses_list.dart
@@ -2,7 +2,7 @@ import 'dart:developer';
 
 import 'package:flutter/material.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/features/learning_support/presentation/widgets/support_catagory_status/widgets/support_category_status_card.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
 
diff --git a/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/support_catagory_status/widgets/support_category_status_entry/support_category_status_entry.dart b/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/support_catagory_status/widgets/support_category_status_entry/support_category_status_entry.dart
index 2b6ef7c2..4ff08e4e 100644
--- a/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/support_catagory_status/widgets/support_category_status_entry/support_category_status_entry.dart
+++ b/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/support_catagory_status/widgets/support_category_status_entry/support_category_status_entry.dart
@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/information_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/long_textfield_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/short_textfield_dialog.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/features/learning_support/domain/learning_support_helper.dart';
 import 'package:school_data_hub_flutter/features/learning_support/domain/learning_support_manager.dart';
 import 'package:school_data_hub_flutter/features/learning_support/presentation/widgets/support_catagory_status/widgets/support_category_status_entry/support_category_status_symbol.dart';
@@ -91,7 +91,7 @@ class SupportCategoryStatusEntry extends StatelessWidget {
                           },
                           child: Text(
                             status.createdAt.formatDateForUser(),
-                            style: const TextStyle(
+                            style: TextStyle(
                               color: AppColors.interactiveColor,
                               fontWeight: FontWeight.bold,
                               fontSize: 18,
@@ -128,7 +128,7 @@ class SupportCategoryStatusEntry extends StatelessWidget {
                           },
                           child: Text(
                             status.comment,
-                            style: const TextStyle(
+                            style: TextStyle(
                               color: AppColors.interactiveColor,
                               fontWeight: FontWeight.bold,
                             ),
@@ -153,17 +153,17 @@ class SupportCategoryStatusEntry extends StatelessWidget {
                                     );
                                 if (correctedCreatedBy != null) {
                                   // TODO: uncomment when ready
-                                  //  _learningSupportManager
-                                  //       .updateSupportCategoryStatusProperty(
-                                  //     pupil: pupil,
-                                  //     statusId: status.statusId,
-                                  //     createdBy: correctedCreatedBy,
-                                  //   );
+                                  // di<LearningSupportManager>().
+                                  //     .updateSupportCategoryStatusProperty(
+                                  //       pupil: pupil,
+                                  //       statusId: status.statusId,
+                                  //       createdBy: correctedCreatedBy,
+                                  //     );
                                 }
                               },
                               child: Text(
                                 status.createdBy,
-                                style: const TextStyle(
+                                style: TextStyle(
                                   color: AppColors.interactiveColor,
                                   fontWeight: FontWeight.bold,
                                 ),
diff --git a/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/support_goal/support_goal_card.dart b/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/support_goal/support_goal_card.dart
index 91152a30..dbd7e668 100644
--- a/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/support_goal/support_goal_card.dart
+++ b/school_data_hub_flutter/lib/features/learning_support/presentation/widgets/support_goal/support_goal_card.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
 import 'package:school_data_hub_flutter/features/learning_support/domain/learning_support_helper.dart';
@@ -44,7 +44,7 @@ class SupportGoalCard extends StatelessWidget {
           child: Card(
             shape: RoundedRectangleBorder(
               borderRadius: BorderRadius.circular(10.0),
-              side: const BorderSide(
+              side: BorderSide(
                 color: AppColors.cardInCardBorderColor,
                 width: 2,
               ),
@@ -113,10 +113,10 @@ class SupportGoalCard extends StatelessWidget {
                     Flexible(
                       child: Text(
                         pupil.supportGoals![goalIndex].description,
-                        style: const TextStyle(
+                        style: TextStyle(
                           fontSize: 18,
                           fontWeight: FontWeight.bold,
-                          color: AppColors.groupColor,
+                          color: AppColors.groupColor.withValues(alpha: 0.7),
                         ),
                       ),
                     ),
diff --git a/school_data_hub_flutter/lib/features/learning_support/services/learning_support_plan_pdf_generator.dart b/school_data_hub_flutter/lib/features/learning_support/services/learning_support_plan_pdf_generator.dart
index 25475064..8b248b0f 100644
--- a/school_data_hub_flutter/lib/features/learning_support/services/learning_support_plan_pdf_generator.dart
+++ b/school_data_hub_flutter/lib/features/learning_support/services/learning_support_plan_pdf_generator.dart
@@ -8,10 +8,10 @@ import 'package:pdf/pdf.dart';
 import 'package:pdf/widgets.dart' as pw;
 import 'package:printing/printing.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_app_bar.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/features/learning_support/domain/learning_support_helper.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
 import 'package:school_data_hub_flutter/features/school_calendar/domain/school_calendar_manager.dart';
@@ -655,7 +655,7 @@ class LearningSupportPlanPdfGenerator {
                     pw.Expanded(
                       child: pw.Container(
                         height: 20,
-                        decoration: pw.BoxDecoration(
+                        decoration: const pw.BoxDecoration(
                           border: pw.Border(
                             bottom: pw.BorderSide(color: PdfColors.black),
                           ),
@@ -679,7 +679,7 @@ class LearningSupportPlanPdfGenerator {
                     pw.Container(
                       width: 80,
                       height: 20,
-                      decoration: pw.BoxDecoration(
+                      decoration: const pw.BoxDecoration(
                         border: pw.Border(
                           bottom: pw.BorderSide(color: PdfColors.black),
                         ),
@@ -695,7 +695,7 @@ class LearningSupportPlanPdfGenerator {
                     pw.Expanded(
                       child: pw.Container(
                         height: 20,
-                        decoration: pw.BoxDecoration(
+                        decoration: const pw.BoxDecoration(
                           border: pw.Border(
                             bottom: pw.BorderSide(color: PdfColors.black),
                           ),
@@ -724,7 +724,7 @@ class LearningSupportPlanPdfGenerator {
                     pw.Expanded(
                       child: pw.Container(
                         height: 20,
-                        decoration: pw.BoxDecoration(
+                        decoration: const pw.BoxDecoration(
                           border: pw.Border(
                             bottom: pw.BorderSide(color: PdfColors.black),
                           ),
@@ -747,7 +747,7 @@ class LearningSupportPlanPdfGenerator {
                     pw.Container(
                       width: 30,
                       height: 20,
-                      decoration: pw.BoxDecoration(
+                      decoration: const pw.BoxDecoration(
                         border: pw.Border(
                           bottom: pw.BorderSide(color: PdfColors.black),
                         ),
@@ -763,7 +763,7 @@ class LearningSupportPlanPdfGenerator {
                     pw.Expanded(
                       child: pw.Container(
                         height: 20,
-                        decoration: pw.BoxDecoration(
+                        decoration: const pw.BoxDecoration(
                           border: pw.Border(
                             bottom: pw.BorderSide(color: PdfColors.black),
                           ),
@@ -785,7 +785,7 @@ class LearningSupportPlanPdfGenerator {
                     pw.Container(
                       width: 50,
                       height: 20,
-                      decoration: pw.BoxDecoration(
+                      decoration: const pw.BoxDecoration(
                         border: pw.Border(
                           bottom: pw.BorderSide(color: PdfColors.black),
                         ),
@@ -797,7 +797,7 @@ class LearningSupportPlanPdfGenerator {
                     pw.Container(
                       width: 50,
                       height: 20,
-                      decoration: pw.BoxDecoration(
+                      decoration: const pw.BoxDecoration(
                         border: pw.Border(
                           bottom: pw.BorderSide(color: PdfColors.black),
                         ),
@@ -832,7 +832,7 @@ class LearningSupportPlanPdfGenerator {
         children: [
           pw.Row(
             children: [
-              pw.Text('☐', style: pw.TextStyle(fontSize: 16)),
+              pw.Text('☐', style: const pw.TextStyle(fontSize: 16)),
               pw.SizedBox(width: 5),
               pw.Text(
                 'Individueller Förderplan (FE I) falls Schriftform gewünscht',
@@ -843,7 +843,7 @@ class LearningSupportPlanPdfGenerator {
           pw.SizedBox(height: 8),
           pw.Row(
             children: [
-              pw.Text('☐', style: pw.TextStyle(fontSize: 16)),
+              pw.Text('☐', style: const pw.TextStyle(fontSize: 16)),
               pw.SizedBox(width: 5),
               pw.Text(
                 'Individuell erweiterter Förderplan [FE II]',
@@ -862,7 +862,7 @@ class LearningSupportPlanPdfGenerator {
           pw.SizedBox(height: 8),
           pw.Row(
             children: [
-              pw.Text('☐', style: pw.TextStyle(fontSize: 16)),
+              pw.Text('☐', style: const pw.TextStyle(fontSize: 16)),
               pw.SizedBox(width: 5),
               pw.Text(
                 'Förderplan gemäß AO-SF § 21(7) mit sonderpädagogischer Unterstützung (FE III)',
@@ -874,7 +874,7 @@ class LearningSupportPlanPdfGenerator {
           pw.Row(
             children: [
               pw.SizedBox(width: 20),
-              pw.Text('☐', style: pw.TextStyle(fontSize: 16)),
+              pw.Text('☐', style: const pw.TextStyle(fontSize: 16)),
               pw.SizedBox(width: 5),
               pw.Text(
                 'mit Bescheid vom',
@@ -884,7 +884,7 @@ class LearningSupportPlanPdfGenerator {
               pw.Container(
                 width: 100,
                 height: 20,
-                decoration: pw.BoxDecoration(
+                decoration: const pw.BoxDecoration(
                   border: pw.Border(
                     bottom: pw.BorderSide(color: PdfColors.black),
                   ),
@@ -896,7 +896,7 @@ class LearningSupportPlanPdfGenerator {
           pw.Row(
             children: [
               pw.SizedBox(width: 20),
-              pw.Text('☐', style: pw.TextStyle(fontSize: 16)),
+              pw.Text('☐', style: const pw.TextStyle(fontSize: 16)),
               pw.SizedBox(width: 5),
               pw.Text('ohne Bescheid', style: pw.TextStyle(font: fontRegular)),
             ],
@@ -931,7 +931,7 @@ class LearningSupportPlanPdfGenerator {
                     pw.Expanded(
                       child: pw.Container(
                         height: 20,
-                        decoration: pw.BoxDecoration(
+                        decoration: const pw.BoxDecoration(
                           border: pw.Border(
                             bottom: pw.BorderSide(color: PdfColors.black),
                           ),
@@ -948,7 +948,7 @@ class LearningSupportPlanPdfGenerator {
                     pw.Expanded(
                       child: pw.Container(
                         height: 20,
-                        decoration: pw.BoxDecoration(
+                        decoration: const pw.BoxDecoration(
                           border: pw.Border(
                             bottom: pw.BorderSide(color: PdfColors.black),
                           ),
@@ -989,7 +989,7 @@ class LearningSupportPlanPdfGenerator {
                     pw.Expanded(
                       child: pw.Container(
                         height: 20,
-                        decoration: pw.BoxDecoration(
+                        decoration: const pw.BoxDecoration(
                           border: pw.Border(
                             bottom: pw.BorderSide(color: PdfColors.black),
                           ),
@@ -1043,7 +1043,7 @@ class LearningSupportPlanPdfGenerator {
                 pw.SizedBox(height: 5),
                 pw.Container(
                   height: 20,
-                  decoration: pw.BoxDecoration(
+                  decoration: const pw.BoxDecoration(
                     border: pw.Border(
                       bottom: pw.BorderSide(color: PdfColors.black),
                     ),
@@ -1068,7 +1068,7 @@ class LearningSupportPlanPdfGenerator {
                 pw.SizedBox(height: 5),
                 pw.Container(
                   height: 20,
-                  decoration: pw.BoxDecoration(
+                  decoration: const pw.BoxDecoration(
                     border: pw.Border(
                       bottom: pw.BorderSide(color: PdfColors.black),
                     ),
@@ -1090,7 +1090,7 @@ class LearningSupportPlanPdfGenerator {
                 pw.SizedBox(height: 5),
                 pw.Container(
                   height: 20,
-                  decoration: pw.BoxDecoration(
+                  decoration: const pw.BoxDecoration(
                     border: pw.Border(
                       bottom: pw.BorderSide(color: PdfColors.black),
                     ),
@@ -1158,7 +1158,7 @@ class LearningSupportPlanPdfGenerator {
         children: [
           pw.Row(
             children: [
-              pw.Text('😊', style: pw.TextStyle(fontSize: 16)),
+              pw.Text('😊', style: const pw.TextStyle(fontSize: 16)),
               pw.SizedBox(width: 5),
               pw.Text(
                 'Stärken',
@@ -1244,28 +1244,28 @@ class LearningSupportPlanPdfGenerator {
           pw.SizedBox(width: 20),
           pw.Row(
             children: [
-              pw.Text('☐', style: pw.TextStyle(fontSize: 16)),
+              pw.Text('☐', style: const pw.TextStyle(fontSize: 16)),
               pw.SizedBox(width: 5),
               pw.Text(
                 '1. Lernjahr Deutsch',
                 style: pw.TextStyle(font: fontRegular),
               ),
               pw.SizedBox(width: 10),
-              pw.Text('☐', style: pw.TextStyle(fontSize: 16)),
+              pw.Text('☐', style: const pw.TextStyle(fontSize: 16)),
               pw.SizedBox(width: 5),
               pw.Text(
                 '2. Lernjahr Deutsch',
                 style: pw.TextStyle(font: fontRegular),
               ),
               pw.SizedBox(width: 10),
-              pw.Text('☐', style: pw.TextStyle(fontSize: 16)),
+              pw.Text('☐', style: const pw.TextStyle(fontSize: 16)),
               pw.SizedBox(width: 5),
               pw.Text(
                 '3. Lernjahr Deutsch',
                 style: pw.TextStyle(font: fontRegular),
               ),
               pw.SizedBox(width: 10),
-              pw.Text('☐', style: pw.TextStyle(fontSize: 16)),
+              pw.Text('☐', style: const pw.TextStyle(fontSize: 16)),
               pw.SizedBox(width: 5),
               pw.Text(
                 '>3. Lernjahr Deutsch',
@@ -1281,7 +1281,7 @@ class LearningSupportPlanPdfGenerator {
               pw.Container(
                 width: 100,
                 height: 20,
-                decoration: pw.BoxDecoration(
+                decoration: const pw.BoxDecoration(
                   border: pw.Border(
                     bottom: pw.BorderSide(color: PdfColors.black),
                   ),
@@ -1324,10 +1324,10 @@ class _LearningSupportPlanPdfViewPageState
         title: 'Förderplan PDF',
       ),
       body: PdfPreview(
-        actionBarTheme: const PdfActionBarTheme(
+        actionBarTheme: PdfActionBarTheme(
           backgroundColor: AppColors.backgroundColor,
           iconColor: Colors.white,
-          textStyle: TextStyle(color: Colors.white),
+          textStyle: const TextStyle(color: Colors.white),
         ),
         allowSharing: true,
         allowPrinting: true,
diff --git a/school_data_hub_flutter/lib/features/matrix/domain/matrix_policy_manager.dart b/school_data_hub_flutter/lib/features/matrix/domain/matrix_policy_manager.dart
index 7fa67c43..15343ea2 100644
--- a/school_data_hub_flutter/lib/features/matrix/domain/matrix_policy_manager.dart
+++ b/school_data_hub_flutter/lib/features/matrix/domain/matrix_policy_manager.dart
@@ -112,6 +112,14 @@ class MatrixPolicyManager extends ChangeNotifier {
     return this;
   }
 
+  void dispose() {
+    _roomManager.dispose();
+    _userManager.dispose();
+    _policyPendingChanges.dispose();
+    super.dispose();
+    return;
+  }
+
   void pendingChangesHandler(bool newValue) {
     if (newValue == _policyPendingChanges.value) return;
     _policyPendingChanges.value = newValue;
@@ -151,7 +159,7 @@ class MatrixPolicyManager extends ChangeNotifier {
 
   Future<void> deleteAndDeregisterMatrixPolicyManager() async {
     await _secureStorage.remove(_secureStorageKey);
-    di.dropScope(DiScope.onMatrixEnvScope.name);
+    await di.dropScope(InitScope.onMatrixEnvScope.name);
 
     _sessionManager.changeMatrixPolicyManagerRegistrationStatus(false);
     _notificationService.showSnackBar(
diff --git a/school_data_hub_flutter/lib/features/matrix/presentation/matrix_entry_page/widgets/matrix_entry_page_top_nav_bar.dart b/school_data_hub_flutter/lib/features/matrix/presentation/matrix_entry_page/widgets/matrix_entry_page_top_nav_bar.dart
index f47f2fdc..03a4f3d4 100644
--- a/school_data_hub_flutter/lib/features/matrix/presentation/matrix_entry_page/widgets/matrix_entry_page_top_nav_bar.dart
+++ b/school_data_hub_flutter/lib/features/matrix/presentation/matrix_entry_page/widgets/matrix_entry_page_top_nav_bar.dart
@@ -4,12 +4,7 @@ import 'package:school_data_hub_flutter/features/matrix/rooms/presentation/matri
 import 'package:school_data_hub_flutter/features/matrix/users/presentation/matrix_users_list_page/matrix_users_list_page.dart';
 import 'package:watch_it/watch_it.dart';
 
-enum SelectedMatrixContent {
-  rooms,
-  users,
-  compulsoryRooms,
-  settings,
-}
+enum SelectedMatrixContent { rooms, users, compulsoryRooms, settings }
 
 class SelectedMatrixContentNotifier extends ChangeNotifier {
   // Private constructor
@@ -46,15 +41,15 @@ class MatrixEntryPageTopNavBar extends WatchingWidget {
       children: [
         const MatrixContentNavBar(),
         Padding(
-            padding: const EdgeInsets.only(top: 5),
-            child: (selectedContent == SelectedMatrixContent.rooms)
-                ? const MatrixRoomsListPage()
-                : (selectedContent == SelectedMatrixContent.users)
-                    ? const MatrixUsersListPage()
-                    : (selectedContent == SelectedMatrixContent.compulsoryRooms)
-                        ? const SizedBox() // Placeholder widget
-                        : const SizedBox() // Default case
-            )
+          padding: const EdgeInsets.only(top: 5),
+          child: (selectedContent == SelectedMatrixContent.rooms)
+              ? const MatrixRoomsListPage()
+              : (selectedContent == SelectedMatrixContent.users)
+              ? const MatrixUsersListPage()
+              : (selectedContent == SelectedMatrixContent.compulsoryRooms)
+              ? const SizedBox() // Placeholder widget
+              : const SizedBox(), // Default case
+        ),
       ],
     );
   }
@@ -77,12 +72,12 @@ class MatrixContentNavBar extends WatchingWidget {
           children: [
             IconButton(
               isSelected: selectedContent == SelectedMatrixContent.rooms,
-              icon: const Icon(
+              icon: Icon(
                 Icons.meeting_room_rounded,
                 size: 30,
                 color: AppColors.interactiveColor,
               ),
-              selectedIcon: const Icon(
+              selectedIcon: Icon(
                 Icons.meeting_room_rounded,
                 size: 30,
                 color: AppColors.accentColor,
@@ -97,12 +92,12 @@ class MatrixContentNavBar extends WatchingWidget {
             ),
             IconButton(
               isSelected: selectedContent == SelectedMatrixContent.users,
-              icon: const Icon(
+              icon: Icon(
                 Icons.people_alt_rounded,
                 size: 30,
                 color: AppColors.interactiveColor,
               ),
-              selectedIcon: const Icon(
+              selectedIcon: Icon(
                 Icons.people_alt_rounded,
                 size: 30,
                 color: AppColors.accentColor,
diff --git a/school_data_hub_flutter/lib/features/matrix/presentation/widgets/dialogues/change_power_level_dialog.dart b/school_data_hub_flutter/lib/features/matrix/presentation/widgets/dialogues/change_power_level_dialog.dart
index 46075281..b4fd7659 100644
--- a/school_data_hub_flutter/lib/features/matrix/presentation/widgets/dialogues/change_power_level_dialog.dart
+++ b/school_data_hub_flutter/lib/features/matrix/presentation/widgets/dialogues/change_power_level_dialog.dart
@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:school_data_hub_flutter/common/theme/styles.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
-import 'package:watch_it/watch_it.dart';
 
 final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
 
@@ -12,34 +10,39 @@ final TextEditingController _textEditingController = TextEditingController();
 // based on https://mobikul.com/creating-stateful-dialog-form-in-flutter/
 
 Future<void> changePowerLevelsDialog(
-    BuildContext context, PupilProxy pupil) async {
-  final _pupilManager = di<PupilManager>();
+  BuildContext context,
+  PupilProxy pupil,
+) async {
   return await showDialog(
-      context: context,
-      builder: (context) {
-        return StatefulBuilder(builder: (context, setState) {
+    context: context,
+    builder: (context) {
+      return StatefulBuilder(
+        builder: (context, setState) {
           return AlertDialog(
             content: Form(
-                key: _formKey,
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    SizedBox(
-                      width: 100,
-                      child: TextFormField(
-                        textAlign: TextAlign.center,
-                        style: const TextStyle(
-                            fontSize: 25, fontWeight: FontWeight.bold),
-                        keyboardType: TextInputType.number,
-                        controller: _textEditingController,
-                        validator: (value) {
-                          return value!.isNotEmpty ? null : "";
-                        },
-                        decoration: const InputDecoration(hintText: "?"),
+              key: _formKey,
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  SizedBox(
+                    width: 100,
+                    child: TextFormField(
+                      textAlign: TextAlign.center,
+                      style: const TextStyle(
+                        fontSize: 25,
+                        fontWeight: FontWeight.bold,
                       ),
+                      keyboardType: TextInputType.number,
+                      controller: _textEditingController,
+                      validator: (value) {
+                        return value!.isNotEmpty ? null : "";
+                      },
+                      decoration: const InputDecoration(hintText: "?"),
                     ),
-                  ],
-                )),
+                  ),
+                ],
+              ),
+            ),
             title: const Text(
               'Guthaben ändern',
               textAlign: TextAlign.center,
@@ -76,10 +79,7 @@ Future<void> changePowerLevelsDialog(
                     //   Navigator.of(context).pop();
                     // }
                   },
-                  child: const Text(
-                    "MINUS",
-                    style: AppStyles.buttonTextStyle,
-                  ),
+                  child: const Text("MINUS", style: AppStyles.buttonTextStyle),
                 ),
               ),
               ElevatedButton(
@@ -97,13 +97,12 @@ Future<void> changePowerLevelsDialog(
                   //   Navigator.of(context).pop();
                   // }
                 },
-                child: const Text(
-                  "PLUS",
-                  style: AppStyles.buttonTextStyle,
-                ),
+                child: const Text("PLUS", style: AppStyles.buttonTextStyle),
               ),
             ],
           );
-        });
-      });
+        },
+      );
+    },
+  );
 }
diff --git a/school_data_hub_flutter/lib/features/matrix/presentation/widgets/dialogues/logout_devices_dialog.dart b/school_data_hub_flutter/lib/features/matrix/presentation/widgets/dialogues/logout_devices_dialog.dart
index 15394d01..1d9c40cb 100644
--- a/school_data_hub_flutter/lib/features/matrix/presentation/widgets/dialogues/logout_devices_dialog.dart
+++ b/school_data_hub_flutter/lib/features/matrix/presentation/widgets/dialogues/logout_devices_dialog.dart
@@ -4,69 +4,65 @@ import 'package:school_data_hub_flutter/common/theme/styles.dart';
 
 Future<bool?> logoutDevicesDialog(BuildContext context) async {
   return await showDialog(
-      context: context,
-      builder: (context) {
-        return AlertDialog(
-          icon: const Icon(Icons.warning_rounded,
-              color: AppColors.dangerButtonColor, size: 50),
-          title: const Text(
-            'Alle Geräte abmelden?',
-            style: TextStyle(fontWeight: FontWeight.bold),
+    context: context,
+    builder: (context) {
+      return AlertDialog(
+        icon: Icon(
+          Icons.warning_rounded,
+          color: AppColors.dangerButtonColor,
+          size: 50,
+        ),
+        title: const Text(
+          'Alle Geräte abmelden?',
+          style: TextStyle(fontWeight: FontWeight.bold),
+        ),
+        content: const SizedBox(
+          width: 300,
+          child: Text(
+            'Sollen alle Geräte mit diesem Konto abgemeldet werden?\nWenn die Zugangsdaten verloren und keine bekannten Geräte angemeldet sind, solten Sie "Ja" wählen!',
           ),
-          content: const SizedBox(
-            width: 300,
-            child: Text(
-                'Sollen alle Geräte mit diesem Konto abgemeldet werden?\nWenn die Zugangsdaten verloren und keine bekannten Geräte angemeldet sind, solten Sie "Ja" wählen!'),
-          ),
-          actions: <Widget>[
-            Row(
-              children: [
-                Expanded(
-                  child: Padding(
-                    padding: const EdgeInsets.all(5.0),
-                    child: ElevatedButton(
-                      style: AppStyles.actionButtonStyle,
-                      onPressed: () {
-                        Navigator.of(context).pop(false);
-                      }, // Add onPressed
-                      child: const Text(
-                        "NEIN",
-                        style: AppStyles.buttonTextStyle,
-                      ),
-                    ),
+        ),
+        actions: <Widget>[
+          Row(
+            children: [
+              Expanded(
+                child: Padding(
+                  padding: const EdgeInsets.all(5.0),
+                  child: ElevatedButton(
+                    style: AppStyles.actionButtonStyle,
+                    onPressed: () {
+                      Navigator.of(context).pop(false);
+                    }, // Add onPressed
+                    child: const Text("NEIN", style: AppStyles.buttonTextStyle),
                   ),
                 ),
-                Expanded(
-                  child: Padding(
-                    padding: const EdgeInsets.all(5.0),
-                    child: ElevatedButton(
-                      style: AppStyles.actionButtonStyle,
-                      onPressed: () {
-                        Navigator.of(context).pop(true);
-                      }, // Add onPressed
-                      child: const Text(
-                        "JA",
-                        style: AppStyles.buttonTextStyle,
-                      ),
-                    ),
+              ),
+              Expanded(
+                child: Padding(
+                  padding: const EdgeInsets.all(5.0),
+                  child: ElevatedButton(
+                    style: AppStyles.actionButtonStyle,
+                    onPressed: () {
+                      Navigator.of(context).pop(true);
+                    }, // Add onPressed
+                    child: const Text("JA", style: AppStyles.buttonTextStyle),
                   ),
                 ),
-              ],
-            ),
-            Padding(
-              padding: const EdgeInsets.all(5.0),
-              child: ElevatedButton(
-                style: AppStyles.cancelButtonStyle,
-                onPressed: () {
-                  Navigator.of(context).pop();
-                },
-                child: const Text(
-                  "ABBRECHEN",
-                  style: AppStyles.buttonTextStyle,
-                ),
               ),
+            ],
+          ),
+          Padding(
+            padding: const EdgeInsets.all(5.0),
+            child: ElevatedButton(
+              style: AppStyles.cancelButtonStyle,
+              onPressed: () {
+                Navigator.of(context).pop();
+              },
+              child: const Text("ABBRECHEN", style: AppStyles.buttonTextStyle),
             ),
-          ],
-        );
-      });
+          ),
+        ],
+      );
+    },
+  );
 }
diff --git a/school_data_hub_flutter/lib/features/matrix/rooms/presentation/matrix_rooms_list_page/widgets/room_list_card.dart b/school_data_hub_flutter/lib/features/matrix/rooms/presentation/matrix_rooms_list_page/widgets/room_list_card.dart
index 66f7115c..44c91222 100644
--- a/school_data_hub_flutter/lib/features/matrix/rooms/presentation/matrix_rooms_list_page/widgets/room_list_card.dart
+++ b/school_data_hub_flutter/lib/features/matrix/rooms/presentation/matrix_rooms_list_page/widgets/room_list_card.dart
@@ -159,7 +159,7 @@ class RoomListCard extends WatchingWidget {
                                   },
                                   child: Text(
                                     room.eventsDefault.toString(),
-                                    style: const TextStyle(
+                                    style: TextStyle(
                                       fontSize: 16,
                                       fontWeight: FontWeight.bold,
                                       color: AppColors.interactiveColor,
@@ -188,7 +188,7 @@ class RoomListCard extends WatchingWidget {
                                   },
                                   child: Text(
                                     room.powerLevelReactions.toString(),
-                                    style: const TextStyle(
+                                    style: TextStyle(
                                       fontSize: 16,
                                       fontWeight: FontWeight.bold,
                                       color: AppColors.interactiveColor,
@@ -269,7 +269,7 @@ class RoomListCard extends WatchingWidget {
                     Center(
                       child: Text(
                         matrixUsersInRoom.length.toString(),
-                        style: const TextStyle(
+                        style: TextStyle(
                           fontSize: 23,
                           fontWeight: FontWeight.bold,
                           color: AppColors.backgroundColor,
diff --git a/school_data_hub_flutter/lib/features/matrix/rooms/presentation/matrix_rooms_list_page/widgets/room_list_searchbar.dart b/school_data_hub_flutter/lib/features/matrix/rooms/presentation/matrix_rooms_list_page/widgets/room_list_searchbar.dart
index ec2f7c37..df89b20e 100644
--- a/school_data_hub_flutter/lib/features/matrix/rooms/presentation/matrix_rooms_list_page/widgets/room_list_searchbar.dart
+++ b/school_data_hub_flutter/lib/features/matrix/rooms/presentation/matrix_rooms_list_page/widgets/room_list_searchbar.dart
@@ -32,7 +32,7 @@ class RoomListSearchBar extends WatchingWidget {
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
-                  const Icon(
+                  Icon(
                     Icons.meeting_room_rounded,
                     color: AppColors.backgroundColor,
                   ),
@@ -55,11 +55,13 @@ class RoomListSearchBar extends WatchingWidget {
             child: Row(
               children: [
                 Expanded(
-                    child: MatrixSearchTextField(
-                        searchType: SearchType.room,
-                        hintText: 'Raum suchen',
-                        refreshFunction:
-                            _matrixPolicyFilterManager.setRoomsFilterText)),
+                  child: MatrixSearchTextField(
+                    searchType: SearchType.room,
+                    hintText: 'Raum suchen',
+                    refreshFunction:
+                        _matrixPolicyFilterManager.setRoomsFilterText,
+                  ),
+                ),
                 InkWell(
                   // TODO: repair this
                   onTap: () => const RoomsFilterBottomSheet(),
diff --git a/school_data_hub_flutter/lib/features/matrix/rooms/presentation/select_matrix_rooms_list_page/widgets/select_room_list_searchbar.dart b/school_data_hub_flutter/lib/features/matrix/rooms/presentation/select_matrix_rooms_list_page/widgets/select_room_list_searchbar.dart
index 423a2a61..4754b653 100644
--- a/school_data_hub_flutter/lib/features/matrix/rooms/presentation/select_matrix_rooms_list_page/widgets/select_room_list_searchbar.dart
+++ b/school_data_hub_flutter/lib/features/matrix/rooms/presentation/select_matrix_rooms_list_page/widgets/select_room_list_searchbar.dart
@@ -14,13 +14,17 @@ final _matrixPolicyFilterManager = di<MatrixPolicyFilterManager>();
 class SelectRoomListSearchBar extends WatchingWidget {
   final List<MatrixRoom> matrixRooms;
   final SelectMatrixRoomsListController controller;
-  const SelectRoomListSearchBar(
-      {required this.matrixRooms, required this.controller, super.key});
+  const SelectRoomListSearchBar({
+    required this.matrixRooms,
+    required this.controller,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
-    final bool filtersOn =
-        watchValue((MatrixPolicyFilterManager x) => x.filtersOn);
+    final bool filtersOn = watchValue(
+      (MatrixPolicyFilterManager x) => x.filtersOn,
+    );
     return Container(
       decoration: BoxDecoration(
         color: AppColors.canvasColor,
@@ -35,7 +39,7 @@ class SelectRoomListSearchBar extends WatchingWidget {
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
-                  const Icon(
+                  Icon(
                     Icons.meeting_room_rounded,
                     color: AppColors.backgroundColor,
                   ),
@@ -49,12 +53,7 @@ class SelectRoomListSearchBar extends WatchingWidget {
                     ),
                   ),
                   const Gap(10),
-                  const Text(
-                    'Ausgewählt:',
-                    style: TextStyle(
-                      fontSize: 13,
-                    ),
-                  ),
+                  const Text('Ausgewählt:', style: TextStyle(fontSize: 13)),
                   const Gap(10),
                   Text(
                     controller.selectedRooms.length.toString(),
@@ -73,11 +72,13 @@ class SelectRoomListSearchBar extends WatchingWidget {
             child: Row(
               children: [
                 Expanded(
-                    child: MatrixSearchTextField(
-                        searchType: SearchType.room,
-                        hintText: 'Raum suchen',
-                        refreshFunction:
-                            _matrixPolicyFilterManager.setRoomsFilterText)),
+                  child: MatrixSearchTextField(
+                    searchType: SearchType.room,
+                    hintText: 'Raum suchen',
+                    refreshFunction:
+                        _matrixPolicyFilterManager.setRoomsFilterText,
+                  ),
+                ),
                 InkWell(
                   onTap: () => showSelectMatrixRoomsFilterBottomSheet(context),
                   onLongPress: () =>
diff --git a/school_data_hub_flutter/lib/features/matrix/services/matrix_bulk_credentials_service.dart b/school_data_hub_flutter/lib/features/matrix/services/matrix_bulk_credentials_service.dart
index 691ce46c..4cb32dfc 100644
--- a/school_data_hub_flutter/lib/features/matrix/services/matrix_bulk_credentials_service.dart
+++ b/school_data_hub_flutter/lib/features/matrix/services/matrix_bulk_credentials_service.dart
@@ -4,7 +4,7 @@ import 'package:flutter/services.dart' show rootBundle;
 import 'package:logging/logging.dart';
 import 'package:pdf/widgets.dart' as pw;
 import 'package:school_data_hub_flutter/app_utils/custom_encrypter.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/features/matrix/domain/matrix_policy_manager.dart';
 import 'package:school_data_hub_flutter/features/matrix/domain/models/matrix_user.dart';
 import 'package:watch_it/watch_it.dart';
diff --git a/school_data_hub_flutter/lib/features/matrix/services/matrix_credentials_pdf_generator.dart b/school_data_hub_flutter/lib/features/matrix/services/matrix_credentials_pdf_generator.dart
index 85a39a95..43b9643f 100644
--- a/school_data_hub_flutter/lib/features/matrix/services/matrix_credentials_pdf_generator.dart
+++ b/school_data_hub_flutter/lib/features/matrix/services/matrix_credentials_pdf_generator.dart
@@ -4,7 +4,7 @@ import 'package:flutter/services.dart' show rootBundle;
 import 'package:logging/logging.dart';
 import 'package:pdf/widgets.dart' as pw;
 import 'package:school_data_hub_flutter/app_utils/custom_encrypter.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/features/matrix/domain/models/matrix_user.dart';
 
 final _log = Logger('MatrixCredentialsPrinter');
diff --git a/school_data_hub_flutter/lib/features/matrix/users/domain/matrix_user_helper.dart b/school_data_hub_flutter/lib/features/matrix/users/domain/matrix_user_helper.dart
index 08ae95ab..454f7bb6 100644
--- a/school_data_hub_flutter/lib/features/matrix/users/domain/matrix_user_helper.dart
+++ b/school_data_hub_flutter/lib/features/matrix/users/domain/matrix_user_helper.dart
@@ -3,19 +3,20 @@ import 'package:collection/collection.dart';
 import 'package:school_data_hub_flutter/features/matrix/domain/matrix_policy_manager.dart';
 import 'package:school_data_hub_flutter/features/matrix/domain/models/matrix_user.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
 class MatrixUserHelper {
   static MatrixPolicyManager get _matrixPolicyManager =>
       di<MatrixPolicyManager>();
-  static PupilManager get _pupilManager => di<PupilManager>();
+  static PupilProxyManager get _pupilManager => di<PupilProxyManager>();
   static List<MatrixUser> usersFromUserIds(List<String> userIds) {
     final List<MatrixUser> users = List.from(
       _matrixPolicyManager.matrixUsers.value,
     );
-    final usersFromUserIds =
-        users.where((user) => userIds.contains(user.id)).toList();
+    final usersFromUserIds = users
+        .where((user) => userIds.contains(user.id))
+        .toList();
     return usersFromUserIds;
   }
 
diff --git a/school_data_hub_flutter/lib/features/matrix/users/presentation/matrix_users_list_page/widgets/matrix_user_list_card.dart b/school_data_hub_flutter/lib/features/matrix/users/presentation/matrix_users_list_page/widgets/matrix_user_list_card.dart
index ab6772a8..7edfccac 100644
--- a/school_data_hub_flutter/lib/features/matrix/users/presentation/matrix_users_list_page/widgets/matrix_user_list_card.dart
+++ b/school_data_hub_flutter/lib/features/matrix/users/presentation/matrix_users_list_page/widgets/matrix_user_list_card.dart
@@ -77,71 +77,70 @@ class _MatrixUsersListCardState extends State<MatrixUsersListCard> {
               ),
               actions: [
                 TextButton(
-                  onPressed:
-                      isSending ? null : () => Navigator.of(context).pop(),
+                  onPressed: isSending
+                      ? null
+                      : () => Navigator.of(context).pop(),
                   child: const Text('Abbrechen'),
                 ),
                 ElevatedButton(
-                  onPressed:
-                      isSending
-                          ? null
-                          : () async {
-                            if (messageController.text.trim().isEmpty) return;
+                  onPressed: isSending
+                      ? null
+                      : () async {
+                          if (messageController.text.trim().isEmpty) return;
 
-                            setState(() => isSending = true);
+                          setState(() => isSending = true);
 
-                            try {
-                              log('Sending direct message to ${matrixUser.id}');
-                              log(
-                                'Message text: ${messageController.text.trim()}',
-                              );
+                          try {
+                            log('Sending direct message to ${matrixUser.id}');
+                            log(
+                              'Message text: ${messageController.text.trim()}',
+                            );
 
-                              final result = await _matrixPolicyManager
-                                  .sendDirectTextMessage(
-                                    targetUserId: matrixUser.id!,
-                                    text: messageController.text.trim(),
-                                  );
+                            final result = await _matrixPolicyManager
+                                .sendDirectTextMessage(
+                                  targetUserId: matrixUser.id!,
+                                  text: messageController.text.trim(),
+                                );
 
-                              log('Message sent successfully: $result');
+                            log('Message sent successfully: $result');
 
-                              if (context.mounted) {
-                                Navigator.of(context).pop();
-                                ScaffoldMessenger.of(context).showSnackBar(
-                                  SnackBar(
-                                    content: Text(
-                                      'Nachricht an ${matrixUser.displayName} gesendet!',
-                                    ),
-                                    backgroundColor: Colors.green,
+                            if (context.mounted) {
+                              Navigator.of(context).pop();
+                              ScaffoldMessenger.of(context).showSnackBar(
+                                SnackBar(
+                                  content: Text(
+                                    'Nachricht an ${matrixUser.displayName} gesendet!',
                                   ),
-                                );
-                              }
-                            } catch (e, stackTrace) {
-                              log('Error sending message: $e');
-                              log('Stack trace: $stackTrace');
+                                  backgroundColor: Colors.green,
+                                ),
+                              );
+                            }
+                          } catch (e, stackTrace) {
+                            log('Error sending message: $e');
+                            log('Stack trace: $stackTrace');
 
-                              if (context.mounted) {
-                                ScaffoldMessenger.of(context).showSnackBar(
-                                  SnackBar(
-                                    content: Text('Fehler beim Senden: $e'),
-                                    backgroundColor: Colors.red,
-                                    duration: const Duration(seconds: 5),
-                                  ),
-                                );
-                              }
-                            } finally {
-                              if (context.mounted) {
-                                setState(() => isSending = false);
-                              }
+                            if (context.mounted) {
+                              ScaffoldMessenger.of(context).showSnackBar(
+                                SnackBar(
+                                  content: Text('Fehler beim Senden: $e'),
+                                  backgroundColor: Colors.red,
+                                  duration: const Duration(seconds: 5),
+                                ),
+                              );
                             }
-                          },
-                  child:
-                      isSending
-                          ? const SizedBox(
-                            width: 16,
-                            height: 16,
-                            child: CircularProgressIndicator(strokeWidth: 2),
-                          )
-                          : const Text('Senden'),
+                          } finally {
+                            if (context.mounted) {
+                              setState(() => isSending = false);
+                            }
+                          }
+                        },
+                  child: isSending
+                      ? const SizedBox(
+                          width: 16,
+                          height: 16,
+                          child: CircularProgressIndicator(strokeWidth: 2),
+                        )
+                      : const Text('Senden'),
                 ),
               ],
             );
@@ -161,13 +160,13 @@ class _MatrixUsersListCardState extends State<MatrixUsersListCard> {
     return Card(
       color:
           !MatrixUserHelper.isLinkedToPupil(matrixUser) &&
-                  matrixUser.id!.contains('_')
-              ? Colors.orange
-              : userRelationship != null && userRelationship.isParent
-              ? const Color.fromARGB(255, 202, 252, 187)
-              : !matrixUser.id!.contains('_')
-              ? const Color.fromARGB(255, 219, 170, 211)
-              : Colors.white,
+              matrixUser.id!.contains('_')
+          ? Colors.orange
+          : userRelationship != null && userRelationship.isParent
+          ? const Color.fromARGB(255, 202, 252, 187)
+          : !matrixUser.id!.contains('_')
+          ? const Color.fromARGB(255, 219, 170, 211)
+          : Colors.white,
       surfaceTintColor: Colors.white,
       shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
       elevation: 1.0,
@@ -276,40 +275,37 @@ class _MatrixUsersListCardState extends State<MatrixUsersListCard> {
                                 }
                                 Navigator.of(context).push(
                                   MaterialPageRoute(
-                                    builder:
-                                        (ctx) => PupilProfilePage(
-                                          pupil:
-                                              MatrixUserHelper.linkedPupil(
-                                                matrixUser,
-                                              )!,
-                                        ),
+                                    builder: (ctx) => PupilProfilePage(
+                                      pupil: MatrixUserHelper.linkedPupil(
+                                        matrixUser,
+                                      )!,
+                                    ),
                                   ),
                                 );
                               },
-                              child:
-                                  matrixUser.isParent
-                                      ? Text(
-                                        '${matrixUser.displayName} 👨‍👩‍👦',
-                                        overflow: TextOverflow.fade,
-                                        softWrap: false,
-                                        textAlign: TextAlign.left,
-                                        style: const TextStyle(
-                                          color: Colors.black,
-                                          fontWeight: FontWeight.bold,
-                                          fontSize: 18,
-                                        ),
-                                      )
-                                      : Text(
-                                        matrixUser.displayName,
-                                        overflow: TextOverflow.fade,
-                                        softWrap: false,
-                                        textAlign: TextAlign.left,
-                                        style: const TextStyle(
-                                          color: Colors.black,
-                                          fontWeight: FontWeight.bold,
-                                          fontSize: 18,
-                                        ),
+                              child: matrixUser.isParent
+                                  ? Text(
+                                      '${matrixUser.displayName} 👨‍👩‍👦',
+                                      overflow: TextOverflow.fade,
+                                      softWrap: false,
+                                      textAlign: TextAlign.left,
+                                      style: const TextStyle(
+                                        color: Colors.black,
+                                        fontWeight: FontWeight.bold,
+                                        fontSize: 18,
                                       ),
+                                    )
+                                  : Text(
+                                      matrixUser.displayName,
+                                      overflow: TextOverflow.fade,
+                                      softWrap: false,
+                                      textAlign: TextAlign.left,
+                                      style: const TextStyle(
+                                        color: Colors.black,
+                                        fontWeight: FontWeight.bold,
+                                        fontSize: 18,
+                                      ),
+                                    ),
                             ),
                           ),
                         ),
@@ -327,10 +323,9 @@ class _MatrixUsersListCardState extends State<MatrixUsersListCard> {
                                   style: TextStyle(
                                     color:
                                         userRelationship?.pupil != null ||
-                                                userRelationship?.isParent ==
-                                                    true
-                                            ? Colors.green
-                                            : AppColors.backgroundColor,
+                                            userRelationship?.isParent == true
+                                        ? Colors.green
+                                        : AppColors.backgroundColor,
                                     fontWeight: FontWeight.bold,
                                     fontSize: 16,
                                   ),
@@ -392,16 +387,15 @@ class _MatrixUsersListCardState extends State<MatrixUsersListCard> {
                                 .resetPasswordAndPrintCredentialsFile(
                                   user: matrixUser,
                                   logoutDevices: logOutDevices,
-                                  isStaff:
-                                      userRelationship?.isTeacher == true
-                                          ? true
-                                          : false,
+                                  isStaff: userRelationship?.isTeacher == true
+                                      ? true
+                                      : false,
                                 );
                             if (file != null) {
                               Navigator.of(context).push(
                                 MaterialPageRoute(
-                                  builder:
-                                      (context) => PdfViewerPage(pdfFile: file),
+                                  builder: (context) =>
+                                      PdfViewerPage(pdfFile: file),
                                 ),
                               );
                             }
@@ -409,8 +403,8 @@ class _MatrixUsersListCardState extends State<MatrixUsersListCard> {
                           icon: const Icon(Icons.qr_code_2_rounded),
                         ),
                         IconButton(
-                          onPressed:
-                              () => _showMessageDialog(context, matrixUser),
+                          onPressed: () =>
+                              _showMessageDialog(context, matrixUser),
                           icon: const Icon(Icons.message, color: Colors.blue),
                         ),
                       ],
@@ -432,7 +426,7 @@ class _MatrixUsersListCardState extends State<MatrixUsersListCard> {
                     Center(
                       child: Text(
                         matrixUser.matrixRooms.length.toString(),
-                        style: const TextStyle(
+                        style: TextStyle(
                           fontSize: 23,
                           fontWeight: FontWeight.bold,
                           color: AppColors.backgroundColor,
@@ -464,20 +458,18 @@ class _MatrixUsersListCardState extends State<MatrixUsersListCard> {
                       final List<String> selectedRoomIds =
                           await Navigator.of(context).push(
                             MaterialPageRoute(
-                              builder:
-                                  (ctx) =>
-                                      SelectMatrixRoomsList(availableRooms),
+                              builder: (ctx) =>
+                                  SelectMatrixRoomsList(availableRooms),
                             ),
                           ) ??
                           [];
                       if (selectedRoomIds.isNotEmpty) {
-                        final List<JoinedRoom> joinedRooms =
-                            selectedRoomIds
-                                .map(
-                                  (roomId) =>
-                                      JoinedRoom(roomId: roomId, powerLevel: 0),
-                                )
-                                .toList();
+                        final List<JoinedRoom> joinedRooms = selectedRoomIds
+                            .map(
+                              (roomId) =>
+                                  JoinedRoom(roomId: roomId, powerLevel: 0),
+                            )
+                            .toList();
                         matrixUser.joinRooms(joinedRooms);
                       }
                     },
diff --git a/school_data_hub_flutter/lib/features/matrix/users/presentation/matrix_users_list_page/widgets/matrix_user_list_searchbar.dart b/school_data_hub_flutter/lib/features/matrix/users/presentation/matrix_users_list_page/widgets/matrix_user_list_searchbar.dart
index c583cc87..f3bd270e 100644
--- a/school_data_hub_flutter/lib/features/matrix/users/presentation/matrix_users_list_page/widgets/matrix_user_list_searchbar.dart
+++ b/school_data_hub_flutter/lib/features/matrix/users/presentation/matrix_users_list_page/widgets/matrix_user_list_searchbar.dart
@@ -31,7 +31,7 @@ class MatrixUsersListSearchBar extends WatchingWidget {
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
-                  const Icon(
+                  Icon(
                     Icons.people_alt_rounded,
                     color: AppColors.backgroundColor,
                   ),
@@ -64,8 +64,8 @@ class MatrixUsersListSearchBar extends WatchingWidget {
                 InkWell(
                   // TODO: implement this
                   // onTap: () => showCreditFilterBottomSheet(context),
-                  onLongPress:
-                      () => _matrixPolicyFilterManager.resetAllMatrixFilters(),
+                  onLongPress: () =>
+                      _matrixPolicyFilterManager.resetAllMatrixFilters(),
                   // onPressed: () => showBottomSheetFilters(context),
                   child: Padding(
                     padding: const EdgeInsets.all(10.0),
diff --git a/school_data_hub_flutter/lib/features/matrix/users/presentation/matrix_users_list_page/widgets/pupil_rooms_list.dart b/school_data_hub_flutter/lib/features/matrix/users/presentation/matrix_users_list_page/widgets/pupil_rooms_list.dart
index 88c1fb50..60524e81 100644
--- a/school_data_hub_flutter/lib/features/matrix/users/presentation/matrix_users_list_page/widgets/pupil_rooms_list.dart
+++ b/school_data_hub_flutter/lib/features/matrix/users/presentation/matrix_users_list_page/widgets/pupil_rooms_list.dart
@@ -130,7 +130,7 @@ class MatrixUserRoomsList extends WatchingWidget {
                                 size: 20,
                               )
                             : powerLevel > 29
-                            ? const Icon(
+                            ? Icon(
                                 Icons.remove_red_eye_outlined,
                                 color: AppColors.groupColor,
                                 size: 20,
@@ -233,7 +233,7 @@ List<Widget> roomsList(
                         : powerLevel > 49
                         ? const Icon(Icons.chat, color: Colors.orange, size: 20)
                         : powerLevel > 29
-                        ? const Icon(
+                        ? Icon(
                             Icons.remove_red_eye_outlined,
                             color: AppColors.groupColor,
                             size: 20,
diff --git a/school_data_hub_flutter/lib/features/matrix/users/presentation/new_matrix_user_page/new_matrix_user_page.dart b/school_data_hub_flutter/lib/features/matrix/users/presentation/new_matrix_user_page/new_matrix_user_page.dart
index e2d12f10..345cff19 100644
--- a/school_data_hub_flutter/lib/features/matrix/users/presentation/new_matrix_user_page/new_matrix_user_page.dart
+++ b/school_data_hub_flutter/lib/features/matrix/users/presentation/new_matrix_user_page/new_matrix_user_page.dart
@@ -105,8 +105,8 @@ class NewMatrixUserPageState extends State<NewMatrixUserPage> {
                         minLines: 1,
                         maxLines: 3,
                         controller: matrixIdController,
-                        decoration: const InputDecoration(
-                          contentPadding: EdgeInsets.all(10),
+                        decoration: InputDecoration(
+                          contentPadding: const EdgeInsets.all(10),
                           border: OutlineInputBorder(
                             borderSide: BorderSide(
                               color: AppColors.backgroundColor,
@@ -142,8 +142,8 @@ class NewMatrixUserPageState extends State<NewMatrixUserPage> {
                   minLines: 1,
                   maxLines: 3,
                   controller: displayNameController,
-                  decoration: const InputDecoration(
-                    contentPadding: EdgeInsets.all(10),
+                  decoration: InputDecoration(
+                    contentPadding: const EdgeInsets.all(10),
                     border: OutlineInputBorder(
                       borderSide: BorderSide(
                         color: AppColors.backgroundColor,
@@ -184,72 +184,74 @@ class NewMatrixUserPageState extends State<NewMatrixUserPage> {
                 if (roomIds.isEmpty) const Gap(30),
                 roomIds.isNotEmpty
                     ? Expanded(
-                      child: Padding(
-                        padding: const EdgeInsets.symmetric(vertical: 8.0),
-                        child: SingleChildScrollView(
-                          scrollDirection: Axis.vertical,
-                          child: ListView.builder(
-                            padding: const EdgeInsets.only(top: 5, bottom: 5),
-                            shrinkWrap: true,
-                            physics: const NeverScrollableScrollPhysics(),
-                            itemCount: roomsFromIds.length,
-                            itemBuilder: (context, int index) {
-                              MatrixRoom listedRoom = roomsFromIds[index];
-                              return Column(
-                                children: [
-                                  Card(
-                                    color: Colors.white,
-                                    child: SizedBox(
-                                      height: 60,
-                                      child: Row(
-                                        children: [
-                                          Padding(
-                                            padding: const EdgeInsets.all(15.0),
-                                            child: Text(
-                                              listedRoom.name!,
-                                              style: const TextStyle(
-                                                fontSize: 17,
-                                                fontWeight: FontWeight.bold,
+                        child: Padding(
+                          padding: const EdgeInsets.symmetric(vertical: 8.0),
+                          child: SingleChildScrollView(
+                            scrollDirection: Axis.vertical,
+                            child: ListView.builder(
+                              padding: const EdgeInsets.only(top: 5, bottom: 5),
+                              shrinkWrap: true,
+                              physics: const NeverScrollableScrollPhysics(),
+                              itemCount: roomsFromIds.length,
+                              itemBuilder: (context, int index) {
+                                MatrixRoom listedRoom = roomsFromIds[index];
+                                return Column(
+                                  children: [
+                                    Card(
+                                      color: Colors.white,
+                                      child: SizedBox(
+                                        height: 60,
+                                        child: Row(
+                                          children: [
+                                            Padding(
+                                              padding: const EdgeInsets.all(
+                                                15.0,
+                                              ),
+                                              child: Text(
+                                                listedRoom.name!,
+                                                style: const TextStyle(
+                                                  fontSize: 17,
+                                                  fontWeight: FontWeight.bold,
+                                                ),
                                               ),
                                             ),
-                                          ),
-                                          const Spacer(),
-                                          IconButton(
-                                            onPressed: () {
-                                              setState(() {
-                                                roomIds.remove(listedRoom.id);
-                                              });
-                                            },
-                                            icon: const Icon(
-                                              Icons.delete,
-                                              color: AppColors.accentColor,
+                                            const Spacer(),
+                                            IconButton(
+                                              onPressed: () {
+                                                setState(() {
+                                                  roomIds.remove(listedRoom.id);
+                                                });
+                                              },
+                                              icon: Icon(
+                                                Icons.delete,
+                                                color: AppColors.accentColor,
+                                              ),
                                             ),
-                                          ),
-                                          const Gap(10),
-                                        ],
+                                            const Gap(10),
+                                          ],
+                                        ),
                                       ),
                                     ),
-                                  ),
-                                ],
-                              );
-                            },
+                                  ],
+                                );
+                              },
+                            ),
                           ),
                         ),
-                      ),
-                    )
+                      )
                     : const Row(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      children: [
-                        Text(
-                          'Keine Räume ausgewählt!',
-                          style: TextStyle(
-                            fontSize: 18,
-                            color: Color.fromARGB(255, 91, 91, 91),
-                            fontWeight: FontWeight.bold,
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          Text(
+                            'Keine Räume ausgewählt!',
+                            style: TextStyle(
+                              fontSize: 18,
+                              color: Color.fromARGB(255, 91, 91, 91),
+                              fontWeight: FontWeight.bold,
+                            ),
                           ),
-                        ),
-                      ],
-                    ),
+                        ],
+                      ),
                 if (roomIds.isEmpty) const Spacer(),
                 ElevatedButton(
                   style: AppStyles.actionButtonStyle,
@@ -257,12 +259,9 @@ class NewMatrixUserPageState extends State<NewMatrixUserPage> {
                     final List<String> selectedRoomIds =
                         await Navigator.of(context).push(
                           MaterialPageRoute(
-                            builder:
-                                (ctx) => SelectMatrixRoomsList(
-                                  MatrixRoomHelper.restOfRooms(
-                                    roomIds.toList(),
-                                  ),
-                                ),
+                            builder: (ctx) => SelectMatrixRoomsList(
+                              MatrixRoomHelper.restOfRooms(roomIds.toList()),
+                            ),
                           ),
                         ) ??
                         [];
diff --git a/school_data_hub_flutter/lib/features/matrix/users/presentation/pupil_matrix_contacts_list_page/pupils_matrix_contacts_list_page.dart b/school_data_hub_flutter/lib/features/matrix/users/presentation/pupil_matrix_contacts_list_page/pupils_matrix_contacts_list_page.dart
index 56f4fb70..94efcfb1 100644
--- a/school_data_hub_flutter/lib/features/matrix/users/presentation/pupil_matrix_contacts_list_page/pupils_matrix_contacts_list_page.dart
+++ b/school_data_hub_flutter/lib/features/matrix/users/presentation/pupil_matrix_contacts_list_page/pupils_matrix_contacts_list_page.dart
@@ -15,7 +15,7 @@ import 'package:school_data_hub_flutter/features/matrix/domain/matrix_policy_man
 import 'package:school_data_hub_flutter/features/matrix/users/presentation/new_matrix_user_page/new_matrix_user_page.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/pupil_mutator.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/_credit/credit_list_page/widgets/credit_list_page_bottom_navbar.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/_credit/credit_list_page/widgets/credit_list_searchbar.dart';
@@ -28,7 +28,7 @@ class PupilsMatrixContactsListPage extends WatchingWidget {
 
   @override
   Widget build(BuildContext context) {
-    final _pupilManager = di<PupilManager>();
+    final _pupilManager = di<PupilProxyManager>();
     List<PupilProxy> pupils = watchValue((PupilsFilter x) => x.filteredPupils);
     return Scaffold(
       appBar: const GenericAppBar(
@@ -102,9 +102,9 @@ class PupilsMatrixContactsListPage extends WatchingWidget {
                                           ),
                                         ),
                                         if (pupil.family != null)
-                                          const Row(
+                                          Row(
                                             children: [
-                                              Gap(10),
+                                              const Gap(10),
                                               Icon(
                                                 Icons.group,
                                                 size: 25,
diff --git a/school_data_hub_flutter/lib/features/matrix/users/presentation/select_matrix_users_list_page/select_matrix_users_list_page.dart b/school_data_hub_flutter/lib/features/matrix/users/presentation/select_matrix_users_list_page/select_matrix_users_list_page.dart
index 27c8ade6..0ed05d8a 100644
--- a/school_data_hub_flutter/lib/features/matrix/users/presentation/select_matrix_users_list_page/select_matrix_users_list_page.dart
+++ b/school_data_hub_flutter/lib/features/matrix/users/presentation/select_matrix_users_list_page/select_matrix_users_list_page.dart
@@ -8,7 +8,7 @@ import 'package:school_data_hub_flutter/features/matrix/users/presentation/selec
 import 'package:school_data_hub_flutter/features/matrix/users/presentation/select_matrix_users_list_page/widgets/select_matrix_user_list_card.dart';
 import 'package:school_data_hub_flutter/features/matrix/users/presentation/select_matrix_users_list_page/widgets/select_matrix_users_list_searchbar.dart';
 import 'package:school_data_hub_flutter/features/matrix/users/presentation/select_matrix_users_list_page/widgets/select_matrix_users_list_view_bottom_navbar.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
 class SelectMatrixUsersListPage extends WatchingWidget {
@@ -25,22 +25,20 @@ class SelectMatrixUsersListPage extends WatchingWidget {
     final List<MatrixUser> filteredUsers = watchValue(
       (MatrixPolicyFilterManager x) => x.filteredMatrixUsers,
     );
-    final selectableUsers =
-        filteredUsers
-            .where((user) => controller.users!.contains(user))
-            .toList();
+    final selectableUsers = filteredUsers
+        .where((user) => controller.users!.contains(user))
+        .toList();
     return Scaffold(
       backgroundColor: AppColors.canvasColor,
       appBar: AppBar(
-        leading:
-            controller.isSelectMode
-                ? IconButton(
-                  onPressed: () {
-                    controller.cancelSelect();
-                  },
-                  icon: const Icon(Icons.close),
-                )
-                : null,
+        leading: controller.isSelectMode
+            ? IconButton(
+                onPressed: () {
+                  controller.cancelSelect();
+                },
+                icon: const Icon(Icons.close),
+              )
+            : null,
         automaticallyImplyLeading: false,
         centerTitle: true,
         backgroundColor: AppColors.backgroundColor,
@@ -52,7 +50,7 @@ class SelectMatrixUsersListPage extends WatchingWidget {
         ),
       ),
       body: RefreshIndicator(
-        onRefresh: () async => di<PupilManager>().fetchAllPupils(),
+        onRefresh: () async => di<PupilProxyManager>().fetchAllPupils(),
         child: Center(
           child: ConstrainedBox(
             constraints: const BoxConstraints(maxWidth: 800),
@@ -84,27 +82,27 @@ class SelectMatrixUsersListPage extends WatchingWidget {
                   ),
                   selectableUsers.isEmpty
                       ? const SliverToBoxAdapter(
-                        child: Center(
-                          child: Padding(
-                            padding: EdgeInsets.all(8.0),
-                            child: Text(
-                              'Keine Ergebnisse',
-                              style: TextStyle(fontSize: 18),
+                          child: Center(
+                            child: Padding(
+                              padding: EdgeInsets.all(8.0),
+                              child: Text(
+                                'Keine Ergebnisse',
+                                style: TextStyle(fontSize: 18),
+                              ),
                             ),
                           ),
-                        ),
-                      )
+                        )
                       : SliverList(
-                        delegate: SliverChildBuilderDelegate((
-                          BuildContext context,
-                          int index,
-                        ) {
-                          return SelectMatrixUserCard(
-                            controller,
-                            selectableUsers[index],
-                          );
-                        }, childCount: selectableUsers.length),
-                      ),
+                          delegate: SliverChildBuilderDelegate((
+                            BuildContext context,
+                            int index,
+                          ) {
+                            return SelectMatrixUserCard(
+                              controller,
+                              selectableUsers[index],
+                            );
+                          }, childCount: selectableUsers.length),
+                        ),
                 ],
               ),
             ),
diff --git a/school_data_hub_flutter/lib/features/matrix/users/presentation/select_matrix_users_list_page/widgets/select_matrix_users_list_searchbar.dart b/school_data_hub_flutter/lib/features/matrix/users/presentation/select_matrix_users_list_page/widgets/select_matrix_users_list_searchbar.dart
index a5514714..970f4f28 100644
--- a/school_data_hub_flutter/lib/features/matrix/users/presentation/select_matrix_users_list_page/widgets/select_matrix_users_list_searchbar.dart
+++ b/school_data_hub_flutter/lib/features/matrix/users/presentation/select_matrix_users_list_page/widgets/select_matrix_users_list_searchbar.dart
@@ -36,10 +36,7 @@ class SelectUserListSearchBar extends WatchingWidget {
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
-                  const Icon(
-                    Icons.group_rounded,
-                    color: AppColors.backgroundColor,
-                  ),
+                  Icon(Icons.group_rounded, color: AppColors.backgroundColor),
                   const Gap(10),
                   Text(
                     matrixUsers.length.toString(),
@@ -78,10 +75,8 @@ class SelectUserListSearchBar extends WatchingWidget {
                 ),
                 InkWell(
                   onTap: () => {},
-                  onLongPress:
-                      () =>
-                          di<MatrixPolicyFilterManager>()
-                              .resetAllMatrixFilters(),
+                  onLongPress: () =>
+                      di<MatrixPolicyFilterManager>().resetAllMatrixFilters(),
                   // onPressed: () => showBottomSheetFilters(context),
                   child: Padding(
                     padding: const EdgeInsets.all(10.0),
diff --git a/school_data_hub_flutter/lib/features/pupil/data/pupil_data_api_service.dart b/school_data_hub_flutter/lib/features/pupil/data/pupil_data_api_service.dart
index 7a3108eb..a61d77b4 100644
--- a/school_data_hub_flutter/lib/features/pupil/data/pupil_data_api_service.dart
+++ b/school_data_hub_flutter/lib/features/pupil/data/pupil_data_api_service.dart
@@ -271,16 +271,17 @@ class PupilDataApiService {
   Future<DateTime?> fetchLastIdentitiesUpdate() async {
     final lastUpdate = await ClientHelper.apiCall(
       call: () => _client.pupilIdentity.fetchLastPupilIdentitiesUpdate(),
-      errorMessage: 'Die letzte Aktualisierung konnte nicht geladen werden',
+      errorMessage:
+          'Die letzte Abgleich-Zeitstempel konnte nicht geladen werden',
     );
     return lastUpdate;
   }
 
-  Future<bool?> updateLastIdentitiesUpdate(DateTime date) async {
+  Future<DateTime?> updateLastIdentitiesUpdate(DateTime date) async {
     final updated = await ClientHelper.apiCall(
       call: () => _client.pupilIdentity.updateLastPupilIdentitiesUpdate(date),
       errorMessage:
-          'Die letzte Aktualisierung konnte nicht aktualisiert werden',
+          'Die letzte Abgleich-Zeitstempel konnte nicht aktualisiert werden',
     );
     return updated;
   }
diff --git a/school_data_hub_flutter/lib/features/pupil/domain/filters/pupil_filter_manager.dart b/school_data_hub_flutter/lib/features/pupil/domain/filters/pupil_filter_manager.dart
index a967e5f6..d343dc35 100644
--- a/school_data_hub_flutter/lib/features/pupil/domain/filters/pupil_filter_manager.dart
+++ b/school_data_hub_flutter/lib/features/pupil/domain/filters/pupil_filter_manager.dart
@@ -5,7 +5,7 @@ import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupil_filt
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/enums.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
 // TODO: this is an old class and the rests being used should be migrated to PupilsFilterImplementation
@@ -28,12 +28,19 @@ class PupilFilterManager {
   ValueListenable<Map<PupilSortMode, bool>> get sortMode => _sortMode;
 
   final _filteredPupils = ValueNotifier<List<PupilProxy>>(
-    di<PupilManager>().allPupils,
+    di<PupilProxyManager>().allPupils,
   );
   ValueListenable<List<PupilProxy>> get filteredPupils => _filteredPupils;
 
   PupilFilterManager();
 
+  void dispose() {
+    _pupilFilterState.dispose();
+    _sortMode.dispose();
+    _filteredPupils.dispose();
+    return;
+  }
+
   void resetFilters() {
     _pupilFilterState.value = {...initialPupilFilterValues};
 
diff --git a/school_data_hub_flutter/lib/features/pupil/domain/filters/pupil_text_filter.dart b/school_data_hub_flutter/lib/features/pupil/domain/filters/pupil_text_filter.dart
index 1f2a9dd4..85c52aa9 100644
--- a/school_data_hub_flutter/lib/features/pupil/domain/filters/pupil_text_filter.dart
+++ b/school_data_hub_flutter/lib/features/pupil/domain/filters/pupil_text_filter.dart
@@ -1,9 +1,6 @@
-import 'package:logging/logging.dart';
 import 'package:school_data_hub_flutter/common/domain/filters/filters.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
 
-final _log = Logger('PupilTextFilter');
-
 class PupilTextFilter extends Filter<PupilProxy> {
   PupilTextFilter({required super.name});
 
@@ -18,7 +15,7 @@ class PupilTextFilter extends Filter<PupilProxy> {
       return;
     }
     toggle(true);
-    _log.finer('Setting pupil filter text: $text');
+
     notifyListeners();
     return;
   }
diff --git a/school_data_hub_flutter/lib/features/pupil/domain/filters/pupils_filter_impl.dart b/school_data_hub_flutter/lib/features/pupil/domain/filters/pupils_filter_impl.dart
index b5fcd790..4ee1e622 100644
--- a/school_data_hub_flutter/lib/features/pupil/domain/filters/pupils_filter_impl.dart
+++ b/school_data_hub_flutter/lib/features/pupil/domain/filters/pupils_filter_impl.dart
@@ -14,27 +14,27 @@ import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupil_text
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/enums.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_helper_functions.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_manager.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_helper.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
-final _log = Logger('PupilsFilterImplementation');
-
 class PupilsFilterImplementation with ChangeNotifier implements PupilsFilter {
+  final _log = Logger('PupilsFilterImplementation');
+
   // Lazy getters to avoid accessing dependencies during construction
   PupilIdentityManager get _pupilIdentityManager => di<PupilIdentityManager>();
   LearningSupportFilterManager get _learningSupportFilterManager =>
       di<LearningSupportFilterManager>();
   SchooldayEventFilterManager get _schooldayEventFilterManager =>
       di<SchooldayEventFilterManager>();
-  PupilFilterManager get _pupilFilterManager => di<PupilFilterManager>();
+  // PupilFilterManager get _pupilFilterManager => di<PupilFilterManager>();
   AttendancePupilFilterManager get _attendancePupilFilterManager =>
       di<AttendancePupilFilterManager>();
   FiltersStateManager get _filtersStateManager => di<FiltersStateManager>();
 
   PupilsFilterImplementation(
-    PupilManager pupilsManager,
+    PupilProxyManager pupilsManager,
     //   {
     //  PupilSortMode? sortMode,
     // }
@@ -46,9 +46,11 @@ class PupilsFilterImplementation with ChangeNotifier implements PupilsFilter {
     refreshs();
     _pupilsManager.addListener(refreshs);
   }
-
+  // guard from trying to call a value when the filter is disposed
+  bool _isDisposed = false;
   @override
   void dispose() {
+    _isDisposed = true;
     _pupilsManager.removeListener(refreshs);
     _filteredPupils.dispose();
 
@@ -57,12 +59,13 @@ class PupilsFilterImplementation with ChangeNotifier implements PupilsFilter {
 
   @override
   void clearFilteredPupils() {
+    if (_isDisposed) return;
     _filteredPupils.value = [];
     _filteredPupilIds.value = [];
     notifyListeners();
   }
 
-  final PupilManager _pupilsManager;
+  final PupilProxyManager _pupilsManager;
 
   @override
   ValueListenable<List<PupilProxy>> get filteredPupils => _filteredPupils;
@@ -95,6 +98,7 @@ class PupilsFilterImplementation with ChangeNotifier implements PupilsFilter {
   // reset the filters to its initial state
   @override
   void resetFilters() {
+    if (_isDisposed) return;
     // first reset all implemented filter objects
 
     for (final filter in allPupilFilters) {
@@ -122,6 +126,7 @@ class PupilsFilterImplementation with ChangeNotifier implements PupilsFilter {
   // and sort mode
   @override
   void refreshs() {
+    //if (_isDisposed) return;
     final allPupils = _pupilsManager.allPupils;
 
     bool filtersOn = false;
@@ -129,7 +134,7 @@ class PupilsFilterImplementation with ChangeNotifier implements PupilsFilter {
     // checks if any not yet migrated filters are active
 
     final bool specificFiltersOn =
-        _pupilFilterManager.pupilFilterState.value.values.any(
+        di<PupilFilterManager>().pupilFilterState.value.values.any(
           (x) => x == true,
         ) ||
         _schooldayEventFilterManager.schooldayEventsFilterState.value.values
@@ -172,7 +177,7 @@ class PupilsFilterImplementation with ChangeNotifier implements PupilsFilter {
       (filter) => filter.isActive,
     );
 
-    bool isTextFilterActive = _textFilter.isActive;
+    // bool isTextFilterActive = _textFilter.isActive;
 
     for (final pupil in allPupils) {
       // matches if no group filter is active or if the group matches the pupil's group
@@ -269,10 +274,10 @@ class PupilsFilterImplementation with ChangeNotifier implements PupilsFilter {
 
       // after school care filters
 
-      if (_pupilFilterManager.pupilFilterState.value[PupilFilter
+      if (di<PupilFilterManager>().pupilFilterState.value[PupilFilter
                   .afterSchoolCare]! &&
               pupil.afterSchoolCare == null ||
-          _pupilFilterManager.pupilFilterState.value[PupilFilter
+          di<PupilFilterManager>().pupilFilterState.value[PupilFilter
                   .noAfterSchoolCare]! &&
               pupil.afterSchoolCare != null) {
         if (filtersOn == false) filtersOn = true;
@@ -303,9 +308,9 @@ class PupilsFilterImplementation with ChangeNotifier implements PupilsFilter {
 
       // language support filters
 
-      if (_pupilFilterManager.pupilFilterState.value[PupilFilter
+      if (di<PupilFilterManager>().pupilFilterState.value[PupilFilter
               .migrationSupport]! &&
-          !PupilHelper.hasLanguageSupport(pupil.migrationSupportEnds)) {
+          !PupilProxyHelper.hasLanguageSupport(pupil.migrationSupportEnds)) {
         if (filtersOn == false) filtersOn = true;
         continue;
       }
diff --git a/school_data_hub_flutter/lib/features/pupil/domain/models/enums.dart b/school_data_hub_flutter/lib/features/pupil/domain/models/enums.dart
index de6c8aca..7366dc51 100644
--- a/school_data_hub_flutter/lib/features/pupil/domain/models/enums.dart
+++ b/school_data_hub_flutter/lib/features/pupil/domain/models/enums.dart
@@ -1,5 +1,7 @@
 enum CommunicationSubject { pupil, tutor1, tutor2 }
 
+enum PupilIdentityStreamRole { sender, receiver }
+
 enum PupilSortMode {
   sortByName,
   sortByMissedExcused,
diff --git a/school_data_hub_flutter/lib/features/pupil/domain/models/extensions.dart b/school_data_hub_flutter/lib/features/pupil/domain/models/extensions.dart
deleted file mode 100644
index 4c73a98f..00000000
--- a/school_data_hub_flutter/lib/features/pupil/domain/models/extensions.dart
+++ /dev/null
@@ -1,43 +0,0 @@
-import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
-
-extension PupilIdentityExtensions on PupilIdentity {
-  bool isEqualTo(PupilIdentity other) {
-    return id == other.id &&
-        firstName == other.firstName &&
-        lastName == other.lastName &&
-        group == other.group &&
-        groupTutor == other.groupTutor &&
-        schoolGrade == other.schoolGrade &&
-        specialNeeds == other.specialNeeds &&
-        gender == other.gender &&
-        language == other.language &&
-        family == other.family &&
-        birthday.isSameDate(other.birthday) &&
-        (migrationSupportEnds == other.migrationSupportEnds ||
-            (migrationSupportEnds != null &&
-                other.migrationSupportEnds != null &&
-                migrationSupportEnds!.isSameDate(
-                  other.migrationSupportEnds!,
-                ))) &&
-        pupilSince.isSameDate(other.pupilSince) &&
-        afterSchoolCare == other.afterSchoolCare &&
-        religion == other.religion &&
-        (religionLessonsSince == other.religionLessonsSince ||
-            (religionLessonsSince != null &&
-                other.religionLessonsSince != null &&
-                religionLessonsSince!.isSameDate(
-                  other.religionLessonsSince!,
-                ))) &&
-        (familyLanguageLessonsSince == other.familyLanguageLessonsSince ||
-            (familyLanguageLessonsSince != null &&
-                other.familyLanguageLessonsSince != null &&
-                familyLanguageLessonsSince!.isSameDate(
-                  other.familyLanguageLessonsSince!,
-                ))) &&
-        (leavingDate == other.leavingDate ||
-            (leavingDate != null &&
-                other.leavingDate != null &&
-                leavingDate!.isSameDate(other.leavingDate!)));
-  }
-}
diff --git a/school_data_hub_flutter/lib/features/pupil/domain/models/pupil_identity_extensions.dart b/school_data_hub_flutter/lib/features/pupil/domain/models/pupil_identity_extensions.dart
new file mode 100644
index 00000000..4812d8c4
--- /dev/null
+++ b/school_data_hub_flutter/lib/features/pupil/domain/models/pupil_identity_extensions.dart
@@ -0,0 +1,59 @@
+import 'package:school_data_hub_client/school_data_hub_client.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
+
+extension PupilIdentityExtension on PupilIdentity {
+  String toTextLine() {
+    final migrationSupportEnds = this.migrationSupportEnds != null
+        ? this.migrationSupportEnds!.formatDateForJson()
+        : '';
+
+    final specialNeeds = this.specialNeeds ?? '';
+
+    return [
+      this.id.toString(),
+      this.firstName,
+      this.lastName,
+      this.group,
+      this.groupTutor,
+      this.schoolGrade,
+      specialNeeds,
+      '', // this is a placeholder for the second special needs field in the administrative data source
+      this.gender,
+      this.language,
+      this.family ?? '',
+      this.birthday.formatDateForJson(normalizeUtc: false),
+      migrationSupportEnds,
+      this.pupilSince.formatDateForJson(normalizeUtc: false),
+      this.afterSchoolCare ? 'OFFGANZ' : '',
+      this.religion ?? '',
+      this.religionLessonsSince?.formatDateForJson(normalizeUtc: false) ?? '',
+      this.religionLessonsCancelledAt?.formatDateForJson(normalizeUtc: false) ??
+          '',
+      this.familyLanguageLessonsSince?.formatDateForJson(normalizeUtc: false) ??
+          '',
+      this.leavingDate?.formatDateForJson(normalizeUtc: false) ?? '',
+    ].join(',');
+  }
+
+  bool isEqual(PupilIdentity other) {
+    return this.id == other.id &&
+        this.firstName == other.firstName &&
+        this.lastName == other.lastName &&
+        this.group == other.group &&
+        this.groupTutor == other.groupTutor &&
+        this.schoolGrade == other.schoolGrade &&
+        this.specialNeeds == other.specialNeeds &&
+        this.gender == other.gender &&
+        this.language == other.language &&
+        this.family == other.family &&
+        this.birthday == other.birthday &&
+        this.migrationSupportEnds == other.migrationSupportEnds &&
+        this.pupilSince == other.pupilSince &&
+        this.afterSchoolCare == other.afterSchoolCare &&
+        this.religion == other.religion &&
+        this.religionLessonsSince == other.religionLessonsSince &&
+        this.religionLessonsCancelledAt == other.religionLessonsCancelledAt &&
+        this.familyLanguageLessonsSince == other.familyLanguageLessonsSince &&
+        this.leavingDate == other.leavingDate;
+  }
+}
diff --git a/school_data_hub_flutter/lib/features/pupil/domain/models/pupil_proxy.dart b/school_data_hub_flutter/lib/features/pupil/domain/models/pupil_proxy.dart
index 25a99fbd..bccee058 100644
--- a/school_data_hub_flutter/lib/features/pupil/domain/models/pupil_proxy.dart
+++ b/school_data_hub_flutter/lib/features/pupil/domain/models/pupil_proxy.dart
@@ -1,13 +1,17 @@
 // ignore_for_file: constant_identifier_names
 
 import 'package:flutter/foundation.dart';
+import 'package:logging/logging.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/common/domain/filters/filters.dart';
+import 'package:school_data_hub_flutter/features/_attendance/domain/attendance_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupil_selector_filters.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/enums.dart';
 import 'package:watch_it/watch_it.dart';
 
+final _log = Logger('PupilProxy');
+
 class PupilProxy with ChangeNotifier {
   PupilProxy({
     required PupilData pupilData,
@@ -50,23 +54,17 @@ class PupilProxy with ChangeNotifier {
   bool pupilIsDirty = false;
 
   void updatePupil(PupilData pupilData) {
-    //- TODO ADVICE: Would it make sense?
-    //if (pupilData == _pupilData) return;
+    // TODO: Revisit for equality check
     _pupilData = pupilData;
-    // ignore: prefer_for_elements_to_map_fromiterable
-    // _missedSchooldays = Map.fromIterable(pupilData.missedSchooldays,
-    //     key: (e) => e.missedDay, value: (e) => e);
 
     pupilIsDirty = true;
     notifyListeners();
   }
 
   void updatePupilIdentity(PupilIdentity pupilIdentity) {
-    if (_pupilIdentity != pupilIdentity) {
-      _pupilIdentity = pupilIdentity;
-      pupilIsDirty = true;
-      notifyListeners();
-    }
+    _pupilIdentity = pupilIdentity;
+    pupilIsDirty = true;
+    notifyListeners();
   }
 
   //- PupilIdentity GETTERS
@@ -83,10 +81,18 @@ class PupilProxy with ChangeNotifier {
   String get gender => _pupilIdentity.gender;
   String get language => _pupilIdentity.language;
   String? get family => _pupilIdentity.family;
-  DateTime get birthday => _pupilIdentity.birthday;
+  DateTime get birthday {
+    final utc = _pupilIdentity.birthday;
+    final local = utc.toLocal();
+    _log.fine('''${_pupilIdentity.firstName} ${_pupilIdentity.lastName}
+    is UTC: ${utc.isUtc}
+    birthday UTC: $utc, local: $local''');
+    return local;
+  }
+
   int get age {
-    final today = DateTime.now().toUtc();
-    int age = today.year - _pupilIdentity.birthday.year;
+    final today = DateTime.now();
+    int age = today.year - _pupilIdentity.birthday.toLocal().year;
     if (today.month < _pupilIdentity.birthday.month ||
         (today.month == _pupilIdentity.birthday.month &&
             today.day < _pupilIdentity.birthday.day)) {
@@ -97,14 +103,16 @@ class PupilProxy with ChangeNotifier {
 
   String? get groupTutor => _pupilIdentity.groupTutor;
 
-  DateTime? get migrationSupportEnds => _pupilIdentity.migrationSupportEnds;
+  DateTime? get migrationSupportEnds =>
+      _pupilIdentity.migrationSupportEnds?.toLocal();
   DateTime get pupilSince => _pupilIdentity.pupilSince;
 
   DateTime? get familyLanguageLessonsSince =>
-      _pupilIdentity.familyLanguageLessonsSince;
-  DateTime? get religionLessonsSince => _pupilIdentity.religionLessonsSince;
+      _pupilIdentity.familyLanguageLessonsSince?.toLocal();
+  DateTime? get religionLessonsSince =>
+      _pupilIdentity.religionLessonsSince?.toLocal();
   DateTime? get religionLessonsCancelledAt =>
-      _pupilIdentity.religionLessonsCancelledAt;
+      _pupilIdentity.religionLessonsCancelledAt?.toLocal();
 
   String? get religion => _pupilIdentity.religion;
   //- PUPIL DATA GETTERS
@@ -149,7 +157,7 @@ class PupilProxy with ChangeNotifier {
 
   // Legacy OGS getters for backward compatibility
   // TODO URGENT: Remove these after migrating all OGS code to use proper afterSchoolCare model
-  bool get ogs => afterSchoolCare != null;
+  //bool get ogs => afterSchoolCare != null;
 
   String? pickUpTime(AfterSchoolCareWeekday weekday) {
     final pickUpTimes = afterSchoolCare?.pickUpTimes;
@@ -182,7 +190,8 @@ class PupilProxy with ChangeNotifier {
 
   // learning related
 
-  DateTime? get schoolyearHeldBackAt => _pupilData.schoolyearHeldBackAt;
+  DateTime? get schoolyearHeldBackAt =>
+      _pupilData.schoolyearHeldBackAt?.toLocal();
 
   List<CompetenceCheck>? get competenceChecks => _pupilData.competenceChecks;
 
@@ -217,6 +226,7 @@ class PupilProxy with ChangeNotifier {
 
   // schoolday related
 
-  List<MissedSchoolday>? get missedSchooldays => _pupilData.missedSchooldays;
+  List<MissedSchoolday>? get missedSchooldays =>
+      di<AttendanceManager>().getAllPupilMissedSchooldays(pupilId);
   List<SchooldayEvent>? get schooldayEvents => _pupilData.schooldayEvents;
 }
diff --git a/school_data_hub_flutter/lib/features/pupil/domain/pupil_identity_helper_functions.dart b/school_data_hub_flutter/lib/features/pupil/domain/pupil_identity_helper.dart
similarity index 52%
rename from school_data_hub_flutter/lib/features/pupil/domain/pupil_identity_helper_functions.dart
rename to school_data_hub_flutter/lib/features/pupil/domain/pupil_identity_helper.dart
index ba644e2b..b9ce8c9c 100644
--- a/school_data_hub_flutter/lib/features/pupil/domain/pupil_identity_helper_functions.dart
+++ b/school_data_hub_flutter/lib/features/pupil/domain/pupil_identity_helper.dart
@@ -3,10 +3,15 @@ import 'dart:convert';
 import 'package:flutter/foundation.dart';
 import 'package:logging/logging.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
+import 'package:school_data_hub_flutter/app_utils/custom_encrypter.dart';
 import 'package:school_data_hub_flutter/app_utils/secure_storage.dart';
+import 'package:school_data_hub_flutter/common/services/notification_service.dart';
+import 'package:school_data_hub_flutter/core/env/env_manager.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_identity_extensions.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_manager.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
 final _log = Logger('PupilIdentityHelper');
@@ -20,46 +25,39 @@ class PupilIdentityHelper {
     final pupilsJson = await HubSecureStorage().getString(secureStorageKey);
     if (pupilsJson == null) return {};
 
-    final Map<String, dynamic> decodedJson = await compute(
-      (json) => jsonDecode(json),
-      pupilsJson,
-    );
+    return compute(_jsonDecodePupilIdentities, pupilsJson);
+  }
 
-    return Map<int, PupilIdentity>.fromEntries(
-      decodedJson.entries.map((entry) {
-        final int pupilId = int.parse(entry.key);
+  /// Decode JSON from secure storage into a map of pupilId -> PupilIdentity
+  /// off the main isolate.
+  static Map<int, PupilIdentity> _jsonDecodePupilIdentities(String json) {
+    final Map<String, dynamic> decodedJson =
+        jsonDecode(json) as Map<String, dynamic>;
+
+    return decodedJson.map(
+      (key, value) => MapEntry(
+        int.parse(key),
+        PupilIdentity.fromJson(Map<String, dynamic>.from(value as Map)),
+      ),
+    );
+  }
 
-        // Clone the JSON map and convert DateTime strings from Berlin to UTC
-        final Map<String, dynamic> jsonData = Map<String, dynamic>.from(
-          entry.value as Map,
+  static void checkForOutdatedPupilIdentities() {
+    final lastIdentitiesUpdate =
+        di<EnvManager>().activeEnv?.lastIdentitiesUpdate;
+    final remoteLastIdentitiesUpdate =
+        di<PupilIdentityManager>().remoteLastIdentitiesUpdate.value;
+    if (lastIdentitiesUpdate != null && remoteLastIdentitiesUpdate != null) {
+      if (remoteLastIdentitiesUpdate.isAfter(lastIdentitiesUpdate)) {
+        di<NotificationService>().showInformationDialog(
+          'Die gespeicherten Schüler*innen-Ids vom\n${lastIdentitiesUpdate.formatDateAndTimeForUser()}\n sind veraltet. Die neueste Version ist vom \n ${remoteLastIdentitiesUpdate.formatDateAndTimeForUser()}.\n Schüler*innen-Ids aus einer vertrauenswürdigen Quelle aktualisieren!',
         );
-
-        // Convert all DateTime fields from Berlin timezone to UTC
-        // final dateTimeFields = [
-        //   'birthday',
-        //   'migrationSupportEnds',
-        //   'pupilSince',
-        //   'religionLessonsSince',
-        //   'familyLanguageLessonsSince',
-        //   'leavingDate',
-        // ];
-
-        // for (final field in dateTimeFields) {
-        //   if (jsonData[field] != null) {
-        //     final convertedDate = _convertBerlinDateStringToUtc(
-        //       jsonData[field] as String?,
-        //     );
-        //     if (convertedDate != null) {
-        //       jsonData[field] = convertedDate.toIso8601String();
-        //     }
-        //   }
-        // }
-
-        final PupilIdentity pupilIdentity = PupilIdentity.fromJson(jsonData);
-
-        return MapEntry(pupilId, pupilIdentity);
-      }),
-    );
+      }
+    } else {
+      di<NotificationService>().showInformationDialog(
+        'No last identities update found in the server.',
+      );
+    }
   }
 
   static Future<void> deletePupilIdentitiesForEnv(
@@ -71,16 +69,18 @@ class PupilIdentityHelper {
     );
     di<PupilIdentityManager>().clearPupilIdentities();
 
+    di<EnvManager>().updateActiveEnv(lastIdentitiesUpdate: null);
+
     di<PupilsFilter>().clearFilteredPupils();
 
-    di<PupilManager>().clearData();
+    di<PupilProxyManager>().clearData();
   }
 
   //- OBJECT HELPERS
 
-  static PupilIdentity decodePupilIdentityFromStringList(
-    List<String> pupilIdentityStringItems,
-  ) {
+  static PupilIdentity decodePupilIdentityFromTextLine(String textLine) {
+    final List<String> pupilIdentityStringItems = textLine.split(',');
+
     final SchoolGrade schoolgrade;
     switch (pupilIdentityStringItems[5]) {
       case 'E1':
@@ -126,28 +126,43 @@ class PupilIdentityHelper {
       family: pupilIdentityStringItems[10] == ''
           ? null
           : pupilIdentityStringItems[10],
-      birthday: DateTime.parse(pupilIdentityStringItems[11]),
+      birthday: pupilIdentityStringItems[11].toDateOnlyUtc(),
       migrationSupportEnds: pupilIdentityStringItems[12] == ''
           ? null
-          : DateTime.tryParse(pupilIdentityStringItems[12]),
-      pupilSince: DateTime.tryParse(pupilIdentityStringItems[13])!,
+          : pupilIdentityStringItems[12].toDateOnlyUtc(),
+      pupilSince: pupilIdentityStringItems[13].toDateOnlyUtc(),
       afterSchoolCare: pupilIdentityStringItems[14] != '' ? true : false,
       religion: pupilIdentityStringItems[15] == ''
           ? null
           : pupilIdentityStringItems[15],
       religionLessonsSince: pupilIdentityStringItems[16] == ''
           ? null
-          : DateTime.tryParse(pupilIdentityStringItems[16])!,
+          : pupilIdentityStringItems[16].tryToDateOnlyUtc(),
       religionLessonsCancelledAt: pupilIdentityStringItems[17] == ''
           ? null
-          : DateTime.tryParse(pupilIdentityStringItems[17])!,
+          : pupilIdentityStringItems[17].tryToDateOnlyUtc(),
       familyLanguageLessonsSince: pupilIdentityStringItems[18] == ''
           ? null
-          : DateTime.tryParse(pupilIdentityStringItems[18])!,
+          : pupilIdentityStringItems[18].tryToDateOnlyUtc(),
       leavingDate: pupilIdentityStringItems[19] == ''
           ? null
-          : DateTime.tryParse(pupilIdentityStringItems[19]),
+          : pupilIdentityStringItems[19].tryToDateOnlyUtc(),
     );
     return newPupilIdentity;
   }
+
+  Future<String> generateEncryptedPupilIdentitiesTransferString(
+    List<int> internalIds,
+  ) async {
+    String transferString = '';
+    for (int internalId in internalIds) {
+      PupilIdentity pupilIdentity = di<PupilIdentityManager>()
+          .getPupilIdentityByInternalId(internalId)!;
+
+      final String pupilIdentityString = pupilIdentity.toTextLine() + ',\n';
+      transferString = transferString + pupilIdentityString;
+    }
+    final encryptedString = customEncrypter.encryptString(transferString);
+    return encryptedString;
+  }
 }
diff --git a/school_data_hub_flutter/lib/features/pupil/domain/pupil_identity_manager.dart b/school_data_hub_flutter/lib/features/pupil/domain/pupil_identity_manager.dart
index 48fba7f6..c31be37b 100644
--- a/school_data_hub_flutter/lib/features/pupil/domain/pupil_identity_manager.dart
+++ b/school_data_hub_flutter/lib/features/pupil/domain/pupil_identity_manager.dart
@@ -6,103 +6,69 @@ import 'package:flutter/foundation.dart';
 import 'package:logging/logging.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/app_utils/custom_encrypter.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/app_utils/secure_storage.dart';
 import 'package:school_data_hub_flutter/common/data/file_upload_service.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
 import 'package:school_data_hub_flutter/core/env/env_manager.dart';
-import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/features/app_main_navigation/domain/main_menu_bottom_nav_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/data/pupil_data_api_service.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupil_selector_filters.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_helper_functions.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_helper.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
+import 'package:signals/signals_flutter.dart';
 import 'package:watch_it/watch_it.dart';
 
-enum PupilIdentityStreamRole { sender, receiver }
-
 class PupilIdentityManager {
+  final _log = Logger('PupilIdentityManager');
+
   final _notificationService = di<NotificationService>();
+  final _envManager = di<EnvManager>();
 
   final _mainMenuBottomNavManager = di<BottomNavManager>();
 
-  final _log = Logger('PupilIdentityManager');
+  final _secureStorageKey = di<EnvManager>().storageKeyForPupilIdentities;
 
-  final secureStorageKey = di<EnvManager>().storageKeyForPupilIdentities;
+  // data holders and getters
 
   Map<int, PupilIdentity> _pupilIdentities = {};
 
-  //-TODO URGENT: add a value notifier for the last update value
-  //- add endpoint to get the value from the server
-  //- compare values and notify if the local value is older than the server value
-
   final _groups = ValueNotifier<Set<String>>({});
   ValueListenable<Set<String>> get groups => _groups;
 
-  StreamSubscription<PupilIdentityDto>? _encryptedPupilIdsSubscription;
+  final Signal<DateTime?> _remoteLastIdentitiesUpdate = signal(null);
+  Signal<DateTime?> get remoteLastIdentitiesUpdate =>
+      _remoteLastIdentitiesUpdate;
 
-  // List<int> get availablePupilIds => _pupilIdentities.keys.toList();
+  List<PupilIdentity> get pupilIdentities => _pupilIdentities.values.toList();
 
   List<int> get availablePupilIds {
-    _log.info(
-      'getter returning [${_pupilIdentities.keys.length}] available pupil ids',
-    );
     return _pupilIdentities.keys.toList();
   }
 
-  PupilIdentity? getPupilIdentityByInternalId(int internalId) {
-    if (_pupilIdentities.containsKey(internalId) == false) {
-      _notificationService.showInformationDialog(
-        '''Die Schülerdaten mit der ID $internalId konnten nicht gefunden werden.
-          
-          Bitte überprüfen Sie die ID und versuchen Sie es erneut.''',
-      );
-      return null;
-    }
-    return _pupilIdentities[internalId]!;
-  }
-
   Future<PupilIdentityManager> init() async {
-    await getPupilIdentitiesForEnv();
+    await _getPupilIdentitiesForEnv();
     return this;
   }
 
-  /// Re-initializes the manager for a new environment
-  /// This should be called when switching environments
-  Future<void> reinitializeForNewEnvironment() async {
-    _log.info('Re-initializing PupilIdentityManager for new environment');
-
-    // Clear old environment data
-    _pupilIdentities.clear();
-    _groups.value = {};
-
-    // Load data for the new environment
-    await getPupilIdentitiesForEnv();
-
-    _log.info(
-      'PupilIdentityManager re-initialized for environment: ${di<EnvManager>().activeEnv?.serverName}',
-    );
-  }
-
-  /// Checks if the manager is ready for the current environment
-  bool get isReadyForCurrentEnvironment {
-    return di<EnvManager>().activeEnv != null && _pupilIdentities.isNotEmpty;
-  }
-
   void dispose() {
     _groups.dispose();
+    _remoteLastIdentitiesUpdate.dispose();
     _pupilIdentities.clear();
     _log.info('PupilIdentityManager disposed');
   }
 
-  Future<void> deleteAllPupilIdentities() async {
-    await HubSecureStorage().remove(secureStorageKey);
-    _pupilIdentities.clear();
-
-    di<PupilsFilter>().clearFilteredPupils();
-    di<PupilManager>().clearData();
+  PupilIdentity? getPupilIdentityByInternalId(int internalId) {
+    if (_pupilIdentities.containsKey(internalId) == false) {
+      _notificationService.showInformationDialog(
+        '''Die Schülerdaten mit der ID $internalId konnten nicht gefunden werden.
+          Bitte überprüfen Sie die ID und versuchen Sie es erneut.''',
+      );
+      return null;
+    }
+    return _pupilIdentities[internalId]!;
   }
 
   void clearPupilIdentities() {
@@ -110,102 +76,87 @@ class PupilIdentityManager {
     return;
   }
 
-  Future<void> getPupilIdentitiesForEnv() async {
-    final activeEnv = di<EnvManager>().activeEnv!;
+  Future<void> _getPupilIdentitiesForEnv() async {
+    final _activeEnv = _envManager.activeEnv!;
 
     final Map<int, PupilIdentity> pupilIdentities =
         await PupilIdentityHelper.readPupilIdentitiesFromStorage(
-          secureStorageKey: secureStorageKey,
+          secureStorageKey: _secureStorageKey,
         );
 
     _pupilIdentities.clear();
     _pupilIdentities = pupilIdentities;
     if (pupilIdentities.isEmpty) {
       _log.warning(
-        'No stored pupil identities found for ${activeEnv.serverName}',
+        'No stored pupil identities found for ${_activeEnv.serverName}',
       );
     } else {
       _log.info(
-        '${pupilIdentities.length} Pupil identities for [${activeEnv.serverName}] loaded from secure storage: ${_pupilIdentities.length}',
+        '${pupilIdentities.length} Pupil identities for [${_activeEnv.serverName}] loaded from secure storage: ${_pupilIdentities.length}',
       );
     }
 
     _groups.value = _pupilIdentities.values.map((e) => e.group).toSet();
 
-    // We check now if the identities are outdated
+    // Now we check if the identities are outdated
 
-    final lastIdentitiesUpdate = await PupilDataApiService()
+    final remoteLastIdentitiesUpdate = await PupilDataApiService()
         .fetchLastIdentitiesUpdate();
-    if (lastIdentitiesUpdate != null &&
-        activeEnv.lastIdentitiesUpdate != null) {
-      if (lastIdentitiesUpdate.isAfter(activeEnv.lastIdentitiesUpdate!)) {
-        _notificationService.showInformationDialog(
-          'Die Schülerdaten sind veraltet. Die neueste Version ist vom $lastIdentitiesUpdate! Bitte aktualisieren Sie die Schülerdaten.',
-        );
-      } else {
-        _log.info('Pupil identities are up to date.');
-      }
-    } else {
-      _log.warning('No last identities update found in the server.');
-    }
+    _remoteLastIdentitiesUpdate.value = remoteLastIdentitiesUpdate;
+
     return;
   }
 
-  Future<void> updatePupilIdentitiesFromEncryptedSource(
-    List<String> encryptedCodes,
+  Future<void> updatePupilIdentitiesFromEncryptedText(
+    DateTime updateTimestamp,
+    String encryptedText,
   ) async {
-    // We need the decrypted information as a string with line breaks.
-    // Since every string in the list of the argument i an encrypted code,
-    // we need to decrypt them and aggregate them to a string with line breaks
-    // in which every line will be a pupil identity.
-    String decryptedString = '';
-    for (String code in encryptedCodes) {
-      decryptedString += '${customEncrypter.decryptString(code)}\n';
-    }
+    final normalizedTimestamp = updateTimestamp.toUtc();
+    final decryptedText = customEncrypter.decryptString(encryptedText);
 
     updatePupilIdentitiesFromUnencryptedSource(
-      identitiesInStringLines: decryptedString,
+      pupilIdentityTextLines: decryptedText,
+      updateTimestamp: normalizedTimestamp,
     );
   }
 
   Future<void> updatePupilIdentitiesFromUnencryptedSource({
-    required String identitiesInStringLines,
+    required String pupilIdentityTextLines,
+    required DateTime? updateTimestamp,
   }) async {
-    late final String? decryptedIdentitiesAsString;
-
-    // If the string is imported in windows, it comes from a .txt file and it's not encrypted
-    decryptedIdentitiesAsString = identitiesInStringLines;
+    final normalizedUpdateTimestamp = updateTimestamp?.toUtc() ?? null;
 
     // The pupils in the string are separated by a '\n' - let's split them apart
-    List<String> splittedPupilIdentities = decryptedIdentitiesAsString.split(
-      '\n',
-    );
+    List<String> pupilIdentityTextLineList = pupilIdentityTextLines.split('\n');
+
     // The properties are separated by commas, let's build the PupilIdentity objects with them
 
     bool updateGroupFilters = false;
-
-    for (String data in splittedPupilIdentities) {
-      if (data != '') {
-        List<String> pupilIdentityValues = data.split(',');
+    String pupilIdentitiesWithBirthday = '';
+    for (String textLine in pupilIdentityTextLineList) {
+      if (textLine != '') {
         final newPupilIdentity =
-            PupilIdentityHelper.decodePupilIdentityFromStringList(
-              pupilIdentityValues,
-            );
+            PupilIdentityHelper.decodePupilIdentityFromTextLine(textLine);
 
-        // TODO: fix this
+        //- check if the group filter needs to be updated
         if (PupilProxy.groupFilters.any(
               (filter) =>
                   (filter as GroupFilter).name == newPupilIdentity.group,
             ) ==
             false) {
+          //- group filter needs to be updated, set the updateGroupFilters flag to true
           updateGroupFilters = true;
         }
         //- add the new pupil to the pupilIdentities map
         _pupilIdentities[newPupilIdentity.id] = newPupilIdentity;
+        pupilIdentitiesWithBirthday =
+            pupilIdentitiesWithBirthday +
+            '${newPupilIdentity.group}, ${newPupilIdentity.firstName}, Geburtstag: ${newPupilIdentity.birthday},\n ';
       }
     }
+    _log.info('Pupil identities with birthday:\n$pupilIdentitiesWithBirthday');
 
-    await writePupilIdentitiesToStorage();
+    await _writePupilIdentitiesToStorage();
 
     if (updateGroupFilters) {
       final availableGroups = _pupilIdentities.values
@@ -214,57 +165,65 @@ class PupilIdentityManager {
       _groups.value = availableGroups;
       di<PupilsFilter>().populateGroupFilters(availableGroups.toList());
     }
+    di<PupilProxyManager>().clearData();
     await di<EnvManager>().updateActiveEnv(
-      lastIdentitiesUpdate: DateTime.now().toUtc(),
+      lastIdentitiesUpdate: normalizedUpdateTimestamp,
     );
-    di<PupilManager>().fetchAllPupils();
+    di<PupilProxyManager>().fetchAllPupils();
     _mainMenuBottomNavManager.setBottomNavPage(0);
   }
 
-  Future<void> writePupilIdentitiesToStorage() async {
+  Future<void> _writePupilIdentitiesToStorage() async {
     final Map<String, Map<String, dynamic>> jsonMap = _pupilIdentities.map(
       (key, value) => MapEntry(key.toString(), value.toJson()),
     );
 
     final jsonPupilIdentitiesAsString = json.encode(jsonMap);
-    await HubSecureStorage().setString(
-      secureStorageKey,
-      jsonPupilIdentitiesAsString,
-    );
-    _log.info(
-      'Pupil identities written to secure storage with key $secureStorageKey',
-    );
+
+    try {
+      await HubSecureStorage().setString(
+        _secureStorageKey,
+        jsonPupilIdentitiesAsString,
+      );
+      _log.info(
+        '${_pupilIdentities.length} pupil identities written to secure storage with key $_secureStorageKey',
+      );
+    } catch (e, stack) {
+      _log.severe(
+        'Failed to write ${_pupilIdentities.length} pupil identities to secure storage with key $_secureStorageKey: $e',
+        e,
+        stack,
+      );
+      rethrow;
+    }
   }
 
-  Future<void> updateBackendPupilsWithSchoolPupilIdentitySource(
+  Future<void> updateServerFromPupilIdentityExternalSource(
     String textFileContent,
   ) async {
     // The pupils in the string are separated by a line break - let's split them out
-    List<String> splittedPupilIdentities = textFileContent.split('\n');
+    List<String> pupilIdentityTextLines = textFileContent.split('\n');
     // Wer prepare a string with the pupils that are going to be updated later in the server
     String pupilListTxtFileContentForBackendUpdate = '';
     // The properties are separated by commas, let's build the pupilbase objects with them
     List<PupilIdentity> importedPupilIdentityList = [];
 
-    for (String data in splittedPupilIdentities) {
-      if (data != '') {
-        List<String> pupilIdentityValues = data.split(',');
-
+    for (String textLine in pupilIdentityTextLines) {
+      if (textLine != '') {
         PupilIdentity pupilIdentity =
-            PupilIdentityHelper.decodePupilIdentityFromStringList(
-              pupilIdentityValues,
-            );
+            PupilIdentityHelper.decodePupilIdentityFromTextLine(textLine);
 
         importedPupilIdentityList.add(pupilIdentity);
 
-        final bool ogsStatus = pupilIdentityValues[14] == 'OFFGANZ'
+        final bool afterSchoolCareStatus = textLine.split(',')[14] == 'OFFGANZ'
             ? true
             : false;
 
-        final idAndOgsStatus =
-            '${int.parse(pupilIdentityValues[0])},$ogsStatus';
+        final internalIdAndAfterSchoolCareData =
+            '${int.parse(textLine.split(',')[0])},$afterSchoolCareStatus';
 
-        pupilListTxtFileContentForBackendUpdate += '$idAndOgsStatus\n';
+        pupilListTxtFileContentForBackendUpdate +=
+            '$internalIdAndAfterSchoolCareData\n';
       }
     }
     // We have the latest dataset from the school database.
@@ -288,6 +247,16 @@ class PupilIdentityManager {
       );
       return;
     }
+
+    // The backend successfuly updated the pupils, let's get the new update timestamp
+    final updateTimestamp = await PupilDataApiService()
+        .fetchLastIdentitiesUpdate();
+
+    // Now we need to store the updated pupil identities in storage
+    updatePupilIdentitiesFromUnencryptedSource(
+      pupilIdentityTextLines: textFileContent,
+      updateTimestamp: updateTimestamp,
+    );
     final List<PupilData>? updatedPupilDataRepository =
         await PupilDataApiService().updateBackendPupilsDatabase(
           filePath: fileResponse.path!,
@@ -296,7 +265,7 @@ class PupilIdentityManager {
       return;
     }
     for (PupilData pupil in updatedPupilDataRepository) {
-      di<PupilManager>().updatePupilProxyWithPupilData(pupil);
+      di<PupilProxyManager>().updatePupilProxyWithPupilData(pupil);
     }
     // We don't need the temp file any more, let's delete it
     textFile.delete();
@@ -305,7 +274,6 @@ class PupilIdentityManager {
       _pupilIdentities[element.id] = element;
     }
 
-    await writePupilIdentitiesToStorage();
     // This is the new reference data for all the clients to adopt.
     // We need to update the active environment and the backend with the new last identities update.
     final newLastIdentitiesUpdate = DateTime.now().toUtc();
@@ -315,7 +283,7 @@ class PupilIdentityManager {
     await PupilDataApiService().updateLastIdentitiesUpdate(
       newLastIdentitiesUpdate,
     );
-    await di<PupilManager>().fetchAllPupils();
+    await di<PupilProxyManager>().fetchAllPupils();
 
     _notificationService.showSnackBar(
       NotificationType.success,
@@ -327,421 +295,40 @@ class PupilIdentityManager {
     return;
   }
 
-  Future<void> fetchLastIdentitiesUpdate() async {
+  Future<void> fetchServerIdentitiesTimestamp() async {
     final lastUpdate = await PupilDataApiService().fetchLastIdentitiesUpdate();
     if (lastUpdate == null) {
       _notificationService.showSnackBar(
         NotificationType.error,
-        'Die letzte Aktualisierung konnte nicht geladen werden',
+        'Zeitstempel für die letzte Aktualisierung der personenbezogenen Daten konnte nicht geladen werden',
       );
       return;
     }
     _notificationService.showSnackBar(
       NotificationType.success,
-      'Letzte Aktualisierung: ${lastUpdate.formatDateForUser()}',
+      'Letzte Aktualisierung personenbezogener Daten: ${lastUpdate.formatDateForUser()}',
     );
   }
 
-  Future<String> generateEncryptedPupilIdentitiesTransferString(
-    List<int> internalIds,
-  ) async {
-    String transferString = '';
-    for (int internalId in internalIds) {
-      PupilIdentity pupilIdentity = _pupilIdentities[internalId]!;
-      final migrationSupportEnds = pupilIdentity.migrationSupportEnds != null
-          ? pupilIdentity.migrationSupportEnds!.formatDateForJson()
-          : '';
-      // We need
-      final specialNeeds = pupilIdentity.specialNeeds ?? '';
-      final family = pupilIdentity.family ?? '';
-
-      final String pupilIdentityString =
-          [
-            pupilIdentity.id.toString(),
-            pupilIdentity.firstName,
-            pupilIdentity.lastName,
-            pupilIdentity.group,
-            pupilIdentity.groupTutor,
-            pupilIdentity.schoolGrade,
-            specialNeeds,
-            '', // this is a placeholder for the second special needs field in the administrative data source
-            pupilIdentity.gender,
-            pupilIdentity.language,
-            family,
-            pupilIdentity.birthday.formatDateForJson(),
-            migrationSupportEnds,
-            pupilIdentity.pupilSince.formatDateForJson(),
-            pupilIdentity.afterSchoolCare ? 'OFFGANZ' : '',
-            pupilIdentity.religion ?? '',
-            pupilIdentity.religionLessonsSince?.formatDateForJson() ?? '',
-            pupilIdentity.religionLessonsCancelledAt?.formatDateForJson() ?? '',
-            pupilIdentity.familyLanguageLessonsSince?.formatDateForJson() ?? '',
-            pupilIdentity.leavingDate?.formatDateForJson() ?? '',
-          ].join(',') +
-          ',\n';
-      transferString = transferString + pupilIdentityString;
-    }
-    final encryptedString = customEncrypter.encryptString(transferString);
-    return encryptedString;
-  }
-
   Future<String> deleteOrphanPupilIdentities(
     List<int> toBeDeletedPupilIds,
   ) async {
-    List<String> toBeDeletedPupilIdentities = [];
+    List<String> deletedPupilIdentities = [];
 
     for (int id in toBeDeletedPupilIds) {
-      toBeDeletedPupilIdentities.add(
+      deletedPupilIdentities.add(
         '${_pupilIdentities[id]!.firstName} ${_pupilIdentities[id]!.lastName}, ${_pupilIdentities[id]!.group}',
       );
 
       _pupilIdentities.remove(id);
     }
 
-    writePupilIdentitiesToStorage();
+    _writePupilIdentitiesToStorage();
 
     _log.info(
-      ' ${toBeDeletedPupilIds.length} pupils are not in the database any more and wer deleted.',
+      ' ${toBeDeletedPupilIds.length} pupils are not in the database any more and were deleted.',
     );
 
-    return toBeDeletedPupilIdentities.join('\n');
-  }
-
-  StreamSubscription<PupilIdentityDto> encryptedPupilIdsStreamSubscription({
-    required String channelName,
-    required PupilIdentityStreamRole role,
-    String? encryptedPupilIds,
-    required Function() onConnected,
-    required Function(String message) onStatusUpdate,
-    required Function() onCompleted,
-    Function(String userName)? onReceiverJoined, // New callback
-    Function(String userName)?
-    onReceiverLeft, // New callback for receiver leaving
-    Function(String userName)? onRequestReceived, // New callback
-    Function()? onRequestConfirmed, // New callback
-    Function(bool wasAutoRejected)?
-    onRequestRejected, // New callback for rejection
-    Function()? onShouldPopPage, // New callback for receiver
-    Function(String message)?
-    onSenderShutdown, // New callback for sender shutdown
-    Function(int newCount, int totalCount)?
-    onDataReceived, // New callback for showing success info
-  }) {
-    _log.info(
-      'encryptedPupilIdsStreamSubscription called with channelName: $channelName and role: $role',
-    );
-    final _client = di<Client>();
-    _log.info('starting encryptedPupilIdsStreamSubscription');
-    // just in case we have a previous subscription, we cancel it first
-    _encryptedPupilIdsSubscription?.cancel();
-    _encryptedPupilIdsSubscription = _client.pupilIdentity
-        .streamEncryptedPupilIds(channelName)
-        .listen(
-          (PupilIdentityDto event) async {
-            _log.info('Received event: [${event.type}] from ${event.sender}');
-            final eventSender = event.sender;
-            switch (role) {
-              //- Stream behavior for sender role
-              case PupilIdentityStreamRole.sender:
-                // - Handle the event based on its type
-                switch (event.type) {
-                  case 'joined':
-                    // Receiver joined the stream
-                    if (onReceiverJoined != null) {
-                      onReceiverJoined(eventSender);
-                    }
-                    onStatusUpdate(
-                      'Empfänger $eventSender ist der Übertragung beigetreten.',
-                    );
-                    break;
-                  case 'request':
-                    // Receiver requests data
-                    if (onRequestReceived != null) {
-                      onRequestReceived(eventSender);
-                    }
-                    onStatusUpdate(
-                      'Empfänger $eventSender hat Daten angefordert. Warten auf Bestätigung...',
-                    );
-                    break;
-                  case 'confirmed':
-                    // Check if confirmation is for a specific user
-                    final targetUser = event.value.isNotEmpty
-                        ? event.value
-                        : null;
-                    if (targetUser == null) {
-                      // Legacy: no targeting, proceed for any receiver
-                      if (onRequestConfirmed != null) {
-                        onRequestConfirmed();
-                      }
-                      onStatusUpdate('Sende Daten...');
-                      await _client.pupilIdentity.sendPupilIdentityMessage(
-                        channelName,
-                        PupilIdentityDto(
-                          sender:
-                              di<HubSessionManager>().user!.userInfo!.userName!,
-                          dataTimeStamp:
-                              di<EnvManager>().activeEnv?.lastIdentitiesUpdate,
-                          type: 'data',
-                          value: encryptedPupilIds ?? '',
-                        ),
-                      );
-                      onStatusUpdate(
-                        'Daten gesendet. Warte auf Bestätigung...',
-                      );
-                    } else {
-                      // Targeted: send data to specific user
-                      if (onRequestConfirmed != null) {
-                        onRequestConfirmed();
-                      }
-                      onStatusUpdate('Sende Daten an $targetUser...');
-                      await _client.pupilIdentity.sendPupilIdentityMessage(
-                        channelName,
-                        PupilIdentityDto(
-                          sender:
-                              di<HubSessionManager>().user!.userInfo!.userName!,
-                          type: 'data',
-                          dataTimeStamp:
-                              di<EnvManager>().activeEnv?.lastIdentitiesUpdate,
-                          value: '$targetUser:${encryptedPupilIds ?? ''}',
-                        ),
-                      );
-                      onStatusUpdate(
-                        'Daten an $targetUser gesendet. Warte auf Bestätigung...',
-                      );
-                    }
-                    break;
-                  case 'ok':
-                    onCompleted();
-                    onStatusUpdate(
-                      'Datenübertragung erfolgreich abgeschlossen!',
-                    );
-                    _log.info('Receiver acknowledged the data');
-                    break;
-                  case 'rejected':
-                    onStatusUpdate('Anfrage wurde vom Sender abgelehnt.');
-                    _log.info('Request was rejected by sender');
-                    break;
-                  case 'close':
-                    // Receiver left the stream
-                    _log.info('Receiver ${event.value} left the stream');
-                    onStatusUpdate(
-                      'Empfänger ${event.value} hat die Verbindung beendet.',
-                    );
-                    if (onReceiverLeft != null) {
-                      onReceiverLeft(event.value);
-                    }
-                    break;
-                }
-                break;
-              //- Stream behavior for receiver role
-              case PupilIdentityStreamRole.receiver:
-                switch (event.type) {
-                  case 'rejected':
-                    // Check if rejection is targeted to this user
-                    String targetUser = event.value;
-                    bool isAutoRejection = false;
-
-                    // Check if this is an auto-rejection (prefixed with 'auto:')
-                    if (targetUser.startsWith('auto:')) {
-                      isAutoRejection = true;
-                      targetUser = targetUser.substring(
-                        5,
-                      ); // Remove 'auto:' prefix
-                    }
-
-                    final currentUserName =
-                        di<HubSessionManager>().user?.userInfo?.userName;
-
-                    if (targetUser.isEmpty || targetUser == currentUserName) {
-                      onStatusUpdate('Anfrage wurde vom Sender abgelehnt.');
-                      if (onRequestRejected != null) {
-                        onRequestRejected(isAutoRejection);
-                      }
-                      _log.info(
-                        'Request was rejected by sender (auto: $isAutoRejection)',
-                      );
-
-                      // Close the connection to kick the receiver off the stream
-                      _encryptedPupilIdsSubscription?.cancel();
-                      _encryptedPupilIdsSubscription = null;
-                    }
-                    // If rejection is for another user, ignore it
-                    break;
-                  case 'data':
-                    // Check if data is targeted to this user
-                    final currentUserName =
-                        di<HubSessionManager>().user?.userInfo?.userName;
-                    String actualData = event.value;
-
-                    if (event.value.contains(':')) {
-                      final parts = event.value.split(':');
-                      if (parts.length >= 2) {
-                        final targetUser = parts[0];
-                        if (targetUser != currentUserName) {
-                          // Data is not for this user, ignore it
-                          _log.info(
-                            'Data received for $targetUser, ignoring as current user is $currentUserName',
-                          );
-                          break;
-                        }
-                        // Extract actual data after removing target prefix
-                        actualData = parts.sublist(1).join(':');
-                      }
-                    }
-
-                    onStatusUpdate(
-                      'Verschlüsselte Schülerdaten empfangen. Verarbeite...',
-                    );
-                    _log.info(
-                      'Received encrypted pupil identities dated on ${event.dataTimeStamp}.',
-                    );
-
-                    try {
-                      final beforeCount = _pupilIdentities.length;
-                      final dataUpdateIsUpToDate = event.dataTimeStamp!.isAfter(
-                        di<EnvManager>().activeEnv!.lastIdentitiesUpdate!,
-                      );
-
-                      _log.info('''Received newer pupil identities:
-                      Timestamp: ${event.dataTimeStamp}
-                      Last identities update: ${di<EnvManager>().activeEnv!.lastIdentitiesUpdate}
-                      ''');
-                      if (!dataUpdateIsUpToDate) {
-                        // Send confirmation
-                        await _client.pupilIdentity.sendPupilIdentityMessage(
-                          channelName,
-                          PupilIdentityDto(
-                            sender: di<HubSessionManager>()
-                                .user!
-                                .userInfo!
-                                .userName!,
-                            type: 'ok',
-                            value: '',
-                          ),
-                        );
-
-                        onCompleted();
-                        onStatusUpdate('Schülerdaten sind veraltet!');
-                        _encryptedPupilIdsSubscription!.cancel();
-                        if (onRequestRejected != null) {
-                          onRequestRejected(false);
-                        }
-                        _notificationService.showInformationDialog(
-                          'Schülerdaten sind veraltet und wurden nicht verarbeitet.',
-                        );
-
-                        return;
-                      }
-                      await updatePupilIdentitiesFromEncryptedSource([
-                        actualData,
-                      ]);
-                      final afterCount = _pupilIdentities.length;
-                      final newCount = afterCount - beforeCount;
-                      // Set the last identities update to the received data time stamp
-                      di<EnvManager>().updateActiveEnv(
-                        lastIdentitiesUpdate: event.dataTimeStamp,
-                      );
-
-                      // Send confirmation
-                      await _client.pupilIdentity.sendPupilIdentityMessage(
-                        channelName,
-                        PupilIdentityDto(
-                          sender:
-                              di<HubSessionManager>().user!.userInfo!.userName!,
-                          type: 'ok',
-                          value: '',
-                        ),
-                      );
-
-                      onCompleted();
-                      onStatusUpdate(
-                        'Schülerdaten erfolgreich empfangen und verarbeitet!',
-                      );
-
-                      // Call the data received callback with count information
-                      if (onDataReceived != null) {
-                        onDataReceived(newCount, afterCount);
-                      } else if (onShouldPopPage != null) {
-                        // Fallback: if no data received callback, use the old pop page callback
-                        onShouldPopPage();
-                      }
-
-                      _encryptedPupilIdsSubscription!.cancel();
-                    } catch (e) {
-                      _log.severe('Error processing received data: $e');
-                      onStatusUpdate('Fehler beim Verarbeiten der Daten: $e');
-                    }
-                    break;
-                  case 'shutdown':
-                    // Sender has shut down the stream
-                    _log.info('Sender has shut down the stream');
-                    onStatusUpdate('Der Sender hat den Stream beendet.');
-                    if (onSenderShutdown != null) {
-                      onSenderShutdown(event.value);
-                    }
-                    // Close the connection
-                    _encryptedPupilIdsSubscription?.cancel();
-                    _encryptedPupilIdsSubscription = null;
-                    break;
-                }
-            }
-          },
-          onError: (error) async {
-            final errorString = error.toString();
-            _log.severe('Error in pupil identity stream: $error');
-            if (error.toString().contains('Unauthorized')) {
-              _encryptedPupilIdsSubscription!.cancel();
-              return di<HubSessionManager>().signOutDevice();
-            } else if (error.toString().contains(
-              'Netzwerkverbindung abgelehnt',
-            )) {
-              // TODO: Implement server not responding
-              //- This is very buggy
-              _notificationService.showInformationDialog(
-                'Der Server konnte nicht gefunden werden. Bitte überprüfen Sie Ihre Internetverbindung und versuchen Sie es erneut.',
-              );
-            } else {
-              _log.severe('Error in pupil identity stream: $errorString');
-              // _notificationService.showSnackBar(
-              //   NotificationType.error,
-              //   'Ein unbekannter Fehler ist aufgetreten: $errorString',
-              // );
-            }
-            // retry the subscription after a delay
-            await Future.delayed(const Duration(seconds: 1));
-            _encryptedPupilIdsSubscription!.cancel();
-            encryptedPupilIdsStreamSubscription(
-              channelName: channelName,
-              role: role,
-              encryptedPupilIds: encryptedPupilIds,
-              onConnected: onConnected,
-              onStatusUpdate: onStatusUpdate,
-              onCompleted: onCompleted,
-              onReceiverJoined: onReceiverJoined,
-              onRequestReceived: onRequestReceived,
-              onRequestConfirmed: onRequestConfirmed,
-              onRequestRejected: onRequestRejected,
-              onShouldPopPage: onShouldPopPage,
-              onDataReceived: onDataReceived,
-              onSenderShutdown: onSenderShutdown,
-            );
-          },
-          onDone: () {
-            _notificationService.showSnackBar(
-              NotificationType.success,
-              'Verbindung zum Client geschlossen.',
-            );
-          },
-        );
-
-    // Call onConnected immediately after subscription is established
-    _log.info(
-      'Stream subscription established for channel: $channelName with role: $role',
-    );
-    onConnected();
-
-    return _encryptedPupilIdsSubscription!;
+    return deletedPupilIdentities.join('\n');
   }
 }
-
-enum PupilIdentityDtoType { request, data, ok }
diff --git a/school_data_hub_flutter/lib/features/pupil/domain/pupil_identity_stream_suscription.dart b/school_data_hub_flutter/lib/features/pupil/domain/pupil_identity_stream_suscription.dart
new file mode 100644
index 00000000..514ccdac
--- /dev/null
+++ b/school_data_hub_flutter/lib/features/pupil/domain/pupil_identity_stream_suscription.dart
@@ -0,0 +1,432 @@
+import 'dart:async';
+
+import 'package:logging/logging.dart';
+import 'package:school_data_hub_client/school_data_hub_client.dart';
+import 'package:school_data_hub_flutter/common/services/notification_service.dart';
+import 'package:school_data_hub_flutter/core/env/env_manager.dart';
+import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/models/enums.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_manager.dart';
+import 'package:watch_it/watch_it.dart';
+
+// enum PupilIdentityDtoType { request, data, ok }
+
+class PupilIdentityStream {
+  StreamSubscription<PupilIdentityDto>? _encryptedPupilIdsSubscription;
+
+  final Logger _log = Logger('PupilIdentityStream');
+
+  StreamSubscription<PupilIdentityDto> encryptedPupilIdsStreamSubscription({
+    required String channelName,
+    required PupilIdentityStreamRole role,
+    String? encryptedPupilIds,
+    required Function() onConnected,
+    required Function(String message) onStatusUpdate,
+    required Function() onCompleted,
+    Function(String userName)? onReceiverJoined, // New callback
+    Function(String userName)?
+    onReceiverLeft, // New callback for receiver leaving
+    Function(String userName)? onRequestReceived, // New callback
+    Function()? onRequestConfirmed, // New callback
+    Function(bool wasAutoRejected)?
+    onRequestRejected, // New callback for rejection
+    Function()? onShouldPopPage, // New callback for receiver
+    Function(String message)?
+    onSenderShutdown, // New callback for sender shutdown
+    Function(int newCount, int totalCount)?
+    onDataReceived, // New callback for showing success info
+  }) {
+    final _notificationService = di<NotificationService>();
+
+    _log.info(
+      'encryptedPupilIdsStreamSubscription called with channelName: $channelName and role: $role',
+    );
+    final _client = di<Client>();
+    _log.info(
+      '[${role.name.toUpperCase()}]: starting encryptedPupilIdsStreamSubscription',
+    );
+    // just in case we have a previous subscription, we cancel it first
+    _encryptedPupilIdsSubscription?.cancel();
+    _encryptedPupilIdsSubscription = _client.pupilIdentity
+        .streamEncryptedPupilIds(channelName)
+        .listen(
+          (PupilIdentityDto event) async {
+            final eventSender = event.sender;
+            _log.info(
+              '[${role.name.toUpperCase()}]: [${event.type}] Received event from $eventSender',
+            );
+
+            switch (role) {
+              //- Stream behavior for sender role
+              case PupilIdentityStreamRole.sender:
+                // - Handle the event based on its type
+                switch (event.type) {
+                  case 'joined':
+                    // Receiver joined the stream
+                    if (onReceiverJoined != null) {
+                      onReceiverJoined(eventSender);
+                    }
+                    onStatusUpdate(
+                      'Empfänger $eventSender ist der Übertragung beigetreten.',
+                    );
+                    break;
+                  case 'request':
+                    // Receiver requests data
+                    if (onRequestReceived != null) {
+                      onRequestReceived(eventSender);
+                    }
+                    onStatusUpdate(
+                      'Empfänger $eventSender hat Daten angefordert. Warten auf Bestätigung...',
+                    );
+                    break;
+                  case 'confirmed':
+                    // Ignore confirmations sent by ourselves to avoid double sending
+                    final currentUser =
+                        di<HubSessionManager>().user?.userInfo?.userName;
+                    if (eventSender == currentUser) {
+                      _log.fine(
+                        '[${role.name.toUpperCase()}] [${event.type}] from $eventSender: Ignoring self-confirmation message.',
+                      );
+                      break;
+                    }
+
+                    // Check if confirmation is for a specific user
+                    final targetUser = event.value.isNotEmpty
+                        ? event.value
+                        : null;
+                    if (targetUser == null) {
+                      // Legacy: no targeting, proceed for any receiver
+                      if (onRequestConfirmed != null) {
+                        onRequestConfirmed();
+                      }
+                      onStatusUpdate('Sende Daten...');
+                      await _client.pupilIdentity.sendPupilIdentityMessage(
+                        channelName,
+                        PupilIdentityDto(
+                          sender:
+                              di<HubSessionManager>().user!.userInfo!.userName!,
+                          dataTimeStamp:
+                              di<EnvManager>().activeEnv?.lastIdentitiesUpdate,
+                          type: 'data',
+                          value: encryptedPupilIds ?? '',
+                        ),
+                      );
+                      onStatusUpdate(
+                        'Daten gesendet. Warte auf Bestätigung...',
+                      );
+                    } else {
+                      // Targeted: send data to specific user
+                      if (onRequestConfirmed != null) {
+                        onRequestConfirmed();
+                      }
+                      _log.info(
+                        '[${role.name.toUpperCase()}] [${event.type}] from $eventSender: Sending data to $targetUser',
+                      );
+                      onStatusUpdate('Sende Daten an $targetUser...');
+                      await _client.pupilIdentity.sendPupilIdentityMessage(
+                        channelName,
+                        PupilIdentityDto(
+                          sender:
+                              di<HubSessionManager>().user!.userInfo!.userName!,
+                          type: 'data',
+                          dataTimeStamp:
+                              di<EnvManager>().activeEnv?.lastIdentitiesUpdate,
+                          value: '$targetUser:${encryptedPupilIds ?? ''}',
+                        ),
+                      );
+                      onStatusUpdate(
+                        'Daten an $targetUser gesendet. Warte auf Bestätigung...',
+                      );
+                    }
+                    break;
+                  case 'ok':
+                    onCompleted();
+                    onStatusUpdate(
+                      'Datenübertragung erfolgreich abgeschlossen!',
+                    );
+                    _log.info(
+                      '[${role.name.toUpperCase()}]: Receiver acknowledged the data.',
+                    );
+                    break;
+                  case 'rejected':
+                    onStatusUpdate('Anfrage wurde vom Sender abgelehnt.');
+                    _log.info(
+                      '[${role.name.toUpperCase()}] [${event.type}] from $eventSender: Request was rejected by sender',
+                    );
+                    break;
+                  case 'close':
+                    // Receiver left the stream
+                    _log.info(
+                      '[${role.name.toUpperCase()}] [${event.type}] from $eventSender: Receiver ${event.value} left the stream',
+                    );
+                    onStatusUpdate(
+                      'Empfänger ${event.value} hat die Verbindung beendet.',
+                    );
+                    if (onReceiverLeft != null) {
+                      onReceiverLeft(event.value);
+                    }
+                    break;
+                }
+                break;
+              //- Stream behavior for receiver role
+              case PupilIdentityStreamRole.receiver:
+                switch (event.type) {
+                  case 'rejected':
+                    // Check if rejection is targeted to this user
+                    String targetUser = event.value;
+                    bool isAutoRejection = false;
+
+                    // Check if this is an auto-rejection (prefixed with 'auto:')
+                    if (targetUser.startsWith('auto:')) {
+                      isAutoRejection = true;
+                      targetUser = targetUser.substring(
+                        5,
+                      ); // Remove 'auto:' prefix
+                    }
+
+                    final currentUserName =
+                        di<HubSessionManager>().user?.userInfo?.userName;
+
+                    if (targetUser.isEmpty || targetUser == currentUserName) {
+                      onStatusUpdate('Anfrage wurde vom Sender abgelehnt.');
+                      if (onRequestRejected != null) {
+                        onRequestRejected(isAutoRejection);
+                      }
+                      _log.info(
+                        '[${role.name.toUpperCase()}] [${event.type}] from $eventSender: Request was rejected by sender (auto: $isAutoRejection)',
+                      );
+
+                      // Close the connection to kick the receiver off the stream
+                      _encryptedPupilIdsSubscription?.cancel();
+                      _encryptedPupilIdsSubscription = null;
+                    }
+                    // If rejection is for another user, ignore it
+                    break;
+                  case 'data':
+                    // Check if data is targeted to this user
+                    final currentUserName =
+                        di<HubSessionManager>().user?.userInfo?.userName;
+
+                    String actualData = event.value;
+
+                    if (event.value.contains(':')) {
+                      final parts = event.value.split(':');
+                      if (parts.length >= 2) {
+                        final targetUser = parts[0];
+                        if (targetUser != currentUserName) {
+                          // Data is not for this user, ignore it
+                          _log.info(
+                            '[${role.name.toUpperCase()}] [${event.type}] from $eventSender: Data received for $targetUser, ignoring as current user is $currentUserName',
+                          );
+                          break;
+                        }
+                        // Extract actual data after removing target prefix
+                        actualData = parts.sublist(1).join(':');
+                      }
+                    }
+
+                    onStatusUpdate(
+                      'Verschlüsselte Schülerdaten empfangen. Verarbeite...',
+                    );
+                    _log.info(
+                      '[${role.name.toUpperCase()}] [${event.type}] from $eventSender: Received encrypted pupil identities dated on ${event.dataTimeStamp}.',
+                    );
+
+                    try {
+                      final beforeCount =
+                          di<PupilIdentityManager>().pupilIdentities.length;
+
+                      // final dataUpdateIsUpToDate = event.dataTimeStamp!.isAfter(
+                      //   di<EnvManager>().activeEnv!.lastIdentitiesUpdate!,
+                      // );
+
+                      _log.info('''Received newer pupil identities:
+                      Timestamp: ${event.dataTimeStamp}
+                      Last identities update: ${di<EnvManager>().activeEnv!.lastIdentitiesUpdate}
+                      ''');
+                      // if (!dataUpdateIsUpToDate) {
+                      //   // Send confirmation
+                      //   await _client.pupilIdentity.sendPupilIdentityMessage(
+                      //     channelName,
+                      //     PupilIdentityDto(
+                      //       sender: di<HubSessionManager>()
+                      //           .user!
+                      //           .userInfo!
+                      //           .userName!,
+                      //       type: 'ok',
+                      //       value: '',
+                      //     ),
+                      //   );
+
+                      //   onCompleted();
+                      //   onStatusUpdate('Schülerdaten sind veraltet!');
+                      //   _encryptedPupilIdsSubscription!.cancel();
+                      //   if (onRequestRejected != null) {
+                      //     onRequestRejected(false);
+                      //   }
+                      //   _notificationService.showInformationDialog(
+                      //     'Schülerdaten sind veraltet und wurden nicht verarbeitet.',
+                      //   );
+
+                      //   return;
+                      // }
+                      await di<PupilIdentityManager>()
+                          .updatePupilIdentitiesFromEncryptedText(
+                            event.dataTimeStamp!,
+                            actualData,
+                          );
+                      final afterCount =
+                          di<PupilIdentityManager>().pupilIdentities.length;
+                      final newCount = afterCount - beforeCount;
+                      // Set the last identities update to the received data time stamp
+                      di<EnvManager>().updateActiveEnv(
+                        lastIdentitiesUpdate: event.dataTimeStamp?.toUtc(),
+                      );
+
+                      // Send confirmation
+                      await _client.pupilIdentity.sendPupilIdentityMessage(
+                        channelName,
+                        PupilIdentityDto(
+                          sender:
+                              di<HubSessionManager>().user!.userInfo!.userName!,
+                          type: 'ok',
+                          value: '',
+                        ),
+                      );
+
+                      onCompleted();
+                      onStatusUpdate(
+                        'Schülerdaten erfolgreich empfangen und verarbeitet!',
+                      );
+
+                      // Call the data received callback with count information
+                      if (onDataReceived != null) {
+                        onDataReceived(newCount, afterCount);
+                      } else if (onShouldPopPage != null) {
+                        // Fallback: if no data received callback, use the old pop page callback
+                        onShouldPopPage();
+                      }
+
+                      _encryptedPupilIdsSubscription!.cancel();
+                    } catch (e) {
+                      _log.severe(
+                        '[${role.name.toUpperCase()}] [${event.type}] from $eventSender: Error processing received data: $e',
+                      );
+                      onStatusUpdate('Fehler beim Verarbeiten der Daten: $e');
+                    }
+                    break;
+                  case 'shutdown':
+                    // Sender has shut down the stream
+                    _log.info(
+                      '[${role.name.toUpperCase()}] [${event.type}] from $eventSender: Sender has shut down the stream',
+                    );
+                    onStatusUpdate('Der Sender hat den Stream beendet.');
+                    if (onSenderShutdown != null) {
+                      onSenderShutdown(event.value);
+                    }
+                    // Close the connection
+                    _encryptedPupilIdsSubscription?.cancel();
+                    _encryptedPupilIdsSubscription = null;
+                    break;
+                }
+            }
+          },
+          onError: (error) async {
+            final errorString = error.toString();
+            _log.severe('Error in pupil identity stream: $error');
+            if (error.toString().contains('Unauthorized')) {
+              _encryptedPupilIdsSubscription!.cancel();
+              return di<HubSessionManager>().signOutDevice();
+            } else if (error.toString().contains(
+              'Netzwerkverbindung abgelehnt',
+            )) {
+              // TODO: Implement server not responding
+              //- This is very buggy
+              _notificationService.showInformationDialog(
+                'Der Server konnte nicht gefunden werden. Bitte überprüfen Sie Ihre Internetverbindung und versuchen Sie es erneut.',
+              );
+            } else {
+              _log.severe(
+                '[${role.name.toUpperCase()}] : Error in pupil identity stream: $errorString',
+              );
+              // _notificationService.showSnackBar(
+              //   NotificationType.error,
+              //   'Ein unbekannter Fehler ist aufgetreten: $errorString',
+              // );
+            }
+            // retry the subscription after a delay
+            await Future.delayed(const Duration(seconds: 1));
+            _encryptedPupilIdsSubscription!.cancel();
+            _log.warning(
+              '[${role.name.toUpperCase()}] : Retrying subscription after error',
+            );
+            encryptedPupilIdsStreamSubscription(
+              channelName: channelName,
+              role: role,
+              encryptedPupilIds: encryptedPupilIds,
+              onConnected: onConnected,
+              onStatusUpdate: onStatusUpdate,
+              onCompleted: onCompleted,
+              onReceiverJoined: onReceiverJoined,
+              onRequestReceived: onRequestReceived,
+              onRequestConfirmed: onRequestConfirmed,
+              onRequestRejected: onRequestRejected,
+              onShouldPopPage: onShouldPopPage,
+              onDataReceived: onDataReceived,
+              onSenderShutdown: onSenderShutdown,
+            );
+          },
+          onDone: () {
+            _notificationService.showSnackBar(
+              NotificationType.success,
+              'Verbindung zum Client geschlossen.',
+            );
+          },
+        );
+
+    // Call onConnected immediately after subscription is established
+    _log.info(
+      '[${role.name.toUpperCase()}]: Stream subscription established for channel: $channelName',
+    );
+    onConnected();
+
+    return _encryptedPupilIdsSubscription!;
+  }
+
+  bool _isReceivedDataUpToDateOrNewer(DateTime dataTimeStamp) {
+    if (di<EnvManager>().activeEnv!.lastIdentitiesUpdate == null) {
+      _log.warning(
+        '[Timestamp]: No last identities update found, so there is still no data',
+      );
+      return true;
+    }
+    if (dataTimeStamp.isBefore(
+      di<PupilIdentityManager>().remoteLastIdentitiesUpdate.value!,
+    )) {
+      _log.warning(
+        '[Timestamp]: Received data is older than the last identities update',
+      );
+      return false;
+    }
+    if (dataTimeStamp.isBefore(
+      di<PupilIdentityManager>().remoteLastIdentitiesUpdate.value!,
+    )) {
+      _log.warning(
+        '[Timestamp]: Received data is older than the remote last identities update',
+      );
+      return true;
+    }
+    if (dataTimeStamp.isAtSameMomentAs(
+      di<PupilIdentityManager>().remoteLastIdentitiesUpdate.value!,
+    )) {
+      _log.warning(
+        '[Timestamp]: Received data is up to date with the remote last identities timestamp',
+      );
+      return true;
+    }
+
+    return dataTimeStamp.isAfter(
+      di<EnvManager>().activeEnv!.lastIdentitiesUpdate!,
+    );
+  }
+}
diff --git a/school_data_hub_flutter/lib/features/pupil/domain/pupil_mutator.dart b/school_data_hub_flutter/lib/features/pupil/domain/pupil_mutator.dart
index 14cb416e..41861e57 100644
--- a/school_data_hub_flutter/lib/features/pupil/domain/pupil_mutator.dart
+++ b/school_data_hub_flutter/lib/features/pupil/domain/pupil_mutator.dart
@@ -7,7 +7,7 @@ import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/data/pupil_data_api_service.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/enums.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
 class PupilMutator {
@@ -22,7 +22,7 @@ class PupilMutator {
 
   final _cacheManager = di<DefaultCacheManager>();
   final _pupilDataApiService = PupilDataApiService();
-  final _pupilManager = di<PupilManager>();
+  final _pupilManager = di<PupilProxyManager>();
   final _hubSessionManager = di<HubSessionManager>();
 
   Future<void> updateStringProperty({
@@ -351,7 +351,7 @@ class PupilMutator {
   }) async {
     // first we get the current after school care value or create a new one if it is null
     final afterSchoolCarePupilValue =
-        di<PupilManager>().getPupilByPupilId(pupilId)!.afterSchoolCare ??
+        di<PupilProxyManager>().getPupilByPupilId(pupilId)!.afterSchoolCare ??
         AfterSchoolCare();
     AfterSchoolCarePickUpTimes? pickUpTimes =
         afterSchoolCarePupilValue.pickUpTimes ?? AfterSchoolCarePickUpTimes();
diff --git a/school_data_hub_flutter/lib/features/pupil/domain/pupil_helper_functions.dart b/school_data_hub_flutter/lib/features/pupil/domain/pupil_proxy_helper.dart
similarity index 99%
rename from school_data_hub_flutter/lib/features/pupil/domain/pupil_helper_functions.dart
rename to school_data_hub_flutter/lib/features/pupil/domain/pupil_proxy_helper.dart
index 878e6ea8..b1a3ef43 100644
--- a/school_data_hub_flutter/lib/features/pupil/domain/pupil_helper_functions.dart
+++ b/school_data_hub_flutter/lib/features/pupil/domain/pupil_proxy_helper.dart
@@ -5,7 +5,7 @@
 import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
 
-class PupilHelper {
+class PupilProxyHelper {
   static String preschoolRevisionPredicate(PreSchoolMedical? preSchoolMedical) {
     if (preSchoolMedical == null) {
       return 'nicht vorhanden';
diff --git a/school_data_hub_flutter/lib/features/pupil/domain/pupil_manager.dart b/school_data_hub_flutter/lib/features/pupil/domain/pupil_proxy_manager.dart
similarity index 59%
rename from school_data_hub_flutter/lib/features/pupil/domain/pupil_manager.dart
rename to school_data_hub_flutter/lib/features/pupil/domain/pupil_proxy_manager.dart
index f392896f..fdbf64cc 100644
--- a/school_data_hub_flutter/lib/features/pupil/domain/pupil_manager.dart
+++ b/school_data_hub_flutter/lib/features/pupil/domain/pupil_proxy_manager.dart
@@ -1,13 +1,11 @@
 import 'dart:async';
-import 'dart:convert';
-import 'dart:io';
 
 import 'package:collection/collection.dart';
-import 'package:file_picker/file_picker.dart';
 import 'package:flutter/foundation.dart';
 import 'package:logging/logging.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 import 'package:school_data_hub_flutter/features/books/data/pupil_book_api_service.dart';
 import 'package:school_data_hub_flutter/features/pupil/data/pupil_data_api_service.dart';
@@ -15,10 +13,9 @@ import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_fil
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter_impl.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_manager.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_mutator.dart';
 import 'package:watch_it/watch_it.dart';
 
-class PupilManager extends ChangeNotifier {
+class PupilProxyManager extends ChangeNotifier {
   final _log = Logger('PupilManager');
 
   final _notificationService = di<NotificationService>();
@@ -33,7 +30,17 @@ class PupilManager extends ChangeNotifier {
 
   List<PupilProxy> get allPupils => _pupilIdPupilsMap.values.toList();
 
-  PupilManager();
+  PupilProxyManager();
+
+  void dispose() {
+    // dispose all the pupil proxies
+    for (final pupil in _pupilIdPupilsMap.values) {
+      pupil.dispose();
+    }
+    _pupilIdPupilsMap.clear();
+    super.dispose();
+    return;
+  }
 
   Future<void> init() async {
     await fetchAllPupils();
@@ -134,17 +141,18 @@ class PupilManager extends ChangeNotifier {
   List<PupilProxy> getPupilsWithBirthdaySinceDate(DateTime date) {
     Map<int, PupilProxy> allPupils = Map<int, PupilProxy>.of(_pupilIdPupilsMap);
 
-    final DateTime now = DateTime.now().toUtc();
+    final DateTime now = DateTime.now();
 
     allPupils.removeWhere((key, pupil) {
+      final birthdayToLocal = pupil.birthday.toLocal();
       final birthdayThisYear = DateTime(
         now.year,
-        pupil.birthday.month,
-        pupil.birthday.day,
+        birthdayToLocal.month,
+        birthdayToLocal.day,
       );
 
       // Ensure the birthday this year is not before the specified date and not after today.
-      return !(birthdayThisYear.isAtSameMomentAs(date) ||
+      return !(birthdayThisYear.isSameDate(date) ||
           (birthdayThisYear.isAfter(date) && birthdayThisYear.isBefore(now)));
     });
 
@@ -180,6 +188,7 @@ class PupilManager extends ChangeNotifier {
   //- Fetch all available pupils from the backend
 
   Future<void> fetchAllPupils() async {
+    _log.info('Fetching all pupils');
     final pupilsToFetch = di<PupilIdentityManager>().availablePupilIds;
 
     if (pupilsToFetch.isEmpty) {
@@ -232,23 +241,7 @@ class PupilManager extends ChangeNotifier {
 
     // now we match the pupils from the response with their personal data
 
-    for (PupilData fetchedPupil in fetchedPupils) {
-      final proxyInRepository = _pupilIdPupilsMap[fetchedPupil.id!];
-      if (proxyInRepository != null) {
-        proxyInRepository.updatePupil(fetchedPupil);
-      } else {
-        // if the pupil is not in the repository, that would be weird
-        // since we did not send the id to the backend
-
-        final pupilIdentity = di<PupilIdentityManager>()
-            .getPupilIdentityByInternalId(fetchedPupil.internalId);
-
-        _pupilIdPupilsMap[fetchedPupil.id!] = PupilProxy(
-          pupilData: fetchedPupil,
-          pupilIdentity: pupilIdentity!,
-        );
-      }
-    }
+    updatePupilProxiesWithPupilData(fetchedPupils);
 
     // remove the outdated pupil identities that
     // did not get a response from the backend
@@ -274,8 +267,16 @@ class PupilManager extends ChangeNotifier {
     final proxy = _pupilIdPupilsMap[pupilData.id!];
     if (proxy != null) {
       proxy.updatePupil(pupilData);
-      //- TODO ADVICE: Is this true? No need to call notifyListeners here, because the proxy will notify the listeners itself
-      notifyListeners();
+    } else {
+      final pupilIdentity = di<PupilIdentityManager>()
+          .getPupilIdentityByInternalId(pupilData.internalId);
+      if (pupilIdentity != null) {
+        _pupilIdPupilsMap[pupilData.id!] = PupilProxy(
+          pupilData: pupilData,
+          pupilIdentity: pupilIdentity,
+        );
+        notifyListeners();
+      }
     }
   }
 
@@ -379,176 +380,4 @@ class PupilManager extends ChangeNotifier {
 
     return;
   }
-
-  //- IMPORT FUNCTIONS
-
-  // Future<void> importSupportLevelsFromJson() async {
-  //   final jsonFilePath = await FilePicker.platform
-  //       .pickFiles(type: FileType.custom, allowedExtensions: ['json'])
-  //       .then((result) => result?.files.single.path);
-
-  //   int totalRecords = 0;
-
-  //   int successCount = 0;
-  //   int notMatchedCount = 0;
-
-  //   _log.info('Starting support level import from: $jsonFilePath');
-
-  //   // Read and parse JSON file
-  //   final file = File(jsonFilePath!);
-  //   if (!await file.exists()) {
-  //     throw Exception('File not found: $jsonFilePath');
-  //   }
-
-  //   final jsonString = await file.readAsString();
-  //   final List<dynamic> jsonData = json.decode(jsonString);
-  //   for (var entry in jsonData) {
-  //     totalRecords++;
-  //     final int internalId = entry['pupil_id'] as int;
-  //     final level = entry['level'] as String;
-  //     final String comment =
-  //         entry['comment'] != ''
-  //             ? customEncrypter.encryptString(entry['comment'] as String)
-  //             : '';
-  //     final DateTime createdAt = DateTime.parse(entry['created_at'] as String);
-  //     final String createdBy = entry['created_by'] as String;
-
-  //     final pupil = getPupilsFromInternalIds([internalId]).firstOrNull;
-  //     if (pupil == null) {
-  //       notMatchedCount++;
-  //       _log.warning(
-  //         'No pupil found for internal ID $internalId - skipping...',
-  //       );
-  //       continue;
-  //     }
-  //     await PupilMutator().updatePupilSupportLevel(
-  //       pupilId: pupil.pupilId,
-  //       level: int.parse(level),
-  //       comment: comment.isEmpty ? 'Kein Eintrag gefunden' : comment,
-  //       createdAt: createdAt,
-  //       createdBy: createdBy,
-  //     );
-  //     _log.warning('Imported support level for pupil ID $internalId');
-  //     // final result = await _updateSupportLevelWithJsonRecord(internalId, entry);
-
-  //     // if (result == true) {
-  //     //   successCount++;
-  //     // } else if (result == false) {
-  //     //   notMatchedCount++;
-  //     // } else {
-  //     //   // result is null, indicating an error during import
-  //     //   _log.warning('Failed to import support level for pupil ID $internalId');
-  //     // }
-  //   }
-
-  //   _log.info(
-  //     'Import completed. Total records: $totalRecords, Successfully updated: $successCount, Not matched: $notMatchedCount',
-  //   );
-  // }
-
-  /// Import pupil data from a JSON file
-  /// Maps contact and parents_contact fields to existing pupils
-  /// Uses array index to match pupils since JSON doesn't contain internal_id
-  Future<void> importPupilDataFromJson() async {
-    final jsonFilePath = await FilePicker.platform
-        .pickFiles(type: FileType.custom, allowedExtensions: ['json'])
-        .then((result) => result?.files.single.path);
-
-    if (jsonFilePath == null) {
-      return;
-    }
-
-    int totalRecords = 0;
-
-    int successCount = 0;
-    int notMatchedCount = 0;
-
-    _log.info('Starting pupil data import from: $jsonFilePath');
-
-    // Read and parse JSON file
-    final file = File(jsonFilePath);
-    if (!await file.exists()) {
-      throw Exception('File not found: $jsonFilePath');
-    }
-
-    final jsonString = await file.readAsString();
-    final List<dynamic> jsonData = json.decode(jsonString);
-    for (var entry in jsonData) {
-      totalRecords++;
-      final int internalId = entry['internal_id'] as int;
-
-      final result = await _updatePupilWithJsonRecord(internalId, entry);
-
-      if (result == true) {
-        successCount++;
-      } else if (result == false) {
-        notMatchedCount++;
-      } else {
-        // result is null, indicating an error during import
-        _log.warning('Failed to import data for pupil ID $internalId');
-      }
-    }
-
-    _log.info(
-      'Import completed. Total records: $totalRecords, Successfully updated: $successCount, Not matched: $notMatchedCount',
-    );
-  }
-
-  /// Process the import data and update pupils
-
-  /// Import individual pupil record
-  Future<bool?> _updatePupilWithJsonRecord(
-    int internalId,
-    Map<String, dynamic> data,
-  ) async {
-    bool hasUpdates = false;
-    _log.info('Querying internal ID: $internalId');
-    final pupil = getPupilsFromInternalIds([internalId]).firstOrNull;
-
-    if (pupil == null) {
-      _log.warning('Pupil not found for internal ID: $internalId');
-      return false;
-    }
-
-    try {
-      final avatarAuthId = data['avatar_auth_id'] as String?;
-      if (avatarAuthId != null) {
-        // Find the avatar file in the decrypted folder
-        final decryptedFolderPath =
-            'H:/code/dabblingwithcode/school_data_hub/private/old_instance/media_upload/auth/decrypted';
-        final avatarFileName = '_${avatarAuthId}.jpg';
-        final avatarFile = File('$decryptedFolderPath/$avatarFileName');
-
-        if (await avatarFile.exists()) {
-          _log.info('Avatar file found: $avatarFileName');
-          try {
-            // Update the pupil with the avatar file
-            await PupilMutator().updatePupilDocument(
-              imageFile: avatarFile,
-              pupilProxy: pupil,
-              documentType: PupilDocumentType.avatarAuth,
-            );
-            hasUpdates = true;
-            _log.info(
-              'Updated avatar auth for pupil ${pupil.internalId} with file: $avatarFileName',
-            );
-          } catch (e) {
-            _log.warning(
-              'Failed to update avatar auth for pupil ${pupil.internalId}: $e',
-            );
-          }
-        } else {
-          _log.warning('Avatar file not found: $avatarFileName');
-        }
-      }
-
-      if (hasUpdates) {
-        return true;
-      }
-    } catch (e, stackTrace) {
-      _log.severe('Error importing data for pupil $internalId', e, stackTrace);
-      return null;
-    }
-    return false;
-  }
 }
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/_credit/credit_list_page/credit_list_page.dart b/school_data_hub_flutter/lib/features/pupil/presentation/_credit/credit_list_page/credit_list_page.dart
index 47c30ebb..20694c1e 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/_credit/credit_list_page/credit_list_page.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/_credit/credit_list_page/credit_list_page.dart
@@ -7,7 +7,7 @@ import 'package:school_data_hub_flutter/common/widgets/generic_components/generi
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/_credit/credit_list_page/widgets/credit_list_card.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/_credit/credit_list_page/widgets/credit_list_page_bottom_navbar.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/_credit/credit_list_page/widgets/credit_list_searchbar.dart';
@@ -19,15 +19,18 @@ class CreditListPage extends WatchingWidget {
   @override
   Widget build(BuildContext context) {
     List<PupilProxy> pupils = watchValue((PupilsFilter x) => x.filteredPupils);
-    int userCredit =
-        watchPropertyValue((HubSessionManager x) => x.user)!.credit;
+    int userCredit = watchPropertyValue(
+      (HubSessionManager x) => x.user,
+    )!.credit;
 
     return Scaffold(
       backgroundColor: AppColors.canvasColor,
       appBar: GenericAppBar(
-          iconData: Icons.credit_card, title: 'Guthaben: $userCredit'),
+        iconData: Icons.credit_card,
+        title: 'Guthaben: $userCredit',
+      ),
       body: RefreshIndicator(
-        onRefresh: () async => di<PupilManager>().fetchAllPupils(),
+        onRefresh: () async => di<PupilProxyManager>().fetchAllPupils(),
         child: Center(
           child: ConstrainedBox(
             constraints: const BoxConstraints(maxWidth: 700),
@@ -39,8 +42,9 @@ class CreditListPage extends WatchingWidget {
                   title: CreditListSearchBar(pupils: pupils),
                 ),
                 GenericSliverListWithEmptyListCheck(
-                    items: pupils,
-                    itemBuilder: (_, pupil) => CreditListCard(pupil)),
+                  items: pupils,
+                  itemBuilder: (_, pupil) => CreditListCard(pupil),
+                ),
               ],
             ),
           ),
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/_credit/credit_list_page/widgets/credit_list_card.dart b/school_data_hub_flutter/lib/features/pupil/presentation/_credit/credit_list_page/widgets/credit_list_card.dart
index 0a616cc7..86309689 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/_credit/credit_list_page/widgets/credit_list_card.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/_credit/credit_list_page/widgets/credit_list_card.dart
@@ -19,8 +19,10 @@ class CreditListCard extends WatchingWidget {
   @override
   Widget build(BuildContext context) {
     final tileController = createOnce(() => CustomExpansionTileController());
-    final creditEarned =
-        watchPropertyValue((m) => m.creditEarned, target: pupil);
+    final creditEarned = watchPropertyValue(
+      (m) => m.creditEarned,
+      target: pupil,
+    );
     final credit = watchPropertyValue((m) => m.credit, target: pupil);
 
     return Card(
@@ -28,8 +30,12 @@ class CreditListCard extends WatchingWidget {
       surfaceTintColor: Colors.white,
       shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
       elevation: 1.0,
-      margin:
-          const EdgeInsets.only(left: 4.0, right: 4.0, top: 4.0, bottom: 4.0),
+      margin: const EdgeInsets.only(
+        left: 4.0,
+        right: 4.0,
+        top: 4.0,
+        bottom: 4.0,
+      ),
       child: Column(
         children: [
           Row(
@@ -53,11 +59,12 @@ class CreditListCard extends WatchingWidget {
                               onTap: () {
                                 _mainMenuBottomNavManager
                                     .setPupilProfileNavPage(2);
-                                Navigator.of(context).push(MaterialPageRoute(
-                                  builder: (ctx) => PupilProfilePage(
-                                    pupil: pupil,
+                                Navigator.of(context).push(
+                                  MaterialPageRoute(
+                                    builder: (ctx) =>
+                                        PupilProfilePage(pupil: pupil),
                                   ),
-                                ));
+                                );
                               },
                               child: Row(
                                 children: [
@@ -132,7 +139,7 @@ class CreditListCard extends WatchingWidget {
                     Center(
                       child: Text(
                         credit.toString(),
-                        style: const TextStyle(
+                        style: TextStyle(
                           fontSize: 23,
                           fontWeight: FontWeight.bold,
                           color: AppColors.backgroundColor,
@@ -146,9 +153,10 @@ class CreditListCard extends WatchingWidget {
             ],
           ),
           CustomExpansionTileContent(
-              title: null,
-              tileController: tileController,
-              widgetList: [CreditTransactions(pupil: pupil)])
+            title: null,
+            tileController: tileController,
+            widgetList: [CreditTransactions(pupil: pupil)],
+          ),
         ],
       ),
     );
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/_credit/credit_list_page/widgets/credit_list_searchbar.dart b/school_data_hub_flutter/lib/features/pupil/presentation/_credit/credit_list_page/widgets/credit_list_searchbar.dart
index 2345deb7..bcec640a 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/_credit/credit_list_page/widgets/credit_list_searchbar.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/_credit/credit_list_page/widgets/credit_list_searchbar.dart
@@ -34,7 +34,7 @@ class CreditListSearchBar extends WatchingWidget {
                 child: Row(
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
-                    const Icon(
+                    Icon(
                       Icons.people_alt_rounded,
                       color: AppColors.backgroundColor,
                     ),
@@ -48,12 +48,13 @@ class CreditListSearchBar extends WatchingWidget {
                       ),
                     ),
                     const Gap(10),
-                    const Text(
+                    Text(
                       'BIP:',
                       style: TextStyle(
-                          fontSize: 13,
-                          color: AppColors.backgroundColor,
-                          fontWeight: FontWeight.bold),
+                        fontSize: 13,
+                        color: AppColors.backgroundColor,
+                        fontWeight: FontWeight.bold,
+                      ),
                     ),
                     const Gap(10),
                     Text(
@@ -65,12 +66,13 @@ class CreditListSearchBar extends WatchingWidget {
                       ),
                     ),
                     const Gap(10),
-                    const Text(
+                    Text(
                       'in Umlauf: ',
                       style: TextStyle(
-                          fontSize: 13,
-                          color: AppColors.backgroundColor,
-                          fontWeight: FontWeight.bold),
+                        fontSize: 13,
+                        color: AppColors.backgroundColor,
+                        fontWeight: FontWeight.bold,
+                      ),
                     ),
                     const Gap(10),
                     Text(
@@ -92,15 +94,18 @@ class CreditListSearchBar extends WatchingWidget {
               children: [
                 Expanded(
                   child: PupilSearchTextField(
-                      searchType: SearchType.pupil,
-                      hintText: 'Schüler/in suchen',
-                      refreshFunction: di<PupilsFilter>().refreshs),
+                    searchType: SearchType.pupil,
+                    hintText: 'Schüler/in suchen',
+                    refreshFunction: di<PupilsFilter>().refreshs,
+                  ),
                 ),
                 const Gap(5),
                 FilterButton(
                   isSearchBar: true,
                   showBottomSheetFunction: () => showGenericBottomSheet(
-                      context, const CreditFilterBottomSheet()),
+                    context,
+                    const CreditFilterBottomSheet(),
+                  ),
                 ),
               ],
             ),
diff --git a/school_data_hub_flutter/lib/features/ogs/ogs_list_page.dart b/school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/after_school_care_list_page.dart
similarity index 69%
rename from school_data_hub_flutter/lib/features/ogs/ogs_list_page.dart
rename to school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/after_school_care_list_page.dart
index 055a3acd..92f0f6e2 100644
--- a/school_data_hub_flutter/lib/features/ogs/ogs_list_page.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/after_school_care_list_page.dart
@@ -5,18 +5,18 @@ import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_app_bar.dart';
 import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_sliver_list.dart';
 import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_sliver_search_app_bar.dart';
-import 'package:school_data_hub_flutter/features/ogs/widgets/ogs_list_card.dart';
-import 'package:school_data_hub_flutter/features/ogs/widgets/ogs_list_search_bar.dart';
-import 'package:school_data_hub_flutter/features/ogs/widgets/ogs_view_bottom_navbar.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/presentation/after_school_care/widgets/after_school_care_list_card.dart';
+import 'package:school_data_hub_flutter/features/pupil/presentation/after_school_care/widgets/after_school_care_list_search_bar.dart';
+import 'package:school_data_hub_flutter/features/pupil/presentation/after_school_care/widgets/after_school_care_view_bottom_navbar.dart';
 import 'package:watch_it/watch_it.dart';
 
-List<PupilProxy> ogsFilter(List<PupilProxy> pupils) {
+List<PupilProxy> _afterSchoolCareFilter(List<PupilProxy> pupils) {
   List<PupilProxy> filteredPupils = [];
   for (PupilProxy pupil in pupils) {
-    if (!pupil.ogs == true) {
+    if (pupil.afterSchoolCare == null) {
       di<FiltersStateManager>().setFilterState(
         filterState: FilterState.pupil,
         value: true,
@@ -38,7 +38,7 @@ class OgsListPage extends WatchingWidget {
 
     List<PupilProxy> pupils = watchValue((PupilsFilter x) => x.filteredPupils);
 
-    List<PupilProxy> ogsPupils = ogsFilter(pupils);
+    List<PupilProxy> ogsPupils = _afterSchoolCareFilter(pupils);
 
     return Scaffold(
       backgroundColor: AppColors.canvasColor,
@@ -47,7 +47,8 @@ class OgsListPage extends WatchingWidget {
         title: 'OGS Infos',
       ),
       body: RefreshIndicator(
-        onRefresh: () async => di<PupilManager>().updatePupilList(ogsPupils),
+        onRefresh: () async =>
+            di<PupilProxyManager>().updatePupilList(ogsPupils),
         child: Center(
           child: ConstrainedBox(
             constraints: const BoxConstraints(maxWidth: 800),
@@ -55,22 +56,24 @@ class OgsListPage extends WatchingWidget {
               slivers: [
                 const SliverGap(5),
                 GenericSliverSearchAppBar(
-                  height: 110,
-                  title: OgsListSearchBar(
+                  height: 105,
+                  title: AfterSchoolCareListSearchBar(
                     pupils: ogsPupils,
                     filtersOn: filtersOn,
                   ),
                 ),
                 GenericSliverListWithEmptyListCheck(
                   items: ogsPupils,
-                  itemBuilder: (_, pupil) => OgsCard(pupil),
+                  itemBuilder: (_, pupil) => AfterSchoolCareCard(pupil),
                 ),
               ],
             ),
           ),
         ),
       ),
-      bottomNavigationBar: OgsListPageBottomNavBar(filtersOn: filtersOn),
+      bottomNavigationBar: AfterSchoolCareListPageBottomNavBar(
+        filtersOn: filtersOn,
+      ),
     );
   }
 }
diff --git a/school_data_hub_flutter/lib/features/ogs/widgets/ogs_details.dart b/school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/after_school_care_details.dart
similarity index 96%
rename from school_data_hub_flutter/lib/features/ogs/widgets/ogs_details.dart
rename to school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/after_school_care_details.dart
index 25448954..9d3233c4 100644
--- a/school_data_hub_flutter/lib/features/ogs/widgets/ogs_details.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/after_school_care_details.dart
@@ -4,15 +4,15 @@ import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/long_textfield_dialog.dart';
-import 'package:school_data_hub_flutter/features/ogs/widgets/dialogs/ogs_edit_emergency_care_dialog.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/enums.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/pupil_mutator.dart';
+import 'package:school_data_hub_flutter/features/pupil/presentation/after_school_care/widgets/dialogs/after_school_care_edit_emergency_care_dialog.dart';
 import 'package:watch_it/watch_it.dart';
 
-class OgsDetails extends WatchingWidget {
+class AfterSchoolCareDetails extends WatchingWidget {
   final PupilProxy pupil;
-  const OgsDetails({required this.pupil, super.key});
+  const AfterSchoolCareDetails({required this.pupil, super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -43,7 +43,7 @@ class OgsDetails extends WatchingWidget {
         Padding(
           padding: const EdgeInsets.all(10.0),
           child: InkWell(
-            onTap: () => ogsEditEmergencyCareDialog(context, pupil),
+            onTap: () => afterSchoolCareEditEmergencyCareDialog(context, pupil),
             child: Row(
               children: [
                 const Text(
@@ -66,11 +66,7 @@ class OgsDetails extends WatchingWidget {
                   ),
                 ),
                 const Gap(10),
-                const Icon(
-                  Icons.edit,
-                  size: 18,
-                  color: AppColors.backgroundColor,
-                ),
+                Icon(Icons.edit, size: 18, color: AppColors.backgroundColor),
               ],
             ),
           ),
@@ -254,7 +250,7 @@ class OgsDetails extends WatchingWidget {
                     children: [
                       if (pickUpInfo?.time == null ||
                           pickUpInfo!.time.isEmpty) ...[
-                        const Icon(
+                        Icon(
                           Icons.access_time,
                           size: 18,
                           color: AppColors.backgroundColor,
diff --git a/school_data_hub_flutter/lib/features/ogs/widgets/ogs_filter_bottom_sheet.dart b/school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/after_school_care_filter_bottom_sheet.dart
similarity index 96%
rename from school_data_hub_flutter/lib/features/ogs/widgets/ogs_filter_bottom_sheet.dart
rename to school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/after_school_care_filter_bottom_sheet.dart
index 67677be8..b3623cd3 100644
--- a/school_data_hub_flutter/lib/features/ogs/widgets/ogs_filter_bottom_sheet.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/after_school_care_filter_bottom_sheet.dart
@@ -6,8 +6,8 @@ import 'package:school_data_hub_flutter/features/_attendance/domain/models/enums
 import 'package:school_data_hub_flutter/features/pupil/presentation/widgets/common_pupil_filters.dart';
 import 'package:watch_it/watch_it.dart';
 
-class OgsFilterBottomSheet extends WatchingWidget {
-  const OgsFilterBottomSheet({super.key});
+class AfterSchoolCareFilterBottomSheet extends WatchingWidget {
+  const AfterSchoolCareFilterBottomSheet({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -139,6 +139,6 @@ showOgsFilterBottomSheet(BuildContext context) {
       ),
     ),
     context: context,
-    builder: (_) => const OgsFilterBottomSheet(),
+    builder: (_) => const AfterSchoolCareFilterBottomSheet(),
   );
 }
diff --git a/school_data_hub_flutter/lib/features/ogs/widgets/ogs_list_card.dart b/school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/after_school_care_list_card.dart
similarity index 94%
rename from school_data_hub_flutter/lib/features/ogs/widgets/ogs_list_card.dart
rename to school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/after_school_care_list_card.dart
index 4a8a80fe..d2f33e90 100644
--- a/school_data_hub_flutter/lib/features/ogs/widgets/ogs_list_card.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/after_school_care_list_card.dart
@@ -4,18 +4,18 @@ import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/custom_expansion_tile/custom_expansion_tile.dart';
 import 'package:school_data_hub_flutter/common/widgets/custom_expansion_tile/custom_expansion_tile_content.dart';
 import 'package:school_data_hub_flutter/features/app_main_navigation/domain/main_menu_bottom_nav_manager.dart';
-import 'package:school_data_hub_flutter/features/ogs/widgets/ogs_details.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/enums.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
+import 'package:school_data_hub_flutter/features/pupil/presentation/after_school_care/widgets/after_school_care_details.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/pupil_profile_page.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_navigation.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/widgets/avatar.dart';
 import 'package:school_data_hub_flutter/features/school_calendar/domain/school_calendar_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
-class OgsCard extends WatchingWidget {
+class AfterSchoolCareCard extends WatchingWidget {
   final PupilProxy pupil;
-  const OgsCard(this.pupil, {super.key});
+  const AfterSchoolCareCard(this.pupil, {super.key});
   @override
   Widget build(BuildContext context) {
     final pupil = watch<PupilProxy>(this.pupil);
@@ -117,7 +117,7 @@ class OgsCard extends WatchingWidget {
                         weekday != null
                             ? (pupil.pickUpTime(weekday) ?? 'keine')
                             : 'keine',
-                        style: const TextStyle(
+                        style: TextStyle(
                           fontSize: 23,
                           fontWeight: FontWeight.bold,
                           color: AppColors.backgroundColor,
@@ -134,7 +134,7 @@ class OgsCard extends WatchingWidget {
           CustomExpansionTileContent(
             title: null,
             tileController: tileController,
-            widgetList: [OgsDetails(pupil: pupil)],
+            widgetList: [AfterSchoolCareDetails(pupil: pupil)],
           ),
         ],
       ),
diff --git a/school_data_hub_flutter/lib/features/ogs/widgets/ogs_list_search_bar.dart b/school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/after_school_care_list_search_bar.dart
similarity index 90%
rename from school_data_hub_flutter/lib/features/ogs/widgets/ogs_list_search_bar.dart
rename to school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/after_school_care_list_search_bar.dart
index 506a656d..4ceaa731 100644
--- a/school_data_hub_flutter/lib/features/ogs/widgets/ogs_list_search_bar.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/after_school_care_list_search_bar.dart
@@ -3,16 +3,16 @@ import 'package:gap/gap.dart';
 import 'package:school_data_hub_flutter/common/domain/models/enums.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/filter_button.dart';
-import 'package:school_data_hub_flutter/features/ogs/widgets/ogs_filter_bottom_sheet.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
+import 'package:school_data_hub_flutter/features/pupil/presentation/after_school_care/widgets/after_school_care_filter_bottom_sheet.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/widgets/pupil_search_text_field.dart';
 import 'package:watch_it/watch_it.dart';
 
-class OgsListSearchBar extends StatelessWidget {
+class AfterSchoolCareListSearchBar extends StatelessWidget {
   final List<PupilProxy> pupils;
   final bool filtersOn;
-  const OgsListSearchBar({
+  const AfterSchoolCareListSearchBar({
     required this.pupils,
     required this.filtersOn,
     super.key,
@@ -33,7 +33,7 @@ class OgsListSearchBar extends StatelessWidget {
             child: Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                const Icon(
+                Icon(
                   Icons.people_alt_rounded,
                   color: AppColors.backgroundColor,
                 ),
diff --git a/school_data_hub_flutter/lib/features/ogs/widgets/ogs_view_bottom_navbar.dart b/school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/after_school_care_view_bottom_navbar.dart
similarity index 81%
rename from school_data_hub_flutter/lib/features/ogs/widgets/ogs_view_bottom_navbar.dart
rename to school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/after_school_care_view_bottom_navbar.dart
index d290a83d..234c1a3c 100644
--- a/school_data_hub_flutter/lib/features/ogs/widgets/ogs_view_bottom_navbar.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/after_school_care_view_bottom_navbar.dart
@@ -3,11 +3,14 @@ import 'package:gap/gap.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/bottom_nav_bar_layouts.dart';
 import 'package:school_data_hub_flutter/common/widgets/filter_button.dart';
-import 'package:school_data_hub_flutter/features/ogs/widgets/ogs_filter_bottom_sheet.dart';
+import 'package:school_data_hub_flutter/features/pupil/presentation/after_school_care/widgets/after_school_care_filter_bottom_sheet.dart';
 
-class OgsListPageBottomNavBar extends StatelessWidget {
+class AfterSchoolCareListPageBottomNavBar extends StatelessWidget {
   final bool filtersOn;
-  const OgsListPageBottomNavBar({required this.filtersOn, super.key});
+  const AfterSchoolCareListPageBottomNavBar({
+    required this.filtersOn,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
diff --git a/school_data_hub_flutter/lib/features/ogs/widgets/dialogs/ogs_edit_emergency_care_dialog.dart b/school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/dialogs/after_school_care_edit_emergency_care_dialog.dart
similarity index 98%
rename from school_data_hub_flutter/lib/features/ogs/widgets/dialogs/ogs_edit_emergency_care_dialog.dart
rename to school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/dialogs/after_school_care_edit_emergency_care_dialog.dart
index bd3fd02e..16ac198d 100644
--- a/school_data_hub_flutter/lib/features/ogs/widgets/dialogs/ogs_edit_emergency_care_dialog.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/dialogs/after_school_care_edit_emergency_care_dialog.dart
@@ -4,7 +4,7 @@ import 'package:school_data_hub_flutter/common/theme/styles.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/pupil_mutator.dart';
 
-Future<void> ogsEditEmergencyCareDialog(
+Future<void> afterSchoolCareEditEmergencyCareDialog(
   BuildContext context,
   PupilProxy pupil,
 ) async {
diff --git a/school_data_hub_flutter/lib/features/ogs/widgets/dialogs/ogs_edit_pickup_times_dialog.dart b/school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/dialogs/after_school_care_edit_pickup_times_dialog.dart
similarity index 99%
rename from school_data_hub_flutter/lib/features/ogs/widgets/dialogs/ogs_edit_pickup_times_dialog.dart
rename to school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/dialogs/after_school_care_edit_pickup_times_dialog.dart
index b79a04cd..a6ef3500 100644
--- a/school_data_hub_flutter/lib/features/ogs/widgets/dialogs/ogs_edit_pickup_times_dialog.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/dialogs/after_school_care_edit_pickup_times_dialog.dart
@@ -5,7 +5,7 @@ import 'package:school_data_hub_flutter/features/pupil/domain/models/enums.dart'
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/pupil_mutator.dart';
 
-Future<void> ogsEditPickUpTimesDialog(
+Future<void> afterSchoolCareEditPickUpTimesDialog(
   BuildContext context,
   PupilProxy pupil,
 ) async {
diff --git a/school_data_hub_flutter/lib/features/ogs/widgets/dialogs/ogs_pickup_time_dialog.dart b/school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/dialogs/after_school_care_pickup_time_dialog.dart
similarity index 100%
rename from school_data_hub_flutter/lib/features/ogs/widgets/dialogs/ogs_pickup_time_dialog.dart
rename to school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/dialogs/after_school_care_pickup_time_dialog.dart
diff --git a/school_data_hub_flutter/lib/features/ogs/widgets/pupil_ogs_content_list.dart b/school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/pupil_after_school_care_content_list.dart
similarity index 73%
rename from school_data_hub_flutter/lib/features/ogs/widgets/pupil_ogs_content_list.dart
rename to school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/pupil_after_school_care_content_list.dart
index a982e76f..81e57cee 100644
--- a/school_data_hub_flutter/lib/features/ogs/widgets/pupil_ogs_content_list.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/after_school_care/widgets/pupil_after_school_care_content_list.dart
@@ -3,14 +3,17 @@ import 'package:gap/gap.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/long_textfield_dialog.dart';
-import 'package:school_data_hub_flutter/features/ogs/widgets/dialogs/ogs_pickup_time_dialog.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/enums.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/pupil_mutator.dart';
+import 'package:school_data_hub_flutter/features/pupil/presentation/after_school_care/widgets/dialogs/after_school_care_pickup_time_dialog.dart';
 import 'package:school_data_hub_flutter/features/school_calendar/domain/school_calendar_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
-List<Widget> pupilOgsContentList(PupilProxy pupil, BuildContext context) {
+List<Widget> pupilAfterSchoolCareContentList(
+  PupilProxy pupil,
+  BuildContext context,
+) {
   final schoolCalendarManager = di<SchoolCalendarManager>();
   final thisDate = schoolCalendarManager.thisDate.value;
   final weekday = dateTimeToAfterSchoolCareWeekday(thisDate);
@@ -25,7 +28,7 @@ List<Widget> pupilOgsContentList(PupilProxy pupil, BuildContext context) {
           onTap: () => pickUpTimeDialog(context, pupil, pickUpTime),
           child: Text(
             pickUpTime ?? 'keine',
-            style: const TextStyle(
+            style: TextStyle(
               fontSize: 20,
               fontWeight: FontWeight.bold,
               color: AppColors.backgroundColor,
@@ -38,7 +41,10 @@ List<Widget> pupilOgsContentList(PupilProxy pupil, BuildContext context) {
     ),
     const Gap(10),
     const Row(
-      children: [Text('OGS Infos:', style: TextStyle(fontSize: 18.0)), Gap(5)],
+      children: [
+        Text('OGS Infos:', style: TextStyle(fontSize: 18.0)),
+        Gap(5),
+      ],
     ),
     const Gap(5),
     InkWell(
@@ -73,24 +79,23 @@ List<Widget> pupilOgsContentList(PupilProxy pupil, BuildContext context) {
       child: Row(
         children: [
           Flexible(
-            child:
-                pupil.ogsInfo != null
-                    ? Text(
-                      pupil.ogsInfo!,
-                      softWrap: true,
-                      style: const TextStyle(
-                        fontSize: 20,
-                        fontWeight: FontWeight.bold,
-                        color: AppColors.backgroundColor,
-                      ),
-                    )
-                    : const Text(
-                      'keine Informationen',
-                      style: TextStyle(
-                        fontSize: 18.0,
-                        fontWeight: FontWeight.bold,
-                      ),
+            child: pupil.ogsInfo != null
+                ? Text(
+                    pupil.ogsInfo!,
+                    softWrap: true,
+                    style: TextStyle(
+                      fontSize: 20,
+                      fontWeight: FontWeight.bold,
+                      color: AppColors.backgroundColor,
+                    ),
+                  )
+                : const Text(
+                    'keine Informationen',
+                    style: TextStyle(
+                      fontSize: 18.0,
+                      fontWeight: FontWeight.bold,
                     ),
+                  ),
           ),
         ],
       ),
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/birthdays_page.dart b/school_data_hub_flutter/lib/features/pupil/presentation/birthdays_page.dart
index 7cc48552..29ac7129 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/birthdays_page.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/birthdays_page.dart
@@ -1,10 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/theme/styles.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/features/app_main_navigation/domain/main_menu_bottom_nav_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/pupil_profile_page.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/widgets/avatar.dart';
 import 'package:watch_it/watch_it.dart';
 
@@ -15,7 +17,7 @@ class BirthdaysView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final Set<DateTime> seenBirthdays = {};
-    final List<PupilProxy> pupils = di<PupilManager>()
+    final List<PupilProxy> pupils = di<PupilProxyManager>()
         .getPupilsWithBirthdaySinceDate(selectedDate);
 
     return Scaffold(
@@ -85,7 +87,7 @@ class BirthdaysView extends StatelessWidget {
                                               const Gap(5),
                                               Text(
                                                 '${DateTime(DateTime.now().year, listedPupil.birthday.month, listedPupil.birthday.day).asWeekdayName(context)}, ${DateTime(DateTime.now().year, listedPupil.birthday.month, listedPupil.birthday.day).formatDateForUser()}',
-                                                style: const TextStyle(
+                                                style: TextStyle(
                                                   fontWeight: FontWeight.bold,
                                                   color:
                                                       AppColors.backgroundColor,
@@ -98,12 +100,15 @@ class BirthdaysView extends StatelessWidget {
                                       : const SizedBox.shrink(),
                                   InkWell(
                                     onTap: () {
-                                      // Navigator.of(context)
-                                      //     .push(MaterialPageRoute(
-                                      //   builder: (ctx) => PupilProfilePage(
-                                      //     pupil: listedPupil,
-                                      //   ),
-                                      // ));
+                                      di<BottomNavManager>()
+                                          .setPupilProfileNavPage(0);
+                                      Navigator.of(context).push(
+                                        MaterialPageRoute(
+                                          builder: (ctx) => PupilProfilePage(
+                                            pupil: listedPupil,
+                                          ),
+                                        ),
+                                      );
                                     },
                                     child: Card(
                                       color: AppColors.cardInCardColor,
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/family_language_lessons_page/family_language_lessons_list_page.dart b/school_data_hub_flutter/lib/features/pupil/presentation/family_language_lessons_page/family_language_lessons_list_page.dart
index 4d449008..92325fd8 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/family_language_lessons_page/family_language_lessons_list_page.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/family_language_lessons_page/family_language_lessons_list_page.dart
@@ -7,7 +7,7 @@ import 'package:school_data_hub_flutter/common/widgets/generic_components/generi
 import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_sliver_search_app_bar.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/family_language_lessons_page/widgets/family_language_lessons_card.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/family_language_lessons_page/widgets/family_language_lessons_list_page_bottom_navbar.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/family_language_lessons_page/widgets/family_language_lessons_list_search_bar.dart';
@@ -45,7 +45,7 @@ class FamilyLanguageLessonsListPage extends WatchingWidget {
   @override
   Widget build(BuildContext context) {
     final _filterStateManager = di<FiltersStateManager>();
-    final _pupilManager = di<PupilManager>();
+    final _pupilManager = di<PupilProxyManager>();
     List<PupilProxy> filteredPupils = watchValue(
       (PupilsFilter x) => x.filteredPupils,
     );
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/family_language_lessons_page/widgets/family_language_lessons_card.dart b/school_data_hub_flutter/lib/features/pupil/presentation/family_language_lessons_page/widgets/family_language_lessons_card.dart
index 21e2287b..350af825 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/family_language_lessons_page/widgets/family_language_lessons_card.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/family_language_lessons_page/widgets/family_language_lessons_card.dart
@@ -1,21 +1,20 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/domain/filters/filters_state_manager.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/features/app_main_navigation/domain/main_menu_bottom_nav_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/pupil_profile_page.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/widgets/avatar.dart';
 import 'package:watch_it/watch_it.dart';
 
-final _mainMenuBottomNavManager = di<BottomNavManager>();
-final _filterStateManager = di<FiltersStateManager>();
-
 class FamilyLanguageLessonsCard extends WatchingWidget {
   final PupilProxy pupil;
   const FamilyLanguageLessonsCard(this.pupil, {super.key});
   @override
   Widget build(BuildContext context) {
+    final _mainMenuBottomNavManager = di<BottomNavManager>();
+    final _filterStateManager = di<FiltersStateManager>();
     return Card(
       color: Colors.white,
       surfaceTintColor: Colors.white,
@@ -56,7 +55,7 @@ class FamilyLanguageLessonsCard extends WatchingWidget {
                                     onTap: () {
                                       _filterStateManager.resetFilters();
                                       _mainMenuBottomNavManager
-                                          .setPupilProfileNavPage(0);
+                                          .setPupilProfileNavPage(1);
                                       Navigator.of(context).push(
                                         MaterialPageRoute(
                                           builder: (ctx) =>
@@ -99,6 +98,7 @@ class FamilyLanguageLessonsCard extends WatchingWidget {
                           ),
                           const Gap(5),
                           Row(
+                            crossAxisAlignment: CrossAxisAlignment.center,
                             children: [
                               const Text('Herkunftssprache:'),
                               const Gap(10),
@@ -111,7 +111,7 @@ class FamilyLanguageLessonsCard extends WatchingWidget {
                                 maxLines: 3,
                                 style: const TextStyle(
                                   fontWeight: FontWeight.bold,
-                                  fontSize: 14,
+                                  fontSize: 16,
                                 ),
                               ),
                             ],
@@ -123,6 +123,7 @@ class FamilyLanguageLessonsCard extends WatchingWidget {
                 ),
                 const Gap(5),
                 Row(
+                  crossAxisAlignment: CrossAxisAlignment.center,
                   children: [
                     const Text('Angemeldet am:'),
                     const Gap(10),
@@ -131,6 +132,10 @@ class FamilyLanguageLessonsCard extends WatchingWidget {
                           ? pupil.familyLanguageLessonsSince!
                                 .formatDateForUser()
                           : 'keine Angabe',
+                      style: const TextStyle(
+                        fontWeight: FontWeight.bold,
+                        fontSize: 16,
+                      ),
                     ),
                   ],
                 ),
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/family_language_lessons_page/widgets/family_language_lessons_list_search_bar.dart b/school_data_hub_flutter/lib/features/pupil/presentation/family_language_lessons_page/widgets/family_language_lessons_list_search_bar.dart
index 2bca77bf..abb2f6d7 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/family_language_lessons_page/widgets/family_language_lessons_list_search_bar.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/family_language_lessons_page/widgets/family_language_lessons_list_search_bar.dart
@@ -31,7 +31,7 @@ class FamilyLanguageLessonsListSearchBar extends WatchingWidget {
             child: Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                const Icon(
+                Icon(
                   Icons.people_alt_rounded,
                   color: AppColors.backgroundColor,
                 ),
@@ -52,17 +52,19 @@ class FamilyLanguageLessonsListSearchBar extends WatchingWidget {
             child: Row(
               children: [
                 Expanded(
-                    child: PupilSearchTextField(
-                        searchType: SearchType.pupil,
-                        hintText: 'Schüler/in suchen',
-                        refreshFunction: _pupilsFilter.refreshs)),
+                  child: PupilSearchTextField(
+                    searchType: SearchType.pupil,
+                    hintText: 'Schüler/in suchen',
+                    refreshFunction: _pupilsFilter.refreshs,
+                  ),
+                ),
                 FilterButton(
                   isSearchBar: true,
                   showBottomSheetFunction: () => showGenericFilterBottomSheet(
-                      context: context, filterList: [
-                    const CommonPupilFiltersWidget(),
-                  ]),
-                )
+                    context: context,
+                    filterList: [const CommonPupilFiltersWidget()],
+                  ),
+                ),
               ],
             ),
           ),
@@ -71,4 +73,3 @@ class FamilyLanguageLessonsListSearchBar extends WatchingWidget {
     );
   }
 }
-
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_identity_stream_page/connection_code_dialog.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_identity_stream_page/connection_code_dialog.dart
index 513dea29..f8d2bb64 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_identity_stream_page/connection_code_dialog.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_identity_stream_page/connection_code_dialog.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/models/enums.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_identity_stream_page/pupil_identity_stream_page.dart';
 
 Future<void> showConnectionCodeDialog(BuildContext context) async {
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_identity_stream_page/controllers/stream_controller.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_identity_stream_page/controllers/stream_controller.dart
index 4fada51e..7acf16d4 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_identity_stream_page/controllers/stream_controller.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_identity_stream_page/controllers/stream_controller.dart
@@ -4,8 +4,11 @@ import 'package:flutter/scheduler.dart';
 import 'package:logging/logging.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
+import 'package:school_data_hub_flutter/core/env/env_manager.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/models/enums.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_helper.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_stream_suscription.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_identity_stream_page/models/stream_state.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_identity_stream_page/utils/stream_utils.dart';
 import 'package:watch_it/watch_it.dart';
@@ -28,6 +31,7 @@ class PupilIdentityStreamController {
   StreamSubscription<PupilIdentityDto>? _subscription;
 
   Timer? _rejectionTimer;
+  bool _isDisposed = false;
 
   // Callbacks for UI interactions
   final Function(String userName) onConfirmationRequired;
@@ -57,6 +61,9 @@ class PupilIdentityStreamController {
 
   /// Complete a transfer and update state
   void completeTransfer() {
+    if (_isDisposed) {
+      return;
+    }
     state.streamState.isProcessing.value = false;
     state.streamState.isCompleted.value = true;
     state.streamState.isTransmitting.value = false;
@@ -102,6 +109,9 @@ class PupilIdentityStreamController {
 
   /// Reset sender state for new requests
   void resetSenderForNewRequest() {
+    if (_isDisposed) {
+      return;
+    }
     if (role == PupilIdentityStreamRole.sender) {
       state.streamState.receiverJoined.value = false;
       state.streamState.receiverUserName.value = '';
@@ -127,7 +137,17 @@ class PupilIdentityStreamController {
     updatedPendingRequests.remove(userName);
     state.receiverState.pendingRequests.value = updatedPendingRequests;
 
-    // Send confirmation to specific receiver
+    // Build encrypted data for the receiver
+    String? dataToSend = encryptedData;
+    if (dataToSend == null && selectedPupilIds != null) {
+      dataToSend = await PupilIdentityHelper()
+          .generateEncryptedPupilIdentitiesTransferString(selectedPupilIds!);
+    }
+
+    // Update local state to transmitting
+    _handleRequestConfirmed();
+
+    // Notify receiver of confirmation (backward compatibility)
     await di<Client>().pupilIdentity.sendPupilIdentityMessage(
       channelName,
       PupilIdentityDto(
@@ -136,6 +156,20 @@ class PupilIdentityStreamController {
         value: userName,
       ),
     );
+
+    // Send the data targeted to this receiver
+    await di<Client>().pupilIdentity.sendPupilIdentityMessage(
+      channelName,
+      PupilIdentityDto(
+        sender: thisUserName,
+        type: 'data',
+        dataTimeStamp: di<EnvManager>().activeEnv?.lastIdentitiesUpdate,
+        value: '$userName:${dataToSend ?? ''}',
+      ),
+    );
+
+    state.streamState.statusMessage.value =
+        'Daten an $userName gesendet. Warte auf Bestätigung...';
   }
 
   /// Handle rejection of a user request
@@ -228,12 +262,12 @@ class PupilIdentityStreamController {
         _log.info(
           'Generating encrypted data for ${selectedPupilIds!.length} pupils',
         );
-        dataToSend = await di<PupilIdentityManager>()
+        dataToSend = await PupilIdentityHelper()
             .generateEncryptedPupilIdentitiesTransferString(selectedPupilIds!);
       }
 
       _log.info('Creating stream subscription...');
-      _subscription = await di<PupilIdentityManager>()
+      _subscription = await PupilIdentityStream()
           .encryptedPupilIdsStreamSubscription(
             channelName: channelName,
             role: role,
@@ -369,11 +403,14 @@ class PupilIdentityStreamController {
     // Reset sender for new requests after a short delay
     if (role == PupilIdentityStreamRole.sender) {
       Future.delayed(const Duration(seconds: 3), () {
+        if (_isDisposed) {
+          return;
+        }
         resetSenderForNewRequest();
       });
     }
     _log.info(
-      'Data transfer completed for channel: $channelName with role: $role',
+      '[${role.name.toUpperCase()}]: Data transfer completed for channel:[ $channelName]',
     );
   }
 
@@ -513,6 +550,7 @@ class PupilIdentityStreamController {
 
   /// Dispose resources
   void dispose() {
+    _isDisposed = true;
     // Cancel the rejection timeout timer
     _rejectionTimer?.cancel();
 
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_identity_stream_page/models/stream_state.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_identity_stream_page/models/stream_state.dart
index fb8794ac..c7e3bc55 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_identity_stream_page/models/stream_state.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_identity_stream_page/models/stream_state.dart
@@ -1,29 +1,29 @@
-import 'package:flutter/foundation.dart';
+import 'package:signals/signals_flutter.dart';
 
 /// Model representing the state of the pupil identity stream
 class StreamState {
-  final ValueNotifier<bool> isConnected;
-  final ValueNotifier<bool> isProcessing;
-  final ValueNotifier<bool> isCompleted;
-  final ValueNotifier<String> statusMessage;
-  final ValueNotifier<bool> receiverJoined;
-  final ValueNotifier<String> receiverUserName;
-  final ValueNotifier<bool> requestReceived;
-  final ValueNotifier<bool> requestSent;
-  final ValueNotifier<bool> isTransmitting;
-  final ValueNotifier<bool> autoConfirmEnabled;
+  final Signal<bool> isConnected;
+  final Signal<bool> isProcessing;
+  final Signal<bool> isCompleted;
+  final Signal<String> statusMessage;
+  final Signal<bool> receiverJoined;
+  final Signal<String> receiverUserName;
+  final Signal<bool> requestReceived;
+  final Signal<bool> requestSent;
+  final Signal<bool> isTransmitting;
+  final Signal<bool> autoConfirmEnabled;
 
   StreamState()
-    : isConnected = ValueNotifier(false),
-      isProcessing = ValueNotifier(false),
-      isCompleted = ValueNotifier(false),
-      statusMessage = ValueNotifier(''),
-      receiverJoined = ValueNotifier(false),
-      receiverUserName = ValueNotifier(''),
-      requestReceived = ValueNotifier(false),
-      requestSent = ValueNotifier(false),
-      isTransmitting = ValueNotifier(false),
-      autoConfirmEnabled = ValueNotifier(false);
+    : isConnected = signal(false),
+      isProcessing = signal(false),
+      isCompleted = signal(false),
+      statusMessage = signal(''),
+      receiverJoined = signal(false),
+      receiverUserName = signal(''),
+      requestReceived = signal(false),
+      requestSent = signal(false),
+      isTransmitting = signal(false),
+      autoConfirmEnabled = signal(false);
 
   void dispose() {
     isConnected.dispose();
@@ -41,12 +41,12 @@ class StreamState {
 
 /// Model representing transfer statistics and history
 class TransferState {
-  final ValueNotifier<int> transferCounter;
-  final ValueNotifier<List<String>> transferHistory;
+  final Signal<int> transferCounter;
+  final Signal<List<String>> transferHistory;
 
   TransferState()
-    : transferCounter = ValueNotifier(0),
-      transferHistory = ValueNotifier([]);
+    : transferCounter = signal(0),
+      transferHistory = signal(<String>[]);
 
   void dispose() {
     transferCounter.dispose();
@@ -56,16 +56,16 @@ class TransferState {
 
 /// Model representing multi-receiver management state
 class ReceiverManagementState {
-  final ValueNotifier<Set<String>> connectedReceivers;
-  final ValueNotifier<Map<String, DateTime>> pendingRequests;
-  final ValueNotifier<Set<String>> activeTransfers;
-  final ValueNotifier<Set<String>> rejectedUsers;
+  final Signal<Set<String>> connectedReceivers;
+  final Signal<Map<String, DateTime>> pendingRequests;
+  final Signal<Set<String>> activeTransfers;
+  final Signal<Set<String>> rejectedUsers;
 
   ReceiverManagementState()
-    : connectedReceivers = ValueNotifier({}),
-      pendingRequests = ValueNotifier({}),
-      activeTransfers = ValueNotifier({}),
-      rejectedUsers = ValueNotifier({});
+    : connectedReceivers = signal(<String>{}),
+      pendingRequests = signal(<String, DateTime>{}),
+      activeTransfers = signal(<String>{}),
+      rejectedUsers = signal(<String>{});
 
   void dispose() {
     connectedReceivers.dispose();
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_identity_stream_page/pupil_identity_stream_page.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_identity_stream_page/pupil_identity_stream_page.dart
index 6ecb7be9..04e64bed 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_identity_stream_page/pupil_identity_stream_page.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_identity_stream_page/pupil_identity_stream_page.dart
@@ -3,7 +3,8 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_app_bar.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/models/enums.dart';
+import 'package:signals/signals_flutter.dart';
 import 'package:watch_it/watch_it.dart';
 
 import 'controllers/stream_controller.dart';
@@ -61,68 +62,34 @@ class PupilIdentityStreamPage extends WatchingWidget {
       return ctrl;
     }, dispose: (controller) => controller.dispose());
 
-    // Access state through the controller
     final state = controller.state;
 
-    // Watch all state variables at the top of build method (best practice)
-    final isConnected = watch(state.streamState.isConnected).value;
-    final isProcessing = watch(state.streamState.isProcessing).value;
-    final receivers = watch(state.receiverState.connectedReceivers).value;
-    final pendingRequests = watch(state.receiverState.pendingRequests).value;
-    final activeTransfers = watch(state.receiverState.activeTransfers).value;
-    final transferHistory = watch(state.transferState.transferHistory).value;
-    final transferCounter = watch(state.transferState.transferCounter).value;
-    final rejectedUsers = watch(state.receiverState.rejectedUsers).value;
-    final receiverJoined = watch(state.streamState.receiverJoined).value;
-    final requestSent = watch(state.streamState.requestSent).value;
-    final isTransmitting = watch(state.streamState.isTransmitting).value;
-    final autoConfirmEnabled = watch(
-      state.streamState.autoConfirmEnabled,
-    ).value;
+    final isConnected = state.streamState.isConnected.watch(context);
+    final isProcessing = state.streamState.isProcessing.watch(context);
+    final receivers = state.receiverState.connectedReceivers.watch(context);
+    final pendingRequests = state.receiverState.pendingRequests.watch(context);
+    final activeTransfers = state.receiverState.activeTransfers.watch(context);
+    final transferHistory = state.transferState.transferHistory.watch(context);
+    final transferCounter = state.transferState.transferCounter.watch(context);
+    final rejectedUsers = state.receiverState.rejectedUsers.watch(context);
+    final receiverJoined = state.streamState.receiverJoined.watch(context);
+    final requestSent = state.streamState.requestSent.watch(context);
+    final isTransmitting = state.streamState.isTransmitting.watch(context);
+    final autoConfirmEnabled = state.streamState.autoConfirmEnabled.watch(
+      context,
+    );
 
-    // Register handlers for receiver status changes that require overlay management
+    // Update overlay when receiver-related signals change
     if (role == PupilIdentityStreamRole.receiver) {
-      registerHandler(
-        select: (state) => state.streamState.receiverJoined,
-        target: state,
-        handler: (context, joined, cancel) {
-          _updateReceiverOverlay(
-            context,
-            controller,
-            joined,
-            requestSent,
-            isTransmitting,
-          );
-        },
-      );
-
-      registerHandler(
-        select: (state) => state.streamState.requestSent,
-        target: state,
-        handler: (context, reqSent, cancel) {
-          _updateReceiverOverlay(
-            context,
-            controller,
-            receiverJoined,
-            reqSent,
-            isTransmitting,
-          );
-        },
-      );
-
-      registerHandler(
-        select: (state) => state.streamState.isTransmitting,
-        target: state,
-        handler: (context, transmitting, cancel) {
-          _updateReceiverOverlay(
-            context,
-            controller,
-            receiverJoined,
-            requestSent,
-            transmitting,
-          );
-        },
-      );
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        _updateReceiverOverlay(
+          context,
+          controller,
+          receiverJoined,
+          requestSent,
+          isTransmitting,
+        );
+      });
     }
 
     return Scaffold(
@@ -136,33 +103,30 @@ class PupilIdentityStreamPage extends WatchingWidget {
           child: Padding(
             padding: const EdgeInsets.all(16.0),
             child: Column(
-              mainAxisAlignment: MainAxisAlignment.start,
               crossAxisAlignment: CrossAxisAlignment.stretch,
               children: [
-                // Connection Status (fixed at top)
-                ConnectionStatus(
-                  isConnected: isConnected,
-                  isProcessing: isProcessing,
-                  statusMessage: state.streamState.statusMessage.value,
-                ),
-
-                const Gap(16),
-
-                // Role-specific UI (scrollable content)
                 Expanded(
-                  child: Column(
-                    children: [
-                      if (role == PupilIdentityStreamRole.sender) ...[
-                        _buildSenderTopSection(
-                          context,
-                          state,
-                          controller,
-                          isConnected,
-                          autoConfirmEnabled,
+                  child: SingleChildScrollView(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.stretch,
+                      children: [
+                        // Connection Status
+                        ConnectionStatus(
+                          isConnected: isConnected,
+                          isProcessing: isProcessing,
+                          statusMessage: state.streamState.statusMessage.value,
                         ),
                         const Gap(16),
-                        Expanded(
-                          child: _buildSenderScrollableContent(
+                        if (role == PupilIdentityStreamRole.sender) ...[
+                          _buildSenderTopSection(
+                            context,
+                            state,
+                            controller,
+                            isConnected,
+                            autoConfirmEnabled,
+                          ),
+                          const Gap(16),
+                          _buildSenderScrollableContent(
                             context,
                             state,
                             controller,
@@ -173,10 +137,8 @@ class PupilIdentityStreamPage extends WatchingWidget {
                             transferCounter,
                             rejectedUsers,
                           ),
-                        ),
-                      ] else ...[
-                        Expanded(
-                          child: _buildReceiverScrollableContent(
+                        ] else ...[
+                          _buildReceiverScrollableContent(
                             context,
                             state,
                             controller,
@@ -184,15 +146,13 @@ class PupilIdentityStreamPage extends WatchingWidget {
                             requestSent,
                             isTransmitting,
                           ),
-                        ),
+                        ],
                       ],
-                    ],
+                    ),
                   ),
                 ),
-
                 const Gap(16),
-
-                // Action Buttons (fixed at bottom)
+                // Action Buttons stay visible
                 _buildActionButtons(
                   context,
                   state,
@@ -262,35 +222,33 @@ class PupilIdentityStreamPage extends WatchingWidget {
     int transferCounter,
     Set<String> rejectedUsers,
   ) {
-    return SingleChildScrollView(
-      child: Column(
-        children: [
-          // Connected Receivers Management
-          _buildReceiversSection(
-            context,
-            receivers,
-            pendingRequests,
-            activeTransfers,
-            controller,
-          ),
+    return Column(
+      children: [
+        // Connected Receivers Management
+        _buildReceiversSection(
+          context,
+          receivers,
+          pendingRequests,
+          activeTransfers,
+          controller,
+        ),
 
-          // Transfer History
-          TransferHistoryWidget(
-            transferHistory: transferHistory,
-            transferCounter: transferCounter,
-          ),
+        // Transfer History
+        TransferHistoryWidget(
+          transferHistory: transferHistory,
+          transferCounter: transferCounter,
+        ),
 
-          const Gap(16),
+        const Gap(16),
 
-          // Rejected Requests
-          RejectedRequestsWidget(
-            rejectedUsers: rejectedUsers,
-            onClearRejected: rejectedUsers.isNotEmpty
-                ? () => controller.clearRejectedUsers()
-                : null,
-          ),
-        ],
-      ),
+        // Rejected Requests
+        RejectedRequestsWidget(
+          rejectedUsers: rejectedUsers,
+          onClearRejected: rejectedUsers.isNotEmpty
+              ? () => controller.clearRejectedUsers()
+              : null,
+        ),
+      ],
     );
   }
 
@@ -303,12 +261,10 @@ class PupilIdentityStreamPage extends WatchingWidget {
     bool isTransmitting,
   ) {
     // Overlay management is now handled by registerHandler calls
-    return const SingleChildScrollView(
-      child: Column(
-        children: [
-          // Overlay will be shown instead of inline content
-        ],
-      ),
+    return const Column(
+      children: [
+        // Overlay will be shown instead of inline content
+      ],
     );
   }
 
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_identity_stream_page/widgets/status_indicators/status_indicator_row.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_identity_stream_page/widgets/status_indicators/status_indicator_row.dart
index 923034db..38ef5308 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_identity_stream_page/widgets/status_indicators/status_indicator_row.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_identity_stream_page/widgets/status_indicators/status_indicator_row.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/models/enums.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_identity_stream_page/widgets/status_indicators/compact_status_indicator.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_identity_stream_page/widgets/status_indicators/status_indicators.dart';
 
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/pupil_profile_page.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/pupil_profile_page.dart
index 4fb03f3b..0644e068 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/pupil_profile_page.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/pupil_profile_page.dart
@@ -1,11 +1,10 @@
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:gap/gap.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/bottom_nav_bar_layouts.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_bottom_navbar.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_heading_card.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_navigation.dart';
@@ -19,7 +18,7 @@ class PupilProfilePage extends WatchingWidget {
 
   @override
   Widget build(BuildContext context) {
-    final _pupilManager = di<PupilManager>();
+    final _pupilManager = di<PupilProxyManager>();
     return Scaffold(
       backgroundColor: AppColors.pupilProfileBackgroundColor,
       body: RefreshIndicator(
@@ -35,7 +34,7 @@ class PupilProfilePage extends WatchingWidget {
                       dragStartBehavior: DragStartBehavior.down,
                       slivers: [
                         SliverAppBar(
-                          systemOverlayStyle: const SystemUiOverlayStyle(
+                          systemOverlayStyle: SystemUiOverlayStyle(
                             statusBarColor:
                                 AppColors.pupilProfileBackgroundColor,
                           ),
@@ -53,24 +52,22 @@ class PupilProfilePage extends WatchingWidget {
                           flexibleSpace: FlexibleSpaceBar(
                             expandedTitleScale: 1,
                             collapseMode: CollapseMode.none,
-                            titlePadding: const EdgeInsets.only(
-                              left: 0,
-                              top: 5,
-                              right: 0,
-                              bottom: 5,
+                            background: Padding(
+                              padding: const EdgeInsets.symmetric(vertical: 5),
+                              child: PupilProfileHeadingCard(
+                                passedPupil: pupil,
+                              ),
                             ),
-                            title: PupilProfileHeadingCard(passedPupil: pupil),
                           ),
                         ),
                         SliverToBoxAdapter(
                           child: PupilProfilePageContent(pupil: pupil),
                         ),
-                        const SliverGap(60),
                       ],
                     ),
                   ),
                   PupilProfileNavigation(
-                    boxWidth: MediaQuery.of(context).size.width,
+                    boxWidth: MediaQuery.sizeOf(context).width,
                     //MediaQuery.of(context).size.width / 5,
                   ),
                 ],
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_bottom_navbar.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_bottom_navbar.dart
index afc742ba..3162c27b 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_bottom_navbar.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_bottom_navbar.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
@@ -16,7 +18,7 @@ class PupilProfileBottomNavBar extends StatelessWidget {
         child: ConstrainedBox(
           constraints: const BoxConstraints(maxWidth: 800),
           child: SizedBox(
-            height: 30,
+            height: Platform.isWindows ? 10 : 30,
             child: Row(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: <Widget>[
@@ -24,9 +26,7 @@ class PupilProfileBottomNavBar extends StatelessWidget {
                 IconButton(
                   iconSize: 35,
                   tooltip: 'zurück',
-                  icon: const Icon(
-                    Icons.arrow_back,
-                  ),
+                  icon: const Icon(Icons.arrow_back),
                   onPressed: () {
                     Navigator.pop(context);
                   },
@@ -35,10 +35,7 @@ class PupilProfileBottomNavBar extends StatelessWidget {
                 IconButton(
                   onPressed: () =>
                       Navigator.popUntil(context, (route) => route.isFirst),
-                  icon: const Icon(
-                    Icons.home,
-                    size: 35,
-                  ),
+                  icon: const Icon(Icons.home, size: 35),
                 ),
               ],
             ),
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_heading_card.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_heading_card.dart
index 3303e144..403ab5a6 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_heading_card.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_heading_card.dart
@@ -15,6 +15,7 @@ class PupilProfileHeadingCard extends WatchingWidget {
     final _hubSessionManager = di<HubSessionManager>();
     final pupil = watch<PupilProxy>(passedPupil);
     return Card(
+      color: Colors.white,
       child: Row(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
@@ -67,14 +68,14 @@ class PupilProfileHeadingCard extends WatchingWidget {
                     const Gap(15),
                     pupil.specialNeeds != null
                         ? Text(
-                          pupil.schoolGrade.name,
-                          textAlign: TextAlign.left,
-                          style: const TextStyle(
-                            color: AppColors.schoolyearColor,
-                            fontWeight: FontWeight.bold,
-                            fontSize: 18.0,
-                          ),
-                        )
+                            pupil.schoolGrade.name,
+                            textAlign: TextAlign.left,
+                            style: TextStyle(
+                              color: AppColors.schoolyearColor,
+                              fontWeight: FontWeight.bold,
+                              fontSize: 18.0,
+                            ),
+                          )
                         : const SizedBox.shrink(),
                     const Gap(15),
                     if (pupil.specialInformation != null)
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_navigation.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_navigation.dart
index 65a264c3..2cb47ab5 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_navigation.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_navigation.dart
@@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/features/app_main_navigation/domain/main_menu_bottom_nav_manager.dart';
@@ -21,31 +23,72 @@ enum ProfileNavigationState {
   const ProfileNavigationState(this.value);
 }
 
-class PupilProfileNavigation extends WatchingStatefulWidget {
+class PupilProfileNavigation extends WatchingWidget {
   final double boxWidth;
   const PupilProfileNavigation({required this.boxWidth, super.key});
 
-  @override
-  State<PupilProfileNavigation> createState() => _PupilProfileNavigationState();
-}
+  Color _navigationBackgroundColor(bool isSelected) {
+    return isSelected ? Colors.white : AppColors.backgroundColor;
+  }
 
-class _PupilProfileNavigationState extends State<PupilProfileNavigation> {
-  Color navigationBackgroundColor(int page) {
-    return page == _mainMenuBottomNavManager.pupilProfileNavState.value
-        ? Colors.white
-        : AppColors.backgroundColor;
+  Color _activeForegroundColor(ProfileNavigationState state) {
+    switch (state) {
+      case ProfileNavigationState.info:
+        return AppColors.backgroundColor;
+      case ProfileNavigationState.language:
+        return AppColors.groupColor;
+      case ProfileNavigationState.credit:
+        return AppColors.accentColor;
+      case ProfileNavigationState.attendance:
+        return Colors.grey.shade800;
+      case ProfileNavigationState.schooldayEvent:
+        return AppColors.accentColor;
+      case ProfileNavigationState.ogs:
+        return AppColors.backgroundColor;
+      case ProfileNavigationState.lists:
+        return Colors.grey.shade600;
+      case ProfileNavigationState.authorization:
+        return Colors.grey.shade600;
+      case ProfileNavigationState.learningSupport:
+        return const Color.fromARGB(255, 245, 75, 75);
+      case ProfileNavigationState.learning:
+        return AppColors.accentColor;
+    }
   }
 
-  Color navigationBackgroundActive = AppColors.accentColor;
-  Color navigationIconInactive = Colors.white;
-  Color navigationIconActive = Colors.white;
+  ElevatedButton _navButton({
+    required ProfileNavigationState state,
+    required int selectedState,
+    required Widget child,
+    EdgeInsetsGeometry? padding,
+  }) {
+    final bool isSelected = selectedState == state.value;
+    return ElevatedButton(
+      style: ElevatedButton.styleFrom(
+        padding: padding,
+        elevation: 0,
+        shape: RoundedRectangleBorder(
+          side: BorderSide(color: AppColors.backgroundColor, width: 2.0),
+          borderRadius: const BorderRadius.all(Radius.circular(10.0)),
+        ),
+        backgroundColor: _navigationBackgroundColor(isSelected),
+      ),
+      onPressed: () {
+        if (isSelected) {
+          return;
+        }
+        _mainMenuBottomNavManager.setPupilProfileNavPage(state.value);
+      },
+      child: child,
+    );
+  }
 
   @override
   Widget build(BuildContext context) {
     final int pupilProfileNavState = watchValue(
       (BottomNavManager x) => x.pupilProfileNavState,
     );
-    //double boxHeight = 35;
+
     return Theme(
       data: Theme.of(context).copyWith(
         elevatedButtonTheme: ElevatedButtonThemeData(
@@ -56,386 +99,220 @@ class _PupilProfileNavigationState extends State<PupilProfileNavigation> {
       ),
       child: Center(
         child: SizedBox(
-          height: 80,
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.end,
-            children: [
-              Row(
-                mainAxisAlignment: MainAxisAlignment.start,
-                crossAxisAlignment: CrossAxisAlignment.end,
+          height: Platform.isWindows ? 65 : 85,
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 0), //5.0),
+            child: Container(
+              decoration: BoxDecoration(
+                color: AppColors.backgroundColor,
+                borderRadius: const BorderRadius.only(
+                  topLeft: Radius.circular(10.0),
+                  topRight: Radius.circular(10.0),
+                ),
+              ),
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.end,
                 children: [
-                  //- Information Button - top left border radius
-                  Expanded(
-                    child: ElevatedButton(
-                      style: ElevatedButton.styleFrom(
-                        elevation: 0,
-                        shape: const RoundedRectangleBorder(
-                          side: BorderSide(
-                            color: AppColors.backgroundColor,
-                            width: 2.0,
-                          ),
-                          borderRadius: BorderRadius.only(
-                            topLeft: Radius.circular(
-                              10.0,
-                            ), // Adjust the radius as needed
-                          ),
-                        ),
-                        backgroundColor: navigationBackgroundColor(
-                          ProfileNavigationState.info.value,
-                        ),
-                      ),
-                      onPressed: () {
-                        if (pupilProfileNavState ==
-                            ProfileNavigationState.info.value) {
-                          return;
-                        }
-                        _mainMenuBottomNavManager.setPupilProfileNavPage(
-                          ProfileNavigationState.info.value,
-                        );
-                      },
-                      child: Icon(
-                        Icons.info_rounded,
-                        color:
-                            _mainMenuBottomNavManager
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.start,
+                    crossAxisAlignment: CrossAxisAlignment.end,
+                    children: [
+                      Expanded(
+                        child: _navButton(
+                          state: ProfileNavigationState.info,
+                          selectedState: pupilProfileNavState,
+                          child: Icon(
+                            Icons.info_rounded,
+                            color:
+                                _mainMenuBottomNavManager
                                         .pupilProfileNavState
                                         .value ==
-                                    0
-                                ? AppColors.backgroundColor
+                                    ProfileNavigationState.info.value
+                                ? _activeForegroundColor(
+                                    ProfileNavigationState.info,
+                                  )
                                 : Colors.white,
-                      ),
-                    ),
-                  ),
-                  //- Language Button
-                  Expanded(
-                    child: ElevatedButton(
-                      style: ElevatedButton.styleFrom(
-                        elevation: 0,
-                        shape: const RoundedRectangleBorder(
-                          side: BorderSide(
-                            color: AppColors.backgroundColor,
-                            width: 2.0,
                           ),
-                          borderRadius: BorderRadius.zero,
-                        ),
-                        backgroundColor: navigationBackgroundColor(
-                          ProfileNavigationState.language.value,
                         ),
                       ),
-                      onPressed: () {
-                        if (pupilProfileNavState ==
-                            ProfileNavigationState.language.value) {
-                          return;
-                        }
-                        _mainMenuBottomNavManager.setPupilProfileNavPage(
-                          ProfileNavigationState.language.value,
-                        );
-                      },
-                      child: Icon(
-                        Icons.language_rounded,
-                        color:
-                            _mainMenuBottomNavManager
+                      Expanded(
+                        child: _navButton(
+                          state: ProfileNavigationState.language,
+                          selectedState: pupilProfileNavState,
+                          child: Icon(
+                            Icons.language_rounded,
+                            color:
+                                _mainMenuBottomNavManager
                                         .pupilProfileNavState
                                         .value ==
-                                    1
-                                ? AppColors.groupColor
+                                    ProfileNavigationState.language.value
+                                ? _activeForegroundColor(
+                                    ProfileNavigationState.language,
+                                  )
                                 : Colors.white,
-                      ),
-                    ),
-                  ),
-                  //- Credit Button
-                  Expanded(
-                    child: ElevatedButton(
-                      style: ElevatedButton.styleFrom(
-                        elevation: 0,
-                        shape: const RoundedRectangleBorder(
-                          side: BorderSide(
-                            color: AppColors.backgroundColor,
-                            width: 2.0,
                           ),
-                          borderRadius: BorderRadius.zero,
-                        ),
-                        backgroundColor: navigationBackgroundColor(
-                          ProfileNavigationState.credit.value,
                         ),
                       ),
-                      onPressed: () {
-                        if (pupilProfileNavState ==
-                            ProfileNavigationState.credit.value) {
-                          return;
-                        }
-                        _mainMenuBottomNavManager.setPupilProfileNavPage(
-                          ProfileNavigationState.credit.value,
-                        );
-                      },
-                      child: Icon(
-                        Icons.attach_money_rounded,
-                        color:
-                            _mainMenuBottomNavManager
+                      Expanded(
+                        child: _navButton(
+                          state: ProfileNavigationState.credit,
+                          selectedState: pupilProfileNavState,
+                          child: Icon(
+                            Icons.attach_money_rounded,
+                            color:
+                                _mainMenuBottomNavManager
                                         .pupilProfileNavState
                                         .value ==
-                                    2
-                                ? AppColors.accentColor
+                                    ProfileNavigationState.credit.value
+                                ? _activeForegroundColor(
+                                    ProfileNavigationState.credit,
+                                  )
                                 : Colors.white,
-                      ),
-                    ),
-                  ),
-                  //- Attendance Button
-                  Expanded(
-                    child: ElevatedButton(
-                      style: ElevatedButton.styleFrom(
-                        elevation: 0,
-                        shape: const RoundedRectangleBorder(
-                          side: BorderSide(
-                            color: AppColors.backgroundColor,
-                            width: 2.0,
                           ),
-                          borderRadius: BorderRadius.zero,
-                        ),
-                        backgroundColor: navigationBackgroundColor(
-                          ProfileNavigationState.attendance.value,
                         ),
                       ),
-                      onPressed: () {
-                        if (pupilProfileNavState ==
-                            ProfileNavigationState.attendance.value) {
-                          return;
-                        }
-                        _mainMenuBottomNavManager.setPupilProfileNavPage(
-                          ProfileNavigationState.attendance.value,
-                        );
-                      },
-                      child: Icon(
-                        Icons.calendar_month_rounded,
-                        color:
-                            _mainMenuBottomNavManager
+                      Expanded(
+                        child: _navButton(
+                          state: ProfileNavigationState.attendance,
+                          selectedState: pupilProfileNavState,
+                          child: Icon(
+                            Icons.calendar_month_rounded,
+                            color:
+                                _mainMenuBottomNavManager
                                         .pupilProfileNavState
                                         .value ==
-                                    3
-                                ? Colors.grey[800]
+                                    ProfileNavigationState.attendance.value
+                                ? _activeForegroundColor(
+                                    ProfileNavigationState.attendance,
+                                  )
                                 : Colors.white,
-                      ),
-                    ),
-                  ),
-                  //- SchooldayEvent Button - bottom right border radius
-                  Expanded(
-                    child: ElevatedButton(
-                      style: ElevatedButton.styleFrom(
-                        elevation: 0,
-                        shape: const RoundedRectangleBorder(
-                          side: BorderSide(
-                            color: AppColors.backgroundColor,
-                            width: 2.0,
-                          ),
-                          borderRadius: BorderRadius.only(
-                            topRight: Radius.circular(
-                              10.0,
-                            ), // Adjust the radius as needed
                           ),
                         ),
-                        backgroundColor: navigationBackgroundColor(
-                          ProfileNavigationState.schooldayEvent.value,
-                        ),
                       ),
-                      onPressed: () {
-                        if (pupilProfileNavState ==
-                            ProfileNavigationState.schooldayEvent.value) {
-                          return;
-                        }
-                        _mainMenuBottomNavManager.setPupilProfileNavPage(
-                          ProfileNavigationState.schooldayEvent.value,
-                        );
-                      },
-                      child: Icon(
-                        Icons.warning_rounded,
-                        color:
-                            _mainMenuBottomNavManager
+                      Expanded(
+                        child: _navButton(
+                          state: ProfileNavigationState.schooldayEvent,
+                          selectedState: pupilProfileNavState,
+                          child: Icon(
+                            Icons.warning_rounded,
+                            color:
+                                _mainMenuBottomNavManager
                                         .pupilProfileNavState
                                         .value ==
-                                    4
-                                ? AppColors.accentColor
+                                    ProfileNavigationState.schooldayEvent.value
+                                ? _activeForegroundColor(
+                                    ProfileNavigationState.schooldayEvent,
+                                  )
                                 : Colors.white,
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-              Row(
-                mainAxisAlignment: MainAxisAlignment.center,
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  //- OGS Button
-                  Expanded(
-                    child: ElevatedButton(
-                      style: ElevatedButton.styleFrom(
-                        padding: EdgeInsets.zero,
-                        elevation: 0,
-                        shape: const RoundedRectangleBorder(
-                          borderRadius: BorderRadius.zero,
-                        ),
-                        backgroundColor: navigationBackgroundColor(
-                          ProfileNavigationState.ogs.value,
+                          ),
                         ),
                       ),
-                      onPressed: () {
-                        if (pupilProfileNavState ==
-                            ProfileNavigationState.ogs.value) {
-                          return;
-                        }
-                        _mainMenuBottomNavManager.setPupilProfileNavPage(
-                          ProfileNavigationState.ogs.value,
-                        );
-                      },
-                      child: Text(
-                        'OGS',
-                        style: TextStyle(
-                          color:
-                              _mainMenuBottomNavManager
+                    ],
+                  ),
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Expanded(
+                        child: _navButton(
+                          state: ProfileNavigationState.ogs,
+                          selectedState: pupilProfileNavState,
+                          padding: EdgeInsets.zero,
+                          child: Text(
+                            'OGS',
+                            style: TextStyle(
+                              color:
+                                  _mainMenuBottomNavManager
                                           .pupilProfileNavState
                                           .value ==
-                                      5
-                                  ? AppColors.backgroundColor
+                                      ProfileNavigationState.ogs.value
+                                  ? _activeForegroundColor(
+                                      ProfileNavigationState.ogs,
+                                    )
                                   : Colors.white,
-                          fontWeight: FontWeight.bold,
-                          fontSize: 13,
-                        ),
-                      ),
-                    ),
-                  ),
-                  //- Lists Button
-                  Expanded(
-                    child: ElevatedButton(
-                      style: ElevatedButton.styleFrom(
-                        elevation: 0,
-                        shape: const RoundedRectangleBorder(
-                          borderRadius: BorderRadius.zero,
-                        ),
-                        backgroundColor: navigationBackgroundColor(
-                          ProfileNavigationState.lists.value,
+                              fontWeight: FontWeight.bold,
+                              fontSize: 13,
+                            ),
+                          ),
                         ),
                       ),
-                      onPressed: () {
-                        if (pupilProfileNavState ==
-                            ProfileNavigationState.lists.value) {
-                          return;
-                        }
-                        _mainMenuBottomNavManager.setPupilProfileNavPage(
-                          ProfileNavigationState.lists.value,
-                        );
-                      },
-                      child: Icon(
-                        Icons.rule,
-                        color:
-                            _mainMenuBottomNavManager
+                      Expanded(
+                        child: _navButton(
+                          state: ProfileNavigationState.lists,
+                          selectedState: pupilProfileNavState,
+                          child: Icon(
+                            Icons.rule,
+                            color:
+                                _mainMenuBottomNavManager
                                         .pupilProfileNavState
                                         .value ==
-                                    6
-                                ? Colors.grey[600]
+                                    ProfileNavigationState.lists.value
+                                ? _activeForegroundColor(
+                                    ProfileNavigationState.lists,
+                                  )
                                 : Colors.white,
-                      ),
-                    ),
-                  ),
-                  //- Authorization Button
-                  Expanded(
-                    child: ElevatedButton(
-                      style: ElevatedButton.styleFrom(
-                        elevation: 0,
-                        shape: const RoundedRectangleBorder(
-                          borderRadius: BorderRadius.zero,
-                        ),
-                        backgroundColor: navigationBackgroundColor(
-                          ProfileNavigationState.authorization.value,
+                          ),
                         ),
                       ),
-                      onPressed: () {
-                        if (pupilProfileNavState ==
-                            ProfileNavigationState.authorization.value) {
-                          return;
-                        }
-                        _mainMenuBottomNavManager.setPupilProfileNavPage(
-                          ProfileNavigationState.authorization.value,
-                        );
-                      },
-                      child: Icon(
-                        Icons.fact_check_rounded,
-                        color:
-                            _mainMenuBottomNavManager
+                      Expanded(
+                        child: _navButton(
+                          state: ProfileNavigationState.authorization,
+                          selectedState: pupilProfileNavState,
+                          child: Icon(
+                            Icons.fact_check_rounded,
+                            color:
+                                _mainMenuBottomNavManager
                                         .pupilProfileNavState
                                         .value ==
-                                    7
-                                ? Colors.grey[600]
+                                    ProfileNavigationState.authorization.value
+                                ? _activeForegroundColor(
+                                    ProfileNavigationState.authorization,
+                                  )
                                 : Colors.white,
-                      ),
-                    ),
-                  ),
-                  //- Learning supporn button
-                  Expanded(
-                    child: ElevatedButton(
-                      style: ElevatedButton.styleFrom(
-                        elevation: 0,
-                        shape: const RoundedRectangleBorder(
-                          borderRadius: BorderRadius.zero,
-                        ),
-                        backgroundColor: navigationBackgroundColor(
-                          ProfileNavigationState.learningSupport.value,
+                          ),
                         ),
                       ),
-                      onPressed: () {
-                        if (pupilProfileNavState ==
-                            ProfileNavigationState.learningSupport.value) {
-                          return;
-                        }
-                        _mainMenuBottomNavManager.setPupilProfileNavPage(
-                          ProfileNavigationState.learningSupport.value,
-                        );
-                      },
-                      child: Icon(
-                        Icons.support_rounded,
-                        color:
-                            _mainMenuBottomNavManager
+                      Expanded(
+                        child: _navButton(
+                          state: ProfileNavigationState.learningSupport,
+                          selectedState: pupilProfileNavState,
+                          child: Icon(
+                            Icons.support_rounded,
+                            color:
+                                _mainMenuBottomNavManager
                                         .pupilProfileNavState
                                         .value ==
-                                    8
-                                ? const Color.fromARGB(255, 245, 75, 75)
+                                    ProfileNavigationState.learningSupport.value
+                                ? _activeForegroundColor(
+                                    ProfileNavigationState.learningSupport,
+                                  )
                                 : Colors.white,
-                      ),
-                    ),
-                  ),
-                  //- Learning Button - bottom right border radius
-                  Expanded(
-                    child: ElevatedButton(
-                      style: ElevatedButton.styleFrom(
-                        elevation: 0,
-                        shape: const RoundedRectangleBorder(
-                          borderRadius: BorderRadius.zero,
-                        ),
-                        backgroundColor: navigationBackgroundColor(
-                          ProfileNavigationState.learning.value,
+                          ),
                         ),
                       ),
-                      onPressed: () {
-                        if (pupilProfileNavState ==
-                            ProfileNavigationState.learning.value) {
-                          return;
-                        }
-                        _mainMenuBottomNavManager.setPupilProfileNavPage(
-                          ProfileNavigationState.learning.value,
-                        );
-                      },
-                      child: Icon(
-                        Icons.lightbulb,
-                        color:
-                            _mainMenuBottomNavManager
+                      Expanded(
+                        child: _navButton(
+                          state: ProfileNavigationState.learning,
+                          selectedState: pupilProfileNavState,
+                          child: Icon(
+                            Icons.lightbulb,
+                            color:
+                                _mainMenuBottomNavManager
                                         .pupilProfileNavState
                                         .value ==
-                                    9
-                                ? AppColors.accentColor
+                                    ProfileNavigationState.learning.value
+                                ? _activeForegroundColor(
+                                    ProfileNavigationState.learning,
+                                  )
                                 : Colors.white,
+                          ),
+                        ),
                       ),
-                    ),
+                    ],
                   ),
                 ],
               ),
-            ],
+            ),
           ),
         ),
       ),
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/after_school_care_content/pupil_ogs_content.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/after_school_care_content/pupil_after_school_care_content.dart
similarity index 74%
rename from school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/after_school_care_content/pupil_ogs_content.dart
rename to school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/after_school_care_content/pupil_after_school_care_content.dart
index c5578dfa..e9ef62c9 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/after_school_care_content/pupil_ogs_content.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/after_school_care_content/pupil_after_school_care_content.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
-import 'package:school_data_hub_flutter/features/ogs/widgets/ogs_details.dart';
+import 'package:school_data_hub_flutter/features/pupil/presentation/after_school_care/widgets/after_school_care_details.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/widgets/pupil_profile_content_widgets.dart';
 
@@ -11,15 +11,13 @@ class PupilOgsContent extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      decoration: const BoxDecoration(
-        color: AppColors.pupilProfileBackgroundColor,
-      ),
+      decoration: BoxDecoration(color: AppColors.pupilProfileBackgroundColor),
       child: Column(
         children: [
           PupilProfileContentSection(
             icon: Icons.access_time,
             title: 'OGS-Informationen',
-            child: OgsDetails(pupil: pupil),
+            child: AfterSchoolCareDetails(pupil: pupil),
           ),
         ],
       ),
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/attendance_content/pupil_profile_attendance_content.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/attendance_content/pupil_profile_attendance_content.dart
index ab10bacf..1e39cd3b 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/attendance_content/pupil_profile_attendance_content.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/attendance_content/pupil_profile_attendance_content.dart
@@ -11,27 +11,25 @@ import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/widgets/pupil_profile_content_widgets.dart';
 import 'package:watch_it/watch_it.dart';
 
-class PupilProfileAttendanceContent extends StatelessWidget {
+class PupilAttendanceContent extends WatchingWidget {
   final PupilProxy pupil;
-  const PupilProfileAttendanceContent({required this.pupil, super.key});
+  const PupilAttendanceContent({required this.pupil, super.key});
 
   @override
   Widget build(BuildContext context) {
     final _attendanceManager = di<AttendanceManager>();
     final missedHoursForActualReport =
         AttendanceHelper.missedHoursforSemesterOrSchoolyear(pupil);
+    List<MissedSchoolday> missedSchooldays = watch(
+      _attendanceManager.getPupilMissedSchooldaysProxy(pupil.pupilId),
+    ).missedSchooldays;
 
-    List<MissedSchoolday> missedSchooldays = _attendanceManager
-        .getPupilMissedSchooldaysProxy(pupil.pupilId)
-        .missedSchooldays;
     // sort by missedDay
     missedSchooldays.sort(
       (b, a) => a.schoolday!.schoolday.compareTo(b.schoolday!.schoolday),
     );
     return Container(
-      decoration: const BoxDecoration(
-        color: AppColors.pupilProfileBackgroundColor,
-      ),
+      decoration: BoxDecoration(color: AppColors.pupilProfileBackgroundColor),
       child: Column(
         children: [
           PupilProfileContentSection(
@@ -46,6 +44,7 @@ class PupilProfileAttendanceContent extends StatelessWidget {
             },
             child: Column(
               children: [
+                const Gap(15),
                 attendanceStats(pupil),
                 const Gap(10),
                 Row(
@@ -75,14 +74,11 @@ class PupilProfileAttendanceContent extends StatelessWidget {
                 ),
                 const Gap(10),
                 ListView.builder(
-                  padding: const EdgeInsets.only(top: 5, bottom: 15),
+                  padding: const EdgeInsets.only(top: 5, bottom: 5),
                   shrinkWrap: true,
                   physics: const NeverScrollableScrollPhysics(),
                   itemCount: missedSchooldays.length,
                   itemBuilder: (BuildContext context, int index) {
-                    // pupil.pupilMissedSchooldayes.sort(
-                    //     (a, b) => a.missedDay.compareTo(b.missedDay));
-
                     return MissedSchooldayCard(
                       pupil: pupil,
                       missedSchoolday: missedSchooldays[index],
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/authorization_content/pupil_content_authorization_entry_card.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/authorization_content/pupil_content_authorization_entry_card.dart
index 0b6acde9..25b7273b 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/authorization_content/pupil_content_authorization_entry_card.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/authorization_content/pupil_content_authorization_entry_card.dart
@@ -7,7 +7,7 @@ import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/custom_checkbox_either_or.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/long_textfield_dialog.dart';
-import 'package:school_data_hub_flutter/common/widgets/document_image.dart';
+import 'package:school_data_hub_flutter/common/widgets/encrypted_document_image.dart';
 import 'package:school_data_hub_flutter/app_utils/create_and_crop_image_file.dart';
 import 'package:school_data_hub_flutter/features/authorizations/domain/authorization_manager.dart';
 import 'package:school_data_hub_flutter/features/authorizations/presentation/authorization_pupils_page/authorization_pupils_page.dart';
@@ -85,7 +85,7 @@ class PupilContentAuthorizationEntryCard extends WatchingWidget {
                                       scrollDirection: Axis.horizontal,
                                       child: Text(
                                         authorization.name,
-                                        style: const TextStyle(
+                                        style: TextStyle(
                                           fontSize: 20,
                                           fontWeight: FontWeight.bold,
                                           color: AppColors.interactiveColor,
@@ -142,7 +142,7 @@ class PupilContentAuthorizationEntryCard extends WatchingWidget {
                                   );
                             },
                             child: pupilAuthorization.fileId != null
-                                ? DocumentImage(
+                                ? EncryptedDocumentImage(
                                     documentId:
                                         pupilAuthorization.file!.documentId,
                                     size: 70,
@@ -240,7 +240,7 @@ class PupilContentAuthorizationEntryCard extends WatchingWidget {
                           },
                           child: Text(
                             pupilAuthorization.comment ?? 'kein Kommentar',
-                            style: const TextStyle(
+                            style: TextStyle(
                               fontSize: 15,
                               fontWeight: FontWeight.bold,
                               color: AppColors.interactiveColor,
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/authorization_content/pupil_profile_authorization_content.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/authorization_content/pupil_profile_authorization_content.dart
index 2c272ff1..e1291740 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/authorization_content/pupil_profile_authorization_content.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/authorization_content/pupil_profile_authorization_content.dart
@@ -12,9 +12,7 @@ class PupilProfileAuthorizationContent extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      decoration: const BoxDecoration(
-        color: AppColors.pupilProfileBackgroundColor,
-      ),
+      decoration: BoxDecoration(color: AppColors.pupilProfileBackgroundColor),
       child: Column(
         children: [
           PupilProfileContentSection(
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/communication_content/communication_values.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/communication_content/communication_values.dart
index ec91a79f..8fa3bc38 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/communication_content/communication_values.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/communication_content/communication_values.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_helper_functions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_helper.dart';
 
 class CommunicationValues extends StatelessWidget {
   final CommunicationSkills? communicationSkills;
@@ -21,10 +21,10 @@ class CommunicationValues extends StatelessWidget {
               const Icon(Icons.hearing),
               const Gap(10),
               Text(
-                PupilHelper.communicationPredicate(
+                PupilProxyHelper.communicationPredicate(
                   communicationSkills?.understanding,
                 ),
-                style: const TextStyle(
+                style: TextStyle(
                   fontSize: 16,
                   color: AppColors.interactiveColor,
                 ),
@@ -38,10 +38,10 @@ class CommunicationValues extends StatelessWidget {
               const Icon(Icons.chat_bubble_outline_rounded),
               const Gap(10),
               Text(
-                PupilHelper.communicationPredicate(
+                PupilProxyHelper.communicationPredicate(
                   communicationSkills?.speaking,
                 ),
-                style: const TextStyle(
+                style: TextStyle(
                   fontSize: 16,
                   color: AppColors.interactiveColor,
                 ),
@@ -55,10 +55,10 @@ class CommunicationValues extends StatelessWidget {
               const Icon(Icons.book),
               const Gap(10),
               Text(
-                PupilHelper.communicationPredicate(
+                PupilProxyHelper.communicationPredicate(
                   communicationSkills?.reading,
                 ),
-                style: const TextStyle(
+                style: TextStyle(
                   fontSize: 16,
                   color: AppColors.interactiveColor,
                 ),
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/communication_content/dialogs/language_dialog.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/communication_content/dialogs/language_dialog.dart
index 453961fc..34f5af95 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/communication_content/dialogs/language_dialog.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/communication_content/dialogs/language_dialog.dart
@@ -83,7 +83,7 @@ Future<void> languageDialog(
               Padding(
                 padding: const EdgeInsets.all(15.0),
                 child: InkWell(
-                  child: const Text(
+                  child: Text(
                     'ABBRECHEN',
                     style: TextStyle(
                       color: AppColors.accentColor,
@@ -99,7 +99,7 @@ Future<void> languageDialog(
               Padding(
                 padding: const EdgeInsets.all(15.0),
                 child: InkWell(
-                  child: const Text(
+                  child: Text(
                     'OK',
                     style: TextStyle(
                       color: AppColors.accentColor,
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/communication_content/dialogs/language_dialog_dropdown.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/communication_content/dialogs/language_dialog_dropdown.dart
index 1ff0498d..4b3bdbfd 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/communication_content/dialogs/language_dialog_dropdown.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/communication_content/dialogs/language_dialog_dropdown.dart
@@ -45,7 +45,7 @@ class LanguageDialogDropdown extends StatelessWidget {
                     FocusManager.instance.primaryFocus?.unfocus();
                   },
                   value: value,
-                  items: const [
+                  items: [
                     DropdownMenuItem(
                       value: 0,
                       child: Center(
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/communication_content/pupil_profile_communication_content.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/communication_content/pupil_profile_communication_content.dart
index 975841f6..a48170e3 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/communication_content/pupil_profile_communication_content.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/communication_content/pupil_profile_communication_content.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/information_dialog.dart';
@@ -28,9 +28,7 @@ class PupilProfileCommunicationContent extends WatchingWidget {
     final tutorInfo = watchPropertyValue((m) => m.tutorInfo, target: pupil);
 
     return Container(
-      decoration: const BoxDecoration(
-        color: AppColors.pupilProfileBackgroundColor,
-      ),
+      decoration: BoxDecoration(color: AppColors.pupilProfileBackgroundColor),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
@@ -77,7 +75,7 @@ class PupilProfileCommunicationContent extends WatchingWidget {
                   icon: Icons.person_outline,
                   label: 'Kind',
                   valueWidget: communicationPupil == null
-                      ? const Text(
+                      ? Text(
                           'kein Eintrag - tippen zum Hinzufügen',
                           style: TextStyle(
                             fontSize: 14,
@@ -120,7 +118,7 @@ class PupilProfileCommunicationContent extends WatchingWidget {
                   icon: Icons.person_outline,
                   label: 'Mutter / TutorIn 1',
                   valueWidget: tutorInfo?.communicationTutor1 == null
-                      ? const Text(
+                      ? Text(
                           'kein Eintrag - tippen zum Hinzufügen',
                           style: TextStyle(
                             fontSize: 14,
@@ -166,7 +164,7 @@ class PupilProfileCommunicationContent extends WatchingWidget {
                   icon: Icons.person_outline,
                   label: 'Vater / TutorIn 2',
                   valueWidget: tutorInfo?.communicationTutor2 == null
-                      ? const Text(
+                      ? Text(
                           'kein Eintrag - tippen zum Hinzufügen',
                           style: TextStyle(
                             fontSize: 14,
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/credit/pupil_profile_credit_content.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/credit/pupil_profile_credit_content.dart
index a6ea8ca1..f2965b66 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/credit/pupil_profile_credit_content.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/credit/pupil_profile_credit_content.dart
@@ -22,9 +22,7 @@ class PupilProfileCreditContent extends WatchingWidget {
       target: pupil,
     );
     return Container(
-      decoration: const BoxDecoration(
-        color: AppColors.pupilProfileBackgroundColor,
-      ),
+      decoration: BoxDecoration(color: AppColors.pupilProfileBackgroundColor),
       child: Column(
         children: [
           PupilProfileContentSection(
@@ -39,7 +37,7 @@ class PupilProfileCreditContent extends WatchingWidget {
               children: [
                 Text(
                   credit.toString(),
-                  style: const TextStyle(
+                  style: TextStyle(
                     color: AppColors.groupColor,
                     fontSize: 60,
                     fontWeight: FontWeight.bold,
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/infos_content/pupil_profile_infos_content.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/infos_content/pupil_profile_infos_content.dart
index 6a3eab67..c1bef6c7 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/infos_content/pupil_profile_infos_content.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/infos_content/pupil_profile_infos_content.dart
@@ -1,13 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/app_utils/pdf_viewer_page.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/long_textfield_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/short_textfield_dialog.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 import 'package:school_data_hub_flutter/features/matrix/domain/matrix_policy_helper.dart';
 import 'package:school_data_hub_flutter/features/matrix/domain/matrix_policy_manager.dart';
@@ -15,8 +15,8 @@ import 'package:school_data_hub_flutter/features/matrix/presentation/widgets/dia
 import 'package:school_data_hub_flutter/features/matrix/users/domain/matrix_user_helper.dart';
 import 'package:school_data_hub_flutter/features/matrix/users/presentation/new_matrix_user_page/new_matrix_user_page.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/pupil_mutator.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/pupil_profile_page.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/infos_content/widgets/avatar_auth_values.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/infos_content/widgets/pupil_media_auth_values.dart';
@@ -33,458 +33,465 @@ class PupilProfileInfosContent extends WatchingWidget {
 
   @override
   Widget build(BuildContext context) {
-    final _pupilManager = di<PupilManager>();
+    final _pupilManager = di<PupilProxyManager>();
 
     final _hubSessionManager = di<HubSessionManager>();
     final pupilSiblings = _pupilManager.getSiblings(pupil);
     watch(pupil);
     return Container(
-      decoration: const BoxDecoration(
-        color: AppColors.pupilProfileBackgroundColor,
-      ),
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          // Header Section
+      decoration: BoxDecoration(color: AppColors.pupilProfileBackgroundColor),
+      child: SingleChildScrollView(
+        physics: const BouncingScrollPhysics(),
+        padding: const EdgeInsets.only(bottom: 16),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            // Header Section
 
-          // Special Information Section
-          // Special Information Section
-          PupilProfileContentSection(
-            icon: Icons.priority_high_rounded,
-            title: 'Besondere Infos',
-            child: InkWell(
-              onTap: () async {
-                final String? specialInformation = await longTextFieldDialog(
-                  title: 'Besondere Infos',
-                  labelText: 'Besondere Infos',
-                  initialValue: pupil.specialInformation ?? '',
-                  parentContext: context,
-                );
-                if (specialInformation == null) return;
-                await PupilMutator().updateStringProperty(
-                  pupilId: pupil.pupilId,
-                  property: 'specialInformation',
-                  value: specialInformation,
-                );
-              },
-              onLongPress: () async {
-                if (pupil.specialInformation == null) return;
-                final bool? confirm = await confirmationDialog(
-                  context: context,
-                  title: 'Besondere Infos löschen',
-                  message: 'Besondere Informationen für dieses Kind löschen?',
-                );
-                if (confirm == false || confirm == null) return;
-                await PupilMutator().updateStringProperty(
-                  pupilId: pupil.pupilId,
-                  property: 'specialInformation',
-                  value: null,
-                );
-              },
-              child: Container(
-                width: double.infinity,
-                padding: const EdgeInsets.all(16),
-                decoration: BoxDecoration(
-                  color: pupil.specialInformation != null
-                      ? AppColors.backgroundColor.withValues(alpha: 0.05)
-                      : AppColors.interactiveColor.withValues(alpha: 0.05),
-                  borderRadius: BorderRadius.circular(8),
-                  border: Border.all(
+            // Special Information Section
+            // Special Information Section
+            PupilProfileContentSection(
+              icon: Icons.priority_high_rounded,
+              title: 'Besondere Infos',
+              child: InkWell(
+                onTap: () async {
+                  final String? specialInformation = await longTextFieldDialog(
+                    title: 'Besondere Infos',
+                    labelText: 'Besondere Infos',
+                    initialValue: pupil.specialInformation ?? '',
+                    parentContext: context,
+                  );
+                  if (specialInformation == null) return;
+                  await PupilMutator().updateStringProperty(
+                    pupilId: pupil.pupilId,
+                    property: 'specialInformation',
+                    value: specialInformation,
+                  );
+                },
+                onLongPress: () async {
+                  if (pupil.specialInformation == null) return;
+                  final bool? confirm = await confirmationDialog(
+                    context: context,
+                    title: 'Besondere Infos löschen',
+                    message: 'Besondere Informationen für dieses Kind löschen?',
+                  );
+                  if (confirm == false || confirm == null) return;
+                  await PupilMutator().updateStringProperty(
+                    pupilId: pupil.pupilId,
+                    property: 'specialInformation',
+                    value: null,
+                  );
+                },
+                child: Container(
+                  width: double.infinity,
+                  padding: const EdgeInsets.all(16),
+                  decoration: BoxDecoration(
                     color: pupil.specialInformation != null
-                        ? AppColors.backgroundColor.withValues(alpha: 0.2)
-                        : AppColors.interactiveColor.withValues(alpha: 0.2),
-                    width: 1,
+                        ? AppColors.backgroundColor.withValues(alpha: 0.05)
+                        : AppColors.interactiveColor.withValues(alpha: 0.05),
+                    borderRadius: BorderRadius.circular(8),
+                    border: Border.all(
+                      color: pupil.specialInformation != null
+                          ? AppColors.backgroundColor.withValues(alpha: 0.2)
+                          : AppColors.interactiveColor.withValues(alpha: 0.2),
+                      width: 1,
+                    ),
                   ),
-                ),
-                child: Text(
-                  pupil.specialInformation ??
-                      'Tippen Sie hier, um besondere Informationen hinzuzufügen',
-                  style: TextStyle(
-                    fontSize: 16,
-                    fontWeight: pupil.specialInformation != null
-                        ? FontWeight.w500
-                        : FontWeight.normal,
-                    color: pupil.specialInformation != null
-                        ? AppColors.backgroundColor
-                        : AppColors.interactiveColor,
-                    fontStyle: pupil.specialInformation == null
-                        ? FontStyle.italic
-                        : FontStyle.normal,
+                  child: Text(
+                    pupil.specialInformation ??
+                        'Tippen Sie hier, um besondere Informationen hinzuzufügen',
+                    style: TextStyle(
+                      fontSize: 16,
+                      fontWeight: pupil.specialInformation != null
+                          ? FontWeight.w500
+                          : FontWeight.normal,
+                      color: pupil.specialInformation != null
+                          ? AppColors.backgroundColor
+                          : AppColors.interactiveColor,
+                      fontStyle: pupil.specialInformation == null
+                          ? FontStyle.italic
+                          : FontStyle.normal,
+                    ),
                   ),
                 ),
               ),
             ),
-          ),
-          const Gap(8),
-          // Basic Information Section
-          // Basic Information Section
-          PupilProfileContentSection(
-            icon: Icons.person_outline,
-            title: 'Grunddaten',
-            child: Column(
-              children: [
-                PupilProfileContentRow(
-                  icon: Icons.wc,
-                  label: 'Geschlecht',
-                  value: pupil.gender == 'm' ? 'männlich' : 'weiblich',
-                ),
-                const Gap(8),
-                PupilProfileContentRow(
-                  icon: Icons.cake_outlined,
-                  label: 'Geburtsdatum',
-                  value: pupil.birthday.formatDateForUser(),
-                ),
-                const Gap(8),
-                PupilProfileContentRow(
-                  icon: Icons.school_outlined,
-                  label: 'Aufnahmedatum',
-                  value: pupil.pupilSince.formatDateForUser(),
-                ),
-              ],
+            const Gap(8),
+            // Basic Information Section
+            // Basic Information Section
+            PupilProfileContentSection(
+              icon: Icons.person_outline,
+              title: 'Grunddaten',
+              child: Column(
+                children: [
+                  PupilProfileContentRow(
+                    icon: Icons.wc,
+                    label: 'Geschlecht',
+                    value: pupil.gender == 'm' ? 'männlich' : 'weiblich',
+                  ),
+                  const Gap(8),
+                  PupilProfileContentRow(
+                    icon: Icons.cake_outlined,
+                    label: 'Geburtsdatum',
+                    value: pupil.birthday.formatDateForUser(),
+                  ),
+                  const Gap(8),
+                  PupilProfileContentRow(
+                    icon: Icons.school_outlined,
+                    label: 'Aufnahmedatum',
+                    value: pupil.pupilSince.formatDateForUser(),
+                  ),
+                ],
+              ),
             ),
-          ),
-          const Gap(8),
-          // Contact Information Section
-          // Contact Information Section
-          PupilProfileContentSection(
-            icon: Icons.contact_phone_outlined,
-            title: 'Kontaktinformationen',
-            child: Column(
-              children: [
-                PupilProfileContentRow(
-                  icon: Icons.person_outline,
-                  label: 'Schüler/in Kontakt',
-                  value: pupil.contact?.isNotEmpty == true
-                      ? pupil.contact!
-                      : 'keine Angabe',
-                  onTap: () {
-                    if (pupil.contact != null && pupil.contact!.isNotEmpty) {
-                      MatrixPolicyHelper.launchMatrixUrl(
-                        context,
-                        pupil.contact!,
+            const Gap(8),
+            // Contact Information Section
+            // Contact Information Section
+            PupilProfileContentSection(
+              icon: Icons.contact_phone_outlined,
+              title: 'Kontaktinformationen',
+              child: Column(
+                children: [
+                  PupilProfileContentRow(
+                    icon: Icons.person_outline,
+                    label: 'Schüler/in Kontakt',
+                    value: pupil.contact?.isNotEmpty == true
+                        ? pupil.contact!
+                        : 'keine Angabe',
+                    onTap: () {
+                      if (pupil.contact != null && pupil.contact!.isNotEmpty) {
+                        MatrixPolicyHelper.launchMatrixUrl(
+                          context,
+                          pupil.contact!,
+                        );
+                      }
+                    },
+                    onLongPress: () async {
+                      final String? contact = await shortTextfieldDialog(
+                        title: 'Kontakt',
+                        hintText: 'Kontakt des Schülers/der Schülerin',
+                        labelText: 'Kontakt',
+                        textinField: pupil.contact ?? '',
+                        context: context,
+                      );
+                      if (contact == null) return;
+                      await PupilMutator().updateStringProperty(
+                        pupilId: pupil.pupilId,
+                        property: 'contact',
+                        value: contact,
                       );
-                    }
-                  },
-                  onLongPress: () async {
-                    final String? contact = await shortTextfieldDialog(
-                      title: 'Kontakt',
-                      hintText: 'Kontakt des Schülers/der Schülerin',
-                      labelText: 'Kontakt',
-                      textinField: pupil.contact ?? '',
-                      context: context,
-                    );
-                    if (contact == null) return;
-                    await PupilMutator().updateStringProperty(
-                      pupilId: pupil.pupilId,
-                      property: 'contact',
-                      value: contact,
-                    );
-                  },
-                  actionButton: pupil.contact == null || pupil.contact!.isEmpty
-                      ? IconButton(
-                          onPressed: () async {
-                            if (_isMatrixAuthorized == false) return;
-                            final confirm = await confirmationDialog(
-                              context: context,
-                              title: 'Matrix-Admindaten erstellen',
-                              message:
-                                  'Möchten Sie die Matrix-Admindaten wirklich erstellen?',
-                            );
-                            if (confirm != true) return;
-                            Navigator.of(context).push(
-                              MaterialPageRoute(
-                                builder: (ctx) => NewMatrixUserPage(
-                                  pupil: pupil,
-                                  matrixId: MatrixPolicyHelper.generateMatrixId(
-                                    isParent: false,
+                    },
+                    actionButton:
+                        pupil.contact == null || pupil.contact!.isEmpty
+                        ? IconButton(
+                            onPressed: () async {
+                              if (_isMatrixAuthorized == false) return;
+                              final confirm = await confirmationDialog(
+                                context: context,
+                                title: 'Matrix-Admindaten erstellen',
+                                message:
+                                    'Möchten Sie die Matrix-Admindaten wirklich erstellen?',
+                              );
+                              if (confirm != true) return;
+                              Navigator.of(context).push(
+                                MaterialPageRoute(
+                                  builder: (ctx) => NewMatrixUserPage(
+                                    pupil: pupil,
+                                    matrixId:
+                                        MatrixPolicyHelper.generateMatrixId(
+                                          isParent: false,
+                                        ),
+                                    displayName:
+                                        '${pupil.firstName} ${pupil.lastName.substring(0, 1).toUpperCase()}. (${pupil.group})',
                                   ),
-                                  displayName:
-                                      '${pupil.firstName} ${pupil.lastName.substring(0, 1).toUpperCase()}. (${pupil.group})',
                                 ),
-                              ),
-                            );
-                          },
-                          icon: const Icon(
-                            Icons.add_circle_outline,
-                            size: 24,
-                            color: AppColors.interactiveColor,
-                          ),
-                        )
-                      : IconButton(
-                          onPressed: () async {
-                            if (_isMatrixAuthorized == false) return;
+                              );
+                            },
+                            icon: Icon(
+                              Icons.add_circle_outline,
+                              size: 24,
+                              color: AppColors.interactiveColor,
+                            ),
+                          )
+                        : IconButton(
+                            onPressed: () async {
+                              if (_isMatrixAuthorized == false) return;
 
-                            final confirmation = await confirmationDialog(
-                              context: context,
-                              title: 'Passwort zurücksetzen',
-                              message:
-                                  'Möchten Sie das Passwort wirklich zurücksetzen?',
-                            );
-                            if (confirmation != true) return;
-                            if (context.mounted) {
-                              final logOutDevices = await logoutDevicesDialog(
-                                context,
+                              final confirmation = await confirmationDialog(
+                                context: context,
+                                title: 'Passwort zurücksetzen',
+                                message:
+                                    'Möchten Sie das Passwort wirklich zurücksetzen?',
                               );
-                              if (logOutDevices == null) return;
-                              final file = await di<MatrixPolicyManager>().users
-                                  .resetPasswordAndPrintCredentialsFile(
-                                    user: MatrixUserHelper.usersFromUserIds([
-                                      pupil.contact!,
-                                    ]).first,
-                                    logoutDevices: logOutDevices,
-                                    isStaff: false,
-                                  );
-                              if (file != null && context.mounted) {
-                                Navigator.of(context).push(
-                                  MaterialPageRoute(
-                                    builder: (context) =>
-                                        PdfViewerPage(pdfFile: file),
-                                  ),
+                              if (confirmation != true) return;
+                              if (context.mounted) {
+                                final logOutDevices = await logoutDevicesDialog(
+                                  context,
                                 );
+                                if (logOutDevices == null) return;
+                                final file = await di<MatrixPolicyManager>()
+                                    .users
+                                    .resetPasswordAndPrintCredentialsFile(
+                                      user: MatrixUserHelper.usersFromUserIds([
+                                        pupil.contact!,
+                                      ]).first,
+                                      logoutDevices: logOutDevices,
+                                      isStaff: false,
+                                    );
+                                if (file != null && context.mounted) {
+                                  Navigator.of(context).push(
+                                    MaterialPageRoute(
+                                      builder: (context) =>
+                                          PdfViewerPage(pdfFile: file),
+                                    ),
+                                  );
+                                }
                               }
-                            }
-                          },
-                          icon: const Icon(
-                            Icons.qr_code_2_rounded,
-                            size: 24,
-                            color: AppColors.backgroundColor,
+                            },
+                            icon: Icon(
+                              Icons.qr_code_2_rounded,
+                              size: 24,
+                              color: AppColors.backgroundColor,
+                            ),
                           ),
-                        ),
-                ),
-                const Gap(10),
-                PupilProfileContentRow(
-                  icon: Icons.family_restroom_outlined,
-                  label: 'Familie Kontakt',
-                  value: pupil.tutorInfo?.parentsContact ?? 'keine Angabe',
-                  onTap: () {
-                    final bool tutorInfoExists = pupil.tutorInfo != null;
-                    if (tutorInfoExists &&
-                        pupil.tutorInfo!.parentsContact != null) {
-                      MatrixPolicyHelper.launchMatrixUrl(
-                        context,
-                        pupil.tutorInfo!.parentsContact!,
+                  ),
+                  const Gap(10),
+                  PupilProfileContentRow(
+                    icon: Icons.family_restroom_outlined,
+                    label: 'Familie Kontakt',
+                    value: pupil.tutorInfo?.parentsContact ?? 'keine Angabe',
+                    onTap: () {
+                      final bool tutorInfoExists = pupil.tutorInfo != null;
+                      if (tutorInfoExists &&
+                          pupil.tutorInfo!.parentsContact != null) {
+                        MatrixPolicyHelper.launchMatrixUrl(
+                          context,
+                          pupil.tutorInfo!.parentsContact!,
+                        );
+                      }
+                    },
+                    onLongPress: () async {
+                      final String? parentsContact = await shortTextfieldDialog(
+                        title: 'Kontakt Familie',
+                        hintText: 'Kontakt der Familie',
+                        labelText: 'Kontakt Familie',
+                        textinField:
+                            pupil.tutorInfo?.parentsContact ?? 'keine Angabe',
+                        context: context,
                       );
-                    }
-                  },
-                  onLongPress: () async {
-                    final String? parentsContact = await shortTextfieldDialog(
-                      title: 'Kontakt Familie',
-                      hintText: 'Kontakt der Familie',
-                      labelText: 'Kontakt Familie',
-                      textinField:
-                          pupil.tutorInfo?.parentsContact ?? 'keine Angabe',
-                      context: context,
-                    );
-                    if (parentsContact == null) return;
-                    await PupilMutator().updateTutorInfo(
-                      pupilId: pupil.pupilId,
-                      tutorInfo: pupil.tutorInfo != null
-                          ? pupil.tutorInfo!.copyWith(
-                              parentsContact: parentsContact,
-                            )
-                          : TutorInfo(
-                              parentsContact: parentsContact,
-                              createdBy: _hubSessionManager.userName!,
-                            ),
-                    );
-                  },
-                  actionButton: pupil.tutorInfo?.parentsContact == null
-                      ? IconButton(
-                          onPressed: () {
-                            String? pupilSiblingsGroups;
-                            if (pupil.family != null) {
-                              pupilSiblingsGroups = [
-                                ..._pupilManager.getSiblings(pupil),
-                                pupil,
-                              ].map((e) => e.group).toList().join();
-                            }
-                            Navigator.of(context).push(
-                              MaterialPageRoute(
-                                builder: (ctx) => NewMatrixUserPage(
-                                  pupil: pupil,
-                                  matrixId: MatrixPolicyHelper.generateMatrixId(
+                      if (parentsContact == null) return;
+                      await PupilMutator().updateTutorInfo(
+                        pupilId: pupil.pupilId,
+                        tutorInfo: pupil.tutorInfo != null
+                            ? pupil.tutorInfo!.copyWith(
+                                parentsContact: parentsContact,
+                              )
+                            : TutorInfo(
+                                parentsContact: parentsContact,
+                                createdBy: _hubSessionManager.userName!,
+                              ),
+                      );
+                    },
+                    actionButton: pupil.tutorInfo?.parentsContact == null
+                        ? IconButton(
+                            onPressed: () {
+                              String? pupilSiblingsGroups;
+                              if (pupil.family != null) {
+                                pupilSiblingsGroups = [
+                                  ..._pupilManager.getSiblings(pupil),
+                                  pupil,
+                                ].map((e) => e.group).toList().join();
+                              }
+                              Navigator.of(context).push(
+                                MaterialPageRoute(
+                                  builder: (ctx) => NewMatrixUserPage(
+                                    pupil: pupil,
+                                    matrixId:
+                                        MatrixPolicyHelper.generateMatrixId(
+                                          isParent: true,
+                                        ),
+                                    displayName: pupilSiblingsGroups != null
+                                        ? 'Fa. ${pupil.lastName} (E) $pupilSiblingsGroups'
+                                        : '${pupil.firstName} ${pupil.lastName.substring(0, 1).toUpperCase()}. (E) ${pupil.group}',
                                     isParent: true,
                                   ),
-                                  displayName: pupilSiblingsGroups != null
-                                      ? 'Fa. ${pupil.lastName} (E) $pupilSiblingsGroups'
-                                      : '${pupil.firstName} ${pupil.lastName.substring(0, 1).toUpperCase()}. (E) ${pupil.group}',
-                                  isParent: true,
                                 ),
-                              ),
-                            );
-                          },
-                          icon: const Icon(
-                            Icons.add_circle_outline,
-                            size: 24,
-                            color: AppColors.interactiveColor,
-                          ),
-                        )
-                      : IconButton(
-                          onPressed: () async {
-                            if (_isMatrixAuthorized == false) return;
-                            final confirmation = await confirmationDialog(
-                              context: context,
-                              title: 'Passwort zurücksetzen',
-                              message:
-                                  'Möchten Sie das Passwort wirklich zurücksetzen?',
-                            );
-                            if (confirmation != true) return;
-                            if (context.mounted) {
-                              final logOutDevices = await logoutDevicesDialog(
-                                context,
                               );
-                              if (logOutDevices == null) return;
-                              final file = await di<MatrixPolicyManager>().users
-                                  .resetPasswordAndPrintCredentialsFile(
-                                    user: MatrixUserHelper.usersFromUserIds([
-                                      pupil.tutorInfo!.parentsContact!,
-                                    ]).first,
-                                    logoutDevices: logOutDevices,
-                                    isStaff: false,
-                                  );
-                              if (file != null && context.mounted) {
-                                Navigator.of(context).push(
-                                  MaterialPageRoute(
-                                    builder: (context) =>
-                                        PdfViewerPage(pdfFile: file),
-                                  ),
+                            },
+                            icon: Icon(
+                              Icons.add_circle_outline,
+                              size: 24,
+                              color: AppColors.interactiveColor,
+                            ),
+                          )
+                        : IconButton(
+                            onPressed: () async {
+                              if (_isMatrixAuthorized == false) return;
+                              final confirmation = await confirmationDialog(
+                                context: context,
+                                title: 'Passwort zurücksetzen',
+                                message:
+                                    'Möchten Sie das Passwort wirklich zurücksetzen?',
+                              );
+                              if (confirmation != true) return;
+                              if (context.mounted) {
+                                final logOutDevices = await logoutDevicesDialog(
+                                  context,
                                 );
+                                if (logOutDevices == null) return;
+                                final file = await di<MatrixPolicyManager>()
+                                    .users
+                                    .resetPasswordAndPrintCredentialsFile(
+                                      user: MatrixUserHelper.usersFromUserIds([
+                                        pupil.tutorInfo!.parentsContact!,
+                                      ]).first,
+                                      logoutDevices: logOutDevices,
+                                      isStaff: false,
+                                    );
+                                if (file != null && context.mounted) {
+                                  Navigator.of(context).push(
+                                    MaterialPageRoute(
+                                      builder: (context) =>
+                                          PdfViewerPage(pdfFile: file),
+                                    ),
+                                  );
+                                }
                               }
-                            }
-                          },
-                          icon: const Icon(
-                            Icons.qr_code_2_rounded,
-                            size: 24,
-                            color: AppColors.backgroundColor,
+                            },
+                            icon: Icon(
+                              Icons.qr_code_2_rounded,
+                              size: 24,
+                              color: AppColors.backgroundColor,
+                            ),
                           ),
-                        ),
-                ),
-              ],
+                  ),
+                ],
+              ),
             ),
-          ),
-          const Gap(8),
-          // Authorizations Section
-          // Authorizations Section
-          PupilProfileContentSection(
-            icon: Icons.verified_user_outlined,
-            title: 'Einwilligungen',
-            child: Column(
-              children: [
-                AvatarAuthValues(pupil: pupil),
-                const Gap(16),
-                PublicMediaAuthValues(pupil: pupil),
-              ],
+            const Gap(8),
+            // Authorizations Section
+            // Authorizations Section
+            PupilProfileContentSection(
+              icon: Icons.verified_user_outlined,
+              title: 'Einwilligungen',
+              child: Column(
+                children: [
+                  AvatarAuthValues(pupil: pupil),
+                  const Gap(16),
+                  PublicMediaAuthValues(pupil: pupil),
+                ],
+              ),
             ),
-          ),
-          const Gap(8),
-          // Siblings Section
-          // Siblings Section
-          PupilProfileContentSection(
-            icon: Icons.family_restroom_outlined,
-            title: 'Geschwister',
-            child: pupilSiblings.isNotEmpty
-                ? ListView.builder(
-                    shrinkWrap: true,
-                    physics: const NeverScrollableScrollPhysics(),
-                    itemCount: pupilSiblings.length,
-                    itemBuilder: (context, int index) {
-                      PupilProxy sibling = pupilSiblings[index];
-                      return Padding(
-                        padding: const EdgeInsets.only(bottom: 12.0),
-                        child: Card(
-                          color: AppColors.pupilProfileCardColor,
-                          child: InkWell(
-                            onTap: () {
-                              Navigator.of(context).push(
-                                MaterialPageRoute(
-                                  builder: (ctx) =>
-                                      PupilProfilePage(pupil: sibling),
-                                ),
-                              );
-                            },
-                            borderRadius: BorderRadius.circular(12),
-                            child: Padding(
-                              padding: const EdgeInsets.all(16.0),
-                              child: Row(
-                                crossAxisAlignment: CrossAxisAlignment.center,
-                                children: [
-                                  AvatarWithBadges(pupil: sibling, size: 60),
-                                  const Gap(16),
-                                  Expanded(
-                                    child: Column(
-                                      crossAxisAlignment:
-                                          CrossAxisAlignment.start,
-                                      children: [
-                                        Text(
-                                          '${sibling.firstName} ${sibling.lastName}',
-                                          style: const TextStyle(
-                                            fontWeight: FontWeight.bold,
-                                            fontSize: 18,
-                                            color: AppColors.backgroundColor,
+            const Gap(8),
+            // Siblings Section
+            // Siblings Section
+            PupilProfileContentSection(
+              icon: Icons.family_restroom_outlined,
+              title: 'Geschwister',
+              child: pupilSiblings.isNotEmpty
+                  ? ListView.builder(
+                      shrinkWrap: true,
+                      physics: const NeverScrollableScrollPhysics(),
+                      itemCount: pupilSiblings.length,
+                      itemBuilder: (context, int index) {
+                        PupilProxy sibling = pupilSiblings[index];
+                        return Padding(
+                          padding: const EdgeInsets.only(bottom: 12.0),
+                          child: Card(
+                            color: AppColors.pupilProfileCardColor,
+                            child: InkWell(
+                              onTap: () {
+                                Navigator.of(context).push(
+                                  MaterialPageRoute(
+                                    builder: (ctx) =>
+                                        PupilProfilePage(pupil: sibling),
+                                  ),
+                                );
+                              },
+                              borderRadius: BorderRadius.circular(12),
+                              child: Padding(
+                                padding: const EdgeInsets.all(16.0),
+                                child: Row(
+                                  crossAxisAlignment: CrossAxisAlignment.center,
+                                  children: [
+                                    AvatarWithBadges(pupil: sibling, size: 60),
+                                    const Gap(16),
+                                    Expanded(
+                                      child: Column(
+                                        crossAxisAlignment:
+                                            CrossAxisAlignment.start,
+                                        children: [
+                                          Text(
+                                            '${sibling.firstName} ${sibling.lastName}',
+                                            style: TextStyle(
+                                              fontWeight: FontWeight.bold,
+                                              fontSize: 18,
+                                              color: AppColors.backgroundColor,
+                                            ),
                                           ),
-                                        ),
-                                        const Gap(4),
-                                        Text(
-                                          'Klasse ${sibling.group}',
-                                          style: TextStyle(
-                                            fontSize: 16,
-                                            color: Colors.grey.withValues(
-                                              alpha: 0.8,
+                                          const Gap(4),
+                                          Text(
+                                            'Klasse ${sibling.group}',
+                                            style: TextStyle(
+                                              fontSize: 16,
+                                              color: Colors.grey.withValues(
+                                                alpha: 0.8,
+                                              ),
                                             ),
                                           ),
-                                        ),
-                                        const Gap(4),
-                                        Text(
-                                          'Geburtsdatum: ${sibling.birthday.formatDateForUser()}',
-                                          style: TextStyle(
-                                            fontSize: 14,
-                                            color: Colors.grey.withValues(
-                                              alpha: 0.7,
+                                          const Gap(4),
+                                          Text(
+                                            'Geburtsdatum: ${sibling.birthday.formatDateForUser()}',
+                                            style: TextStyle(
+                                              fontSize: 14,
+                                              color: Colors.grey.withValues(
+                                                alpha: 0.7,
+                                              ),
                                             ),
                                           ),
-                                        ),
-                                      ],
+                                        ],
+                                      ),
                                     ),
-                                  ),
-                                  Icon(
-                                    Icons.arrow_forward_ios,
-                                    color: AppColors.interactiveColor,
-                                    size: 18,
-                                  ),
-                                ],
+                                    Icon(
+                                      Icons.arrow_forward_ios,
+                                      color: AppColors.interactiveColor,
+                                      size: 18,
+                                    ),
+                                  ],
+                                ),
                               ),
                             ),
                           ),
-                        ),
-                      );
-                    },
-                  )
-                : Card(
-                    child: Padding(
-                      padding: const EdgeInsets.all(20),
-                      child: Row(
-                        children: [
-                          Icon(
-                            Icons.info_outline,
-                            color: Colors.grey.withValues(alpha: 0.6),
-                            size: 24,
-                          ),
-                          const Gap(12),
-                          Text(
-                            'Keine Geschwister erfasst',
-                            style: TextStyle(
-                              fontSize: 16,
-                              color: Colors.grey.withValues(alpha: 0.7),
-                              fontStyle: FontStyle.italic,
+                        );
+                      },
+                    )
+                  : Card(
+                      child: Padding(
+                        padding: const EdgeInsets.all(20),
+                        child: Row(
+                          children: [
+                            Icon(
+                              Icons.info_outline,
+                              color: Colors.grey.withValues(alpha: 0.6),
+                              size: 24,
                             ),
-                          ),
-                        ],
+                            const Gap(12),
+                            Text(
+                              'Keine Geschwister erfasst',
+                              style: TextStyle(
+                                fontSize: 16,
+                                color: Colors.grey.withValues(alpha: 0.7),
+                                fontStyle: FontStyle.italic,
+                              ),
+                            ),
+                          ],
+                        ),
                       ),
                     ),
-                  ),
-          ),
-          const Gap(20), // Extra spacing at the bottom
-        ],
+            ),
+            // Extra spacing at the bottom to avoid nav overlap
+          ],
+        ),
       ),
     );
   }
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/infos_content/widgets/avatar_auth_values.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/infos_content/widgets/avatar_auth_values.dart
index ee53b901..3dfa7a0f 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/infos_content/widgets/avatar_auth_values.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/infos_content/widgets/avatar_auth_values.dart
@@ -6,7 +6,7 @@ import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
-import 'package:school_data_hub_flutter/common/widgets/document_image.dart';
+import 'package:school_data_hub_flutter/common/widgets/encrypted_document_image.dart';
 import 'package:school_data_hub_flutter/app_utils/create_and_crop_image_file.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
@@ -69,7 +69,7 @@ class AvatarAuthValues extends WatchingWidget {
             child: Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               children: [
-                const Text(
+                Text(
                   'Avatar-Einwilligung',
                   style: TextStyle(
                     fontSize: 14,
@@ -137,7 +137,7 @@ class AvatarAuthValues extends WatchingWidget {
                 ),
               ),
               child: avatarAuthId != null
-                  ? DocumentImage(
+                  ? EncryptedDocumentImage(
                       documentId: avatarAuth!.documentId,
                       size: 50, // Reduced from 70 to 50
                     )
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/infos_content/widgets/pupil_media_auth_values.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/infos_content/widgets/pupil_media_auth_values.dart
index 9a0412e2..2ed3d3d6 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/infos_content/widgets/pupil_media_auth_values.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/infos_content/widgets/pupil_media_auth_values.dart
@@ -3,11 +3,11 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
+import 'package:school_data_hub_flutter/app_utils/create_and_crop_image_file.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
-import 'package:school_data_hub_flutter/common/widgets/document_image.dart';
-import 'package:school_data_hub_flutter/app_utils/create_and_crop_image_file.dart';
+import 'package:school_data_hub_flutter/common/widgets/encrypted_document_image.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/pupil_mutator.dart';
@@ -62,7 +62,7 @@ class PublicMediaAuthValues extends WatchingWidget {
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    const Text(
+                    Text(
                       'Veröffentlichungseinwilligung',
                       style: TextStyle(
                         fontSize: 14,
@@ -119,7 +119,7 @@ class PublicMediaAuthValues extends WatchingWidget {
                     ),
                   ),
                   child: publicMediaAuthDocumentId != null
-                      ? DocumentImage(
+                      ? EncryptedDocumentImage(
                           documentId: publicMediaAuthDocument!.documentId,
                           size: 40, // Smaller than before
                         )
@@ -236,7 +236,7 @@ class PublicMediaAuthValues extends WatchingWidget {
             Expanded(
               child: Text(
                 label,
-                style: const TextStyle(
+                style: TextStyle(
                   fontSize: 12,
                   fontWeight: FontWeight.w500,
                   color: AppColors.backgroundColor,
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/widgets/pupil_language_card.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/language_content/pupil_language_card.dart
similarity index 100%
rename from school_data_hub_flutter/lib/features/pupil/presentation/widgets/pupil_language_card.dart
rename to school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/language_content/pupil_language_card.dart
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/learning_content/pupil_profile_learning_content.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/learning_content/pupil_profile_learning_content.dart
index 8277d7b3..ee0fe413 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/learning_content/pupil_profile_learning_content.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/learning_content/pupil_profile_learning_content.dart
@@ -1,12 +1,12 @@
 import 'package:calendar_date_picker2/calendar_date_picker2.dart';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/features/learning/presentation/widgets/pupil_learning_content_expansion_tile_nav_bar.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/widgets/pupil_profile_content_widgets.dart';
 import 'package:watch_it/watch_it.dart';
 
@@ -18,9 +18,7 @@ class PupilLearningContent extends WatchingWidget {
   Widget build(BuildContext context) {
     watch(pupil);
     return Container(
-      decoration: const BoxDecoration(
-        color: AppColors.pupilProfileBackgroundColor,
-      ),
+      decoration: BoxDecoration(color: AppColors.pupilProfileBackgroundColor),
       child: Column(
         children: [
           PupilProfileContentSection(
@@ -49,7 +47,7 @@ class PupilLearningContent extends WatchingWidget {
                         );
 
                         if (date != null && date.isNotEmpty) {
-                          di<PupilManager>().updateSchoolyearHeldBackDate(
+                          di<PupilProxyManager>().updateSchoolyearHeldBackDate(
                             pupilId: pupil.pupilId,
                             date: (value: date.first!.toUtc()),
                           );
@@ -63,7 +61,7 @@ class PupilLearningContent extends WatchingWidget {
                           message: 'Eintrag wirklich löschen?',
                         );
                         if (confirmation != true) return;
-                        di<PupilManager>().updateSchoolyearHeldBackDate(
+                        di<PupilProxyManager>().updateSchoolyearHeldBackDate(
                           pupilId: pupil.internalId,
                           date: (value: null),
                         );
@@ -72,7 +70,7 @@ class PupilLearningContent extends WatchingWidget {
                         pupil.schoolyearHeldBackAt != null
                             ? 'Entscheidung vom ${pupil.schoolyearHeldBackAt!.formatDateForUser()}'
                             : 'nein',
-                        style: const TextStyle(
+                        style: TextStyle(
                           color: AppColors.interactiveColor,
                           fontWeight: FontWeight.bold,
                         ),
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/learning_support_content/pupil_profile_learning_support_content.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/learning_support_content/pupil_profile_learning_support_content.dart
index d54fe4fd..1a4e4b21 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/learning_support_content/pupil_profile_learning_support_content.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/learning_support_content/pupil_profile_learning_support_content.dart
@@ -12,9 +12,7 @@ class PupilProfileLearningSupportContent extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      decoration: const BoxDecoration(
-        color: AppColors.pupilProfileBackgroundColor,
-      ),
+      decoration: BoxDecoration(color: AppColors.pupilProfileBackgroundColor),
       child: Column(
         children: [
           PupilProfileContentSection(
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/learning_support_content/pupil_profile_learning_support_content_list.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/learning_support_content/pupil_profile_learning_support_content_list.dart
index 946c2a63..1a529a32 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/learning_support_content/pupil_profile_learning_support_content_list.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/learning_support_content/pupil_profile_learning_support_content_list.dart
@@ -12,7 +12,8 @@ import 'package:school_data_hub_flutter/common/widgets/custom_expansion_tile/cus
 import 'package:school_data_hub_flutter/common/widgets/custom_expansion_tile/custom_expansion_tile_content.dart';
 import 'package:school_data_hub_flutter/common/widgets/custom_expansion_tile/custom_expansion_tile_switch.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
-import 'package:school_data_hub_flutter/common/widgets/document_image.dart';
+import 'package:school_data_hub_flutter/common/widgets/dialogs/long_textfield_dialog.dart';
+import 'package:school_data_hub_flutter/common/widgets/encrypted_document_image.dart';
 import 'package:school_data_hub_flutter/core/client/client_helper.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 import 'package:school_data_hub_flutter/features/learning_support/domain/support_category_manager.dart';
@@ -24,8 +25,9 @@ import 'package:school_data_hub_flutter/features/learning_support/presentation/w
 import 'package:school_data_hub_flutter/features/learning_support/presentation/widgets/support_catagory_status/support_category_statuses_list.dart';
 import 'package:school_data_hub_flutter/features/learning_support/services/learning_support_plan_pdf_generator.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_helper_functions.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_mutator.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_helper.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/learning_support_content/support_level_history_expansion_tile.dart';
 import 'package:school_data_hub_flutter/features/school_calendar/domain/school_calendar_manager.dart';
 import 'package:watch_it/watch_it.dart';
@@ -42,6 +44,7 @@ class PupilProfileLearningSupportContentList extends WatchingWidget {
   Widget build(BuildContext context) {
     final _hubSessionManager = di<HubSessionManager>();
     final isAdmin = _hubSessionManager.isAdmin;
+
     final kindergarden = watchPropertyValue(
       (m) => m.kindergarden,
       target: pupil,
@@ -64,134 +67,148 @@ class PupilProfileLearningSupportContentList extends WatchingWidget {
           ],
         ),
         const Gap(10),
-        if (isAdmin)
-          Row(
-            children: [
-              Expanded(
-                child: InkWell(
-                  onTap: () => preschoolRevisionDialog(
-                    context,
-                    pupil,
-                    pupil.preSchoolMedical?.preschoolMedicalStatus,
+
+        Row(
+          children: [
+            Expanded(
+              child: InkWell(
+                onTap: () => preschoolRevisionDialog(
+                  context,
+                  pupil,
+                  pupil.preSchoolMedical?.preschoolMedicalStatus,
+                ),
+                child: Text(
+                  PupilProxyHelper.preschoolRevisionPredicate(
+                    pupil.preSchoolMedical,
                   ),
-                  child: Text(
-                    PupilHelper.preschoolRevisionPredicate(
-                      pupil.preSchoolMedical,
-                    ),
-                    style: const TextStyle(
-                      fontSize: 18.0,
-                      fontWeight: FontWeight.bold,
-                      color: AppColors.interactiveColor,
-                    ),
+                  style: TextStyle(
+                    fontSize: 18.0,
+                    fontWeight: FontWeight.bold,
+                    color: AppColors.interactiveColor,
                   ),
                 ),
               ),
-              // HubDocument files display (following competence check pattern)
-              if (pupil.preSchoolMedical?.preschoolMedicalFiles != null)
-                for (HubDocument file
-                    in pupil.preSchoolMedical!.preschoolMedicalFiles!) ...[
-                  const Gap(10),
-                  Column(
-                    mainAxisAlignment: MainAxisAlignment.center,
-                    children: [
-                      InkWell(
-                        onTap: () async {
-                          // Show document in full screen dialog
-                          showDialog(
-                            context: context,
-                            builder: (context) => Dialog(
-                              child: Container(
-                                constraints: const BoxConstraints(
-                                  maxWidth: 600,
-                                  maxHeight: 800,
-                                ),
-                                child: DocumentImage(
-                                  documentId: file.documentId,
-                                  size: 400,
-                                ),
-                              ),
-                            ),
-                          );
-                        },
-                        onLongPress: () async {
-                          bool? confirm = await confirmationDialog(
-                            context: context,
-                            title: 'Dokument löschen',
-                            message: 'Dokument löschen?',
-                          );
-                          if (confirm != true) {
-                            return;
-                          }
-
-                          await _removeFileFromPreSchoolMedical(file, pupil);
-                        },
-                        child: DocumentImage(
-                          documentId: file.documentId,
-                          size: 70,
-                        ),
-                      ),
-                    ],
-                  ),
-                ],
-              // Upload button (following competence check pattern)
-              if (pupil.preSchoolMedical?.preschoolMedicalFiles == null ||
-                  (pupil.preSchoolMedical?.preschoolMedicalFiles?.length ?? 0) <
-                      4)
+            ),
+            // HubDocument files display (following competence check pattern)
+            if (pupil.preSchoolMedical?.preschoolMedicalFiles != null)
+              for (HubDocument file
+                  in pupil.preSchoolMedical!.preschoolMedicalFiles!) ...[
+                const Gap(10),
                 Column(
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
                     InkWell(
                       onTap: () async {
-                        final File? file = await createAndCropImageFile(
-                          context,
+                        // Show document in full screen dialog
+                        showDialog(
+                          context: context,
+                          builder: (context) => Dialog(
+                            child: Container(
+                              constraints: const BoxConstraints(
+                                maxWidth: 600,
+                                maxHeight: 800,
+                              ),
+                              child: EncryptedDocumentImage(
+                                documentId: file.documentId,
+                                size: 400,
+                              ),
+                            ),
+                          ),
+                        );
+                      },
+                      onLongPress: () async {
+                        if (!isAdmin) {
+                          di<NotificationService>().showSnackBar(
+                            NotificationType.error,
+                            'Nur Admins können Dokumente ansehen',
+                          );
+                          return;
+                        }
+                        bool? confirm = await confirmationDialog(
+                          context: context,
+                          title: 'Dokument löschen',
+                          message: 'Dokument löschen?',
                         );
-                        if (file == null) return;
+                        if (confirm != true) {
+                          return;
+                        }
 
-                        await _uploadFileToPreSchoolMedical(file, pupil);
+                        await _removeFileFromPreSchoolMedical(file, pupil);
                       },
-                      child: SizedBox(
-                        height: 70,
-                        child: ClipRRect(
-                          borderRadius: BorderRadius.circular(5),
-                          child: Image.asset('assets/document_camera.png'),
-                        ),
+                      child: EncryptedDocumentImage(
+                        documentId: file.documentId,
+                        size: 70,
                       ),
                     ),
                   ],
                 ),
-            ],
-          ),
-        if (isAdmin)
+              ],
+            // Upload button (following competence check pattern)
+            if (pupil.preSchoolMedical?.preschoolMedicalFiles == null ||
+                (pupil.preSchoolMedical?.preschoolMedicalFiles?.length ?? 0) <
+                    4)
+              Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  InkWell(
+                    onTap: () async {
+                      if (!isAdmin) {
+                        di<NotificationService>().showSnackBar(
+                          NotificationType.error,
+                          'Nur Admins können Dokumente hochladen',
+                        );
+                        return;
+                      }
+                      final File? file = await createAndCropImageFile(context);
+                      if (file == null) return;
+
+                      await _uploadFileToPreSchoolMedical(file, pupil);
+                    },
+                    child: SizedBox(
+                      height: 70,
+                      child: ClipRRect(
+                        borderRadius: BorderRadius.circular(5),
+                        child: Image.asset('assets/document_camera.png'),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+          ],
+        ),
+        if (isAdmin) ...[
           const Row(
             children: [
               Text('Kindergartenbesuch: ', style: TextStyle(fontSize: 15.0)),
               Gap(5),
             ],
           ),
-        const Gap(10),
-        if (isAdmin)
+          const Gap(10),
+
           Row(
             children: [
               InkWell(
                 //- TODO: implement long text field dialog
                 onTap: () async {
-                  //   final newKindergardenValue = await longTextFieldDialog(
-                  //       title: 'Informationen zum Kindergartenbesuch',
-                  //       labelText: 'Kindergartenbesuch',
-                  //       initialValue: kindergarden ?? '',
-                  //       parentContext: context);
-                  //   if (newKindergardenValue == null ||
-                  //       newKindergardenValue.isEmpty) {
-                  //     return;
-                  //   }
-                  //   await _pupilManager.updateStringProperty(
-                  //       pupilId: pupil.pupilId,
-                  //       property: 'kindergarden',
-                  //       value: newKindergardenValue);
+                  final newKindergardenValue = await longTextFieldDialog(
+                    title: 'Informationen zum Kindergartenbesuch',
+                    labelText: 'Kindergartenbesuch',
+                    initialValue: kindergarden?.name ?? 'Kein Eintrag',
+                    parentContext: context,
+                  );
+                  if (newKindergardenValue == null ||
+                      newKindergardenValue.isEmpty) {
+                    return;
+                  }
+                  await di<PupilMutator>().updateStringProperty(
+                    pupilId: pupil.pupilId,
+                    property: 'kindergarden',
+                    value: newKindergardenValue,
+                  );
                 },
                 child: Text(
                   kindergarden?.name ?? 'kein Eintrag',
-                  style: const TextStyle(
+                  style: TextStyle(
                     fontSize: 18.0,
                     fontWeight: FontWeight.bold,
                     color: AppColors.interactiveColor,
@@ -200,6 +217,7 @@ class PupilProfileLearningSupportContentList extends WatchingWidget {
               ),
             ],
           ),
+        ],
         const Gap(10),
         if (supportLevelHistory != null)
           supportLevelHistory.isNotEmpty
@@ -231,7 +249,7 @@ class PupilProfileLearningSupportContentList extends WatchingWidget {
                             : latestSupportLevel.level == 4
                             ? 'Regenbogenförderung'
                             : 'unbekannt',
-                        style: const TextStyle(
+                        style: TextStyle(
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                           color: AppColors.interactiveColor,
@@ -452,7 +470,7 @@ class PupilProfileLearningSupportContentList extends WatchingWidget {
                   ),
                   child: Text(
                     'Förderebene ${plan.learningSupportLevelId}',
-                    style: const TextStyle(
+                    style: TextStyle(
                       fontSize: 12,
                       fontWeight: FontWeight.w500,
                       color: AppColors.backgroundColor,
@@ -472,7 +490,7 @@ class PupilProfileLearningSupportContentList extends WatchingWidget {
                         color: AppColors.accentColor.withValues(alpha: 0.3),
                       ),
                     ),
-                    child: const Icon(
+                    child: Icon(
                       Icons.picture_as_pdf,
                       size: 20,
                       color: AppColors.accentColor,
@@ -608,7 +626,7 @@ class PupilProfileLearningSupportContentList extends WatchingWidget {
       final client = di<Client>();
       final notificationService = di<NotificationService>();
       final hubSessionManager = di<HubSessionManager>();
-      final pupilManager = di<PupilManager>();
+      final pupilManager = di<PupilProxyManager>();
 
       // Ensure PreSchoolMedical record exists
       if (pupil.preSchoolMedical == null) {
@@ -695,7 +713,7 @@ class PupilProfileLearningSupportContentList extends WatchingWidget {
     try {
       final client = di<Client>();
       final notificationService = di<NotificationService>();
-      final pupilManager = di<PupilManager>();
+      final pupilManager = di<PupilProxyManager>();
 
       if (pupil.preSchoolMedical == null) {
         notificationService.showSnackBar(
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/learning_support_content/support_level_history_expansion_tile.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/learning_support_content/support_level_history_expansion_tile.dart
index 5c4c43b1..9158d7ca 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/learning_support_content/support_level_history_expansion_tile.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/learning_support_content/support_level_history_expansion_tile.dart
@@ -2,9 +2,9 @@ import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/app_utils/custom_encrypter.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 import 'package:school_data_hub_flutter/features/learning_support/presentation/widgets/dialogs/support_level_dialog.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
@@ -66,7 +66,7 @@ class _SupportLevelHistoryExpansionTileState
                       : pupil.latestSupportLevel!.level == 3
                       ? 'Förderebene 3'
                       : '🌈-Förderung',
-                  style: const TextStyle(
+                  style: TextStyle(
                     fontSize: 20,
                     fontWeight: FontWeight.bold,
                     color: AppColors.interactiveColor,
@@ -135,7 +135,7 @@ class _SupportLevelHistoryExpansionTileState
                                             .supportLevelHistory![index]
                                             .level
                                             .toString(),
-                                        style: const TextStyle(
+                                        style: TextStyle(
                                           color: AppColors.backgroundColor,
                                           fontWeight: FontWeight.bold,
                                           fontSize: 18,
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/pupil_profile_page_content.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/pupil_profile_page_content.dart
index f4207c85..461a15ee 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/pupil_profile_page_content.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/pupil_profile_page_content.dart
@@ -1,10 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:gap/gap.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/features/app_main_navigation/domain/main_menu_bottom_nav_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_navigation.dart';
-import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/after_school_care_content/pupil_ogs_content.dart';
+import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/after_school_care_content/pupil_after_school_care_content.dart';
+import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/attendance_content/pupil_profile_attendance_content.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/authorization_content/pupil_profile_authorization_content.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/communication_content/pupil_profile_communication_content.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/credit/pupil_profile_credit_content.dart';
@@ -13,7 +12,6 @@ import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profil
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/learning_support_content/pupil_profile_learning_support_content.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/school_list_content/pupil_school_lists_content_card.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/schoolday_events_content/pupil_profile_schoolday_events_content.dart';
-import 'package:school_data_hub_flutter/features/pupil/presentation/widgets/pupil_profile_attendance_content.dart';
 import 'package:watch_it/watch_it.dart';
 
 class PupilProfilePageContent extends WatchingWidget {
@@ -25,55 +23,93 @@ class PupilProfilePageContent extends WatchingWidget {
   Widget build(BuildContext context) {
     int navState = watchValue((BottomNavManager x) => x.pupilProfileNavState);
 
+    final children = [
+      const _ProfilePageWrapper(childBuilder: _ProfilePageChild.info),
+      const _ProfilePageWrapper(childBuilder: _ProfilePageChild.language),
+      const _ProfilePageWrapper(childBuilder: _ProfilePageChild.credit),
+      const _ProfilePageWrapper(childBuilder: _ProfilePageChild.attendance),
+      const _ProfilePageWrapper(childBuilder: _ProfilePageChild.schoolday),
+      const _ProfilePageWrapper(childBuilder: _ProfilePageChild.ogs),
+      const _ProfilePageWrapper(childBuilder: _ProfilePageChild.lists),
+      const _ProfilePageWrapper(childBuilder: _ProfilePageChild.auth),
+      const _ProfilePageWrapper(childBuilder: _ProfilePageChild.learningSup),
+      const _ProfilePageWrapper(childBuilder: _ProfilePageChild.learning),
+    ];
+
     return Container(
-      decoration: const BoxDecoration(
-        color: AppColors.pupilProfileBackgroundColor,
-      ),
-      child: SingleChildScrollView(
-        physics: const BouncingScrollPhysics(),
-        child: Padding(
-          padding: const EdgeInsets.only(
-            left: 4,
-            right: 4,
-            bottom: 8.0,
-          ), // Reduced padding
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.stretch,
-            children: <Widget>[
-              // Add animated transition for content switching
-              AnimatedSwitcher(
-                duration: const Duration(milliseconds: 300),
-                transitionBuilder: (Widget child, Animation<double> animation) {
-                  return SlideTransition(
-                    position:
-                        Tween<Offset>(
-                          begin: const Offset(0.1, 0),
-                          end: Offset.zero,
-                        ).animate(
-                          CurvedAnimation(
-                            parent: animation,
-                            curve: Curves.easeInOut,
-                          ),
-                        ),
-                    child: FadeTransition(opacity: animation, child: child),
-                  );
-                },
-                child: _buildContentForState(navState),
-              ),
-              const Gap(16), // Reduced from 32 to 16
-            ],
+      decoration: BoxDecoration(color: AppColors.pupilProfileBackgroundColor),
+      child: Padding(
+        padding: const EdgeInsets.only(left: 4, right: 4, bottom: 10),
+        child: AnimatedSwitcher(
+          duration: const Duration(milliseconds: 200),
+          child: KeyedSubtree(
+            key: ValueKey(navState),
+            child: children[navState],
           ),
         ),
       ),
     );
   }
+}
+
+enum _ProfilePageChild {
+  info,
+  language,
+  credit,
+  attendance,
+  schoolday,
+  ogs,
+  lists,
+  auth,
+  learningSup,
+  learning,
+}
+
+class _ProfilePageWrapper extends StatelessWidget {
+  final _ProfilePageChild childBuilder;
+  const _ProfilePageWrapper({required this.childBuilder});
 
-  Widget _buildContentForState(int navState) {
-    // Use a key to ensure AnimatedSwitcher recognizes content changes
-    final contentKey = ValueKey(navState);
+  @override
+  Widget build(BuildContext context) {
+    final PupilProxy pupil = (context as Element)
+        .findAncestorWidgetOfExactType<PupilProfilePageContent>()!
+        .pupil;
+
+    Widget child;
+    switch (childBuilder) {
+      case _ProfilePageChild.info:
+        child = PupilProfileInfosContent(pupil: pupil);
+        break;
+      case _ProfilePageChild.language:
+        child = PupilProfileCommunicationContent(pupil: pupil);
+        break;
+      case _ProfilePageChild.credit:
+        child = PupilProfileCreditContent(pupil: pupil);
+        break;
+      case _ProfilePageChild.attendance:
+        child = PupilAttendanceContent(pupil: pupil);
+        break;
+      case _ProfilePageChild.schoolday:
+        child = PupilProfileSchooldayEventsContent(pupil: pupil);
+        break;
+      case _ProfilePageChild.ogs:
+        child = PupilOgsContent(pupil: pupil);
+        break;
+      case _ProfilePageChild.lists:
+        child = PupilSchoolListsContentCard(pupil: pupil);
+        break;
+      case _ProfilePageChild.auth:
+        child = PupilProfileAuthorizationContent(pupil: pupil);
+        break;
+      case _ProfilePageChild.learningSup:
+        child = PupilProfileLearningSupportContent(pupil: pupil);
+        break;
+      case _ProfilePageChild.learning:
+        child = PupilLearningContent(pupil: pupil);
+        break;
+    }
 
     return Container(
-      key: contentKey,
       decoration: BoxDecoration(
         borderRadius: BorderRadius.circular(16),
         boxShadow: [
@@ -84,36 +120,7 @@ class PupilProfilePageContent extends WatchingWidget {
           ),
         ],
       ),
-      child: ClipRRect(
-        borderRadius: BorderRadius.circular(16),
-        child: _getContentWidget(navState),
-      ),
+      child: ClipRRect(borderRadius: BorderRadius.circular(16), child: child),
     );
   }
-
-  Widget _getContentWidget(int navState) {
-    if (navState == ProfileNavigationState.info.value) {
-      return PupilProfileInfosContent(pupil: pupil);
-    } else if (navState == ProfileNavigationState.language.value) {
-      return PupilProfileCommunicationContent(pupil: pupil);
-    } else if (navState == ProfileNavigationState.credit.value) {
-      return PupilProfileCreditContent(pupil: pupil);
-    } else if (navState == ProfileNavigationState.attendance.value) {
-      return PupilAttendanceContent(pupil: pupil);
-    } else if (navState == ProfileNavigationState.schooldayEvent.value) {
-      return PupilProfileSchooldayEventsContent(pupil: pupil);
-    } else if (navState == ProfileNavigationState.ogs.value) {
-      return PupilOgsContent(pupil: pupil);
-    } else if (navState == ProfileNavigationState.lists.value) {
-      return PupilSchoolListsContentCard(pupil: pupil);
-    } else if (navState == ProfileNavigationState.authorization.value) {
-      return PupilProfileAuthorizationContent(pupil: pupil);
-    } else if (navState == ProfileNavigationState.learningSupport.value) {
-      return PupilProfileLearningSupportContent(pupil: pupil);
-    } else if (navState == ProfileNavigationState.learning.value) {
-      return PupilLearningContent(pupil: pupil);
-    } else {
-      return PupilProfileInfosContent(pupil: pupil);
-    }
-  }
 }
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/school_list_content/pupil_school_lists_content_card.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/school_list_content/pupil_school_lists_content_card.dart
index fae9cda4..06d3e212 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/school_list_content/pupil_school_lists_content_card.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/school_list_content/pupil_school_lists_content_card.dart
@@ -12,9 +12,7 @@ class PupilSchoolListsContentCard extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      decoration: const BoxDecoration(
-        color: AppColors.pupilProfileBackgroundColor,
-      ),
+      decoration: BoxDecoration(color: AppColors.pupilProfileBackgroundColor),
       child: Column(
         children: [
           PupilProfileContentSection(
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/school_list_content/widgets/pupil_profile_school_list_pupil_entry_card.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/school_list_content/widgets/pupil_profile_school_list_pupil_entry_card.dart
index ec1da99f..c744918c 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/school_list_content/widgets/pupil_profile_school_list_pupil_entry_card.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/school_list_content/widgets/pupil_profile_school_list_pupil_entry_card.dart
@@ -66,15 +66,14 @@ class PupilProfileSchoolListPupilEntryCard extends WatchingWidget {
                           onTap: () {
                             Navigator.of(context).push(
                               MaterialPageRoute(
-                                builder:
-                                    (ctx) =>
-                                        SchoolListPupilEntriesPage(schoolList),
+                                builder: (ctx) =>
+                                    SchoolListPupilEntriesPage(schoolList),
                               ),
                             );
                           },
                           child: Text(
                             schoolList.name,
-                            style: const TextStyle(
+                            style: TextStyle(
                               fontSize: 18,
                               fontWeight: FontWeight.bold,
                               color: AppColors.interactiveColor,
@@ -172,7 +171,7 @@ class PupilProfileSchoolListPupilEntryCard extends WatchingWidget {
                       },
                       child: Text(
                         pupilListEntry.comment ?? 'kein Kommentar',
-                        style: const TextStyle(
+                        style: TextStyle(
                           fontSize: 15,
                           fontWeight: FontWeight.bold,
                           color: AppColors.interactiveColor,
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/schoolday_events_content/pupil_profile_schoolday_events_content.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/schoolday_events_content/pupil_profile_schoolday_events_content.dart
index 9beecb58..bd75ab51 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/schoolday_events_content/pupil_profile_schoolday_events_content.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/schoolday_events_content/pupil_profile_schoolday_events_content.dart
@@ -12,9 +12,7 @@ class PupilProfileSchooldayEventsContent extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Container(
-      decoration: const BoxDecoration(
-        color: AppColors.pupilProfileBackgroundColor,
-      ),
+      decoration: BoxDecoration(color: AppColors.pupilProfileBackgroundColor),
       child: Column(
         children: [
           PupilProfileContentSection(
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/widgets/pupil_profile_content_widgets.dart b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/widgets/pupil_profile_content_widgets.dart
index 7e53d444..ddcfb5f9 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/widgets/pupil_profile_content_widgets.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/widgets/pupil_profile_content_widgets.dart
@@ -26,15 +26,11 @@ class PupilProfileContentHeader extends StatelessWidget {
       ),
       child: Row(
         children: [
-          Icon(
-            icon,
-            color: AppColors.groupColor,
-            size: 28,
-          ),
+          Icon(icon, color: AppColors.groupColor, size: 28),
           const Gap(12),
           Text(
             title,
-            style: const TextStyle(
+            style: TextStyle(
               fontSize: 22,
               fontWeight: FontWeight.bold,
               color: AppColors.backgroundColor,
@@ -78,13 +74,16 @@ class PupilProfileContentSection extends StatelessWidget {
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               InkWell(
                 onTap: onTitleTap,
                 borderRadius: BorderRadius.circular(8),
                 child: Padding(
                   padding: const EdgeInsets.symmetric(
-                      vertical: 4.0, horizontal: 4.0),
+                    vertical: 4.0,
+                    horizontal: 4.0,
+                  ),
                   child: Row(
                     mainAxisSize: MainAxisSize.min,
                     children: [
@@ -92,7 +91,7 @@ class PupilProfileContentSection extends StatelessWidget {
                       const Gap(10),
                       Text(
                         title,
-                        style: const TextStyle(
+                        style: TextStyle(
                           fontSize: 20,
                           fontWeight: FontWeight.bold,
                           color: AppColors.backgroundColor,
@@ -102,10 +101,7 @@ class PupilProfileContentSection extends StatelessWidget {
                   ),
                 ),
               ),
-              if (headerTrailing != null) ...[
-                const Spacer(),
-                headerTrailing!,
-              ],
+              if (headerTrailing != null) ...[const Spacer(), headerTrailing!],
             ],
           ),
           const Gap(12),
@@ -134,8 +130,10 @@ class PupilProfileContentRow extends StatelessWidget {
     this.onLongPress,
     this.actionButton,
     super.key,
-  }) : assert(value != null || valueWidget != null,
-            'Either value or valueWidget must be provided');
+  }) : assert(
+         value != null || valueWidget != null,
+         'Either value or valueWidget must be provided',
+       );
 
   @override
   Widget build(BuildContext context) {
@@ -149,54 +147,57 @@ class PupilProfileContentRow extends StatelessWidget {
           width: 1,
         ),
       ),
-      child: Row(
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          Icon(
-            icon,
-            color: AppColors.backgroundColor.withValues(alpha: 0.7),
-            size: 18,
-          ),
-          const Gap(8),
-          Text(
-            '$label:',
-            style: const TextStyle(
-              fontSize: 14,
-              fontWeight: FontWeight.w500,
-              color: AppColors.backgroundColor,
-            ),
+          Row(
+            children: [
+              Icon(
+                icon,
+                color: AppColors.backgroundColor.withValues(alpha: 0.7),
+                size: 18,
+              ),
+              const Gap(8),
+              Text(
+                '$label:',
+                style: TextStyle(
+                  fontSize: 14,
+                  fontWeight: FontWeight.w500,
+                  color: AppColors.backgroundColor,
+                ),
+              ),
+              if (actionButton != null) ...[const Spacer(), actionButton!],
+            ],
           ),
           const Gap(6),
-          Expanded(
-            child: InkWell(
-              onTap: onTap,
-              onLongPress: onLongPress,
-              borderRadius: BorderRadius.circular(8),
-              child: Container(
-                padding: const EdgeInsets.symmetric(
-                  vertical: 8,
-                  horizontal: 12,
-                ),
-                decoration: BoxDecoration(
-                  color: onTap != null
-                      ? AppColors.interactiveColor.withValues(alpha: 0.1)
-                      : Colors.transparent,
-                  borderRadius: BorderRadius.circular(8),
-                ),
-                child: valueWidget ??
-                    Text(
-                      value!,
-                      style: TextStyle(
-                        fontSize: 14,
-                        fontWeight: FontWeight.w600,
-                        color: onTap != null
-                            ? AppColors.interactiveColor
-                            : Colors.black87,
-                      ),
-                    ),
+          InkWell(
+            onTap: onTap,
+            onLongPress: onLongPress,
+            borderRadius: BorderRadius.circular(8),
+            child: Container(
+              width: double.infinity,
+              padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 12),
+              decoration: BoxDecoration(
+                color: onTap != null
+                    ? AppColors.interactiveColor.withValues(alpha: 0.1)
+                    : Colors.transparent,
+                borderRadius: BorderRadius.circular(8),
               ),
+              child:
+                  valueWidget ??
+                  Text(
+                    value!,
+                    style: TextStyle(
+                      fontSize: 14,
+                      fontWeight: FontWeight.w600,
+                      color: onTap != null
+                          ? AppColors.interactiveColor
+                          : Colors.black87,
+                    ),
+                  ),
             ),
           ),
-          if (actionButton != null) ...[const Gap(8), actionButton!],
+          const Gap(10),
         ],
       ),
     );
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/religion_page/religion_list_page.dart b/school_data_hub_flutter/lib/features/pupil/presentation/religion_page/religion_list_page.dart
index 3806cbb0..c0b98319 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/religion_page/religion_list_page.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/religion_page/religion_list_page.dart
@@ -7,7 +7,7 @@ import 'package:school_data_hub_flutter/common/widgets/generic_components/generi
 import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_sliver_search_app_bar.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/religion_page/widgets/religion_card.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/religion_page/widgets/religion_list_page_bottom_navbar.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/religion_page/widgets/religion_list_search_bar.dart';
@@ -52,7 +52,7 @@ class ReligionListPage extends WatchingWidget {
   @override
   Widget build(BuildContext context) {
     final _filterStateManager = di<FiltersStateManager>();
-    final _pupilManager = di<PupilManager>();
+    final _pupilManager = di<PupilProxyManager>();
     List<PupilProxy> filteredPupils = watchValue(
       (PupilsFilter x) => x.filteredPupils,
     );
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/religion_page/widgets/religion_card.dart b/school_data_hub_flutter/lib/features/pupil/presentation/religion_page/widgets/religion_card.dart
index 63f790a9..06ed9dec 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/religion_page/widgets/religion_card.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/religion_page/widgets/religion_card.dart
@@ -1,21 +1,20 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/domain/filters/filters_state_manager.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/features/app_main_navigation/domain/main_menu_bottom_nav_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/pupil_profile_page.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/widgets/avatar.dart';
 import 'package:watch_it/watch_it.dart';
 
-final _mainMenuBottomNavManager = di<BottomNavManager>();
-final _filterStateManager = di<FiltersStateManager>();
-
 class ReligionCard extends WatchingWidget {
   final PupilProxy pupil;
   const ReligionCard(this.pupil, {super.key});
   @override
   Widget build(BuildContext context) {
+    final _filterStateManager = di<FiltersStateManager>();
+    final _mainMenuBottomNavManager = di<BottomNavManager>();
     return Card(
       color: Colors.white,
       surfaceTintColor: Colors.white,
@@ -99,7 +98,7 @@ class ReligionCard extends WatchingWidget {
                           ),
 
                           Row(
-                            crossAxisAlignment: CrossAxisAlignment.start,
+                            crossAxisAlignment: CrossAxisAlignment.center,
                             children: [
                               const Text('Religion:'),
                               const Gap(10),
@@ -113,7 +112,7 @@ class ReligionCard extends WatchingWidget {
                                     maxLines: 3,
                                     style: const TextStyle(
                                       fontWeight: FontWeight.bold,
-                                      fontSize: 14,
+                                      fontSize: 16,
                                     ),
                                   ),
                                 ),
@@ -134,6 +133,10 @@ class ReligionCard extends WatchingWidget {
                       pupil.religionLessonsSince != null
                           ? pupil.religionLessonsSince!.formatDateForUser()
                           : 'keine Angabe',
+                      style: const TextStyle(
+                        fontWeight: FontWeight.bold,
+                        fontSize: 16,
+                      ),
                     ),
                   ],
                 ),
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/religion_page/widgets/religion_list_search_bar.dart b/school_data_hub_flutter/lib/features/pupil/presentation/religion_page/widgets/religion_list_search_bar.dart
index 43b7e1e3..e1c97ef3 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/religion_page/widgets/religion_list_search_bar.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/religion_page/widgets/religion_list_search_bar.dart
@@ -31,7 +31,7 @@ class ReligionListSearchBar extends WatchingWidget {
             child: Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                const Icon(
+                Icon(
                   Icons.people_alt_rounded,
                   color: AppColors.backgroundColor,
                 ),
@@ -52,17 +52,19 @@ class ReligionListSearchBar extends WatchingWidget {
             child: Row(
               children: [
                 Expanded(
-                    child: PupilSearchTextField(
-                        searchType: SearchType.pupil,
-                        hintText: 'Schüler/in suchen',
-                        refreshFunction: _pupilsFilter.refreshs)),
+                  child: PupilSearchTextField(
+                    searchType: SearchType.pupil,
+                    hintText: 'Schüler/in suchen',
+                    refreshFunction: _pupilsFilter.refreshs,
+                  ),
+                ),
                 FilterButton(
                   isSearchBar: true,
                   showBottomSheetFunction: () => showGenericFilterBottomSheet(
-                      context: context, filterList: [
-                    const ReligionFilterBottomSheet(),
-                  ]),
-                )
+                    context: context,
+                    filterList: [const ReligionFilterBottomSheet()],
+                  ),
+                ),
               ],
             ),
           ),
@@ -71,4 +73,3 @@ class ReligionListSearchBar extends WatchingWidget {
     );
   }
 }
-
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/select_pupils_list_page/select_pupils_list_page.dart b/school_data_hub_flutter/lib/features/pupil/presentation/select_pupils_list_page/select_pupils_list_page.dart
index 4ccdc788..2451c11c 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/select_pupils_list_page/select_pupils_list_page.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/select_pupils_list_page/select_pupils_list_page.dart
@@ -9,7 +9,7 @@ import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupil_filt
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupil_filter_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/select_pupils_list_page/widgets/select_pupils_list_card.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/select_pupils_list_page/widgets/select_pupils_search_bar.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/select_pupils_list_page/widgets/select_pupils_view_bottom_navbar.dart';
@@ -34,7 +34,7 @@ class _SelectPupilsListPageState extends State<SelectPupilsListPage> {
   bool isSelectAllMode = false;
   bool isSelectMode = false;
 
-  PupilManager get _pupilManager => di<PupilManager>();
+  PupilProxyManager get _pupilManager => di<PupilProxyManager>();
   PupilFilterManager get _pupilFilerManager => di<PupilFilterManager>();
 
   @override
@@ -80,8 +80,9 @@ class _SelectPupilsListPageState extends State<SelectPupilsListPage> {
       isSelectAllMode = !isSelectAllMode;
       if (isSelectAllMode) {
         isSelectMode = true;
-        selectedPupilIds =
-            selectablePupils.map((pupil) => pupil.pupilId).toList();
+        selectedPupilIds = selectablePupils
+            .map((pupil) => pupil.pupilId)
+            .toList();
       } else {
         isSelectMode = false;
         selectedPupilIds.clear();
@@ -97,8 +98,9 @@ class _SelectPupilsListPageState extends State<SelectPupilsListPage> {
   Widget build(BuildContext context) {
     final locale = AppLocalizations.of(context)!;
     bool filtersOn = watchValue((FiltersStateManager x) => x.filtersActive);
-    final List<PupilProxy> filteredPupils =
-        watchValue((PupilsFilter x) => x.filteredPupils);
+    final List<PupilProxy> filteredPupils = watchValue(
+      (PupilsFilter x) => x.filteredPupils,
+    );
 
     final List<PupilProxy> selectablePupils = filteredPupils
         .where((pupil) => widget.selectablePupils!.contains(pupil))
@@ -122,18 +124,20 @@ class _SelectPupilsListPageState extends State<SelectPupilsListPage> {
                   height: 110,
                   title: SelectPupilsSearchBar(
                     selectablePupils: selectablePupils,
-                    selectedPupils:
-                        _pupilManager.getPupilsFromPupilIds(selectedPupilIds),
+                    selectedPupils: _pupilManager.getPupilsFromPupilIds(
+                      selectedPupilIds,
+                    ),
                   ),
                 ),
                 GenericSliverListWithEmptyListCheck(
-                    items: selectablePupils,
-                    itemBuilder: (_, pupil) => SelectPupilListCard(
-                          isSelectMode: isSelectMode,
-                          isSelected: selectedPupilIds.contains(pupil.pupilId),
-                          passedPupil: pupil,
-                          onCardPress: onCardPress,
-                        )),
+                  items: selectablePupils,
+                  itemBuilder: (_, pupil) => SelectPupilListCard(
+                    isSelectMode: isSelectMode,
+                    isSelected: selectedPupilIds.contains(pupil.pupilId),
+                    passedPupil: pupil,
+                    onCardPress: onCardPress,
+                  ),
+                ),
               ],
             ),
           ),
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/special_info_page/special_info_list_page.dart b/school_data_hub_flutter/lib/features/pupil/presentation/special_info_page/special_info_list_page.dart
index afa8dc45..8ae71e24 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/special_info_page/special_info_list_page.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/special_info_page/special_info_list_page.dart
@@ -7,7 +7,7 @@ import 'package:school_data_hub_flutter/common/widgets/generic_components/generi
 import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_sliver_search_app_bar.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/special_info_page/widgets/special_info_card.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/special_info_page/widgets/special_info_list_page_bottom_navbar.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/special_info_page/widgets/special_info_list_search_bar.dart';
@@ -27,7 +27,9 @@ List<PupilProxy> specialInfoFilter(List<PupilProxy> pupils) {
   }
   if (filtersOn) {
     _filterStateManager.setFilterState(
-        filterState: FilterState.pupil, value: true);
+      filterState: FilterState.pupil,
+      value: true,
+    );
   }
   return filteredPupils;
 }
@@ -43,9 +45,10 @@ class SpecialInfoListPage extends WatchingWidget {
   @override
   Widget build(BuildContext context) {
     final _filterStateManager = di<FiltersStateManager>();
-    final _pupilManager = di<PupilManager>();
-    List<PupilProxy> filteredPupils =
-        watchValue((PupilsFilter x) => x.filteredPupils);
+    final _pupilManager = di<PupilProxyManager>();
+    List<PupilProxy> filteredPupils = watchValue(
+      (PupilsFilter x) => x.filteredPupils,
+    );
     List<PupilProxy> pupils = specialInfoFilter(filteredPupils);
     onDispose(() {
       _filterStateManager.resetFilters();
@@ -60,16 +63,9 @@ class SpecialInfoListPage extends WatchingWidget {
           title: const Row(
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              Icon(
-                Icons.emergency_rounded,
-                size: 25,
-                color: Colors.white,
-              ),
+              Icon(Icons.emergency_rounded, size: 25, color: Colors.white),
               Gap(10),
-              Text(
-                'Besondere Infos',
-                style: AppStyles.appBarTextStyle,
-              ),
+              Text('Besondere Infos', style: AppStyles.appBarTextStyle),
             ],
           ),
           automaticallyImplyLeading: false,
@@ -84,13 +80,12 @@ class SpecialInfoListPage extends WatchingWidget {
                   const SliverGap(5),
                   GenericSliverSearchAppBar(
                     height: 110,
-                    title: SpecialInfoListSearchBar(
-                      pupils: pupils,
-                    ),
+                    title: SpecialInfoListSearchBar(pupils: pupils),
                   ),
                   GenericSliverListWithEmptyListCheck(
-                      items: pupils,
-                      itemBuilder: (_, pupil) => SpecialInfoCard(pupil)),
+                    items: pupils,
+                    itemBuilder: (_, pupil) => SpecialInfoCard(pupil),
+                  ),
                 ],
               ),
             ),
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/special_info_page/widgets/special_info_list_search_bar.dart b/school_data_hub_flutter/lib/features/pupil/presentation/special_info_page/widgets/special_info_list_search_bar.dart
index 6b4bf38e..c9204ee4 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/special_info_page/widgets/special_info_list_search_bar.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/special_info_page/widgets/special_info_list_search_bar.dart
@@ -30,7 +30,7 @@ class SpecialInfoListSearchBar extends WatchingWidget {
             child: Row(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                const Icon(
+                Icon(
                   Icons.people_alt_rounded,
                   color: AppColors.backgroundColor,
                 ),
@@ -51,15 +51,19 @@ class SpecialInfoListSearchBar extends WatchingWidget {
             child: Row(
               children: [
                 Expanded(
-                    child: PupilSearchTextField(
-                        searchType: SearchType.pupil,
-                        hintText: 'Schüler/in suchen',
-                        refreshFunction: _pupilsFilter.refreshs)),
+                  child: PupilSearchTextField(
+                    searchType: SearchType.pupil,
+                    hintText: 'Schüler/in suchen',
+                    refreshFunction: _pupilsFilter.refreshs,
+                  ),
+                ),
                 FilterButton(
                   isSearchBar: true,
                   showBottomSheetFunction: () => showGenericFilterBottomSheet(
-                      context: context, filterList: []),
-                )
+                    context: context,
+                    filterList: [],
+                  ),
+                ),
               ],
             ),
           ),
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/widgets/avatar.dart b/school_data_hub_flutter/lib/features/pupil/presentation/widgets/avatar.dart
index ed0d9bf0..e696f7c2 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/widgets/avatar.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/widgets/avatar.dart
@@ -7,8 +7,8 @@ import 'package:school_data_hub_flutter/common/widgets/dialogs/information_dialo
 import 'package:school_data_hub_flutter/features/_attendance/domain/attendance_helper_functions.dart';
 import 'package:school_data_hub_flutter/features/_schoolday_events/domain/schoolday_event_helper_functions.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_helper_functions.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/pupil_mutator.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_helper.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/widgets/pupil_set_avatar.dart';
 import 'package:watch_it/watch_it.dart';
 import 'package:widget_zoom/widget_zoom.dart';
@@ -27,10 +27,6 @@ class AvatarImage extends WatchingWidget {
   Widget build(BuildContext context) {
     final avatar = watchPropertyValue((m) => m.avatar, target: pupil);
 
-    // TODO Thomas: How do I watch just pupil.avatarAuth?
-    // final avatar =
-    //         watchPropertyValue<PupilProxy, HubDocument?>((pupil) => pupil.avatar);
-
     final bool avatarAuth = (pupil.avatarAuth != null);
     return SizedBox(
       width: size,
@@ -48,7 +44,7 @@ class AvatarImage extends WatchingWidget {
                     Widget child;
                     if (snapshot.connectionState == ConnectionState.waiting) {
                       // Display a loading indicator while the future is not complete
-                      child = const CircularProgressIndicator(
+                      child = CircularProgressIndicator(
                         strokeWidth: 8,
                         color: AppColors.backgroundColor,
                       );
@@ -68,21 +64,29 @@ class AvatarImage extends WatchingWidget {
                   },
                 ),
               )
-            : ClipRRect(
-                borderRadius: BorderRadius.circular(size / 2),
-                child: avatarAuth
-                    ? Image.asset(
-                        'assets/dummy-profile-pic-auth.png',
-                        width: 100,
-                        height: 100,
-                        fit: BoxFit.cover,
-                      )
-                    : Image.asset(
-                        'assets/dummy-profile-pic-unauth.png',
-                        width: 100,
-                        height: 100,
-                        fit: BoxFit.cover,
-                      ),
+            : Container(
+                width: size,
+                height: size,
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(size / 2),
+                  // border: Border.all(
+                  //   color: avatarAuth
+                  //       ? const Color.fromARGB(255, 29, 221, 35)
+                  //       : const Color.fromARGB(255, 255, 228, 20),
+                  //   width: 3,
+                  // ),
+                ),
+                child: ClipRRect(
+                  borderRadius: BorderRadius.circular(size / 2),
+                  child: Image.asset(
+                    avatarAuth
+                        ? 'assets/dummy-profile-pic-auth.png'
+                        : 'assets/dummy-profile-pic-unauth.png',
+                    width: size,
+                    height: size,
+                    fit: BoxFit.cover,
+                  ),
+                ),
               ),
       ),
     );
@@ -90,166 +94,244 @@ class AvatarImage extends WatchingWidget {
 }
 
 class AvatarWithBadges extends WatchingWidget {
+  static const double _badgeSize = 30.0;
+  static const double _badgeOffset = -1.0;
+  static const double _avatarPadding = 1.0;
+
   final PupilProxy pupil;
   final double size;
   const AvatarWithBadges({required this.pupil, required this.size, super.key});
 
   @override
   Widget build(BuildContext context) {
-    // watchValue((AttendanceManager x) => x.missedSchooldays);
+    final badgeMargin = (_badgeSize / 2) + _badgeOffset;
+    final containerSize = size + (badgeMargin * 2);
+    final specialNeedsText = pupil.specialNeeds != null
+        ? pupil.specialNeeds!.length == 4
+              ? '${pupil.specialNeeds!.substring(0, 2)}\n${pupil.specialNeeds!.substring(2, 4)}'
+              : pupil.specialNeeds!.substring(0, 2)
+        : '';
+
     return Padding(
-      padding: const EdgeInsets.all(5.0),
-      child: Stack(
-        children: [
-          GestureDetector(
-            onLongPressStart: (details) {
-              if (pupil.avatarAuth == null) {
-                informationDialog(
-                  context,
-                  'Einwilligung nicht vorhanden',
-                  'Bitte zuerst die Einwilligung einholen und in der App dokumentieren (im Kindprofil unter "Infos"). ',
-                );
-                return;
-              }
-              final offset = details.globalPosition;
-              final position = RelativeRect.fromLTRB(
-                offset.dx,
-                offset.dy,
-                offset.dx,
-                offset.dy,
-              );
-              showMenu(
-                context: context,
-                position: position,
-                items: [
-                  PopupMenuItem(
-                    child: pupil.avatar == null
-                        ? const Text('Foto hochladen')
-                        : const Text('Foto ersetzen'),
-                    onTap: () => setAvatar(context: context, pupil: pupil),
-                  ),
-                  if (pupil.avatar != null)
-                    PopupMenuItem(
-                      child: const Text('Foto löschen'),
-                      onTap: () async {
-                        final confirm = await confirmationDialog(
-                          context: context,
-                          title: 'Foto löschen',
-                          message: 'Möchten Sie wirklich das Foto löschen?',
-                        );
-                        if (confirm != true) return;
-                        await PupilMutator().deletePupilDocument(
-                          pupil.pupilId,
-                          pupil.avatar!.documentId,
-                          PupilDocumentType.avatar,
-                        );
-                      },
-                    ),
-                ],
-              );
-            },
-            child: Padding(
-              padding: const EdgeInsets.all(4.0),
-              child: AvatarImage(pupil: pupil, size: size),
-            ),
-          ),
-          Positioned(
-            bottom: 0,
-            left: 0,
-            child: Container(
-              width: 30.0,
-              height: 30.0,
-              decoration: BoxDecoration(
-                color: AttendanceHelper.pupilIsMissedToday(pupil)
-                    ? AppColors.warningButtonColor
-                    : AppColors.groupColor,
-                shape: BoxShape.circle,
-              ),
-              child: Center(
-                child: Text(
-                  pupil.group,
-                  style: const TextStyle(
-                    color: Colors.white,
-                    fontSize: 15,
-                    fontWeight: FontWeight.bold,
-                  ),
+      padding: const EdgeInsets.all(8.0),
+      child: SizedBox(
+        width: containerSize,
+        height: containerSize,
+        child: Stack(
+          clipBehavior: Clip.none,
+          children: [
+            Align(
+              alignment: Alignment.center,
+              child: GestureDetector(
+                onLongPressStart: (details) {
+                  if (pupil.avatarAuth == null) {
+                    informationDialog(
+                      context,
+                      'Einwilligung nicht vorhanden',
+                      'Bitte zuerst die Einwilligung einholen und in der App dokumentieren (im Kindprofil unter "Infos"). ',
+                    );
+                    return;
+                  }
+                  final offset = details.globalPosition;
+                  final position = RelativeRect.fromLTRB(
+                    offset.dx,
+                    offset.dy,
+                    offset.dx,
+                    offset.dy,
+                  );
+                  showMenu(
+                    context: context,
+                    position: position,
+                    items: [
+                      PopupMenuItem(
+                        child: pupil.avatar == null
+                            ? const Text('Foto hochladen')
+                            : const Text('Foto ersetzen'),
+                        onTap: () => setAvatar(context: context, pupil: pupil),
+                      ),
+                      if (pupil.avatar != null)
+                        PopupMenuItem(
+                          child: const Text('Foto löschen'),
+                          onTap: () async {
+                            final confirm = await confirmationDialog(
+                              context: context,
+                              title: 'Foto löschen',
+                              message: 'Möchten Sie wirklich das Foto löschen?',
+                            );
+                            if (confirm != true) return;
+                            await PupilMutator().deletePupilDocument(
+                              pupil.pupilId,
+                              pupil.avatar!.documentId,
+                              PupilDocumentType.avatar,
+                            );
+                          },
+                        ),
+                    ],
+                  );
+                },
+                child: Padding(
+                  padding: const EdgeInsets.all(_avatarPadding),
+                  child: AvatarImage(pupil: pupil, size: size),
                 ),
               ),
             ),
-          ),
-          Positioned(
-            bottom: 0,
-            right: 0,
-            child: Container(
-              width: pupil.schoolyearHeldBackAt != null ? 33.0 : 30.0,
-              height: pupil.schoolyearHeldBackAt != null ? 33.0 : 30.0,
-              decoration: BoxDecoration(
-                border: pupil.schoolyearHeldBackAt != null
-                    ? Border.all(
-                        color: const Color.fromARGB(255, 250, 197, 98),
-                        width: 3,
-                      )
-                    : null,
-                color: SchoolDayEventHelper.pupilIsAdmonishedToday(pupil)
-                    ? Colors.red
-                    : AppColors.schoolyearColor,
-                shape: BoxShape.circle,
+            if (pupil.specialNeeds != null)
+              Positioned(
+                top: 0,
+                bottom: 0,
+                right: -_badgeOffset,
+                child: Align(
+                  alignment: Alignment.centerRight,
+                  child: Stack(
+                    alignment: Alignment.center,
+                    children: [
+                      Text(
+                        specialNeedsText,
+                        textAlign: TextAlign.center,
+                        style: TextStyle(
+                          fontWeight: FontWeight.bold,
+                          fontSize: 17,
+                          foreground: Paint()
+                            ..style = PaintingStyle.stroke
+                            ..strokeWidth = 4
+                            ..color = Colors.white,
+                        ),
+                      ),
+
+                      const SizedBox(),
+                      Text(
+                        specialNeedsText,
+                        textAlign: TextAlign.center,
+                        style: TextStyle(
+                          fontWeight: FontWeight.bold,
+                          fontSize: 16,
+                          color: AppColors.groupColor,
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
               ),
-              child: Center(
-                child: Text(
-                  pupil.schoolGrade.name,
-                  style: const TextStyle(
-                    color: Colors.white,
-                    fontSize: 15,
-                    fontWeight: FontWeight.bold,
+
+            if (pupil.specialInformation != null)
+              const Positioned(
+                top: 0,
+                bottom: 0,
+                left: -_badgeOffset,
+                child: Center(
+                  child: Icon(
+                    Icons.info_rounded,
+                    size: 25,
+                    color: Color.fromARGB(255, 6, 92, 163),
                   ),
                 ),
               ),
-            ),
-          ),
-          if (pupil.afterSchoolCare != null)
             Positioned(
-              top: 0,
-              left: 0,
+              bottom: -_badgeOffset,
+              left: -_badgeOffset,
               child: Container(
-                width: 30.0,
-                height: 30.0,
-                decoration: const BoxDecoration(
-                  color: AppColors.ogsColor,
+                width: pupil.family != null ? _badgeSize + 3 : _badgeSize,
+                height: pupil.family != null ? _badgeSize + 3 : _badgeSize,
+                decoration: BoxDecoration(
+                  border: pupil.family != null
+                      ? Border.all(
+                          color: const Color.fromARGB(255, 120, 127, 216),
+                          width: 3,
+                        )
+                      : null,
+                  color: AttendanceHelper.pupilIsMissedToday(pupil)
+                      ? AppColors.warningButtonColor
+                      : AppColors.groupColor,
                   shape: BoxShape.circle,
                 ),
-                child: const Center(
+                child: Center(
                   child: Text(
-                    'OGS',
-                    style: TextStyle(
+                    pupil.group,
+                    style: const TextStyle(
                       color: Colors.white,
-                      fontSize: 13,
+                      fontSize: 15,
                       fontWeight: FontWeight.bold,
                     ),
                   ),
                 ),
               ),
             ),
-          if (pupil.migrationSupportEnds != null)
             Positioned(
-              top: 0,
-              right: 0,
+              bottom: -_badgeOffset,
+              right: -_badgeOffset,
               child: Container(
-                width: 30.0,
-                height: 30.0,
+                width: pupil.family != null ? _badgeSize + 3 : _badgeSize,
+                height: pupil.family != null ? _badgeSize + 3 : _badgeSize,
                 decoration: BoxDecoration(
-                  color:
-                      PupilHelper.hasLanguageSupport(pupil.migrationSupportEnds)
-                      ? Colors.green
-                      : Colors.grey,
+                  border: pupil.schoolyearHeldBackAt != null
+                      ? Border.all(
+                          color: const Color.fromARGB(255, 250, 197, 98),
+                          width: 3,
+                        )
+                      : null,
+                  color: SchoolDayEventHelper.pupilIsAdmonishedToday(pupil)
+                      ? Colors.red
+                      : AppColors.schoolyearColor,
                   shape: BoxShape.circle,
                 ),
-                child: const Center(
-                  child: Icon(Icons.language_rounded, color: Colors.white),
+                child: Center(
+                  child: Text(
+                    pupil.schoolGrade.name,
+                    style: const TextStyle(
+                      color: Colors.white,
+                      fontSize: 15,
+                      fontWeight: FontWeight.bold,
+                    ),
+                  ),
                 ),
               ),
             ),
-        ],
+            if (pupil.afterSchoolCare != null)
+              Positioned(
+                top: -_badgeOffset,
+                left: -_badgeOffset,
+                child: Container(
+                  width: _badgeSize,
+                  height: _badgeSize,
+                  decoration: BoxDecoration(
+                    color: AppColors.ogsColor,
+                    shape: BoxShape.circle,
+                  ),
+                  child: const Center(
+                    child: Text(
+                      'OGS',
+                      style: TextStyle(
+                        color: Colors.white,
+                        fontSize: 13,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            if (pupil.migrationSupportEnds != null)
+              Positioned(
+                top: -_badgeOffset,
+                right: -_badgeOffset,
+                child: Container(
+                  width: _badgeSize,
+                  height: _badgeSize,
+                  decoration: BoxDecoration(
+                    color:
+                        PupilProxyHelper.hasLanguageSupport(
+                          pupil.migrationSupportEnds,
+                        )
+                        ? Colors.green
+                        : Colors.grey,
+                    shape: BoxShape.circle,
+                  ),
+                  child: const Center(
+                    child: Icon(Icons.language_rounded, color: Colors.white),
+                  ),
+                ),
+              ),
+          ],
+        ),
       ),
     );
   }
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/widgets/common_pupil_filters.dart b/school_data_hub_flutter/lib/features/pupil/presentation/widgets/common_pupil_filters.dart
index 04f64b8b..e642e80f 100644
--- a/school_data_hub_flutter/lib/features/pupil/presentation/widgets/common_pupil_filters.dart
+++ b/school_data_hub_flutter/lib/features/pupil/presentation/widgets/common_pupil_filters.dart
@@ -23,7 +23,7 @@ class FilterHeading extends StatelessWidget {
             di<FiltersStateManager>().resetFilters();
             //Navigator.pop(context);
           },
-          icon: const Icon(
+          icon: Icon(
             Icons.delete_forever_rounded,
             size: 35,
             color: AppColors.accentColor,
diff --git a/school_data_hub_flutter/lib/features/pupil/presentation/widgets/pupil_profile_attendance_content.dart b/school_data_hub_flutter/lib/features/pupil/presentation/widgets/pupil_profile_attendance_content.dart
deleted file mode 100644
index 503ba691..00000000
--- a/school_data_hub_flutter/lib/features/pupil/presentation/widgets/pupil_profile_attendance_content.dart
+++ /dev/null
@@ -1,141 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:gap/gap.dart';
-import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
-import 'package:school_data_hub_flutter/common/theme/paddings.dart';
-import 'package:school_data_hub_flutter/features/_attendance/domain/attendance_helper_functions.dart';
-import 'package:school_data_hub_flutter/features/_attendance/domain/attendance_manager.dart';
-import 'package:school_data_hub_flutter/features/_attendance/presentation/missed_classes_pupil_list_page/missed_classes_pupil_list_page.dart';
-import 'package:school_data_hub_flutter/features/_attendance/presentation/widgets/attendance_stats_pupil.dart';
-import 'package:school_data_hub_flutter/features/_attendance/presentation/widgets/missed_class_card.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:watch_it/watch_it.dart';
-
-class PupilAttendanceContent extends WatchingWidget {
-  final PupilProxy pupil;
-  const PupilAttendanceContent({required this.pupil, super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    final _attendanceManager = di<AttendanceManager>();
-    final missedHoursForActualReport =
-        AttendanceHelper.missedHoursforSemesterOrSchoolyear(pupil);
-    List<MissedSchoolday> missedSchooldays =
-        watch(
-          _attendanceManager.getPupilMissedSchooldaysProxy(pupil.pupilId),
-        ).missedSchooldays;
-
-    // sort by missedDay
-    missedSchooldays.sort(
-      (b, a) => a.schoolday!.schoolday.compareTo(b.schoolday!.schoolday),
-    );
-    return Padding(
-      padding: const EdgeInsets.only(left: 8.0, right: 8.0, bottom: 4.0),
-      child: Card(
-        color: AppColors.pupilProfileCardColor,
-        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
-        child: Padding(
-          padding: AppPaddings.pupilProfileCardPadding,
-          child: Column(
-            children: [
-              Row(
-                crossAxisAlignment: CrossAxisAlignment.center,
-                children: [
-                  Icon(
-                    Icons.calendar_month_rounded,
-                    color: Colors.grey[700],
-                    size: 24,
-                  ),
-                  const Gap(5),
-                  InkWell(
-                    onTap: () {
-                      Navigator.of(context).push(
-                        MaterialPageRoute(
-                          builder:
-                              (ctx) => const MissedSchooldayesPupilListPage(),
-                        ),
-                      );
-                    },
-                    child: const Text(
-                      'Fehlzeiten',
-                      style: TextStyle(
-                        fontSize: 24,
-                        fontWeight: FontWeight.bold,
-                        color: AppColors.backgroundColor,
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-              const Gap(15),
-              attendanceStats(pupil),
-              const Gap(10),
-              Row(
-                mainAxisAlignment: MainAxisAlignment.start,
-                children: [
-                  const Text('Fehlstunden:', style: TextStyle(fontSize: 14)),
-                  Text(
-                    ' ${missedHoursForActualReport.missed.toString()}',
-                    style: const TextStyle(
-                      color: Colors.black,
-                      fontWeight: FontWeight.bold,
-                      fontSize: 16,
-                    ),
-                  ),
-                  const Gap(5),
-                  const Text('davon unent:', style: TextStyle(fontSize: 14)),
-                  Text(
-                    ' ${missedHoursForActualReport.unexcused.toString()}',
-                    style: const TextStyle(
-                      color: Colors.black,
-                      fontWeight: FontWeight.bold,
-                      fontSize: 16,
-                    ),
-                  ),
-                  const Gap(15),
-                ],
-              ),
-              const Gap(10),
-              ListView.builder(
-                padding: const EdgeInsets.only(top: 5, bottom: 5),
-                shrinkWrap: true,
-                physics: const NeverScrollableScrollPhysics(),
-                itemCount: missedSchooldays.length,
-                itemBuilder: (BuildContext context, int index) {
-                  // pupil.pupilMissedSchooldayes.sort(
-                  //     (a, b) => a.missedDay.compareTo(b.missedDay));
-
-                  return MissedSchooldayCard(
-                    pupil: pupil,
-                    missedSchoolday: missedSchooldays[index],
-                  );
-                },
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-// List<Widget> pupilAttendanceContentList(PupilProxy pupil, context) {
-//   List<MissedSchoolday> missedSchooldays = List.from(pupil.missedSchooldays!);
-//   // sort by missedDay
-//   missedSchooldays
-//       .sort((b, a) => a.schoolday!.schoolday.compareTo(b.schoolday!.schoolday));
-//   return [
-//     ListView.builder(
-//       padding: const EdgeInsets.only(top: 5, bottom: 15),
-//       shrinkWrap: true,
-//       physics: const NeverScrollableScrollPhysics(),
-//       itemCount: missedSchooldays.length,
-//       itemBuilder: (BuildContext context, int index) {
-//         // pupil.pupilMissedSchooldayes.sort(
-//         //     (a, b) => a.missedDay.compareTo(b.missedDay));
-
-//         return MissedSchooldayCard(pupil: pupil, missedSchoolday: missedSchooldays[index]);
-//       },
-//     ),
-//   ];
-// }
diff --git a/school_data_hub_flutter/lib/features/school/domain/school_data_manager.dart b/school_data_hub_flutter/lib/features/school/domain/school_data_manager.dart
index 8d803b35..6c83d9d2 100644
--- a/school_data_hub_flutter/lib/features/school/domain/school_data_manager.dart
+++ b/school_data_hub_flutter/lib/features/school/domain/school_data_manager.dart
@@ -48,6 +48,14 @@ class SchoolDataMainManager extends ChangeNotifier {
     return this;
   }
 
+  void dispose() {
+    _dataManager.dispose();
+    _crudManager.dispose();
+    _uiManager.dispose();
+    super.dispose();
+    return;
+  }
+
   /// Refresh all data from API
   Future<void> refreshData() async {
     _dataManager.setLoading(true);
diff --git a/school_data_hub_flutter/lib/features/school/presentation/edit_school_data_page/edit_school_data_page.dart b/school_data_hub_flutter/lib/features/school/presentation/edit_school_data_page/edit_school_data_page.dart
index 5ee164fb..498bbb3c 100644
--- a/school_data_hub_flutter/lib/features/school/presentation/edit_school_data_page/edit_school_data_page.dart
+++ b/school_data_hub_flutter/lib/features/school/presentation/edit_school_data_page/edit_school_data_page.dart
@@ -52,7 +52,7 @@ class EditSchoolDataPage extends WatchingWidget {
                         onPressed: () {
                           schoolDataManager.resetForm();
                         },
-                        child: const Text(
+                        child: Text(
                           'Zurücksetzen',
                           style: TextStyle(color: AppColors.backgroundColor),
                         ),
@@ -71,44 +71,40 @@ class EditSchoolDataPage extends WatchingWidget {
                   children: [
                     Expanded(
                       child: ElevatedButton(
-                        onPressed:
-                            isFormValid && !isSaving
-                                ? () async {
-                                  try {
-                                    await schoolDataManager.saveSchoolData();
-                                    if (context.mounted) {
-                                      Navigator.of(context).pop();
-                                    }
-                                  } catch (e) {
-                                    if (context.mounted) {
-                                      ScaffoldMessenger.of(
-                                        context,
-                                      ).showSnackBar(
-                                        SnackBar(
-                                          content: Text(
-                                            'Fehler beim Speichern: $e',
-                                          ),
-                                          backgroundColor: Colors.red,
+                        onPressed: isFormValid && !isSaving
+                            ? () async {
+                                try {
+                                  await schoolDataManager.saveSchoolData();
+                                  if (context.mounted) {
+                                    Navigator.of(context).pop();
+                                  }
+                                } catch (e) {
+                                  if (context.mounted) {
+                                    ScaffoldMessenger.of(context).showSnackBar(
+                                      SnackBar(
+                                        content: Text(
+                                          'Fehler beim Speichern: $e',
                                         ),
-                                      );
-                                    }
+                                        backgroundColor: Colors.red,
+                                      ),
+                                    );
                                   }
                                 }
-                                : null,
+                              }
+                            : null,
                         style: AppStyles.actionButtonStyle,
-                        child:
-                            isSaving
-                                ? const SizedBox(
-                                  height: 20,
-                                  width: 20,
-                                  child: CircularProgressIndicator(
-                                    strokeWidth: 2,
-                                    valueColor: AlwaysStoppedAnimation<Color>(
-                                      Colors.white,
-                                    ),
+                        child: isSaving
+                            ? const SizedBox(
+                                height: 20,
+                                width: 20,
+                                child: CircularProgressIndicator(
+                                  strokeWidth: 2,
+                                  valueColor: AlwaysStoppedAnimation<Color>(
+                                    Colors.white,
                                   ),
-                                )
-                                : const Text('Speichern'),
+                                ),
+                              )
+                            : const Text('Speichern'),
                       ),
                     ),
                     const Gap(16),
diff --git a/school_data_hub_flutter/lib/features/school/presentation/school_data_page/widgets/contact_info_card.dart b/school_data_hub_flutter/lib/features/school/presentation/school_data_page/widgets/contact_info_card.dart
index b2756026..1d50898e 100644
--- a/school_data_hub_flutter/lib/features/school/presentation/school_data_page/widgets/contact_info_card.dart
+++ b/school_data_hub_flutter/lib/features/school/presentation/school_data_page/widgets/contact_info_card.dart
@@ -21,10 +21,7 @@ class ContactInfoCard extends StatelessWidget {
           children: [
             Row(
               children: [
-                const Icon(
-                  Icons.contact_phone,
-                  color: AppColors.backgroundColor,
-                ),
+                Icon(Icons.contact_phone, color: AppColors.backgroundColor),
                 const Gap(8),
                 const Text('Kontaktinformationen', style: AppStyles.title),
               ],
@@ -86,8 +83,9 @@ class ContactInfoCard extends StatelessWidget {
                     style: TextStyle(
                       fontSize: 14,
                       color: onTap != null ? AppColors.backgroundColor : null,
-                      decoration:
-                          onTap != null ? TextDecoration.underline : null,
+                      decoration: onTap != null
+                          ? TextDecoration.underline
+                          : null,
                     ),
                   ),
                 ),
diff --git a/school_data_hub_flutter/lib/features/school/presentation/school_data_page/widgets/school_info_card.dart b/school_data_hub_flutter/lib/features/school/presentation/school_data_page/widgets/school_info_card.dart
index 6a064dbb..c4f00051 100644
--- a/school_data_hub_flutter/lib/features/school/presentation/school_data_page/widgets/school_info_card.dart
+++ b/school_data_hub_flutter/lib/features/school/presentation/school_data_page/widgets/school_info_card.dart
@@ -20,7 +20,7 @@ class SchoolInfoCard extends StatelessWidget {
           children: [
             Row(
               children: [
-                const Icon(Icons.school, color: AppColors.backgroundColor),
+                Icon(Icons.school, color: AppColors.backgroundColor),
                 const Gap(8),
                 const Text('Schulinformationen', style: AppStyles.title),
               ],
diff --git a/school_data_hub_flutter/lib/features/school/presentation/school_data_page/widgets/school_logo_card.dart b/school_data_hub_flutter/lib/features/school/presentation/school_data_page/widgets/school_logo_card.dart
index 0d6dcc2c..ec5107f1 100644
--- a/school_data_hub_flutter/lib/features/school/presentation/school_data_page/widgets/school_logo_card.dart
+++ b/school_data_hub_flutter/lib/features/school/presentation/school_data_page/widgets/school_logo_card.dart
@@ -29,12 +29,9 @@ class SchoolLogoCard extends StatelessWidget {
           children: [
             Row(
               children: [
-                const Icon(Icons.image, color: AppColors.backgroundColor),
+                Icon(Icons.image, color: AppColors.backgroundColor),
                 const Gap(8),
-                const Text(
-                  'Schul-Logo & Amtssiegel',
-                  style: AppStyles.title,
-                ),
+                const Text('Schul-Logo & Amtssiegel', style: AppStyles.title),
               ],
             ),
             const Gap(16),
diff --git a/school_data_hub_flutter/lib/features/school_calendar/domain/school_calendar_manager.dart b/school_data_hub_flutter/lib/features/school_calendar/domain/school_calendar_manager.dart
index ccc20217..eafae1c5 100644
--- a/school_data_hub_flutter/lib/features/school_calendar/domain/school_calendar_manager.dart
+++ b/school_data_hub_flutter/lib/features/school_calendar/domain/school_calendar_manager.dart
@@ -40,6 +40,14 @@ class SchoolCalendarManager {
     return this;
   }
 
+  void dispose() {
+    _schooldays.dispose();
+    _availableDates.dispose();
+    _schoolSemesters.dispose();
+    _currentSemester.dispose();
+    _thisDate.dispose();
+    return;
+  }
   //- DOMAIN FUNCTIONS
 
   void clearData() {
@@ -173,8 +181,8 @@ class SchoolCalendarManager {
   //- read
 
   Future<void> fetchSchooldays() async {
-    final List<Schoolday> responseSchooldays =
-        await _client.schoolday.getSchooldays();
+    final List<Schoolday> responseSchooldays = await _client.schoolday
+        .getSchooldays();
 
     if (responseSchooldays.isNotEmpty) {
       _notificationService.showSnackBar(
@@ -215,8 +223,9 @@ class SchoolCalendarManager {
       return;
     }
     if (isDeleted) {
-      _schooldays.value =
-          _schooldays.value.where((day) => day != schoolday).toList();
+      _schooldays.value = _schooldays.value
+          .where((day) => day != schoolday)
+          .toList();
 
       _notificationService.showSnackBar(
         NotificationType.success,
@@ -246,17 +255,16 @@ class SchoolCalendarManager {
     required bool isFirst,
   }) async {
     final SchoolSemester? newSemester = await ClientHelper.apiCall(
-      call:
-          () => _client.schooldayAdmin.createSchoolSemester(
-            schoolYearName,
-            startDate.toUtc(),
-            endDate.toUtc(),
-            isFirst,
-            classConferenceDate?.toUtc(),
-            supportConferenceDate?.toUtc(),
-            reportConferenceDate?.toUtc(),
-            reportSignedDate?.toUtc(),
-          ),
+      call: () => _client.schooldayAdmin.createSchoolSemester(
+        schoolYearName,
+        startDate.toUtc(),
+        endDate.toUtc(),
+        isFirst,
+        classConferenceDate?.toUtc(),
+        supportConferenceDate?.toUtc(),
+        reportConferenceDate?.toUtc(),
+        reportSignedDate?.toUtc(),
+      ),
     );
     if (newSemester == null) {
       return;
@@ -279,8 +287,8 @@ class SchoolCalendarManager {
   //- read
 
   Future<void> fetchSchoolSemesters() async {
-    final List<SchoolSemester> responseSchoolSemesters =
-        await _client.schoolday.getSchoolSemesters();
+    final List<SchoolSemester> responseSchoolSemesters = await _client.schoolday
+        .getSchoolSemesters();
 
     _notificationService.showSnackBar(
       NotificationType.success,
diff --git a/school_data_hub_flutter/lib/features/school_calendar/presentation/new_school_semester_page/schooldays_calendar_page/schooldays_calendar_page.dart b/school_data_hub_flutter/lib/features/school_calendar/presentation/new_school_semester_page/schooldays_calendar_page/schooldays_calendar_page.dart
index 09549a73..948940f3 100644
--- a/school_data_hub_flutter/lib/features/school_calendar/presentation/new_school_semester_page/schooldays_calendar_page/schooldays_calendar_page.dart
+++ b/school_data_hub_flutter/lib/features/school_calendar/presentation/new_school_semester_page/schooldays_calendar_page/schooldays_calendar_page.dart
@@ -2,7 +2,7 @@ import 'package:calendar_date_picker2/calendar_date_picker2.dart';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:intl/intl.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/theme/styles.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
diff --git a/school_data_hub_flutter/lib/features/school_calendar/presentation/new_school_semester_page/widgets/date_picker_button.dart b/school_data_hub_flutter/lib/features/school_calendar/presentation/new_school_semester_page/widgets/date_picker_button.dart
index ce01d5d8..dd4c094a 100644
--- a/school_data_hub_flutter/lib/features/school_calendar/presentation/new_school_semester_page/widgets/date_picker_button.dart
+++ b/school_data_hub_flutter/lib/features/school_calendar/presentation/new_school_semester_page/widgets/date_picker_button.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 
 class DatePickerButton extends StatelessWidget {
   final DateTime? dateToSelect;
diff --git a/school_data_hub_flutter/lib/features/school_lists/domain/filters/school_list_filter_manager.dart b/school_data_hub_flutter/lib/features/school_lists/domain/filters/school_list_filter_manager.dart
index 5367ff7a..bb577e90 100644
--- a/school_data_hub_flutter/lib/features/school_lists/domain/filters/school_list_filter_manager.dart
+++ b/school_data_hub_flutter/lib/features/school_lists/domain/filters/school_list_filter_manager.dart
@@ -20,6 +20,14 @@ class SchoolListFilterManager {
   ValueListenable<bool> get filterState => _filterState;
   final _filterState = ValueNotifier<bool>(false);
 
+  void dispose() {
+    _filteredSchoolLists.dispose();
+    _filterState.dispose();
+    _schoolListManager.removeListener(_onSchoolListsChanged);
+
+    return;
+  }
+
   SchoolListFilterManager init() {
     _schoolListManager.addListener(_onSchoolListsChanged);
     resetFilters();
@@ -27,10 +35,6 @@ class SchoolListFilterManager {
     return this;
   }
 
-  void dispose() {
-    _schoolListManager.removeListener(_onSchoolListsChanged);
-  }
-
   void _onSchoolListsChanged() {
     // If we have an active filter, reapply it to the new data
     if (_filterState.value) {
diff --git a/school_data_hub_flutter/lib/features/school_lists/domain/school_list_manager.dart b/school_data_hub_flutter/lib/features/school_lists/domain/school_list_manager.dart
index a6c1b3ca..d5f6b596 100644
--- a/school_data_hub_flutter/lib/features/school_lists/domain/school_list_manager.dart
+++ b/school_data_hub_flutter/lib/features/school_lists/domain/school_list_manager.dart
@@ -5,7 +5,7 @@ import 'package:school_data_hub_flutter/common/services/notification_service.dar
 import 'package:school_data_hub_flutter/core/client/client_helper.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/school_lists/data/school_list_api_service.dart';
 import 'package:school_data_hub_flutter/features/school_lists/domain/models/pupil_list_entry_proxy.dart';
 import 'package:school_data_hub_flutter/features/school_lists/domain/models/school_list_pupil_entries_proxy.dart';
@@ -16,7 +16,7 @@ class SchoolListManager with ChangeNotifier {
 
   final _apiSchoolListService = SchoolListApiService();
 
-  final _pupilManager = di<PupilManager>();
+  final _pupilManager = di<PupilProxyManager>();
 
   final _log = Logger('SchoolListManager');
 
@@ -36,6 +36,12 @@ class SchoolListManager with ChangeNotifier {
     _schoolListIdPupilEntriesMap.clear();
   }
 
+  void dispose() {
+    clearData();
+    super.dispose();
+    return;
+  }
+
   Future<SchoolListManager> init() async {
     await fetchSchoolLists();
     return this;
diff --git a/school_data_hub_flutter/lib/features/school_lists/presentation/new_list_page/new_school_list_page.dart b/school_data_hub_flutter/lib/features/school_lists/presentation/new_list_page/new_school_list_page.dart
index 328c2f82..d038dd0c 100644
--- a/school_data_hub_flutter/lib/features/school_lists/presentation/new_list_page/new_school_list_page.dart
+++ b/school_data_hub_flutter/lib/features/school_lists/presentation/new_list_page/new_school_list_page.dart
@@ -5,7 +5,7 @@ import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/theme/styles.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/pupil_profile_page.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/select_pupils_list_page/select_pupils_list_page.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/widgets/avatar.dart';
@@ -18,7 +18,7 @@ class NewSchoolListPage extends WatchingWidget {
   @override
   Widget build(BuildContext context) {
     final _schoolListManager = di<SchoolListManager>();
-    final _pupilManager = di<PupilManager>();
+    final _pupilManager = di<PupilProxyManager>();
     final _hubSessionManager = di<HubSessionManager>();
     // Create text editing controllers using createOnce
     final schoolListNameController = createOnce<TextEditingController>(
@@ -102,26 +102,26 @@ class NewSchoolListPage extends WatchingWidget {
                 const Gap(10),
                 _hubSessionManager.isAdmin == true
                     ? Row(
-                      children: [
-                        const Text(
-                          'Öffentliche Liste:',
-                          style: TextStyle(
-                            fontSize: 16,
-                            fontWeight: FontWeight.bold,
+                        children: [
+                          const Text(
+                            'Öffentliche Liste:',
+                            style: TextStyle(
+                              fontSize: 16,
+                              fontWeight: FontWeight.bold,
+                            ),
                           ),
-                        ),
-                        const Gap(10),
+                          const Gap(10),
 
-                        Switch(
-                          value:
-                              isOnValue, // Boolean value representing the switch state
-                          onChanged: (newValue) {
-                            isOn.value = newValue;
-                          },
-                          activeColor: Colors.blue, // Change color if desired
-                        ),
-                      ],
-                    )
+                          Switch(
+                            value:
+                                isOnValue, // Boolean value representing the switch state
+                            onChanged: (newValue) {
+                              isOn.value = newValue;
+                            },
+                            activeColor: Colors.blue, // Change color if desired
+                          ),
+                        ],
+                      )
                     : const SizedBox.shrink(),
                 Row(
                   children: [
@@ -156,119 +156,126 @@ class NewSchoolListPage extends WatchingWidget {
                 if (pupilIdsValue.isEmpty) const Gap(30),
                 pupilIdsValue.isNotEmpty
                     ? Expanded(
-                      child: Padding(
-                        padding: const EdgeInsets.symmetric(vertical: 8.0),
-                        child: SingleChildScrollView(
-                          scrollDirection: Axis.vertical,
-                          child: ListView.builder(
-                            padding: const EdgeInsets.only(top: 5, bottom: 15),
-                            shrinkWrap: true,
-                            physics: const NeverScrollableScrollPhysics(),
-                            itemCount: pupilsFromIds.length,
-                            itemBuilder: (context, int index) {
-                              PupilProxy listedPupil = pupilsFromIds[index];
-                              return Column(
-                                children: [
-                                  // const Gap(5),
-                                  InkWell(
-                                    onLongPress: () {
-                                      final currentPupilIds = Set<int>.from(
-                                        pupilIdsValue,
-                                      );
-                                      currentPupilIds.remove(
-                                        listedPupil.internalId,
-                                      );
-                                      pupilIds.value = currentPupilIds;
-                                    },
-                                    onTap: () {
-                                      Navigator.of(context).push(
-                                        MaterialPageRoute(
-                                          builder:
-                                              (ctx) => PupilProfilePage(
-                                                pupil: listedPupil,
-                                              ),
-                                        ),
-                                      );
-                                    },
-                                    child: Card(
-                                      child: Padding(
-                                        padding: const EdgeInsets.all(8.0),
-                                        child: Row(
-                                          children: [
-                                            AvatarWithBadges(
+                        child: Padding(
+                          padding: const EdgeInsets.symmetric(vertical: 8.0),
+                          child: SingleChildScrollView(
+                            scrollDirection: Axis.vertical,
+                            child: ListView.builder(
+                              padding: const EdgeInsets.only(
+                                top: 5,
+                                bottom: 15,
+                              ),
+                              shrinkWrap: true,
+                              physics: const NeverScrollableScrollPhysics(),
+                              itemCount: pupilsFromIds.length,
+                              itemBuilder: (context, int index) {
+                                PupilProxy listedPupil = pupilsFromIds[index];
+                                return Column(
+                                  children: [
+                                    // const Gap(5),
+                                    InkWell(
+                                      onLongPress: () {
+                                        final currentPupilIds = Set<int>.from(
+                                          pupilIdsValue,
+                                        );
+                                        currentPupilIds.remove(
+                                          listedPupil.internalId,
+                                        );
+                                        pupilIds.value = currentPupilIds;
+                                      },
+                                      onTap: () {
+                                        Navigator.of(context).push(
+                                          MaterialPageRoute(
+                                            builder: (ctx) => PupilProfilePage(
                                               pupil: listedPupil,
-                                              size: 50,
                                             ),
-                                            const Gap(10),
-                                            Column(
-                                              mainAxisAlignment:
-                                                  MainAxisAlignment.start,
-                                              crossAxisAlignment:
-                                                  CrossAxisAlignment.start,
-                                              children: [
-                                                Text(
-                                                  listedPupil.firstName,
-                                                  style: const TextStyle(
-                                                    fontWeight: FontWeight.bold,
-                                                    fontSize: 18,
+                                          ),
+                                        );
+                                      },
+                                      child: Card(
+                                        child: Padding(
+                                          padding: const EdgeInsets.all(8.0),
+                                          child: Row(
+                                            children: [
+                                              AvatarWithBadges(
+                                                pupil: listedPupil,
+                                                size: 50,
+                                              ),
+                                              const Gap(10),
+                                              Column(
+                                                mainAxisAlignment:
+                                                    MainAxisAlignment.start,
+                                                crossAxisAlignment:
+                                                    CrossAxisAlignment.start,
+                                                children: [
+                                                  Text(
+                                                    listedPupil.firstName,
+                                                    style: const TextStyle(
+                                                      fontWeight:
+                                                          FontWeight.bold,
+                                                      fontSize: 18,
+                                                    ),
                                                   ),
-                                                ),
-                                                //const Gap(10),
-                                                Text(
-                                                  listedPupil.lastName,
-                                                  style: const TextStyle(),
-                                                ),
-                                              ],
-                                            ),
-                                            const Spacer(),
-                                            Column(
-                                              children: [
-                                                Text(
-                                                  listedPupil.group,
-                                                  style: const TextStyle(
-                                                    fontWeight: FontWeight.bold,
-                                                    color: AppColors.groupColor,
-                                                    fontSize: 18,
+                                                  //const Gap(10),
+                                                  Text(
+                                                    listedPupil.lastName,
+                                                    style: const TextStyle(),
                                                   ),
-                                                ),
-                                                Text(
-                                                  listedPupil.schoolGrade.name,
-                                                  style: const TextStyle(
-                                                    fontWeight: FontWeight.bold,
-                                                    color:
-                                                        AppColors
-                                                            .schoolyearColor,
-                                                    fontSize: 18,
+                                                ],
+                                              ),
+                                              const Spacer(),
+                                              Column(
+                                                children: [
+                                                  Text(
+                                                    listedPupil.group,
+                                                    style: TextStyle(
+                                                      fontWeight:
+                                                          FontWeight.bold,
+                                                      color:
+                                                          AppColors.groupColor,
+                                                      fontSize: 18,
+                                                    ),
                                                   ),
-                                                ),
-                                              ],
-                                            ),
-                                            const Gap(15),
-                                          ],
+                                                  Text(
+                                                    listedPupil
+                                                        .schoolGrade
+                                                        .name,
+                                                    style: TextStyle(
+                                                      fontWeight:
+                                                          FontWeight.bold,
+                                                      color: AppColors
+                                                          .schoolyearColor,
+                                                      fontSize: 18,
+                                                    ),
+                                                  ),
+                                                ],
+                                              ),
+                                              const Gap(15),
+                                            ],
+                                          ),
                                         ),
                                       ),
                                     ),
-                                  ),
-                                ],
-                              );
-                            },
+                                  ],
+                                );
+                              },
+                            ),
                           ),
                         ),
-                      ),
-                    )
+                      )
                     : const Row(
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      children: [
-                        Text(
-                          'Keine Kinder ausgewählt!',
-                          style: TextStyle(
-                            fontSize: 18,
-                            color: Color.fromARGB(255, 91, 91, 91),
-                            fontWeight: FontWeight.bold,
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          Text(
+                            'Keine Kinder ausgewählt!',
+                            style: TextStyle(
+                              fontSize: 18,
+                              color: Color.fromARGB(255, 91, 91, 91),
+                              fontWeight: FontWeight.bold,
+                            ),
                           ),
-                        ),
-                      ],
-                    ),
+                        ],
+                      ),
                 if (pupilIds.value.isEmpty) const Spacer(),
                 ElevatedButton(
                   style: AppStyles.actionButtonStyle,
@@ -276,13 +283,10 @@ class NewSchoolListPage extends WatchingWidget {
                     final List<int> selectedPupilIds =
                         await Navigator.of(context).push(
                           MaterialPageRoute(
-                            builder:
-                                (ctx) => SelectPupilsListPage(
-                                  selectablePupils: _pupilManager
-                                      .getPupilsNotListed(
-                                        pupilIdsValue.toList(),
-                                      ),
-                                ),
+                            builder: (ctx) => SelectPupilsListPage(
+                              selectablePupils: _pupilManager
+                                  .getPupilsNotListed(pupilIdsValue.toList()),
+                            ),
                           ),
                         ) ??
                         [];
diff --git a/school_data_hub_flutter/lib/features/school_lists/presentation/school_list_pupil_entries_page/school_list_pupil_entries_page.dart b/school_data_hub_flutter/lib/features/school_lists/presentation/school_list_pupil_entries_page/school_list_pupil_entries_page.dart
index 15ee39d5..605a979e 100644
--- a/school_data_hub_flutter/lib/features/school_lists/presentation/school_list_pupil_entries_page/school_list_pupil_entries_page.dart
+++ b/school_data_hub_flutter/lib/features/school_lists/presentation/school_list_pupil_entries_page/school_list_pupil_entries_page.dart
@@ -7,7 +7,7 @@ import 'package:school_data_hub_flutter/common/widgets/generic_components/generi
 import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_sliver_search_app_bar.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/filters/pupils_filter.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/school_lists/domain/filters/school_list_filter_manager.dart';
 import 'package:school_data_hub_flutter/features/school_lists/domain/school_list_manager.dart';
 import 'package:school_data_hub_flutter/features/school_lists/presentation/school_list_pupil_entries_page/widgets/school_list_pupil_entries_bottom_navbar.dart';
@@ -24,7 +24,7 @@ class SchoolListPupilEntriesPage extends WatchingWidget {
   Widget build(BuildContext context) {
     final _schoolListManager = di<SchoolListManager>();
     final _schoolListFilterManager = di<SchoolListFilterManager>();
-    final _pupilManager = di<PupilManager>();
+    final _pupilManager = di<PupilProxyManager>();
     final unfilteredPupilListEntries = watch(
       _schoolListManager.getPupilEntriesProxyFromSchoolList(schoolList.id!),
     ).pupilEntries.values.map((e) => e.pupilEntry).toList();
diff --git a/school_data_hub_flutter/lib/features/school_lists/presentation/school_list_pupil_entries_page/widgets/school_list_pupil_entries_bottom_navbar.dart b/school_data_hub_flutter/lib/features/school_lists/presentation/school_list_pupil_entries_page/widgets/school_list_pupil_entries_bottom_navbar.dart
index 3cb6dbe0..2937ca55 100644
--- a/school_data_hub_flutter/lib/features/school_lists/presentation/school_list_pupil_entries_page/widgets/school_list_pupil_entries_bottom_navbar.dart
+++ b/school_data_hub_flutter/lib/features/school_lists/presentation/school_list_pupil_entries_page/widgets/school_list_pupil_entries_bottom_navbar.dart
@@ -7,7 +7,7 @@ import 'package:school_data_hub_flutter/common/widgets/bottom_nav_bar_layouts.da
 import 'package:school_data_hub_flutter/common/widgets/filter_button.dart';
 import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_filter_bottom_sheet.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/select_pupils_list_page/select_pupils_list_page.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/widgets/common_pupil_filters.dart';
 import 'package:school_data_hub_flutter/features/school_lists/domain/school_list_manager.dart';
@@ -31,7 +31,7 @@ class SchoolListPupilEntriesBottomNavBar extends StatelessWidget {
   Widget build(BuildContext context) {
     final _schoolListManager = di<SchoolListManager>();
     final _hubSessionManager = di<HubSessionManager>();
-    final _pupilManager = di<PupilManager>();
+    final _pupilManager = di<PupilProxyManager>();
     final schoolList = _schoolListManager.getSchoolListById(listId);
     return BottomNavBarLayout(
       bottomNavBar: BottomAppBar(
@@ -61,42 +61,38 @@ class SchoolListPupilEntriesBottomNavBar extends StatelessWidget {
                       tooltip: 'Liste teilen',
                       onPressed: () async {
                         final users = di<UserManager>().users.value;
-                        final List<int>? selectedUsers = await Navigator.of(
-                          context,
-                        ).push(
-                          MaterialPageRoute(
-                            builder:
-                                (ctx) => SelectUsersPage(
-                                  selectableUsers:
-                                      users
-                                          .where(
-                                            (user) =>
-                                                user.userInfo?.userName !=
-                                                _hubSessionManager.userName,
-                                          )
-                                          .toList(),
+                        final List<int>? selectedUsers =
+                            await Navigator.of(context).push(
+                              MaterialPageRoute(
+                                builder: (ctx) => SelectUsersPage(
+                                  selectableUsers: users
+                                      .where(
+                                        (user) =>
+                                            user.userInfo?.userName !=
+                                            _hubSessionManager.userName,
+                                      )
+                                      .toList(),
                                   authorizedUsers: schoolList.authorizedUsers,
                                 ),
-                          ),
-                        );
+                              ),
+                            );
                         if (selectedUsers == null) return;
 
                         final userManager = di<UserManager>();
-                        final authorizedUsernames =
-                            selectedUsers.isEmpty
-                                ? null
-                                : selectedUsers
-                                    .map(
-                                      (userId) =>
-                                          userManager.users.value
-                                              .firstWhere(
-                                                (user) => user.id == userId,
-                                              )
-                                              .userInfo
-                                              ?.userName ??
-                                          'Unknown',
-                                    )
-                                    .join('*');
+                        final authorizedUsernames = selectedUsers.isEmpty
+                            ? null
+                            : selectedUsers
+                                  .map(
+                                    (userId) =>
+                                        userManager.users.value
+                                            .firstWhere(
+                                              (user) => user.id == userId,
+                                            )
+                                            .userInfo
+                                            ?.userName ??
+                                        'Unknown',
+                                  )
+                                  .join('*');
 
                         _schoolListManager.updateSchoolListProperty(
                           listId: listId,
@@ -115,11 +111,11 @@ class SchoolListPupilEntriesBottomNavBar extends StatelessWidget {
                   final List<int> selectedPupilIds =
                       await Navigator.of(context).push(
                         MaterialPageRoute(
-                          builder:
-                              (ctx) => SelectPupilsListPage(
-                                selectablePupils: _pupilManager
-                                    .getPupilsNotListed(pupilsInList),
-                              ),
+                          builder: (ctx) => SelectPupilsListPage(
+                            selectablePupils: _pupilManager.getPupilsNotListed(
+                              pupilsInList,
+                            ),
+                          ),
                         ),
                       ) ??
                       [];
@@ -150,8 +146,8 @@ class SchoolListPupilEntriesBottomNavBar extends StatelessWidget {
                   if (context.mounted) {
                     Navigator.of(context).push(
                       MaterialPageRoute(
-                        builder:
-                            (ctx) => SchoolListPdfViewPage(pdfFile: pdfFile),
+                        builder: (ctx) =>
+                            SchoolListPdfViewPage(pdfFile: pdfFile),
                       ),
                     );
                   }
diff --git a/school_data_hub_flutter/lib/features/school_lists/presentation/school_list_pupil_entries_page/widgets/school_list_pupil_entries_searchbar.dart b/school_data_hub_flutter/lib/features/school_lists/presentation/school_list_pupil_entries_page/widgets/school_list_pupil_entries_searchbar.dart
index a1045e47..f44b4986 100644
--- a/school_data_hub_flutter/lib/features/school_lists/presentation/school_list_pupil_entries_page/widgets/school_list_pupil_entries_searchbar.dart
+++ b/school_data_hub_flutter/lib/features/school_lists/presentation/school_list_pupil_entries_page/widgets/school_list_pupil_entries_searchbar.dart
@@ -72,12 +72,12 @@ class SchoolListPupilEntriesPageSearchBar extends WatchingWidget {
                       observedSchoolList.public != true
                           ? Text(
                             observedSchoolList.createdBy,
-                            style: const TextStyle(
+                            style: TextStyle(
                               color: AppColors.backgroundColor,
                               fontWeight: FontWeight.bold,
                             ),
                           )
-                          : const Icon(
+                          : Icon(
                             Icons.school_rounded,
                             color: AppColors.backgroundColor,
                           ),
diff --git a/school_data_hub_flutter/lib/features/school_lists/presentation/school_list_pupil_entries_page/widgets/school_list_pupil_entry_card.dart b/school_data_hub_flutter/lib/features/school_lists/presentation/school_list_pupil_entries_page/widgets/school_list_pupil_entry_card.dart
index 4470ecbb..becfe75d 100644
--- a/school_data_hub_flutter/lib/features/school_lists/presentation/school_list_pupil_entries_page/widgets/school_list_pupil_entry_card.dart
+++ b/school_data_hub_flutter/lib/features/school_lists/presentation/school_list_pupil_entries_page/widgets/school_list_pupil_entry_card.dart
@@ -10,7 +10,7 @@ import 'package:school_data_hub_flutter/common/widgets/dialogs/long_textfield_di
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 import 'package:school_data_hub_flutter/features/app_main_navigation/domain/main_menu_bottom_nav_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/pupil_profile_page.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/widgets/avatar.dart';
 import 'package:school_data_hub_flutter/features/school_lists/domain/school_list_helper_functions.dart';
@@ -26,20 +26,19 @@ class SchoolListPupilEntryCard extends WatchingWidget {
 
   @override
   Widget build(BuildContext context) {
-    final _pupilManager = di<PupilManager>();
+    final _pupilManager = di<PupilProxyManager>();
     final _mainMenuBottomNavManager = di<BottomNavManager>();
     final _hubSessionManager = di<HubSessionManager>();
     final _notificationService = di<NotificationService>();
     final _schoolListManager = di<SchoolListManager>();
     final PupilProxy pupil = _pupilManager.getPupilByPupilId(pupilId)!;
 
-    final PupilListEntry pupilEntry =
-        watch(
-          _schoolListManager.getPupilSchoolListEntryProxy(
-            pupilId: pupilId,
-            listId: originListId,
-          )!,
-        ).pupilEntry;
+    final PupilListEntry pupilEntry = watch(
+      _schoolListManager.getPupilSchoolListEntryProxy(
+        pupilId: pupilId,
+        listId: originListId,
+      )!,
+    ).pupilEntry;
 
     return Card(
       color: Colors.white,
@@ -148,7 +147,7 @@ class SchoolListPupilEntryCard extends WatchingWidget {
                             ? pupilEntry.comment!
                             : 'kein Kommentar',
                         textAlign: TextAlign.left,
-                        style: const TextStyle(
+                        style: TextStyle(
                           fontSize: 16,
                           color: AppColors.backgroundColor,
                         ),
diff --git a/school_data_hub_flutter/lib/features/school_lists/presentation/school_list_pupil_entries_page/widgets/school_list_stats_row.dart b/school_data_hub_flutter/lib/features/school_lists/presentation/school_list_pupil_entries_page/widgets/school_list_stats_row.dart
index 966927c4..3432cffb 100644
--- a/school_data_hub_flutter/lib/features/school_lists/presentation/school_list_pupil_entries_page/widgets/school_list_stats_row.dart
+++ b/school_data_hub_flutter/lib/features/school_lists/presentation/school_list_pupil_entries_page/widgets/school_list_stats_row.dart
@@ -41,12 +41,12 @@ class SchoolListStatsRow extends WatchingWidget {
             if (confirm != true) return;
             Navigator.of(context).push(
               MaterialPageRoute(
-                builder:
-                    (ctx) => NewSchoolListPage(initialSchoolList: schoolList),
+                builder: (ctx) =>
+                    NewSchoolListPage(initialSchoolList: schoolList),
               ),
             );
           },
-          child: const Icon(
+          child: Icon(
             Icons.people_alt_rounded,
             color: AppColors.backgroundColor,
           ),
@@ -83,7 +83,7 @@ class SchoolListStatsRow extends WatchingWidget {
           ),
         ),
         const Gap(10),
-        const Icon(Icons.question_mark_rounded, color: AppColors.accentColor),
+        Icon(Icons.question_mark_rounded, color: AppColors.accentColor),
         const Gap(5),
         Text(
           stats['null'].toString(),
@@ -94,7 +94,7 @@ class SchoolListStatsRow extends WatchingWidget {
           ),
         ),
         const Gap(10),
-        const Icon(Icons.create, color: AppColors.backgroundColor),
+        Icon(Icons.create, color: AppColors.backgroundColor),
         const Gap(5),
         Text(
           stats['comment'].toString(),
diff --git a/school_data_hub_flutter/lib/features/school_lists/presentation/school_lists_page/widgets/school_list_card.dart b/school_data_hub_flutter/lib/features/school_lists/presentation/school_lists_page/widgets/school_list_card.dart
index 1b1d9809..7b390fe5 100644
--- a/school_data_hub_flutter/lib/features/school_lists/presentation/school_lists_page/widgets/school_list_card.dart
+++ b/school_data_hub_flutter/lib/features/school_lists/presentation/school_lists_page/widgets/school_list_card.dart
@@ -80,7 +80,7 @@ class SchoolListCard extends WatchingWidget {
                                 scrollDirection: Axis.horizontal,
                                 child: Text(
                                   schoolList.name,
-                                  style: const TextStyle(
+                                  style: TextStyle(
                                     fontSize: 18,
                                     fontWeight: FontWeight.bold,
                                     color: AppColors.interactiveColor,
@@ -90,17 +90,17 @@ class SchoolListCard extends WatchingWidget {
                             ),
                             const Gap(10),
                             schoolList.public == true
-                                ? const Icon(
-                                  Icons.school_rounded,
-                                  color: AppColors.backgroundColor,
-                                )
+                                ? Icon(
+                                    Icons.school_rounded,
+                                    color: AppColors.backgroundColor,
+                                  )
                                 : Text(
-                                  schoolList.createdBy,
-                                  style: const TextStyle(
-                                    fontSize: 18,
-                                    fontWeight: FontWeight.bold,
+                                    schoolList.createdBy,
+                                    style: const TextStyle(
+                                      fontSize: 18,
+                                      fontWeight: FontWeight.bold,
+                                    ),
                                   ),
-                                ),
                             const Padding(padding: EdgeInsets.only(right: 10)),
                           ],
                         ),
@@ -127,7 +127,7 @@ class SchoolListCard extends WatchingWidget {
                                     const Gap(2),
                                     Text(
                                       '+ ${schoolList.authorizedUsers!.replaceAll('*', ' + ')}',
-                                      style: const TextStyle(
+                                      style: TextStyle(
                                         fontSize: 12,
                                         color: AppColors.backgroundColor,
                                         fontWeight: FontWeight.w500,
diff --git a/school_data_hub_flutter/lib/features/school_lists/services/school_list_pdf_generator.dart b/school_data_hub_flutter/lib/features/school_lists/services/school_list_pdf_generator.dart
index 88113b05..40d80c59 100644
--- a/school_data_hub_flutter/lib/features/school_lists/services/school_list_pdf_generator.dart
+++ b/school_data_hub_flutter/lib/features/school_lists/services/school_list_pdf_generator.dart
@@ -8,7 +8,7 @@ import 'package:pdf/pdf.dart';
 import 'package:pdf/widgets.dart' as pw;
 import 'package:printing/printing.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/generic_components/generic_app_bar.dart';
@@ -590,10 +590,10 @@ class _SchoolListPdfViewPageState extends State<SchoolListPdfViewPage> {
         title: 'Schulliste PDF',
       ),
       body: PdfPreview(
-        actionBarTheme: const PdfActionBarTheme(
+        actionBarTheme: PdfActionBarTheme(
           backgroundColor: AppColors.backgroundColor,
           iconColor: Colors.white,
-          textStyle: TextStyle(color: Colors.white),
+          textStyle: const TextStyle(color: Colors.white),
         ),
         allowSharing: true,
         allowPrinting: true,
diff --git a/school_data_hub_flutter/lib/features/statistics/chart_page/chart_page_controller.dart b/school_data_hub_flutter/lib/features/statistics/chart_page/chart_page_controller.dart
index 528f425a..56a5c1bd 100644
--- a/school_data_hub_flutter/lib/features/statistics/chart_page/chart_page_controller.dart
+++ b/school_data_hub_flutter/lib/features/statistics/chart_page/chart_page_controller.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/features/_attendance/domain/attendance_manager.dart';
 import 'package:school_data_hub_flutter/features/_schoolday_events/domain/schoolday_event_manager.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/school_calendar/domain/school_calendar_manager.dart';
 import 'package:school_data_hub_flutter/features/statistics/chart_page/chart_page.dart';
 import 'package:watch_it/watch_it.dart';
@@ -15,7 +15,7 @@ class ChartPageController extends StatefulWidget {
 }
 
 class _ChartPageControllerState extends State<ChartPageController> {
-  late final PupilManager _pupilManager;
+  late final PupilProxyManager _pupilManager;
   late final SchoolCalendarManager _schoolCalendarManager;
   late final SchooldayEventManager _schooldayEventManager;
   late final AttendanceManager _attendanceManager;
@@ -53,7 +53,7 @@ class _ChartPageControllerState extends State<ChartPageController> {
   @override
   void initState() {
     super.initState();
-    _pupilManager = di<PupilManager>();
+    _pupilManager = di<PupilProxyManager>();
     _schoolCalendarManager = di<SchoolCalendarManager>();
     _schooldayEventManager = di<SchooldayEventManager>();
     _attendanceManager = di<AttendanceManager>();
diff --git a/school_data_hub_flutter/lib/features/statistics/chart_page/widgets/attendance_stats_view.dart b/school_data_hub_flutter/lib/features/statistics/chart_page/widgets/attendance_stats_view.dart
index 5e1d213f..2df07032 100644
--- a/school_data_hub_flutter/lib/features/statistics/chart_page/widgets/attendance_stats_view.dart
+++ b/school_data_hub_flutter/lib/features/statistics/chart_page/widgets/attendance_stats_view.dart
@@ -5,6 +5,7 @@ import 'package:gap/gap.dart';
 import 'package:intl/intl.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/common/theme/styles.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/features/_attendance/domain/filters/attendance_pupil_filter.dart';
 import 'package:school_data_hub_flutter/features/_attendance/domain/models/enums.dart';
 import 'package:school_data_hub_flutter/features/_attendance/presentation/attendance_page/attendance_list_page.dart';
@@ -38,16 +39,18 @@ class AttendanceStatsView extends WatchingWidget {
         if (dateData == null) return;
 
         final buffer = StringBuffer();
-        buffer.writeln('Datum: ${chartData.dateString}');
-        buffer.writeln();
+
         buffer.writeln('Entschuldigt: ${dateData.excused}');
         buffer.writeln('Unentschuldigt: ${dateData.unexcused}');
-        buffer.writeln('Nach Hause geschickt: ${dateData.goneHome}');
+        buffer.writeln('Abgeholt: ${dateData.goneHome}');
 
         showDialog(
           context: context,
           builder: (context) => AlertDialog(
-            title: const Text('Details', style: AppStyles.title),
+            title: Text(
+              '${chartData.date.formatWithWeekday()}',
+              style: AppStyles.title,
+            ),
             content: Text(buffer.toString()),
             actions: [
               TextButton(
@@ -302,11 +305,7 @@ class AttendanceStatsView extends WatchingWidget {
                 children: [
                   _buildLegendItem('Entschuldigt', Colors.green, 'excused'),
                   _buildLegendItem('Unentschuldigt', Colors.red, 'unexcused'),
-                  _buildLegendItem(
-                    'Nach Hause geschickt',
-                    Colors.orange,
-                    'goneHome',
-                  ),
+                  _buildLegendItem('abgeholt', Colors.orange, 'goneHome'),
                 ],
               ),
             ),
diff --git a/school_data_hub_flutter/lib/features/statistics/chart_page/widgets/pupil_stats_view.dart b/school_data_hub_flutter/lib/features/statistics/chart_page/widgets/pupil_stats_view.dart
index 00cc2996..5109b19a 100644
--- a/school_data_hub_flutter/lib/features/statistics/chart_page/widgets/pupil_stats_view.dart
+++ b/school_data_hub_flutter/lib/features/statistics/chart_page/widgets/pupil_stats_view.dart
@@ -185,17 +185,17 @@ class _PupilStatsViewState extends State<PupilStatsView> {
                 runSpacing: 10,
                 children: [
                   _buildLegendItem(
-                    'Besonderer Förderbedarf',
+                    'festgestellter Förderbedarf',
                     AppColors.accentColor,
                     'Special Needs',
                   ),
                   _buildLegendItem(
-                    'Migrationsunterstützung',
+                    'Erstförderung',
                     AppColors.backgroundColor,
                     'Migration Support',
                   ),
                   _buildLegendItem(
-                    'Förderstufe 3',
+                    'Förderebene 3',
                     AppColors.warningButtonColor,
                     'Support Level 3',
                   ),
diff --git a/school_data_hub_flutter/lib/features/statistics/statistics_page/controller/statistics.dart b/school_data_hub_flutter/lib/features/statistics/statistics_page/controller/statistics.dart
index 9f322969..55b1a398 100644
--- a/school_data_hub_flutter/lib/features/statistics/statistics_page/controller/statistics.dart
+++ b/school_data_hub_flutter/lib/features/statistics/statistics_page/controller/statistics.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_helper_functions.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_helper.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/school_calendar/domain/school_calendar_manager.dart';
 import 'package:school_data_hub_flutter/features/statistics/statistics_page/statistics_page.dart';
 import 'package:watch_it/watch_it.dart';
@@ -16,7 +16,7 @@ class Statistics extends WatchingStatefulWidget {
 }
 
 class StatisticsController extends State<Statistics> {
-  final List<PupilProxy> pupils = di<PupilManager>().allPupils;
+  final List<PupilProxy> pupils = di<PupilProxyManager>().allPupils;
   Map<String, int> languageOccurrences = {};
   Map<String, DateTime> enrollments = {};
   @override
@@ -43,9 +43,9 @@ class StatisticsController extends State<Statistics> {
       pupilsWithEnrollmentDate[pupil.internalId] = pupil.pupilSince
           .formatDateForUser();
     }
-    // debugger();
+
     return givenPupils.where((pupil) {
-      final date = pupil.pupilSince.toLocal().add(const Duration(hours: 2));
+      final date = pupil.pupilSince;
       return !(date.month == DateTime.august && date.day == 1);
     }).toList();
   }
@@ -127,7 +127,7 @@ class StatisticsController extends State<Statistics> {
       // if the pupil has a language support as of today, add to list
 
       if (pupil.migrationSupportEnds != null) {
-        if (PupilHelper.hasLanguageSupport(pupil.migrationSupportEnds)) {
+        if (PupilProxyHelper.hasLanguageSupport(pupil.migrationSupportEnds)) {
           groupPupils.add(pupil);
         }
       }
@@ -140,7 +140,7 @@ class StatisticsController extends State<Statistics> {
     for (PupilProxy pupil in givenPupils) {
       // if the pupil has a language support as of today, add to list
       if (pupil.migrationSupportEnds != null) {
-        if (PupilHelper.hadLanguageSupport(pupil.migrationSupportEnds)) {
+        if (PupilProxyHelper.hadLanguageSupport(pupil.migrationSupportEnds)) {
           groupPupils.add(pupil);
         }
       }
diff --git a/school_data_hub_flutter/lib/features/statistics/statistics_page/list_tiles/enrollment_list_tiles.dart b/school_data_hub_flutter/lib/features/statistics/statistics_page/list_tiles/enrollment_list_tiles.dart
index ab4fe4e3..003e29b4 100644
--- a/school_data_hub_flutter/lib/features/statistics/statistics_page/list_tiles/enrollment_list_tiles.dart
+++ b/school_data_hub_flutter/lib/features/statistics/statistics_page/list_tiles/enrollment_list_tiles.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:intl/intl.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
-import 'package:school_data_hub_flutter/features/pupil/presentation/widgets/pupil_language_card.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/features/pupil/presentation/pupil_profile_page/widgets/pupil_profile_page_content/language_content/pupil_language_card.dart';
 import 'package:school_data_hub_flutter/features/statistics/statistics_page/controller/statistics.dart';
 import 'package:watch_it/watch_it.dart';
 
@@ -102,7 +102,7 @@ class EnrollmentListTiles extends WatchingWidget {
                                 const Gap(5),
                                 Text(
                                   '${pupil.pupilSince.asWeekdayName(context)}, ${pupil.pupilSince.formatDateForUser()}',
-                                  style: const TextStyle(
+                                  style: TextStyle(
                                     fontWeight: FontWeight.bold,
                                     color: AppColors.backgroundColor,
                                     fontSize: 18,
diff --git a/school_data_hub_flutter/lib/features/statistics/statistics_page/list_tiles/group_card.dart b/school_data_hub_flutter/lib/features/statistics/statistics_page/list_tiles/group_card.dart
index 5b1db64f..3c30041c 100644
--- a/school_data_hub_flutter/lib/features/statistics/statistics_page/list_tiles/group_card.dart
+++ b/school_data_hub_flutter/lib/features/statistics/statistics_page/list_tiles/group_card.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
+import 'package:school_data_hub_client/school_data_hub_client.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/features/_attendance/presentation/widgets/attendance_badges.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
@@ -93,13 +94,13 @@ Widget statisticsGroupCard(
               ),
               const Gap(10),
               const Text(
-                'S3:',
+                'K3:',
                 style: TextStyle(color: Colors.black, fontSize: 18),
               ),
               const Gap(5),
               Text(
                 controller
-                    .schoolyearInaGivenGroup(group, 'S3')
+                    .schoolyearInaGivenGroup(group, 'K3')
                     .length
                     .toString(),
                 style: const TextStyle(
@@ -110,13 +111,13 @@ Widget statisticsGroupCard(
               ),
               const Gap(10),
               const Text(
-                'S4:',
+                'K4:',
                 style: TextStyle(color: Colors.black, fontSize: 18),
               ),
               const Gap(5),
               Text(
                 controller
-                    .schoolyearInaGivenGroup(group, 'S4')
+                    .schoolyearInaGivenGroup(group, 'K4')
                     .length
                     .toString(),
                 style: const TextStyle(
@@ -166,17 +167,7 @@ Widget statisticsGroupCard(
           const Gap(5),
           Row(
             children: [
-              // const Text(
-              //   'a. Familiensprache:',
-              //   style: TextStyle(
-              //     color: Colors.black,
-              //     fontSize: 18,
-              //   ),
-              // ),
-              const Icon(
-                Icons.translate_rounded,
-                color: AppColors.backgroundColor,
-              ),
+              Icon(Icons.translate_rounded, color: AppColors.backgroundColor),
 
               const Gap(5),
               Text(
@@ -383,7 +374,7 @@ Widget statisticsGroupCard(
           Row(
             mainAxisAlignment: MainAxisAlignment.start,
             children: [
-              missedTypeBadge('missed'),
+              missedTypeBadge(MissedType.missed),
               const Gap(5),
               Text(
                 controller.totalMissedClasses(group).length.toString(),
diff --git a/school_data_hub_flutter/lib/features/statistics/statistics_page/list_tiles/languages_list_tiles.dart b/school_data_hub_flutter/lib/features/statistics/statistics_page/list_tiles/languages_list_tiles.dart
index 7e6672c2..4fbeebbd 100644
--- a/school_data_hub_flutter/lib/features/statistics/statistics_page/list_tiles/languages_list_tiles.dart
+++ b/school_data_hub_flutter/lib/features/statistics/statistics_page/list_tiles/languages_list_tiles.dart
@@ -81,7 +81,7 @@ class LanguagesListTiles extends WatchingWidget {
                           await showDialog(
                             context: context,
                             builder: (context) => PupilListDialog(
-                              title: 'Schüler mit Sprache: $language',
+                              title: '$language',
                               pupils: pupilsWithLanguage,
                             ),
                           );
diff --git a/school_data_hub_flutter/lib/features/timetable/domain/timetable_manager.dart b/school_data_hub_flutter/lib/features/timetable/domain/timetable_manager.dart
index e7c54b42..4326d3a4 100644
--- a/school_data_hub_flutter/lib/features/timetable/domain/timetable_manager.dart
+++ b/school_data_hub_flutter/lib/features/timetable/domain/timetable_manager.dart
@@ -52,6 +52,16 @@ class TimetableManager extends ChangeNotifier {
   Map<int, Classroom> get classroomIdMap => _dataManager.classroomIdMap;
   Map<int, LessonGroup> get lessonGroupIdMap => _dataManager.lessonGroupIdMap;
 
+  void dispose() {
+    _dataManager.dispose();
+    _crudManager.dispose();
+    _uiManager.dispose();
+    _lessonManager.dispose();
+    _membershipManager.dispose();
+    super.dispose();
+    return;
+  }
+
   /// Initialize the timetable manager
   Future<TimetableManager> init() async {
     await _dataManager.init();
@@ -428,8 +438,9 @@ class TimetableManager extends ChangeNotifier {
     String period,
   ) {
     final slotsForPeriod = getSlotsByTimePeriod(period);
-    final slotForWeekday =
-        slotsForPeriod.where((slot) => slot.day == weekday).firstOrNull;
+    final slotForWeekday = slotsForPeriod
+        .where((slot) => slot.day == weekday)
+        .firstOrNull;
 
     if (slotForWeekday == null) return [];
 
diff --git a/school_data_hub_flutter/lib/features/timetable/presentation/new_lesson_group_page/new_lesson_group_page.dart b/school_data_hub_flutter/lib/features/timetable/presentation/new_lesson_group_page/new_lesson_group_page.dart
index d915ce4d..1c5a0f84 100644
--- a/school_data_hub_flutter/lib/features/timetable/presentation/new_lesson_group_page/new_lesson_group_page.dart
+++ b/school_data_hub_flutter/lib/features/timetable/presentation/new_lesson_group_page/new_lesson_group_page.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/theme/styles.dart';
 import 'package:school_data_hub_flutter/features/timetable/domain/timetable_manager.dart';
diff --git a/school_data_hub_flutter/lib/features/timetable/presentation/new_lesson_group_page/widgets/pupil_management_section.dart b/school_data_hub_flutter/lib/features/timetable/presentation/new_lesson_group_page/widgets/pupil_management_section.dart
index 8156086e..7ea06a0e 100644
--- a/school_data_hub_flutter/lib/features/timetable/presentation/new_lesson_group_page/widgets/pupil_management_section.dart
+++ b/school_data_hub_flutter/lib/features/timetable/presentation/new_lesson_group_page/widgets/pupil_management_section.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_proxy.dart';
-import 'package:school_data_hub_flutter/features/pupil/domain/pupil_manager.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_proxy_manager.dart';
 import 'package:school_data_hub_flutter/features/pupil/presentation/select_pupils_list_page/select_pupils_list_page.dart';
 import 'package:school_data_hub_flutter/features/timetable/domain/timetable_manager.dart';
 import 'package:watch_it/watch_it.dart';
@@ -23,13 +23,12 @@ class PupilManagementSection extends WatchingWidget {
 
   @override
   Widget build(BuildContext context) {
-    final pupils = di<PupilManager>().allPupils;
+    final pupils = di<PupilProxyManager>().allPupils;
 
     // Get selected pupils
-    final selectedPupils =
-        pupils
-            .where((pupil) => selectedPupilIds.contains(pupil.pupilId))
-            .toList();
+    final selectedPupils = pupils
+        .where((pupil) => selectedPupilIds.contains(pupil.pupilId))
+        .toList();
 
     return Card(
       margin: const EdgeInsets.symmetric(vertical: 8),
@@ -152,10 +151,9 @@ class PupilManagementSection extends WatchingWidget {
   void _selectPupils(BuildContext context) async {
     final result = await Navigator.of(context).push<List<int>>(
       MaterialPageRoute(
-        builder:
-            (context) => SelectPupilsListPage(
-              selectablePupils: di<PupilManager>().allPupils,
-            ),
+        builder: (context) => SelectPupilsListPage(
+          selectablePupils: di<PupilProxyManager>().allPupils,
+        ),
       ),
     );
 
diff --git a/school_data_hub_flutter/lib/features/timetable/presentation/new_scheduled_lesson_page/new_scheduled_lesson_page.dart b/school_data_hub_flutter/lib/features/timetable/presentation/new_scheduled_lesson_page/new_scheduled_lesson_page.dart
index 2e3e2ade..c6619401 100644
--- a/school_data_hub_flutter/lib/features/timetable/presentation/new_scheduled_lesson_page/new_scheduled_lesson_page.dart
+++ b/school_data_hub_flutter/lib/features/timetable/presentation/new_scheduled_lesson_page/new_scheduled_lesson_page.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/theme/styles.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
diff --git a/school_data_hub_flutter/lib/features/timetable/presentation/new_timetable_page/new_timetable_page.dart b/school_data_hub_flutter/lib/features/timetable/presentation/new_timetable_page/new_timetable_page.dart
index aea2e513..b37f6c42 100644
--- a/school_data_hub_flutter/lib/features/timetable/presentation/new_timetable_page/new_timetable_page.dart
+++ b/school_data_hub_flutter/lib/features/timetable/presentation/new_timetable_page/new_timetable_page.dart
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:logging/logging.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/theme/styles.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
diff --git a/school_data_hub_flutter/lib/features/timetable/presentation/new_timetable_page/widgets/end_date_field.dart b/school_data_hub_flutter/lib/features/timetable/presentation/new_timetable_page/widgets/end_date_field.dart
index 4f582daf..4ab7ba8d 100644
--- a/school_data_hub_flutter/lib/features/timetable/presentation/new_timetable_page/widgets/end_date_field.dart
+++ b/school_data_hub_flutter/lib/features/timetable/presentation/new_timetable_page/widgets/end_date_field.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/features/school_calendar/domain/school_calendar_manager.dart';
 import 'package:watch_it/watch_it.dart';
 
@@ -73,7 +73,7 @@ class EndDateField extends StatelessWidget {
                     ),
                   ),
                 const SizedBox(width: 8),
-                const Icon(
+                Icon(
                   Icons.calendar_today,
                   color: AppColors.accentColor,
                   size: 20,
@@ -142,9 +142,9 @@ class EndDateField extends StatelessWidget {
       builder: (context, child) {
         return Theme(
           data: Theme.of(context).copyWith(
-            colorScheme: const ColorScheme.light(
+            colorScheme: ColorScheme.light(
               primary: AppColors.backgroundColor,
-              onPrimary: Color.fromARGB(255, 241, 241, 241),
+              onPrimary: const Color.fromARGB(255, 241, 241, 241),
               onSurface: Colors.deepPurple,
             ),
             textButtonTheme: TextButtonThemeData(
diff --git a/school_data_hub_flutter/lib/features/timetable/presentation/new_timetable_page/widgets/start_date_field.dart b/school_data_hub_flutter/lib/features/timetable/presentation/new_timetable_page/widgets/start_date_field.dart
index fa60545f..28d98076 100644
--- a/school_data_hub_flutter/lib/features/timetable/presentation/new_timetable_page/widgets/start_date_field.dart
+++ b/school_data_hub_flutter/lib/features/timetable/presentation/new_timetable_page/widgets/start_date_field.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/features/school_calendar/domain/school_calendar_manager.dart';
 import 'package:watch_it/watch_it.dart';
@@ -60,7 +60,7 @@ class StartDateField extends StatelessWidget {
                     ),
                   ),
                 ),
-                const Icon(
+                Icon(
                   Icons.calendar_today,
                   color: AppColors.accentColor,
                   size: 20,
@@ -137,9 +137,9 @@ class StartDateField extends StatelessWidget {
       builder: (context, child) {
         return Theme(
           data: Theme.of(context).copyWith(
-            colorScheme: const ColorScheme.light(
+            colorScheme: ColorScheme.light(
               primary: AppColors.backgroundColor,
-              onPrimary: Color.fromARGB(255, 241, 241, 241),
+              onPrimary: const Color.fromARGB(255, 241, 241, 241),
               onSurface: Colors.deepPurple,
             ),
             textButtonTheme: TextButtonThemeData(
diff --git a/school_data_hub_flutter/lib/features/timetable/presentation/new_timetable_slot_page/new_timetable_slot_page.dart b/school_data_hub_flutter/lib/features/timetable/presentation/new_timetable_slot_page/new_timetable_slot_page.dart
index 25dc78a6..f0490188 100644
--- a/school_data_hub_flutter/lib/features/timetable/presentation/new_timetable_slot_page/new_timetable_slot_page.dart
+++ b/school_data_hub_flutter/lib/features/timetable/presentation/new_timetable_slot_page/new_timetable_slot_page.dart
@@ -167,8 +167,8 @@ class NewTimetableSlotPage extends WatchingWidget {
 
     if (selectedWeekdayOption.value == null) {
       ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(
-          content: Text('Bitte wählen Sie einen Wochentag aus.'),
+        SnackBar(
+          content: const Text('Bitte wählen Sie einen Wochentag aus.'),
           backgroundColor: AppColors.snackBarErrorColor,
         ),
       );
@@ -177,8 +177,8 @@ class NewTimetableSlotPage extends WatchingWidget {
 
     if (startTimeController.text.trim().isEmpty) {
       ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(
-          content: Text('Bitte geben Sie eine Startzeit ein.'),
+        SnackBar(
+          content: const Text('Bitte geben Sie eine Startzeit ein.'),
           backgroundColor: AppColors.snackBarErrorColor,
         ),
       );
@@ -187,8 +187,8 @@ class NewTimetableSlotPage extends WatchingWidget {
 
     if (endTimeController.text.trim().isEmpty) {
       ScaffoldMessenger.of(context).showSnackBar(
-        const SnackBar(
-          content: Text('Bitte geben Sie eine Endzeit ein.'),
+        SnackBar(
+          content: const Text('Bitte geben Sie eine Endzeit ein.'),
           backgroundColor: AppColors.snackBarErrorColor,
         ),
       );
@@ -211,8 +211,8 @@ class NewTimetableSlotPage extends WatchingWidget {
         );
 
         ScaffoldMessenger.of(context).showSnackBar(
-          const SnackBar(
-            content: Text(
+          SnackBar(
+            content: const Text(
               'Kein Stundenplan ausgewählt. Bitte erstellen Sie zuerst einen Stundenplan.',
             ),
             backgroundColor: AppColors.snackBarErrorColor,
@@ -269,8 +269,8 @@ class NewTimetableSlotPage extends WatchingWidget {
           await timetableManager.addTimetableSlot(newTimetableSlot);
           if (context.mounted) {
             ScaffoldMessenger.of(context).showSnackBar(
-              const SnackBar(
-                content: Text('Zeitslot erfolgreich erstellt.'),
+              SnackBar(
+                content: const Text('Zeitslot erfolgreich erstellt.'),
                 backgroundColor: AppColors.snackBarSuccessColor,
               ),
             );
@@ -290,8 +290,8 @@ class NewTimetableSlotPage extends WatchingWidget {
         await timetableManager.updateTimetableSlot(updatedTimetableSlot);
         if (context.mounted) {
           ScaffoldMessenger.of(context).showSnackBar(
-            const SnackBar(
-              content: Text('Zeitslot erfolgreich aktualisiert.'),
+            SnackBar(
+              content: const Text('Zeitslot erfolgreich aktualisiert.'),
               backgroundColor: AppColors.snackBarSuccessColor,
             ),
           );
@@ -346,8 +346,8 @@ class NewTimetableSlotPage extends WatchingWidget {
         await timetableManager.removeTimetableSlot(timetableSlot!);
         if (context.mounted) {
           ScaffoldMessenger.of(context).showSnackBar(
-            const SnackBar(
-              content: Text('Zeitslot erfolgreich gelöscht.'),
+            SnackBar(
+              content: const Text('Zeitslot erfolgreich gelöscht.'),
               backgroundColor: AppColors.snackBarSuccessColor,
             ),
           );
diff --git a/school_data_hub_flutter/lib/features/timetable/presentation/sliver_dashboard_page/sliver_dashboard_page.dart b/school_data_hub_flutter/lib/features/timetable/presentation/sliver_dashboard_page/sliver_dashboard_page.dart
new file mode 100644
index 00000000..9f5c16b7
--- /dev/null
+++ b/school_data_hub_flutter/lib/features/timetable/presentation/sliver_dashboard_page/sliver_dashboard_page.dart
@@ -0,0 +1,469 @@
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+import 'package:sliver_dashboard/sliver_dashboard.dart';
+
+class DashboardPage extends StatefulWidget {
+  const DashboardPage({super.key});
+
+  @override
+  State<DashboardPage> createState() => _DashboardPageState();
+}
+
+class _DashboardPageState extends State<DashboardPage> {
+  // Initial slot count for the controller.
+  // The Dashboard widget will update this automatically based on breakpoints.
+  var slotCount = 8;
+
+  // Create and manage your DashboardController.
+  late final controller = DashboardController(
+    initialSlotCount: slotCount,
+    onLayoutChanged: (items) {
+      debugPrint(
+        'Layout changed! Saving ${items.length} items to persistence...',
+      );
+      // In a real app, you would save the layout to a DB or SharedPreferences.
+      // You can get a JSON-ready list of maps using:
+      // final json = controller.exportLayout();
+      // myStorage.save(json);
+    },
+    onInteractionStart: (item) {
+      // Do something, eg. haptic feedback..
+      debugPrint('Interaction started on ${item.id}');
+    },
+    initialLayout: [
+      // Row 1
+      const LayoutItem(
+        id: '9',
+        x: 0,
+        y: 0,
+        w: 2,
+        h: 2,
+        isDraggable: true,
+        isResizable: true,
+        isStatic: false,
+      ),
+      const LayoutItem(id: '12', x: 2, y: 4, w: 2, h: 2),
+      const LayoutItem(id: '7', x: 4, y: 0, w: 2, h: 2),
+      const LayoutItem(id: '1', x: 6, y: 0, w: 2, h: 1),
+
+      // Row 2
+      const LayoutItem(id: '13', x: 6, y: 1, w: 2, h: 1),
+
+      // Row 3
+      const LayoutItem(id: '15', x: 0, y: 2, w: 2, h: 2),
+      const LayoutItem(id: '0', x: 2, y: 2, w: 2, h: 1),
+      const LayoutItem(id: '2', x: 4, y: 2, w: 2, h: 3),
+      const LayoutItem(id: '14', x: 6, y: 2, w: 2, h: 2),
+
+      // Row 4
+      const LayoutItem(id: '6', x: 2, y: 3, w: 2, h: 1),
+
+      // Row 5
+      const LayoutItem(id: '24', x: 0, y: 4, w: 2, h: 2),
+      const LayoutItem(id: '18', x: 2, y: 4, w: 2, h: 2),
+      const LayoutItem(id: '21', x: 6, y: 4, w: 2, h: 2),
+
+      // Row 6 (Static and others at the bottom)
+      const LayoutItem(id: '19', x: 4, y: 5, w: 2, h: 2, isStatic: true),
+      const LayoutItem(id: '20', x: 6, y: 6, w: 2, h: 2),
+      const LayoutItem(id: '3', x: 4, y: 7, w: 2, h: 1),
+    ],
+  );
+
+  final editMode = ValueNotifier(false);
+  final compactionType = ValueNotifier<CompactType>(CompactType.vertical);
+  var scrollDirection = Axis.vertical;
+  var resizeBehavior = ResizeBehavior.push;
+  final cardColors = <String, Color>{};
+  final random = Random();
+
+  Color getColorForItem(String id) {
+    return cardColors.putIfAbsent(id, () {
+      return Color.fromRGBO(
+        random.nextInt(256),
+        random.nextInt(256),
+        random.nextInt(256),
+        1,
+      );
+    });
+  }
+
+  @override
+  void dispose() {
+    editMode.dispose();
+    compactionType.dispose();
+    controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Sliver Dashboard Example'),
+        actions: [
+          // Add a button to toggle edit mode.
+          ValueListenableBuilder(
+            valueListenable: editMode,
+            builder: (context, value, _) {
+              return IconButton(
+                tooltip: 'Toggle Edit Mode',
+                icon: Icon(value ? Icons.check : Icons.edit),
+                onPressed: () {
+                  editMode.value = !editMode.value;
+                  controller.setEditMode(editMode.value);
+                },
+              );
+            },
+          ),
+        ],
+      ),
+      body: Column(
+        children: [
+          Wrap(
+            direction: Axis.horizontal,
+            alignment: WrapAlignment.center,
+            runSpacing: 8,
+            spacing: 8,
+            children: [
+              ValueListenableBuilder(
+                valueListenable: compactionType,
+                builder: (context, _, _) {
+                  return SegmentedButton<CompactType>(
+                    selected: {compactionType.value},
+                    onSelectionChanged: (value) {
+                      compactionType.value = value.first;
+                      controller.setCompactionType(value.first);
+                    },
+                    segments: [
+                      ButtonSegment(
+                        label: Text('None'),
+                        value: CompactType.none,
+                      ),
+                      ButtonSegment(
+                        label: Text('Compact ${CompactType.vertical.name}'),
+                        value: CompactType.vertical,
+                      ),
+                      ButtonSegment(
+                        label: Text('Compact ${CompactType.horizontal.name}'),
+                        value: CompactType.horizontal,
+                      ),
+                    ],
+                  );
+                },
+              ),
+              SegmentedButton<Axis>(
+                selected: {scrollDirection},
+                onSelectionChanged: (value) => setState(() {
+                  scrollDirection = value.firstOrNull == Axis.horizontal
+                      ? Axis.horizontal
+                      : Axis.vertical;
+                }),
+                segments: [
+                  ButtonSegment(
+                    label: Text('Scroll ${Axis.vertical.name}'),
+                    value: Axis.vertical,
+                  ),
+                  ButtonSegment(
+                    label: Text('Scroll ${Axis.horizontal.name}'),
+                    value: Axis.horizontal,
+                  ),
+                ],
+              ),
+              SegmentedButton<ResizeBehavior>(
+                selected: {resizeBehavior},
+                onSelectionChanged: (value) => setState(() {
+                  resizeBehavior = value.firstOrNull == ResizeBehavior.shrink
+                      ? ResizeBehavior.shrink
+                      : ResizeBehavior.push;
+                }),
+                segments: [
+                  ButtonSegment(
+                    label: Text('Resize Push'),
+                    value: ResizeBehavior.push,
+                  ),
+                  ButtonSegment(
+                    label: Text('Resize Shrink'),
+                    value: ResizeBehavior.shrink,
+                  ),
+                ],
+              ),
+            ],
+          ),
+          // Add some external draggables to demonstrate dropping new items.
+          const Divider(),
+          const Padding(
+            padding: EdgeInsets.all(8),
+            child: Wrap(
+              spacing: 10,
+              runSpacing: 10,
+              crossAxisAlignment: WrapCrossAlignment.center,
+              children: [
+                Text('Drag to add:'),
+                Draggable<String>(
+                  data: 'New Chart',
+                  feedback: SizedBox(
+                    width: 100,
+                    height: 50,
+                    child: Card(
+                      elevation: 8,
+                      child: Center(child: Icon(Icons.bar_chart)),
+                    ),
+                  ),
+                  child: Chip(
+                    label: Text('Chart'),
+                    avatar: Icon(Icons.bar_chart),
+                  ),
+                ),
+                Draggable<String>(
+                  data: 'New Table',
+                  feedback: SizedBox(
+                    width: 100,
+                    height: 50,
+                    child: Card(
+                      elevation: 8,
+                      child: Center(child: Icon(Icons.table_rows)),
+                    ),
+                  ),
+                  child: Chip(
+                    label: Text('Table'),
+                    avatar: Icon(Icons.table_rows),
+                  ),
+                ),
+              ],
+            ),
+          ),
+          const Divider(),
+          Expanded(
+            // Build the Dashboard widget.
+            child: Padding(
+              padding: const EdgeInsets.all(8.0),
+              // Optional: Breakpoint wrapper widget for responsive
+              child: Dashboard<String>(
+                controller: controller,
+                trashHoverDelay: const Duration(seconds: 1),
+                scrollDirection: scrollDirection,
+                // ResizeBehavior.push or ResizeBehavior.shrink
+                resizeBehavior: resizeBehavior,
+                showScrollbar: false,
+                slotAspectRatio: 1.0,
+                // Responsive breakpoints:
+                breakpoints: {
+                  0: 4, // Mobile: 4 cols
+                  600: 8, // Tablet/Desktop: 8 cols
+                },
+                // The size of the touch target
+                resizeHandleSide: 20, // default 20.0
+                padding: EdgeInsets.zero,
+                mainAxisSpacing: 8.0, // default 8.0
+                crossAxisSpacing: 8.0, // default 8.0
+                // how many non visible pixels to preload on top and bottom
+                cacheExtent: 500,
+                guidance:
+                    DashboardGuidance.byDefault, // default null for no guidance
+                // guidance: const DashboardGuidance(
+                //   move: InteractionGuidance(
+                //     SystemMouseCursors.grab,
+                //     'Click and drag to move item',
+                //   ),
+                // ),
+                gridStyle: GridStyle(
+                  fillColor: Colors.black.withValues(alpha: 0.5),
+                  handleColor: Colors.red.withValues(alpha: 0.5),
+                  lineColor: Colors.black26.withValues(alpha: 0.5),
+                  lineWidth: 1,
+                ),
+                // Custom Feedback Builder
+                itemFeedbackBuilder: (context, item, child) {
+                  return Opacity(
+                    opacity: 0.7,
+                    child: Material(
+                      elevation: 8,
+                      shadowColor: Colors.black,
+                      borderRadius: BorderRadius.circular(12),
+                      color: Colors.transparent,
+                      child: child,
+                    ),
+                  );
+                },
+                // Handle drops from external sources.
+                onDrop: (data, layoutItem) {
+                  debugPrint('Dropped data: $data');
+                  return DateTime.now().millisecondsSinceEpoch.toString();
+                },
+                // The itemBuilder builds the visual representation of each item.
+                itemBuilder: (context, item) {
+                  return MyCard(
+                    key: ValueKey(item.id),
+                    item: item,
+                    color: getColorForItem(item.id),
+                    onDeleteItem: () => controller.removeItem(item.id),
+                    isEditing: controller.isEditing.value,
+                  );
+                },
+                // trashLayout: TrashLayout.bottomCenter,
+                trashLayout: TrashLayout(
+                  visible: TrashLayout.bottomCenter.visible.copyWith(bottom: 0),
+                  hidden: TrashLayout.bottomCenter.hidden,
+                ),
+                // Optional: Customize the trash area.
+                trashBuilder: (context, isHovered, isActive, activeItemId) {
+                  return Align(
+                    alignment: Alignment.bottomCenter,
+                    child: Container(
+                      height: 60,
+                      width: 200,
+                      margin: const EdgeInsets.all(20.0),
+                      decoration: BoxDecoration(
+                        color: isActive
+                            ? Colors.red
+                            : (isHovered ? Colors.orange : Colors.redAccent),
+                        borderRadius: BorderRadius.circular(30),
+                        boxShadow: const [
+                          BoxShadow(blurRadius: 10, color: Colors.black26),
+                        ],
+                        border: isHovered
+                            ? Border.all(color: Colors.white, width: 2)
+                            : null,
+                      ),
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          Icon(
+                            isActive ? Icons.delete_forever : Icons.delete,
+                            color: Colors.white,
+                            size: isActive ? 30 : 24,
+                          ),
+                          const SizedBox(width: 8),
+                          Text(
+                            isActive ? 'Release to Delete' : 'Drop to Delete',
+                            style: TextStyle(
+                              color: Colors.white,
+                              fontWeight: FontWeight.bold,
+                              fontSize: isActive ? 18 : 16,
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                  );
+                },
+                // Validate the Trash deletion
+                onWillDelete: (item) async {
+                  return await showDialog<bool>(
+                        context: context,
+                        builder: (ctx) => AlertDialog(
+                          title: Text("Delete ?"),
+                          content: Text("Do you want remove item ${item.id} ?"),
+                          actions: [
+                            TextButton(
+                              onPressed: () => Navigator.pop(ctx, false),
+                              child: Text("No"),
+                            ),
+                            TextButton(
+                              onPressed: () => Navigator.pop(ctx, true),
+                              child: Text("Yes"),
+                            ),
+                          ],
+                        ),
+                      ) ??
+                      false;
+                },
+                // Optional: Called when an item is deleted
+                onItemDeleted: (item) {
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    SnackBar(content: Text('Item ${item.id} deleted')),
+                  );
+                },
+              ),
+            ),
+          ),
+        ],
+      ),
+      // Add a FloatingActionButton to add new items programmatically.
+      floatingActionButton: FloatingActionButton(
+        onPressed: _addNewItem,
+        tooltip: 'Add New Item',
+        child: const Icon(Icons.add),
+      ),
+    );
+  }
+
+  void _addNewItem() {
+    final random = Random();
+    final newItem = LayoutItem(
+      // Use a unique ID for each item.
+      id: DateTime.now().millisecondsSinceEpoch.toString(),
+      // The engine will find the best spot, so initial x/y can be 0.
+      x: 0,
+      y: 0,
+      w: random.nextInt(2) + 1, // Random width (1 or 2)
+      h: random.nextInt(2) + 1, // Random height (1 or 2)
+    );
+    controller.addItem(newItem);
+  }
+}
+
+/// A custom widget to display inside a dashboard item.
+class MyCard extends StatelessWidget {
+  const MyCard({
+    required this.item,
+    required this.color,
+    required this.onDeleteItem,
+    required this.isEditing,
+    super.key,
+  });
+
+  final LayoutItem item;
+  final Color color;
+  final VoidCallback onDeleteItem;
+  final bool isEditing;
+
+  @override
+  Widget build(BuildContext context) {
+    return Card(
+      elevation: 2,
+      color: color,
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+      child: Stack(
+        children: [
+          Center(
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                Text(
+                  'Item ${item.id}',
+                  style: Theme.of(context).textTheme.titleMedium,
+                  overflow: TextOverflow.ellipsis,
+                ),
+                Text('(${item.w}x${item.h})'),
+                if (item.isStatic)
+                  const Chip(label: Text('Static'), avatar: Icon(Icons.lock)),
+              ],
+            ),
+          ),
+          if (isEditing && !item.isStatic)
+            Positioned(
+              top: 4,
+              right: 4,
+              child: Tooltip(
+                message: 'Delete Item',
+                child: GestureDetector(
+                  onTap: onDeleteItem,
+                  child: Container(
+                    padding: const EdgeInsets.all(4),
+                    decoration: BoxDecoration(
+                      color: Colors.white.withValues(alpha: 0.5),
+                      shape: BoxShape.circle,
+                    ),
+                    child: const Icon(Icons.close, size: 16, color: Colors.red),
+                  ),
+                ),
+              ),
+            ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/school_data_hub_flutter/lib/features/timetable/presentation/widgets/lesson_cell/lesson_cell.dart b/school_data_hub_flutter/lib/features/timetable/presentation/widgets/lesson_cell/lesson_cell.dart
index 45e6044b..3084ce2c 100644
--- a/school_data_hub_flutter/lib/features/timetable/presentation/widgets/lesson_cell/lesson_cell.dart
+++ b/school_data_hub_flutter/lib/features/timetable/presentation/widgets/lesson_cell/lesson_cell.dart
@@ -26,9 +26,9 @@ class LessonCell extends WatchingWidget {
     final _timetableManager = di<TimetableManager>();
 
     // Watch scheduled lesson group memberships to update pupil count
-    final scheduledLessonGroupMemberships = watchValue(
-      (TimetableManager x) => x.scheduledLessonGroupMemberships,
-    );
+    // final scheduledLessonGroupMemberships = watchValue(
+    //   (TimetableManager x) => x.scheduledLessonGroupMemberships,
+    // );
 
     if (lesson != null) {
       return LongPressDraggable<ScheduledLesson>(
@@ -72,13 +72,12 @@ class LessonCell extends WatchingWidget {
                 child: Container(
                   width: double.infinity,
                   padding: const EdgeInsets.all(4.0),
-                  decoration:
-                      candidateData.isNotEmpty
-                          ? BoxDecoration(
-                            border: Border.all(color: Colors.blue, width: 2),
-                            borderRadius: BorderRadius.circular(4),
-                          )
-                          : null,
+                  decoration: candidateData.isNotEmpty
+                      ? BoxDecoration(
+                          border: Border.all(color: Colors.blue, width: 2),
+                          borderRadius: BorderRadius.circular(4),
+                        )
+                      : null,
                   child: _buildLessonContent(context, _userManager),
                 ),
               ),
@@ -102,13 +101,12 @@ class LessonCell extends WatchingWidget {
               child: Container(
                 width: double.infinity,
                 padding: const EdgeInsets.all(4.0),
-                decoration:
-                    candidateData.isNotEmpty
-                        ? BoxDecoration(
-                          border: Border.all(color: Colors.green, width: 2),
-                          borderRadius: BorderRadius.circular(4),
-                        )
-                        : null,
+                decoration: candidateData.isNotEmpty
+                    ? BoxDecoration(
+                        border: Border.all(color: Colors.green, width: 2),
+                        borderRadius: BorderRadius.circular(4),
+                      )
+                    : null,
                 child: _buildEmptyContent(context),
               ),
             ),
@@ -126,12 +124,11 @@ class LessonCell extends WatchingWidget {
 
     // Get pupil count for this lesson group
     final timetableManager = di<TimetableManager>();
-    final pupilCount =
-        lesson!.lessonGroup?.id != null
-            ? timetableManager
-                .getPupilIdsForLessonGroup(lesson!.lessonGroup!.id!)
-                .length
-            : 0;
+    final pupilCount = lesson!.lessonGroup?.id != null
+        ? timetableManager
+              .getPupilIdsForLessonGroup(lesson!.lessonGroup!.id!)
+              .length
+        : 0;
 
     return Card(
       margin: const EdgeInsets.all(0),
@@ -241,12 +238,11 @@ class LessonCell extends WatchingWidget {
 
     showDialog(
       context: context,
-      builder:
-          (context) => _TeacherSelectionDialog(
-            lesson: lesson!,
-            slot: slot,
-            timetableManager: timetableManager,
-          ),
+      builder: (context) => _TeacherSelectionDialog(
+        lesson: lesson!,
+        slot: slot,
+        timetableManager: timetableManager,
+      ),
     );
   }
 
@@ -305,20 +301,20 @@ class _TeacherSelectionDialogState extends State<_TeacherSelectionDialog> {
     final users = watchValue((UserManager m) => m.users);
 
     // Get all teachers (users with teacher role)
-    final allTeachers =
-        users.where((user) => user.role == Role.teacher).toList();
+    final allTeachers = users
+        .where((user) => user.role == Role.teacher)
+        .toList();
 
     // Get available teachers for this time slot (not busy with other lessons)
     final busyUserIds = widget.timetableManager.getBusyUserIdsForTimeSlot(
       widget.slot.day,
       widget.slot.startTime,
     );
-    final availableTeachers =
-        allTeachers.where((teacher) {
-          // Include if not busy OR already assigned to this lesson
-          return !busyUserIds.contains(teacher.id) ||
-              _selectedTeacherIds.contains(teacher.id);
-        }).toList();
+    final availableTeachers = allTeachers.where((teacher) {
+      // Include if not busy OR already assigned to this lesson
+      return !busyUserIds.contains(teacher.id) ||
+          _selectedTeacherIds.contains(teacher.id);
+    }).toList();
 
     return AlertDialog(
       title: Text(
@@ -339,138 +335,126 @@ class _TeacherSelectionDialogState extends State<_TeacherSelectionDialog> {
             Flexible(
               child: SingleChildScrollView(
                 child: Column(
-                  children:
-                      availableTeachers.map((teacher) {
-                        final isSelected = _selectedTeacherIds.contains(
-                          teacher.id,
+                  children: availableTeachers.map((teacher) {
+                    final isSelected = _selectedTeacherIds.contains(teacher.id);
+                    final isMainTeacher = teacher.id == _mainTeacherId;
+                    final isBusy =
+                        busyUserIds.contains(teacher.id) && !isSelected;
+
+                    // Get remaining time units for this teacher
+                    final remainingTimeUnits = widget.timetableManager
+                        .getRemainingTimeUnitsForUser(
+                          teacher.id!,
+                          teacher.timeUnits,
                         );
-                        final isMainTeacher = teacher.id == _mainTeacherId;
-                        final isBusy =
-                            busyUserIds.contains(teacher.id) && !isSelected;
-
-                        // Get remaining time units for this teacher
-                        final remainingTimeUnits = widget.timetableManager
-                            .getRemainingTimeUnitsForUser(
-                              teacher.id!,
-                              teacher.timeUnits,
-                            );
-
-                        return CheckboxListTile(
-                          title: Row(
-                            children: [
-                              Expanded(
-                                child: Text(
-                                  teacher.userInfo?.fullName ??
-                                      'Unbekannter Lehrer',
-                                  style: TextStyle(
-                                    fontWeight:
-                                        isMainTeacher
-                                            ? FontWeight.bold
-                                            : FontWeight.normal,
-                                    color: isBusy ? Colors.grey : null,
-                                  ),
-                                ),
-                              ),
-                              Container(
-                                padding: const EdgeInsets.symmetric(
-                                  horizontal: 6,
-                                  vertical: 2,
-                                ),
-                                decoration: BoxDecoration(
-                                  color:
-                                      remainingTimeUnits > 0
-                                          ? Colors.green
-                                          : Colors.red,
-                                  borderRadius: BorderRadius.circular(12),
-                                ),
-                                child: Text(
-                                  '${remainingTimeUnits}h',
-                                  style: const TextStyle(
-                                    color: Colors.white,
-                                    fontSize: 11,
-                                    fontWeight: FontWeight.bold,
-                                  ),
-                                ),
+
+                    return CheckboxListTile(
+                      title: Row(
+                        children: [
+                          Expanded(
+                            child: Text(
+                              teacher.userInfo?.fullName ??
+                                  'Unbekannter Lehrer',
+                              style: TextStyle(
+                                fontWeight: isMainTeacher
+                                    ? FontWeight.bold
+                                    : FontWeight.normal,
+                                color: isBusy ? Colors.grey : null,
                               ),
-                            ],
+                            ),
                           ),
-                          subtitle: Column(
-                            crossAxisAlignment: CrossAxisAlignment.start,
-                            children: [
-                              Text(teacher.userInfo?.email ?? ''),
-                              if (isMainTeacher)
-                                const Text(
-                                  'Hauptlehrer',
-                                  style: TextStyle(
-                                    color: Colors.orange,
-                                    fontWeight: FontWeight.bold,
-                                    fontSize: 12,
-                                  ),
-                                ),
-                              if (isBusy)
-                                const Text(
-                                  'Belegt zu dieser Zeit',
-                                  style: TextStyle(
-                                    color: Colors.red,
-                                    fontSize: 12,
-                                  ),
-                                ),
-                              if (remainingTimeUnits <= 0)
-                                const Text(
-                                  'Keine verfügbaren Stunden',
-                                  style: TextStyle(
-                                    color: Colors.red,
-                                    fontSize: 12,
-                                    fontWeight: FontWeight.bold,
-                                  ),
-                                ),
-                            ],
+                          Container(
+                            padding: const EdgeInsets.symmetric(
+                              horizontal: 6,
+                              vertical: 2,
+                            ),
+                            decoration: BoxDecoration(
+                              color: remainingTimeUnits > 0
+                                  ? Colors.green
+                                  : Colors.red,
+                              borderRadius: BorderRadius.circular(12),
+                            ),
+                            child: Text(
+                              '${remainingTimeUnits}h',
+                              style: const TextStyle(
+                                color: Colors.white,
+                                fontSize: 11,
+                                fontWeight: FontWeight.bold,
+                              ),
+                            ),
                           ),
-                          value: isSelected,
-                          onChanged:
-                              teacher.id == null
-                                  ? null
-                                  : (bool? value) {
-                                    setState(() {
-                                      if (value == true) {
-                                        if (!_selectedTeacherIds.contains(
-                                          teacher.id,
-                                        )) {
-                                          _selectedTeacherIds.add(teacher.id!);
-                                        }
-                                      } else {
-                                        // Don't allow unchecking main teacher
-                                        if (teacher.id != _mainTeacherId) {
-                                          _selectedTeacherIds.remove(
-                                            teacher.id,
-                                          );
-                                        }
-                                      }
-                                    });
-                                  },
-                          secondary:
-                              isMainTeacher
-                                  ? const Icon(Icons.star, color: Colors.orange)
-                                  : IconButton(
-                                    icon: const Icon(
-                                      Icons.star_border,
-                                      color: Colors.grey,
-                                    ),
-                                    onPressed: () {
-                                      setState(() {
-                                        _mainTeacherId = teacher.id!;
-                                        // Ensure main teacher is selected
-                                        if (!_selectedTeacherIds.contains(
-                                          teacher.id,
-                                        )) {
-                                          _selectedTeacherIds.add(teacher.id!);
-                                        }
-                                      });
-                                    },
-                                    tooltip: 'Als Hauptlehrer setzen',
-                                  ),
-                        );
-                      }).toList(),
+                        ],
+                      ),
+                      subtitle: Column(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Text(teacher.userInfo?.email ?? ''),
+                          if (isMainTeacher)
+                            const Text(
+                              'Hauptlehrer',
+                              style: TextStyle(
+                                color: Colors.orange,
+                                fontWeight: FontWeight.bold,
+                                fontSize: 12,
+                              ),
+                            ),
+                          if (isBusy)
+                            const Text(
+                              'Belegt zu dieser Zeit',
+                              style: TextStyle(color: Colors.red, fontSize: 12),
+                            ),
+                          if (remainingTimeUnits <= 0)
+                            const Text(
+                              'Keine verfügbaren Stunden',
+                              style: TextStyle(
+                                color: Colors.red,
+                                fontSize: 12,
+                                fontWeight: FontWeight.bold,
+                              ),
+                            ),
+                        ],
+                      ),
+                      value: isSelected,
+                      onChanged: teacher.id == null
+                          ? null
+                          : (bool? value) {
+                              setState(() {
+                                if (value == true) {
+                                  if (!_selectedTeacherIds.contains(
+                                    teacher.id,
+                                  )) {
+                                    _selectedTeacherIds.add(teacher.id!);
+                                  }
+                                } else {
+                                  // Don't allow unchecking main teacher
+                                  if (teacher.id != _mainTeacherId) {
+                                    _selectedTeacherIds.remove(teacher.id);
+                                  }
+                                }
+                              });
+                            },
+                      secondary: isMainTeacher
+                          ? const Icon(Icons.star, color: Colors.orange)
+                          : IconButton(
+                              icon: const Icon(
+                                Icons.star_border,
+                                color: Colors.grey,
+                              ),
+                              onPressed: () {
+                                setState(() {
+                                  _mainTeacherId = teacher.id!;
+                                  // Ensure main teacher is selected
+                                  if (!_selectedTeacherIds.contains(
+                                    teacher.id,
+                                  )) {
+                                    _selectedTeacherIds.add(teacher.id!);
+                                  }
+                                });
+                              },
+                              tooltip: 'Als Hauptlehrer setzen',
+                            ),
+                    );
+                  }).toList(),
                 ),
               ),
             ),
@@ -505,18 +489,17 @@ class _TeacherSelectionDialogState extends State<_TeacherSelectionDialog> {
 
   void _saveTeacherAssignments() {
     // Update the lesson with new teacher assignments
-    final updatedLessonTeachers =
-        _selectedTeacherIds
-            .where(
-              (id) => id != _mainTeacherId,
-            ) // Exclude main teacher from lessonTeachers list
-            .map(
-              (id) => ScheduledLessonTeacher(
-                userId: id,
-                scheduledLessonId: widget.lesson.id!,
-              ),
-            )
-            .toList();
+    final updatedLessonTeachers = _selectedTeacherIds
+        .where(
+          (id) => id != _mainTeacherId,
+        ) // Exclude main teacher from lessonTeachers list
+        .map(
+          (id) => ScheduledLessonTeacher(
+            userId: id,
+            scheduledLessonId: widget.lesson.id!,
+          ),
+        )
+        .toList();
 
     final updatedLesson = widget.lesson.copyWith(
       mainTeacherId: _mainTeacherId,
diff --git a/school_data_hub_flutter/lib/features/user/domain/user_manager.dart b/school_data_hub_flutter/lib/features/user/domain/user_manager.dart
index 55de21e1..c7cad00a 100644
--- a/school_data_hub_flutter/lib/features/user/domain/user_manager.dart
+++ b/school_data_hub_flutter/lib/features/user/domain/user_manager.dart
@@ -15,6 +15,11 @@ class UserManager {
   final _users = ValueNotifier<List<User>>([]);
 
   UserManager();
+  void dispose() {
+    _users.dispose();
+    return;
+  }
+
   Future<UserManager> init() async {
     await fetchUsers();
     return this;
diff --git a/school_data_hub_flutter/lib/features/user/presentation/select_users/widgets/select_users_list_card.dart b/school_data_hub_flutter/lib/features/user/presentation/select_users/widgets/select_users_list_card.dart
index ec54feaf..0ccbe6ef 100644
--- a/school_data_hub_flutter/lib/features/user/presentation/select_users/widgets/select_users_list_card.dart
+++ b/school_data_hub_flutter/lib/features/user/presentation/select_users/widgets/select_users_list_card.dart
@@ -21,10 +21,9 @@ class SelectUsersListCard extends WatchingWidget {
   @override
   Widget build(BuildContext context) {
     return Card(
-      color:
-          isSelected
-              ? AppColors.interactiveColor.withValues(alpha: 0.3)
-              : Colors.white,
+      color: isSelected
+          ? AppColors.interactiveColor.withValues(alpha: 0.3)
+          : Colors.white,
       surfaceTintColor: Colors.white,
       shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
       elevation: 1.0,
@@ -52,10 +51,9 @@ class SelectUsersListCard extends WatchingWidget {
                 height: 80,
                 margin: const EdgeInsets.all(8.0),
                 decoration: BoxDecoration(
-                  color:
-                      isSelected
-                          ? AppColors.interactiveColor
-                          : Colors.grey.shade300,
+                  color: isSelected
+                      ? AppColors.interactiveColor
+                      : Colors.grey.shade300,
                   borderRadius: BorderRadius.circular(8),
                 ),
                 child: Icon(
@@ -149,7 +147,7 @@ class SelectUsersListCard extends WatchingWidget {
                   const Text('Credit', style: TextStyle(fontSize: 12)),
                   Text(
                     passedUser.credit.toString(),
-                    style: const TextStyle(
+                    style: TextStyle(
                       fontSize: 20,
                       fontWeight: FontWeight.bold,
                       color: AppColors.backgroundColor,
diff --git a/school_data_hub_flutter/lib/features/user/presentation/select_users/widgets/select_users_search_bar.dart b/school_data_hub_flutter/lib/features/user/presentation/select_users/widgets/select_users_search_bar.dart
index 1354a5e2..b6acd179 100644
--- a/school_data_hub_flutter/lib/features/user/presentation/select_users/widgets/select_users_search_bar.dart
+++ b/school_data_hub_flutter/lib/features/user/presentation/select_users/widgets/select_users_search_bar.dart
@@ -49,7 +49,7 @@ class SelectUsersSearchBar extends WatchingWidget {
                       children: [
                         Text(
                           'Ausgewählt: ${selectedUsers.length}',
-                          style: const TextStyle(
+                          style: TextStyle(
                             fontSize: 14,
                             color: AppColors.backgroundColor,
                             fontWeight: FontWeight.bold,
diff --git a/school_data_hub_flutter/lib/features/user/presentation/user_list/widgets/user_list_card.dart b/school_data_hub_flutter/lib/features/user/presentation/user_list/widgets/user_list_card.dart
index eac96365..2fb9a11d 100644
--- a/school_data_hub_flutter/lib/features/user/presentation/user_list/widgets/user_list_card.dart
+++ b/school_data_hub_flutter/lib/features/user/presentation/user_list/widgets/user_list_card.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/custom_expansion_tile/custom_expansion_tile.dart';
 import 'package:school_data_hub_flutter/common/widgets/custom_expansion_tile/custom_expansion_tile_content.dart';
@@ -206,7 +206,7 @@ class UserListCard extends WatchingWidget {
                     Center(
                       child: Text(
                         user.credit.toString(),
-                        style: const TextStyle(
+                        style: TextStyle(
                           fontSize: 23,
                           fontWeight: FontWeight.bold,
                           color: AppColors.backgroundColor,
diff --git a/school_data_hub_flutter/lib/features/user/presentation/user_list/widgets/user_list_searchbar.dart b/school_data_hub_flutter/lib/features/user/presentation/user_list/widgets/user_list_searchbar.dart
index 899f6929..9eba9677 100644
--- a/school_data_hub_flutter/lib/features/user/presentation/user_list/widgets/user_list_searchbar.dart
+++ b/school_data_hub_flutter/lib/features/user/presentation/user_list/widgets/user_list_searchbar.dart
@@ -18,8 +18,9 @@ class UserListSearchBar extends WatchingWidget {
       0,
       (sum, user) => sum + user.timeUnits,
     );
-    final int adminCount =
-        users.where((user) => user.role == Role.admin).length;
+    final int adminCount = users
+        .where((user) => user.role == Role.admin)
+        .length;
 
     return Container(
       decoration: BoxDecoration(
@@ -37,7 +38,7 @@ class UserListSearchBar extends WatchingWidget {
                 child: Row(
                   mainAxisAlignment: MainAxisAlignment.center,
                   children: [
-                    const Icon(Icons.people, color: AppColors.backgroundColor),
+                    Icon(Icons.people, color: AppColors.backgroundColor),
                     const Gap(10),
                     Text(
                       totalUsers.toString(),
@@ -48,7 +49,7 @@ class UserListSearchBar extends WatchingWidget {
                       ),
                     ),
                     const Gap(10),
-                    const Text(
+                    Text(
                       'Admins:',
                       style: TextStyle(
                         fontSize: 13,
@@ -66,7 +67,7 @@ class UserListSearchBar extends WatchingWidget {
                       ),
                     ),
                     const Gap(10),
-                    const Text(
+                    Text(
                       'Gesamt Credit:',
                       style: TextStyle(
                         fontSize: 13,
@@ -84,7 +85,7 @@ class UserListSearchBar extends WatchingWidget {
                       ),
                     ),
                     const Gap(10),
-                    const Text(
+                    Text(
                       'Zeiteinheiten:',
                       style: TextStyle(
                         fontSize: 13,
diff --git a/school_data_hub_flutter/lib/features/workbooks/domain/workbook_manager.dart b/school_data_hub_flutter/lib/features/workbooks/domain/workbook_manager.dart
index 8cb8b932..3671af48 100644
--- a/school_data_hub_flutter/lib/features/workbooks/domain/workbook_manager.dart
+++ b/school_data_hub_flutter/lib/features/workbooks/domain/workbook_manager.dart
@@ -17,6 +17,11 @@ class WorkbookManager {
 
   WorkbookManager();
 
+  void dispose() {
+    _workbooks.dispose();
+    return;
+  }
+
   Future<WorkbookManager> init() async {
     await fetchWorkbooks();
 
@@ -48,15 +53,17 @@ class WorkbookManager {
   }
 
   Future<void> fetchWorkbooks() async {
-    final List<Workbook>? responseWorkbooks =
-        await _workbookApiService.getWorkbooks();
+    final List<Workbook>? responseWorkbooks = await _workbookApiService
+        .getWorkbooks();
     if (responseWorkbooks == null) {
       return;
     }
     // sort workbooks by name
     responseWorkbooks.sort((a, b) => a.name.compareTo(b.name));
     _notificationService.showSnackBar(
-        NotificationType.success, 'Arbeitshefte erfolgreich geladen');
+      NotificationType.success,
+      'Arbeitshefte erfolgreich geladen',
+    );
 
     _workbooks.value = responseWorkbooks;
 
@@ -64,25 +71,28 @@ class WorkbookManager {
   }
 
   Future<void> fetchWorkbookByIsbn(int isbn) async {
-    final Workbook? responseWorkbook =
-        await _workbookApiService.fetchWorkbookByIsbn(isbn);
+    final Workbook? responseWorkbook = await _workbookApiService
+        .fetchWorkbookByIsbn(isbn);
     if (responseWorkbook == null) {
       return;
     }
     _updateWorkbookInCollection(responseWorkbook);
 
     _notificationService.showSnackBar(
-        NotificationType.success, 'Arbeitsheft erfolgreich geladen');
+      NotificationType.success,
+      'Arbeitsheft erfolgreich geladen',
+    );
 
     return;
   }
 
-  Future<void> updateWorkbookProperty(
-      {required Workbook workbook,
-      String? name,
-      String? subject,
-      String? level,
-      int? amount}) async {
+  Future<void> updateWorkbookProperty({
+    required Workbook workbook,
+    String? name,
+    String? subject,
+    String? level,
+    int? amount,
+  }) async {
     final Workbook workbookToUpdate = workbook.copyWith(
       name: name ?? workbook.name,
       subject: subject ?? workbook.subject,
@@ -91,9 +101,8 @@ class WorkbookManager {
     );
 
     final updatedWorkbook = await ClientHelper.apiCall(
-      call: () => _workbookApiService.updateWorkbook(
-        workbook: workbookToUpdate,
-      ),
+      call: () =>
+          _workbookApiService.updateWorkbook(workbook: workbookToUpdate),
       errorMessage: 'Fehler beim Aktualisieren des Arbeitshefts',
     );
     if (updatedWorkbook == null) {
@@ -102,7 +111,9 @@ class WorkbookManager {
     _updateWorkbookInCollection(updatedWorkbook);
 
     _notificationService.showSnackBar(
-        NotificationType.success, 'Arbeitsheft erfolgreich aktualisiert');
+      NotificationType.success,
+      'Arbeitsheft erfolgreich aktualisiert',
+    );
 
     return;
   }
@@ -127,7 +138,9 @@ class WorkbookManager {
 
     _removeWorkbookFromCollection(workbook.isbn);
     _notificationService.showSnackBar(
-        NotificationType.success, 'Arbeitsheft erfolgreich gelöscht');
+      NotificationType.success,
+      'Arbeitsheft erfolgreich gelöscht',
+    );
 
     //- TODO: delete all pupilWorkbooks with this isbn in memory
 
@@ -137,8 +150,9 @@ class WorkbookManager {
   //- helper function
   Workbook? getWorkbookByIsbn(int? isbn) {
     if (isbn == null) return null;
-    final Workbook? workbook =
-        _workbooks.value.firstWhereOrNull((element) => element.isbn == isbn);
+    final Workbook? workbook = _workbooks.value.firstWhereOrNull(
+      (element) => element.isbn == isbn,
+    );
     return workbook;
   }
 
diff --git a/school_data_hub_flutter/lib/features/workbooks/presentation/workbook_list_page/widgets/pupil_workbook_card.dart b/school_data_hub_flutter/lib/features/workbooks/presentation/workbook_list_page/widgets/pupil_workbook_card.dart
index 78985df9..8be2c1b6 100644
--- a/school_data_hub_flutter/lib/features/workbooks/presentation/workbook_list_page/widgets/pupil_workbook_card.dart
+++ b/school_data_hub_flutter/lib/features/workbooks/presentation/workbook_list_page/widgets/pupil_workbook_card.dart
@@ -3,7 +3,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
 import 'package:school_data_hub_client/school_data_hub_client.dart';
-import 'package:school_data_hub_flutter/app_utils/extensions/datetime_extensions.dart';
+import 'package:school_data_hub_flutter/app_utils/create_and_crop_image_file.dart';
 import 'package:school_data_hub_flutter/common/services/notification_service.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/confirmation_dialog.dart';
@@ -11,7 +11,7 @@ import 'package:school_data_hub_flutter/common/widgets/dialogs/information_dialo
 import 'package:school_data_hub_flutter/common/widgets/dialogs/long_textfield_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/dialogs/short_textfield_dialog.dart';
 import 'package:school_data_hub_flutter/common/widgets/grades_widget.dart';
-import 'package:school_data_hub_flutter/app_utils/create_and_crop_image_file.dart';
+import 'package:school_data_hub_flutter/core/models/datetime_extensions.dart';
 import 'package:school_data_hub_flutter/core/session/hub_session_manager.dart';
 import 'package:school_data_hub_flutter/features/learning/domain/enums.dart';
 import 'package:school_data_hub_flutter/features/learning/presentation/widgets/competence_check_dropdown.dart';
@@ -302,7 +302,7 @@ class PupilWorkbookCard extends WatchingWidget {
                             pupilWorkbook.comment! == ''
                         ? 'Kein Kommentar'
                         : pupilWorkbook.comment!,
-                    style: const TextStyle(
+                    style: TextStyle(
                       fontSize: 16,
                       color: AppColors.interactiveColor,
                     ),
diff --git a/school_data_hub_flutter/lib/main.dart b/school_data_hub_flutter/lib/main.dart
index 62bc17a9..2eb518e9 100644
--- a/school_data_hub_flutter/lib/main.dart
+++ b/school_data_hub_flutter/lib/main.dart
@@ -6,8 +6,9 @@ import 'package:flutter/services.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:logging/logging.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:school_data_hub_flutter/app_utils/logger/log_service.dart';
-import 'package:school_data_hub_flutter/app_utils/logger/logrecord_formatter.dart';
+import 'package:school_data_hub_flutter/app_utils/logger/domain/log_record_formatter.dart';
+import 'package:school_data_hub_flutter/app_utils/logger/domain/log_service.dart';
+import 'package:school_data_hub_flutter/app_utils/logger/model/app_log.dart';
 import 'package:school_data_hub_flutter/common/theme/app_colors.dart';
 import 'package:school_data_hub_flutter/core/env/env_manager.dart';
 import 'package:school_data_hub_flutter/core/init/init_manager.dart';
@@ -19,17 +20,22 @@ import 'package:school_data_hub_flutter/features/app_entry_point/login_page/logi
 import 'package:school_data_hub_flutter/features/app_entry_point/no_connection_page.dart';
 import 'package:school_data_hub_flutter/features/app_main_navigation/widgets/landing_bottom_nav_bar.dart';
 import 'package:school_data_hub_flutter/l10n/app_localizations.dart';
+import 'package:signals/signals_flutter.dart';
 import 'package:watch_it/watch_it.dart';
 import 'package:window_manager/window_manager.dart';
 
 void main() async {
+  // Disable Signals debug logging
+  SignalsObserver.instance = null; // AppSignalsObserver();
   WidgetsFlutterBinding.ensureInitialized();
   // Set the global logging level
   Logger.root.level = Level.ALL;
   di.registerSingleton<LogService>(LogService());
+
   final logService = di<LogService>();
   // Add your custom colored console listener
   Logger.root.onRecord.listen((record) {
+    //  if (record.loggerName == 'Signals') return;
     final colorFormatter = const ColorFormatter();
     log(colorFormatter.format(record));
     final appLog = AppLog(record.level, record.message, record.loggerName);
@@ -83,16 +89,24 @@ class MyApp extends WatchingWidget {
   Widget build(BuildContext context) {
     final log = Logger('MyApp');
 
-    // Watch for environment changes - this will trigger rebuilds when EnvManager notifies
-    final envManager = watchIt<EnvManager>();
+    // Watch the color palette signal to trigger rebuilds on color changes
+    AppColors.paletteSignal.watch(context);
 
-    final bool envIsReady = watchValue((EnvManager x) => x.envIsReady);
-    final bool userIsAuthenticated = watchValue(
-      (EnvManager x) => x.isAuthenticated,
+    // Update status bar color when palette changes
+    SystemChrome.setSystemUIOverlayStyle(
+      const SystemUiOverlayStyle().copyWith(
+        statusBarColor: AppColors.backgroundColor,
+        statusBarBrightness: Brightness.dark,
+        statusBarIconBrightness: Brightness.light,
+      ),
     );
-    final bool isConnected = watchValue(
-      (ServerpodConnectivityMonitor x) => x.isConnected,
+
+    final bool envIsReady = di<EnvManager>().envIsReady.watch(context);
+    final bool userIsAuthenticated = di<EnvManager>().isAuthenticated.watch(
+      context,
     );
+    final bool isConnected = di<ServerpodConnectivityMonitor>().isConnected
+        .watch(context);
 
     return MaterialApp(
       localizationsDelegates: const <LocalizationsDelegate<Object>>[
@@ -131,7 +145,7 @@ class MyApp extends WatchingWidget {
                 }
               },
             )
-          : envManager.activeEnv != null
+          : di<EnvManager>().activeEnv != null
           ? const LoadingPage()
           : const EntryPoint(),
     );
diff --git a/school_data_hub_flutter/pubspec.lock b/school_data_hub_flutter/pubspec.lock
index 66f5e06e..078239c2 100644
--- a/school_data_hub_flutter/pubspec.lock
+++ b/school_data_hub_flutter/pubspec.lock
@@ -73,6 +73,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.2.9"
+  basic_interfaces:
+    dependency: transitive
+    description:
+      name: basic_interfaces
+      sha256: c37c8c4ddbc594430eb3817a4edfcc9a0cadbc7ea4c51a5b48785e351f1ba479
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
   bidi:
     dependency: transitive
     description:
@@ -542,6 +550,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.4.1"
+  flutter_hooks:
+    dependency: "direct main"
+    description:
+      name: flutter_hooks
+      sha256: cde36b12f7188c85286fba9b38cc5a902e7279f36dd676967106c041dc9dde70
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.20.5"
   flutter_launcher_icons:
     dependency: "direct main"
     description:
@@ -941,6 +957,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "5.1.1"
+  lite_ref:
+    dependency: transitive
+    description:
+      name: lite_ref
+      sha256: "2519ee5c20257ed8b8eec92c967b8ae2a3361895e9e5dd268569c681803df41b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.8.1"
+  lite_ref_core:
+    dependency: transitive
+    description:
+      name: lite_ref_core
+      sha256: b902af6b90736d6fb7a2c171af37d15f4894a5880e9eb55ffb3fee5f01385849
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.1"
   logging:
     dependency: "direct main"
     description:
@@ -1165,6 +1197,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.5.1"
+  preact_signals:
+    dependency: transitive
+    description:
+      name: preact_signals
+      sha256: ad45313c86b2228536a16d3dfc86da8263705d4acb4136c42907378de6910d8c
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.9.4"
   printing:
     dependency: "direct main"
     description:
@@ -1272,42 +1312,42 @@ packages:
     dependency: "direct main"
     description:
       name: serverpod_auth_client
-      sha256: "41615696ff57d86e45dbbd8b51f48e914b3c1719b229e8b01ebd937c983ae1ad"
+      sha256: "9ac62f7071a1d7cbe7890799f4334ad2c698b02000c1ca092999531f30e45549"
       url: "https://pub.dev"
     source: hosted
-    version: "2.9.1"
+    version: "2.9.2"
   serverpod_auth_shared_flutter:
     dependency: "direct main"
     description:
       name: serverpod_auth_shared_flutter
-      sha256: f63ce3f663d41bee2c0235119d5597ce655ad777c74b507c49666eed0ec9c040
+      sha256: eb36e10124ca35fbf89256c58c374b5ee45359f629c275ecb60e1f6d53b95b7c
       url: "https://pub.dev"
     source: hosted
-    version: "2.9.1"
+    version: "2.9.2"
   serverpod_client:
     dependency: "direct main"
     description:
       name: serverpod_client
-      sha256: "04cb6d36730c8c24c067cde6e41551ad2dd7ae3725bbaa2756e82d2f5b345f54"
+      sha256: f1f9695e06b12c4ed6bfafba9e54c64b8154c6aa2cb0526ac4f8c9e7c0a6aed1
       url: "https://pub.dev"
     source: hosted
-    version: "2.9.1"
+    version: "2.9.2"
   serverpod_flutter:
     dependency: "direct main"
     description:
       name: serverpod_flutter
-      sha256: "1d9c2cb511581a7fdc1fc81ac5475ef75c0cf0a1c9181308e956db4818759bb7"
+      sha256: fe756b793c85b67196be89e9c505730ab9b6430eab7455b1d4938e1ed963142f
       url: "https://pub.dev"
     source: hosted
-    version: "2.9.1"
+    version: "2.9.2"
   serverpod_serialization:
     dependency: transitive
     description:
       name: serverpod_serialization
-      sha256: c301a5e45610c062e51e1ba580f51f3257c3404ce2dd2f7e216dccbd93869502
+      sha256: e68bee9f9e5d609ae6249365826748c43742fd05080bae8549eabf939294271c
       url: "https://pub.dev"
     source: hosted
-    version: "2.9.1"
+    version: "2.9.2"
   shared_preferences:
     dependency: transitive
     description:
@@ -1388,6 +1428,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.0.4"
+  signals:
+    dependency: "direct main"
+    description:
+      name: signals
+      sha256: "0d644f4ec8ce4862c61e3d3d1168d08a7b9b6ecbe067d4f96e26dd35287f5dcd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.3.0"
+  signals_core:
+    dependency: transitive
+    description:
+      name: signals_core
+      sha256: ea427bd53619e69e6f6cf244177e3b72870e433065c807600fb496fd80611c9f
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.2.1"
+  signals_flutter:
+    dependency: transitive
+    description:
+      name: signals_flutter
+      sha256: "7c83418f47e3538685217e583f0fbd17a29716fa1a9ce2247e2455786e8ea81a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.3.0"
+  signals_hooks:
+    dependency: "direct main"
+    description:
+      name: signals_hooks
+      sha256: "31f561507886ae27ee9bb0ea19454417e3cf2f007c87dc11dcec12acbe95e02a"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.0"
   simple_gesture_detector:
     dependency: transitive
     description:
@@ -1401,6 +1473,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  sliver_dashboard:
+    dependency: "direct main"
+    description:
+      name: sliver_dashboard
+      sha256: "5de309ba727fe0b0d15d67e6d3f74f9555ecaefc16f864d116a963b38530d646"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.3"
   source_gen:
     dependency: transitive
     description:
@@ -1481,6 +1561,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.12.1"
+  state_beacon:
+    dependency: transitive
+    description:
+      name: state_beacon
+      sha256: "74550d1df83fec01ccce7b35b8a365f7e44d64b994bea8f3d3a2c3ea8720f62b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.1"
+  state_beacon_core:
+    dependency: transitive
+    description:
+      name: state_beacon_core
+      sha256: c60eceef6d638938e26ff3f502d79377c595ab0a08442a9c879f053f6bcaa25c
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.1"
+  state_beacon_flutter:
+    dependency: transitive
+    description:
+      name: state_beacon_flutter
+      sha256: "7a9db1a4532f0563e240ab1803751810c3d619a1d631e101b4abac43a21b4406"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.1"
   stream_channel:
     dependency: transitive
     description:
diff --git a/school_data_hub_flutter/pubspec.yaml b/school_data_hub_flutter/pubspec.yaml
index 090e541d..72ee65d2 100644
--- a/school_data_hub_flutter/pubspec.yaml
+++ b/school_data_hub_flutter/pubspec.yaml
@@ -13,7 +13,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 0.5.1+1
+version: 0.5.2+1
 
 environment:
   sdk: '>=3.8.0 <4.0.0'
@@ -23,7 +23,7 @@ dependencies:
   flutter:
     sdk: flutter
 
-  serverpod_flutter: 2.9.1
+  serverpod_flutter: 2.9.2
   school_data_hub_client:
     path: ../school_data_hub_client
 
@@ -32,7 +32,7 @@ dependencies:
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.5
   window_manager: ^0.5.0
-  serverpod_auth_shared_flutter: 2.9.1
+  serverpod_auth_shared_flutter: 2.9.2
   watch_it: ^1.7.0
   package_info_plus: ^9.0.0
   file_picker: ^10.3.7
@@ -68,10 +68,10 @@ dependencies:
   printing: ^5.14.2
   url_launcher: ^6.3.1
   dio: ^5.8.0+1
-  serverpod_auth_client: ^2.9.1
+  serverpod_auth_client: ^2.9.2
   image_picker_platform_interface: ^2.10.1
   isbn: ^1.0.4
-  serverpod_client: ^2.9.1
+  serverpod_client: ^2.9.2
   cristalyse: ^1.2.3
   shorebird_code_push: ^2.0.4
   flex_color_picker: ^3.7.1
@@ -80,6 +80,10 @@ dependencies:
   community_charts_flutter: ^1.0.4
   go_router: ^17.0.0
   just_audio: ^0.10.5
+  signals: ^6.3.0
+  signals_hooks: ^0.4.0
+  flutter_hooks: ^0.20.5
+  sliver_dashboard: ^0.1.3
 
 
 dev_dependencies:
diff --git a/school_data_hub_flutter/signals.md b/school_data_hub_flutter/signals.md
new file mode 100644
index 00000000..4bb75133
--- /dev/null
+++ b/school_data_hub_flutter/signals.md
@@ -0,0 +1,3657 @@
+import { Card, CardGrid } from '@astrojs/starlight/components';
+
+## Features
+
+<CardGrid stagger>
+	<Card title="Fine grained reactivity" icon="pencil">
+		Based on Preact Signals and provides a fine grained reactivity system that will automatically track dependencies and free them when no longer needed.
+	</Card>
+	<Card title="100% Dart Native" icon="forward-slash">
+		Supports Dart JS (HTML), Shelf Server, CLI (and Native), VM, Flutter (Web, Mobile and Desktop). Signals can be used in any Dart project!
+	</Card>
+	<Card title="Lazy evaluation" icon="approve-check">
+		Signals are lazy and will only compute values when read. If a signal is not read, it will not be computed.
+	</Card>
+	<Card title="Flexible API" icon="puzzle">
+		Every app is different and signals can be composed in multiple ways. There are a few rules to follow but the API surface is small.
+	</Card>
+	<Card title="Surgical Rendering" icon="star">
+		Widgets can be rebuilt surgically, only marking dirty the parts of the Widget tree that need to be updated and if mounted.
+	</Card>
+</CardGrid>
+
+<iframe src="https://dartpad.dev/?id=1b2f58d30c33ee2ee5c5a159b8867861?theme=dark" style="width: 100%; height: 600px;"></iframe>
+
+---
+
+In case when you're receiving a callback that can read some signals, but you don't want to subscribe to them, you can use `untracked` to prevent any subscriptions from happening.
+
+```dart
+final counter = signal(0);
+final effectCount = signal(0);
+final fn = () => effectCount.value + 1;
+
+effect(() {
+	print(counter.value);
+
+	// Whenever this effect is triggered, run `fn` that gives new value
+	effectCount.value = untracked(fn);
+});
+```
+
+---
+
+All signals are synchronous but data can be computed asynchronously.
+
+Streams and Futures are the most common async signals, but sometimes you need to compute a value asynchronously and react to changes on input signals.
+
+## computedAsync
+
+Async Computed is syntax sugar around FutureSignal.
+
+_Inspired by [computedAsync](https://ngxtension.netlify.app/utilities/signals/computed-async/) from Angular NgExtension._
+
+computedAsync takes a callback function to compute the value
+of the signal. This callback is converted into a Computed signal.
+
+```dart
+final movieId = signal('id');
+late final movie = computedAsync(() => fetchMovie(movieId()));
+```
+
+:::caution
+It is important that signals are called before any async gaps with await.
+:::
+
+Any signal that is read inside the callback will be tracked as a dependency and the computed signal will be re-evaluated when any of the dependencies change.
+
+## computedFrom
+
+Async Computed is syntax sugar around FutureSignal.
+
+_Inspired by [computedFrom](https://ngxtension.netlify.app/utilities/signals/computed-from/) from Angular NgExtension._
+
+computedFrom takes a list of signals and a callback function to
+compute the value of the signal every time one of the signals changes.
+
+```dart
+final movieId = signal('id');
+late final movie = computedFrom([movieId], (args) => fetchMovie(args.first));
+```
+
+Since all dependencies are passed in as arguments there is no need to worry about calling the signals before any async gaps with await.
+
+---
+
+The idea for `connect` comes from Anguar Signals with RxJS:
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/R7-KdADEq0A?si=kK8XasbBedE3sPrR" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+
+Start with a signal and then use the `connect` method to create a connector.
+Streams will feed Signal value.
+
+```dart
+final s = signal(0);
+final c = connect(s);
+```
+
+### to
+
+Add streams to the connector.
+
+```dart
+final s = signal(0);
+final c = connect(s);
+
+final s1 = Stream.value(1);
+final s2 = Stream.value(2);
+
+c.from(s1).from(s2); // These can be chained
+```
+
+### dispose
+
+Cancel all subscriptions.
+
+```dart
+final s = signal(0);
+final c = connect(s);
+
+final s1 = Stream.value(1);
+final s2 = Stream.value(2);
+
+c.from(s1).from(s2);
+// or
+c << s1 << s2
+
+c.dispose(); // This will cancel all subscriptions
+```
+
+---
+
+The `batch` function allows you to combine multiple signal writes into one single update that is triggered at the end when the callback completes.
+
+```dart
+import 'package:signals/signals.dart';
+
+final name = signal("Jane");
+final surname = signal("Doe");
+final fullName = computed(() => name.value + " " + surname.value);
+
+// Logs: "Jane Doe"
+effect(() => print(fullName.value));
+
+// Combines both signal writes into one update. Once the callback
+// returns the `effect` will trigger and we'll log "Foo Bar"
+batch(() {
+	name.value = "Foo";
+	surname.value = "Bar";
+});
+```
+
+When you access a signal that you wrote to earlier inside the callback, or access a computed signal that was invalidated by another signal, we'll only update the necessary dependencies to get the current value for the signal you read from. All other invalidated signals will update at the end of the callback function.
+
+```dart
+import 'package:signals/signals.dart';
+
+final counter = signal(0);
+final _double = computed(() => counter.value * 2);
+final _triple = computed(() => counter.value * 3);
+
+effect(() => print(_double.value, _triple.value));
+
+batch(() {
+	counter.value = 1;
+	// Logs: 2, despite being inside batch, but `triple`
+	// will only update once the callback is complete
+	print(_double.value);
+});
+// Now we reached the end of the batch and call the effect
+```
+
+Batches can be nested and updates will be flushed when the outermost batch call completes.
+
+```dart
+import 'package:signals/signals.dart';
+
+final counter = signal(0);
+effect(() => print(counter.value));
+
+batch(() {
+	batch(() {
+		// Signal is invalidated, but update is not flushed because
+		// we're still inside another batch
+		counter.value = 1;
+	});
+
+	// Still not updated...
+});
+// Now the callback completed and we'll trigger the effect.
+```
+
+---
+
+The `effect` function is the last piece that makes everything reactive. When you access a signal inside its callback function, that signal and every dependency of said signal will be activated and subscribed to. In that regard it is very similar to [`computed(fn)`](/core/computed). By default all updates are lazy, so nothing will update until you access a signal inside `effect`.
+
+```dart
+import 'package:signals/signals.dart';
+
+final name = signal("Jane");
+final surname = signal("Doe");
+final fullName = computed(() => name.value + " " + surname.value);
+
+// Logs: "Jane Doe"
+effect(() => print(fullName.value));
+
+// Updating one of its dependencies will automatically trigger
+// the effect above, and will print "John Doe" to the console.
+name.value = "John";
+```
+
+You can destroy an effect and unsubscribe from all signals it was subscribed to, by calling the returned function.
+
+```dart
+import 'package:signals/signals.dart';
+
+final name = signal("Jane");
+final surname = signal("Doe");
+final fullName = computed(() => name.value + " " + surname.value);
+
+// Logs: "Jane Doe"
+final dispose = effect(() => print(fullName.value));
+
+// Destroy effect and subscriptions
+dispose();
+
+// Update does nothing, because no one is subscribed anymore.
+// Even the computed `fullName` signal won't change, because it knows
+// that no one listens to it.
+surname.value = "Doe 2";
+```
+
+## Cleanup Callback
+
+You can also return a cleanup function from an effect. This function will be called when the effect is destroyed.
+
+```dart
+import 'package:signals/signals.dart';
+
+final s = signal(0);
+
+final dispose = effect(() {
+  print(s.value);
+  return () => print('Effect destroyed');
+});
+
+// Destroy effect and subscriptions
+dispose();
+```
+
+## On Dispose Callback
+
+You can also pass a callback to `effect` that will be called when the effect is destroyed.
+
+```dart
+import 'package:signals/signals.dart';
+
+final s = signal(0);
+
+final dispose = effect(() {
+  print(s.value);
+}, onDispose: () => print('Effect destroyed'));
+
+// Destroy effect and subscriptions
+dispose();
+```
+
+## Preventing Cycles
+
+:::danger
+Mutating a signal inside an effect will cause an infinite loop, because the effect will be triggered again. To prevent this, you can use [`untracked(fn)`](/core/untracked) to read a signal without subscribing to it.
+
+```dart
+import 'dart:async';
+
+import 'package:signals/signals.dart';
+
+Future<void> main() async {
+  final completer = Completer<void>();
+  final age = signal(0);
+
+  effect(() {
+    print('You are ${age.value} years old');
+    age.value++; // <-- This will throw a cycle error
+  });
+
+  await completer.future;
+}
+```
+
+:::
+
+---
+
+Future signals can be created by extension or method.
+
+### futureSignal
+
+```dart
+final s = futureSignal(() async => 1);
+```
+
+### toSignal()
+
+```dart
+final s = Future(() => 1).toSignal();
+```
+
+## .value, .peek()
+
+Returns [`AsyncState<T>`](/dart/async/state) for the value and can handle the various states.
+
+The `value` getter returns the value of the future if it completed successfully.
+
+> .peek() can also be used to not subscribe in an effect
+
+```dart
+final s = futureSignal(() => Future(() => 1));
+final value = s.value.value; // 1 or null
+```
+
+## .reset()
+
+The `reset` method resets the future to its initial state to recall on the next evaluation.
+
+```dart
+final s = futureSignal(() => Future(() => 1));
+s.reset();
+```
+
+## .refresh()
+
+Refresh the future value by setting `isLoading` to true, but maintain the current state (AsyncData, AsyncLoading, AsyncError).
+
+```dart
+final s = futureSignal(() => Future(() => 1));
+s.refresh();
+print(s.value.isLoading); // true
+```
+
+## .reload()
+
+Reload the future value by setting the state to `AsyncLoading` and pass in the value or error as data.
+
+```dart
+final s = futureSignal(() => Future(() => 1));
+s.reload();
+print(s.value is AsyncLoading); // true
+```
+
+## Dependencies
+
+By default the callback will be called once and the future will be cached unless a signal is read in the callback.
+
+```dart
+final count = signal(0);
+final s = futureSignal(() async => count.value);
+
+await s.future; // 0
+count.value = 1;
+await s.future; // 1
+```
+
+If there are signals that need to be tracked across an async gap then use the `dependencies` when creating the `futureSignal` to [`reset`](#.reset()) every time any signal in the dependency array changes.
+
+```dart
+final count = signal(0);
+final s = futureSignal(
+    () async => count.value,
+    dependencies: [count],
+);
+s.value; // state with count 0
+count.value = 1; // resets the future
+s.value; // state with count 1
+```
+
+---
+
+Stream signals can be created by extension or method.
+
+### streamSignal
+
+```dart
+final stream = () async* {
+    yield 1;
+};
+final s = streamSignal(() => stream);
+```
+
+### toSignal()
+
+```dart
+final stream = () async* {
+    yield 1;
+};
+final s = stream.toSignal();
+```
+
+## .value, .peek()
+
+Returns [`AsyncState<T>`](/dart/async/state) for the value and can handle the various states.
+
+The `value` getter returns the value of the stream if it completed successfully.
+
+> .peek() can also be used to not subscribe in an effect
+
+```dart
+final stream = (int value) async* {
+    yield value;
+};
+final s = streamSignal(() => stream);
+final value = s.value.value; // 1 or null
+```
+
+## .reset()
+
+The `reset` method resets the stream to its initial state to recall on the next evaluation.
+
+```dart
+final stream = (int value) async* {
+    yield value;
+};
+final s = streamSignal(() => stream);
+s.reset();
+```
+
+## .refresh()
+
+Refresh the stream value by setting `isLoading` to true, but maintain the current state (AsyncData, AsyncLoading, AsyncError).
+
+```dart
+final stream = (int value) async* {
+    yield value;
+};
+final s = streamSignal(() => stream);
+s.refresh();
+print(s.value.isLoading); // true
+```
+
+## .reload()
+
+Reload the stream value by setting the state to `AsyncLoading` and pass in the value or error as data.
+
+```dart
+final stream = (int value) async* {
+    yield value;
+};
+final s = streamSignal(() => stream);
+s.reload();
+print(s.value is AsyncLoading); // true
+```
+
+## Dependencies
+
+By default the callback will be called once and the stream will be cached unless a signal is read in the callback.
+
+```dart
+final count = signal(0);
+final s = streamSignal(() async* {
+    final value = count();
+    yield value;
+});
+
+await s.future; // 0
+count.value = 1;
+await s.future; // 1
+```
+
+If there are signals that need to be tracked across an async gap then use the `dependencies` when creating the `streamSignal` to [`reset`](#.reset()) every time any signal in the dependency array changes.
+
+```dart
+final count = signal(0);
+final s = streamSignal(
+    () async* {
+        final value = count();
+        yield value;
+    },
+    dependencies: [count],
+);
+s.value; // state with count 0
+count.value = 1; // resets the future
+s.value; // state with count 1
+```
+
+---
+
+Data is often derived from other pieces of existing data. The `computed` function lets you combine the values of multiple signals into a new signal that can be reacted to, or even used by additional computeds. When the signals accessed from within a computed callback change, the computed callback is re-executed and its new return value becomes the computed signal's value.
+
+> `Computed` class extends the [`Signal`](/core/signal/) class, so you can use it anywhere you would use a signal.
+
+```dart
+import 'package:signals/signals.dart';
+
+final name = signal("Jane");
+final surname = signal("Doe");
+
+final fullName = computed(() => name.value + " " + surname.value);
+
+// Logs: "Jane Doe"
+print(fullName.value);
+
+// Updates flow through computed, but only if someone
+// subscribes to it. More on that later.
+name.value = "John";
+// Logs: "John Doe"
+print(fullName.value);
+```
+
+Any signal that is accessed inside the `computed`'s callback function will be automatically subscribed to and tracked as a dependency of the computed signal.
+
+> Computed signals are both lazily evaluated and memoized
+
+## Force Re-evaluation
+
+You can force a computed signal to re-evaluate by calling its `.recompute` method. This will re-run the computed callback and update the computed signal's value.
+
+```dart
+final name = signal("Jane");
+final surname = signal("Doe");
+final fullName = computed(() => name.value + " " + surname.value);
+
+fullName.recompute(); // Re-runs the computed callback
+```
+
+## Disposing
+
+### Auto Dispose
+
+If a computed signal is created with autoDispose set to true, it will automatically dispose itself when there are no more listeners.
+
+```dart
+final s = computed(() => 0, autoDispose: true);
+s.onDispose(() => print('Signal destroyed'));
+final dispose = s.subscribe((_) {});
+dispose();
+final value = s.value; // 0
+// prints: Signal destroyed
+```
+
+A auto disposing signal does not require its dependencies to be auto disposing. When it is disposed it will freeze its value and stop tracking its dependencies.
+
+This means that it will no longer react to changes in its dependencies.
+
+```dart
+final s = computed(() => 0);
+s.dispose();
+final value = s.value; // 0
+final b = computed(() => s.value); // 0
+// b will not react to changes in s
+```
+
+You can check if a signal is disposed by calling the `.disposed` method.
+
+```dart
+final s = computed(() => 0);
+print(s.disposed); // false
+s.dispose();
+print(s.disposed); // true
+```
+
+### On Dispose Callback
+
+You can attach a callback to a signal that will be called when the signal is destroyed.
+
+```dart
+final s = computed(() => 0);
+s.onDispose(() => print('Signal destroyed'));
+s.dispose();
+```
+
+## Custom Computed
+
+You can create a custom computed signal by extending the `Computed` class.
+
+```dart
+class MyComputed extends Computed<int> {
+  MyComputed() : super(() => 0);
+}
+```
+
+## Flutter
+
+In Flutter if you want to create a signal that automatically disposes itself when the widget is removed from the widget tree and rebuilds the widget when the signal changes, you can use the `createComputed` inside a stateful widget.
+
+```dart
+import 'package:flutter/material.dart';
+import 'package:signals/signals_flutter.dart';
+
+class CounterWidget extends StatefulWidget {
+  @override
+  _CounterWidgetState createState() => _CounterWidgetState();
+}
+
+class _CounterWidgetState extends State<CounterWidget> with SignalsMixin {
+  late final counter = createSignal(0);
+  late final isEven = createComputed(() => counter.value.isEven);
+  late final isOdd = createComputed(() => counter.value.isOdd);
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Text('Counter: even=$isEven, odd=$isOdd'),
+            ElevatedButton(
+              onPressed: () => counter.value++,
+              child: Text('Increment'),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+```
+
+No `Watch` widget or extension is needed, the signal will automatically dispose itself when the widget is removed from the widget tree.
+
+The `SignalsMixin` is a mixin that automatically disposes all signals created in the state when the widget is removed from the widget tree.
+
+## Testing
+
+Testing computed signals is possible by converting a computed to a stream and testing it like any other stream in Dart.
+
+```dart
+test('test as stream', () {
+    final a = signal(0);
+    final s = computed(() => a());
+    final stream = s.toStream();
+
+    a.value = 1;
+    a.value = 2;
+    a.value = 3;
+
+    expect(stream, emitsInOrder([0, 1, 2, 3]));
+});
+```
+
+`emitsInOrder` is a matcher that will check if the stream emits the values in the correct order which in this case is each value after a signal is updated.
+
+You can also override the initial value of a computed signal when testing. This is is useful for mocking and testing specific value implementations.
+
+```dart
+test('test with override', () {
+    final a = signal(0);
+    final s = computed(() => a()).overrideWith(-1);
+
+    final stream = s.toStream();
+
+    a.value = 1;
+    a.value = 2;
+    a.value = 2; // check if skipped
+    a.value = 3;
+
+    expect(stream, emitsInOrder([-1, 1, 2, 3]));
+});
+```
+
+`overrideWith` returns a new computed signal with the same global id sets the value as if the computed callback returned it.
+
+---
+
+The `signal` function creates a new signal. A signal is a container for a value that can change over time. You can read a signal's value or subscribe to value updates by accessing its `.value` property.
+
+```dart
+import 'package:signals/signals.dart';
+
+final counter = signal(0);
+
+// Read value from signal, logs: 0
+print(counter.value);
+
+// Write to a signal
+counter.value = 1;
+```
+
+Signals can be created globally, inside classes or functions. It's up to you how you want to structure your app.
+
+It is not recommended to create signals inside effects or computed, as this will create a new signal every time the effect or computed is triggered. This can lead to unexpected behavior.
+
+In Flutter do not create signals inside `build` methods, as this will create a new signal every time the widget is rebuilt.
+
+## Writing to a signal
+
+Writing to a signal is done by setting its `.value` property. Changing a signal's value synchronously updates every [computed](/core/computed) and [effect](/core/effect) that depends on that signal, ensuring your app state is always consistent.
+
+## .peek()
+
+In the rare instance that you have an effect that should write to another signal based on the previous value, but you _don't_ want the effect to be subscribed to that signal, you can read a signals's previous value via `signal.peek()`.
+
+```dart
+final counter = signal(0);
+final effectCount = signal(0);
+
+effect(() {
+	print(counter.value);
+
+	// Whenever this effect is triggered, increase `effectCount`.
+	// But we don't want this signal to react to `effectCount`
+	effectCount.value = effectCount.peek() + 1;
+});
+```
+
+Note that you should only use `signal.peek()` if you really need it. Reading a signal's value via `signal.value` is the preferred way in most scenarios.
+
+## .value
+
+The `.value` property of a signal is used to read or write to the signal. If used inside an effect or computed, it will subscribe to the signal and trigger the effect or computed whenever the signal's value changes.
+
+```dart
+final counter = signal(0);
+
+effect(() {
+	print(counter.value);
+});
+
+counter.value = 1;
+```
+
+## Force Update
+
+If you want to force an update for a signal, you can call the `.set(..., force: true)` method. This will trigger all effects and mark all computed as dirty.
+
+```dart
+final counter = signal(0);
+counter.set(1, force: true);
+```
+
+## Disposing
+
+### Auto Dispose
+
+If a signal is created with autoDispose set to true, it will automatically dispose itself when there are no more listeners.
+
+```dart
+final s = signal(0, autoDispose: true);
+s.onDispose(() => print('Signal destroyed'));
+final dispose = s.subscribe((_) {});
+dispose();
+final value = s.value; // 0
+// prints: Signal destroyed
+```
+
+A auto disposing signal does not require its dependencies to be auto disposing. When it is disposed it will freeze its value and stop tracking its dependencies.
+
+```dart
+final s = signal(0);
+s.dispose();
+final c = computed(() => s.value);
+// c will not react to changes in s
+```
+
+You can check if a signal is disposed by calling the `.disposed` method.
+
+```dart
+final s = signal(0);
+print(s.disposed); // false
+s.dispose();
+print(s.disposed); // true
+```
+
+### On Dispose Callback
+
+You can attach a callback to a signal that will be called when the signal is destroyed.
+
+```dart
+final s = signal(0);
+s.onDispose(() => print('Signal destroyed'));
+s.dispose();
+```
+
+## Custom Signal
+
+You can create a custom signal by extending the `Signal` class.
+
+```dart
+class MySignal extends Signal<int> {
+  MySignal(int value) : super(value);
+}
+```
+
+:::tip
+You can apply any number of mixins to a custom signal to add additional functionality.
+
+Mixins:
+- [ValueListenableSignalMixin](/mixins/value-listenable) to implement ValueListenable<T>
+- [ValueNotifierSignalMixin](/mixins/value-notifier) to implement ValueNotifier<T>
+- [ChangeStackSignalMixin](/mixins/change-stack) to add undo and redo functionality
+- [TrackedSignalMixin](/mixins/tracked) to add initial and previous value tracking
+- [StreamSignalMixin](/mixins/stream) to implement Stream
+- [SinkSignalMixin](/mixins/sink) to implement Sink
+- [EventSinkSignalMixin](/mixins/event-sink) to implement EventSink
+- [ListSignalMixin](/mixins/list) for List value types
+- [MapSignalMixin](/mixins/map) for Map value types
+- [SetSignalMixin](/mixins/set) for Set value types
+- [IterableSignalMixin](/mixins/iterable) for Iterable<T> value types
+- [QueueSignalMixin](/mixins/queue) for Queue value types
+:::
+
+## Flutter
+
+In Flutter if you want to create a signal that automatically disposes itself when the widget is removed from the widget tree and rebuilds the widget when the signal changes, you can use the `createSignal` inside a stateful widget.
+
+```dart
+import 'package:flutter/material.dart';
+import 'package:signals/signals_flutter.dart';
+
+class CounterWidget extends StatefulWidget {
+  @override
+  _CounterWidgetState createState() => _CounterWidgetState();
+}
+
+class _CounterWidgetState extends State<CounterWidget> with SignalsMixin {
+  late final counter = createSignal(0);
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Text('Counter: $counter'),
+            ElevatedButton(
+              onPressed: () => counter.value++,
+              child: Text('Increment'),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
+```
+
+No `Watch` widget or extension is needed, the signal will automatically dispose itself when the widget is removed from the widget tree.
+
+The `SignalsMixin` is a mixin that automatically disposes all signals created in the state when the widget is removed from the widget tree.
+
+## Testing
+
+Testing signals is possible by converting a signal to a stream and testing it like any other stream in Dart.
+
+```dart
+test('test as stream', () {
+  final s = signal(0);
+  final stream = s.toStream(); // create a stream of values
+
+  s.value = 1;
+  s.value = 2;
+  s.value = 3;
+
+  expect(stream, emitsInOrder([0, 1, 2, 3]));
+});
+```
+
+`emitsInOrder` is a matcher that will check if the stream emits the values in the correct order which in this case is each value after a signal is updated.
+
+You can also override the initial value of a signal when testing. This is is useful for mocking and testing specific value implementations.
+
+```dart
+test('test with override', () {
+  final s = signal(0).overrideWith(-1);
+
+  final stream = s.toStream();
+
+  s.value = 1;
+  s.value = 2;
+  s.value = 3;
+
+  expect(stream, emitsInOrder([-1, 1, 2, 3]));
+});
+```
+
+`overrideWith` returns a new signal with the same global id sets the value as if it was created with it. This can be useful when using async signals or global signals used for dependency injection.
+
+---
+
+`AsyncState` is class commonly used with Future/Stream signals to represent the states the signal can be in.
+
+## AsyncSignal
+
+`AsyncState` is the default state if you want to create a `AsyncSignal` directly:
+
+```dart
+final s = asyncSignal(AsyncState.data(1));
+s.value = AsyncState.loading(); // or AsyncLoading();
+s.value = AsyncState.error('Error', null); // or AsyncError();
+```
+
+## AsyncState
+
+`AsyncState` is a sealed union made up of `AsyncLoading`, `AsyncData` and `AsyncError`.
+
+### .future
+
+Sometimes you need to await a signal value in a async function until a value is completed and in this case use the .future getter.
+
+```dart
+final s = asyncSignal<int>(AsyncState.loading());
+s.value = AsyncState.data(1);
+await s.future; // Waits until data or error is set
+```
+
+### .isCompleted
+
+Returns true if the future has completed with an error or value:
+
+```dart
+final s = asyncSignal<int>(AsyncState.loading());
+s.value = AsyncState.data(1);
+print(s.isCompleted); // true
+```
+
+### .hasValue
+
+Returns true if a value has been set regardless of the state.
+
+```dart
+final s = asyncSignal<int>(AsyncState.loading());
+print(s.hasValue); // false
+s.value = AsyncState.data(1);
+print(s.hasValue); // true
+```
+
+### .hasError
+
+Returns true if a error has been set regardless of the state.
+
+```dart
+final s = asyncSignal<int>(AsyncState.loading());
+print(s.hasError); // false
+s.value = AsyncState.error('error', null);
+print(s.hasError); // true
+```
+
+### .isRefreshing
+
+Returns true if the state is refreshing with a loading flag, has a value or error and is not the loading state.
+
+```dart
+final s = asyncSignal<int>(AsyncState.loading());
+print(s.isRefreshing); // false
+s.value = AsyncState.error('error', null, isLoading: true);
+print(s.isRefreshing); // true
+s.value = AsyncData(1, isLoading: true);
+print(s.isRefreshing); // true
+```
+
+### .isReloading
+
+Returns true if the state is reloading with having a value or error, and is the loading state.
+
+```dart
+final s = asyncSignal<int>(AsyncState.loading());
+print(s.isReloading); // false
+s.value = AsyncState.loading(data: 1);
+print(s.isReloading); // true
+s.value = AsyncState.loading(error: ('error', null));
+print(s.isReloading); // true
+```
+
+### .requireValue
+
+Force unwrap the value of the state and throw an error if it has an error or is null.
+
+```dart
+final s = asyncSignal<int>(AsyncState.data(1));
+print(s.requireValue); // 1
+```
+
+### .value
+
+Return the current value if exists.
+
+```dart
+final s = asyncSignal<int>(AsyncState.data(1));
+print(s.value); // 1 or null
+```
+
+### .error
+
+Return the current error if exists.
+
+```dart
+final s = asyncSignal<int>(AsyncState.error('error', null));
+print(s.error); // 'error' or null
+```
+
+### .stackTrace
+
+Return the current stack trace if exists.
+
+```dart
+final s = asyncSignal<int>(AsyncState.error('error', StackTrace(...)));
+print(s.stackTrace); // StackTrace(...) or null
+```
+
+### .map
+
+If you want to handle the states of the signal `map` will enforce all branching.
+
+```dart
+final signal = asyncSignal<int>(AsyncState.data(1));
+signal.value.map(
+ data: (value) => 'Value: $value',
+ error: (error, stackTrace) => 'Error: $error',
+ loading: () => 'Loading...',
+);
+```
+
+### .maybeMap
+
+If you want to handle some of the states of the signal `maybeMap` will provide a default and optional overrides.
+
+```dart
+final signal = asyncSignal<int>(AsyncState.data(1));
+signal.value.maybeMap(
+ data: (value) => 'Value: $value',
+ orElse: () => 'Loading...',
+);
+```
+
+### Pattern Matching
+
+Instead of `map` and `maybeMap` it is also possible to use [dart switch expressions](https://dart.dev/language/patterns) to handle the branching.
+
+```dart
+final signal = asyncSignal<int>(AsyncState.data(1));
+final value = switch (signal.value) {
+    AsyncData<int> data => 'value: ${data.value}',
+    AsyncError<int> error => 'error: ${error.error}',
+    AsyncLoading<int>() => 'loading',
+};
+```
+
+---
+
+Since Signals 6.0.0, you can use the `signals_flutter` import to create signals that extend [ValueListenable](https://api.flutter.dev/flutter/foundation/ValueListenable-class.html).
+
+```dart
+import 'package:signals/signals_flutter.dart';
+
+final count = computed(() => 0);
+
+assert(count is Signal<int>);
+assert(count is FlutterComputed<int>);
+assert(count is FlutterReadonlySignal<int>);
+assert(count is ValueListenable<int>);
+```
+
+## Custom Signal
+
+To create a custom signal that extends ValueListenable, use the [`ValueListenableSignalMixin`](/mixins/value-listenable) mixin.
+
+```dart
+import 'package:signals/signals_flutter.dart';
+
+class MySignal extends Computed<int> with ValueListenableSignalMixin<int> {
+  MySignal(int Function() cb) : super(cb);
+}
+```
+
+Or extend FlutterComputed directly.
+
+```dart
+import 'package:signals/signals_flutter.dart';
+
+class MySignal extends FlutterComputed<int> {
+  MySignal(int Function() cb) : super(cb);
+}
+```
+
+---
+
+There is an early version of a devtools extension included with the package.
+
+![Graph view](/graph.png)
+![List view](/list.png)
+
+---
+
+Helper library to make working with [signals](https://pub.dev/packages/signals) in [flutter_hooks](https://pub.dev/packages/flutter_hooks) easier.
+
+```dart
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:signals_hooks/signals_hooks.dart';
+
+class Example extends HookWidget {
+  const Example({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final count = useSignal(0);
+    final doubleCount = useComputed(() => count.value * 2);
+    useSignalEffect(() {
+      debugPrint('count: $count, double: $doubleCount');
+    });
+    return Scaffold(
+      body: Center(
+        child: Text('Count: $count'),
+      ),
+      floatingActionButton: FloatingActionButton(
+        onPressed: () => count.value++,
+        child: const Icon(Icons.add),
+      ),
+    );
+  }
+}
+```
+
+All of the signals and effects created will get cleaned up when the widget gets unmounted.
+
+## Core
+
+### useSignal
+
+How to create a new signal inside of a hook widget:
+
+```dart
+class Example extends HookWidget {
+  @override
+  Widget build(BuildContext context) {
+    final count = useSignal(0);
+    return Text('Count: $count');
+  }
+}
+```
+
+The value will auto rebuild the widget when it changes.
+
+### useComputed
+
+How to create a new computed signal inside of a hook widget:
+
+```dart
+class Example extends HookWidget {
+  @override
+  Widget build(BuildContext context) {
+    final count = useSignal(0);
+    final countStr = useComputed(() => count.toString());
+    return Text('Count: $countStr');
+  }
+}
+```
+
+The value will auto rebuild the widget when it changes.
+
+### useSignalEffect
+
+How to create a new effect inside of a hook widget:
+
+```dart
+class Example extends HookWidget {
+  @override
+  Widget build(BuildContext context) {
+    final count = useSignal(0);
+    useSignalEffect(() {
+        print('count: $count');
+    });
+    return Text('Count: $count');
+  }
+}
+```
+
+### useExistingSignal
+
+How to bind an existing signal inside of a hook widget:
+
+```dart
+class Example extends HookWidget {
+  final Signal<int> count;
+
+  const Example(this.count, {super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final counter = useExistingSignal(count);
+    return Text('Count: $counter');
+  }
+}
+```
+
+The value will auto rebuild the widget when it changes.
+
+### useSignalValue
+
+How to get the value of a signal directly:
+
+```dart
+class Example extends HookWidget {
+  final Signal<int> count;
+
+  const Example(this.count, {super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final counter = useSignalValue(count);
+    return Text('Count: $counter');
+  }
+}
+```
+
+The value will auto rebuild the widget when it changes.
+
+## Async
+
+### useFutureSignal
+
+Creates a new `FutureSignal` and subscribes to it.
+
+```dart
+class MyWidget extends HookWidget {
+  @override
+  Widget build(BuildContext context) {
+    final future = useFutureSignal(() => Future.delayed(const Duration(seconds: 1), () => 1));
+    return future.value.map(
+      data: (value) => Text('$value'),
+      error: (error, stack) => Text('$error'),
+      loading: () => const CircularProgressIndicator(),
+    );
+  }
+}
+```
+
+### useStreamSignal
+
+Creates a new `StreamSignal` and subscribes to it.
+
+```dart
+class MyWidget extends HookWidget {
+  @override
+  Widget build(BuildContext context) {
+    final stream = useStreamSignal(() => Stream.periodic(const Duration(seconds: 1), (i) => i));
+    return stream.value.map(
+      data: (value) => Text('$value'),
+      error: (error, stack) => Text('$error'),
+      loading: () => const CircularProgressIndicator(),
+    );
+  }
+}
+```
+
+### useAsyncSignal
+
+Creates a new `AsyncSignal` and subscribes to it.
+
+```dart
+class MyWidget extends HookWidget {
+  @override
+  Widget build(BuildContext context) {
+    final signal = useAsyncSignal<int>(AsyncState.loading());
+    return signal.value.map(
+      data: (value) => Text('$value'),
+      error: (error, stack) => Text('$error'),
+      loading: () => const CircularProgressIndicator(),
+    );
+  }
+}
+```
+
+### useAsyncComputed
+
+Creates a new `FutureSignal` from a computed async value and subscribes to it.
+
+```dart
+class MyWidget extends HookWidget {
+  @override
+  Widget build(BuildContext context) {
+    final count = useSignal(0);
+    final future = useAsyncComputed(() async {
+      await Future.delayed(const Duration(seconds: 1));
+      return count.value * 2;
+    }, dependencies: [count]);
+    return future.value.map(
+      data: (value) => Text('$value'),
+      error: (error, stack) => Text('$error'),
+      loading: () => const CircularProgressIndicator(),
+    );
+  }
+}
+```
+
+## Collections
+
+### useListSignal
+
+Creates a new `ListSignal` and subscribes to it.
+
+```dart
+class MyWidget extends HookWidget {
+  @override
+  Widget build(BuildContext context) {
+    final list = useListSignal([1, 2, 3]);
+    return Text('${list.value}');
+  }
+}
+```
+
+### useSetSignal
+
+Creates a new `SetSignal` and subscribes to it.
+
+```dart
+class MyWidget extends HookWidget {
+  @override
+  Widget build(BuildContext context) {
+    final set = useSetSignal({1, 2, 3});
+    return Text('${set.value}');
+  }
+}
+```
+
+### useMapSignal
+
+Creates a new `MapSignal` and subscribes to it.
+
+```dart
+class MyWidget extends HookWidget {
+  @override
+  Widget build(BuildContext context) {
+    final map = useMapSignal({'a': 1, 'b': 2});
+    return Text('${map.value}');
+  }
+}
+```
+
+## Flutter
+
+### useValueNotifierToSignal
+
+Creates a new `Signal` from a `ValueNotifier` and subscribes to it.
+
+```dart
+class MyWidget extends HookWidget {
+  @override
+  Widget build(BuildContext context) {
+    final notifier = useValueNotifier(0);
+    final signal = useValueNotifierToSignal(notifier);
+    return Text('${signal.value}');
+  }
+}
+```
+
+### useValueListenableToSignal
+
+Creates a new `ReadonlySignal` from a `ValueListenable` and subscribes to it.
+
+```dart
+class MyWidget extends HookWidget {
+  @override
+  Widget build(BuildContext context) {
+    final notifier = useValueNotifier(0);
+    final signal = useValueListenableToSignal(notifier);
+    return Text('${signal.value}');
+  }
+}
+```
+
+## Testing
+
+To test hooks that use signals you can use `flutter_test` and `HookBuilder`.
+
+Here is an example of how to test `useSignal`:
+
+```dart
+import 'package:flutter/widgets.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:signals_hooks/signals_hooks.dart';
+
+void main() {
+  testWidgets('useSignal', (tester) async {
+    late Signal<int> state;
+    await tester.pumpWidget(
+      HookBuilder(builder: (context) {
+        state = useSignal(42);
+        return GestureDetector(
+          onTap: () => state.value++,
+          child: Text('$state', textDirection: TextDirection.ltr),
+        );
+      }),
+    );
+
+    expect(state.value, 42);
+    expect(find.text('42'), findsOneWidget);
+
+    // Click text and wait
+    await tester.tap(find.text('42'));
+    await tester.pumpAndSettle();
+
+    expect(state.value, 43);
+    expect(find.text('43'), findsOneWidget);
+  });
+}
+```
+
+You can find more examples in the [test folder](https://github.com/rodydavis/signals.dart/tree/main/packages/signals_hooks/test).
+
+---
+
+SignalProvider is an [InheritedNotifier](https://api.flutter.dev/flutter/widgets/InheritedNotifier-class.html) widget that allows you to pass signals around the widget tree.
+
+```dart
+import 'package:signals/signals_flutter.dart';
+import 'package:flutter/material.dart';
+
+class Counter extends FlutterSignal<int> {
+  Counter([super.value = 0]);
+
+  void increment() => value++;
+}
+
+class Example extends StatelessWidget {
+  const Example({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return SignalProvider<Counter>(
+      create: () => Counter(0),
+      child: Scaffold(
+        appBar: AppBar(
+          backgroundColor: Theme.of(context).colorScheme.inversePrimary,
+          title: const Text('Counter'),
+        ),
+        body: Center(
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: <Widget>[
+              const Text(
+                'You have pushed the button this many times:',
+              ),
+              Builder(builder: (context) {
+                final counter = SignalProvider.of<Counter>(context);
+                return Text(
+                  '$counter',
+                  style: Theme.of(context).textTheme.headlineMedium,
+                );
+              }),
+            ],
+          ),
+        ),
+        floatingActionButton: Builder(builder: (context) {
+          final counter = SignalProvider.of<Counter>(context, listen: false)!;
+          return FloatingActionButton(
+            onPressed: counter.increment,
+            tooltip: 'Increment',
+            child: const Icon(Icons.add),
+          );
+        }),
+      ),
+    );
+  }
+}
+```
+
+:::note
+The signal in the `create` method needs to extend `FlutterReadonlySignal` which can be from a signal or computed created with the flutter import or by extending `FlutterReadonlySignal`, `FlutterSignal` or `FlutterComputed`.
+:::
+
+---
+
+Since Signals 6.0.0, you can use the `signals_flutter` import to create signals that extend [ValueNotifier](https://api.flutter.dev/flutter/foundation/ValueNotifier-class.html).
+
+```dart
+import 'package:signals/signals_flutter.dart';
+
+final count = signal(0);
+
+assert(count is Signal<int>);
+assert(count is FlutterSignal<int>);
+assert(count is FlutterReadonlySignal<int>);
+assert(count is ValueNotifier<int>);
+```
+
+## Custom Signal
+
+To create a custom signal that extends ValueNotifier, use the [`ValueNotifierSignalMixin`](/mixins/value-notifier) mixin.
+
+```dart
+import 'package:signals/signals_flutter.dart';
+
+class MySignal extends Signal<int> with ValueNotifierSignalMixin<int> {
+  MySignal(int value) : super(value);
+}
+```
+
+Or extend FlutterSignal directly.
+
+```dart
+import 'package:signals/signals_flutter.dart';
+
+class MySignal extends FlutterSignal<int> {
+  MySignal(int value) : super(value);
+}
+```
+
+---
+
+:::tip
+As of Signals 6.0.0 any Computed created with the flutter import implement ValueListenable by default.
+
+```dart
+import 'package:signals/signals_flutter.dart';
+
+final count = computed(() => 0);
+assert(count is Computed<int>);
+assert(count is ValueListenable<int>);
+```
+:::
+
+To create a readonly signal from a `ValueListenable`, use the `toSignal` extension:
+
+```dart
+final ValueListenable listenable = ValueNotifier(10);
+final signal = listenable.toSignal();
+```
+
+---
+
+IterableSignalMixin is a mixin for a Signal that adds reactive methods for [Iterable](https://api.flutter.dev/flutter/dart-core/Iterable-class.html).
+
+:::note
+This mixin only works with signals that have a value type of `Iterable<T>`.
+:::
+
+```dart
+class MySignal extends Signal<Iterable<int>>
+    with IterableSignalMixin<int, Iterable<int>> {
+  MySignal(super.internalValue);
+}
+
+void main() {
+  final signal = MySignal([1, 2, 3]);
+  
+  effect(() {
+    print(signal.length);
+  });
+}
+```
+
+---
+
+EventSinkSignalMixin is a mixin for a Signal that implements [EventSink](https://api.flutter.dev/flutter/dart-async/EventSink-class.html).
+
+:::note
+This mixin only works with signals that have a value type of `AsyncState<T>`.
+:::
+
+```dart
+class MySignal extends Signal<AsyncState<int>> with EventSinkSignalMixin<int> {
+  MySignal(int value) : super(AsyncState.data(value));
+}
+
+void main() {
+  final signal = MySignal(0);
+  signal.add(1);
+  print(signal.value.hasValue); // true
+  print(signal.value.value); // 1
+  signal.addError('error');
+  print(signal.value.hasError); // true
+  print(signal.value.error); // error
+  signal.close();
+  print(signal.disposed); // true
+}
+```
+
+This allows you to use the signal as a EventSink anywhere you would use a EventSink in Dart.
+
+## .add()
+
+When `add` is called it will set the value of the signal.
+
+## .addError()
+
+When `addError` is called it will set the error of the signal.
+
+## .close()
+
+When `close` is called it will dispose the signal and remove all listeners.
+
+---
+
+ListSignalMixin is a mixin for a Signal that adds reactive methods for [List](https://api.flutter.dev/flutter/dart-core/List-class.html).
+
+:::note
+This mixin only works with signals that have a value type of `List<T>`.
+:::
+
+```dart
+class MySignal extends Signal<List<int>>
+    with IterableSignalMixin<int, List<int>>, ListSignalMixin<int, List<int>> {
+  MySignal(super.internalValue);
+}
+
+void main() {
+  final signal = MySignal([1, 2, 3]);
+  
+  effect(() {
+    print(signal.length);
+  });
+
+  signal.add(4);
+  signal.remove(1);
+
+  print(signal.contains(2)); // true
+}
+```
+
+---
+
+:::tip
+As of Signals 6.0.0 any Signal created with the flutter import implement ValueNotifier by default.
+
+```dart
+import 'package:signals/signals_flutter.dart';
+
+final count = signal(0);
+assert(count is Signal<int>);
+assert(count is ValueNotifier<int>);
+```
+
+You can replace any `ValueNotifier` with a `Signal` and implement both APIs.
+
+```diff
+- import 'package:flutter/foundation.dart';
++ import 'package:signals/signals_flutter.dart';
+- final count = ValueNotifier(0);
++ final count = signal(0);
+
+count.addListener(() => print(count.value));
+count.value = 1;
+print(count.value);
+count.notifyListeners();
+count.dispose();
+```
+:::
+
+To create a mutable signal from a `ValueNotifier`, use the `toSignal` extension:
+
+```dart
+final notifier = ValueNotifier(10);
+final signal = notifier.toSignal();
+```
+
+Setting the value on the signal or notifier will update the other.
+
+---
+
+ChangeStackSignalMixin is a mixin for a Signal that adds undo and redo functionality.
+
+:::note
+If you are just looking for initial and previous values, use the [TrackedSignalMixin](/mixins/tracked).
+:::
+
+```dart
+class MySignal extends Signal<int> with ChangeStackSignalMixin<int> {
+  MySignal(super.internalValue);
+}
+
+void main() {
+  final signal = MySignal(0);
+  
+  signal.value = 1;
+  print(signal.canUndo); // true
+  signal.undo();
+  print(signal.value); // 0
+  print(signal.canUndo); // false
+  signal.redo();
+  print(signal.value); // 1
+}
+```
+
+:::caution
+This mixin only works with values that are immutable or are copied when changed otherwise the initial and previous value will always be the same.
+:::
+
+## Setting a limit
+
+You can set a limit to the number of changes that can be undone with the `limit` parameter.
+
+```diff
+class MySignal extends Signal<int> with ChangeStackSignalMixin<int> {
+  MySignal(int value) : super(value);
+
++  @override
++  int limit = 3;
+}
+
+---
+
+By default, Signals are uni-directional but can be used in a bi-directional way if needed.
+
+:::caution
+Bi-directional data flow should only be used when necessary as it can lead to infinite loops if not used correctly.
+:::
+
+Consider the following example:
+
+```dart
+final a = signal(0);
+final b = signal(0);
+
+effect(() {
+  b.value = a.value + 1;
+});
+
+effect(() {
+  a.value = b.value + 1;
+});
+```
+
+In this example, `a` and `b` are two signals that are dependent on each other. When `a` changes, `b` should update, and when `b` changes, `a` should update.
+
+This however can lead to an infinite loop and will throw a `EffectCycleDetectionError`. To prevent this, you can use the `untracked` method to prevent the signal from updating itself.
+
+```dart
+final a = signal(0);
+final b = signal(0);
+
+effect(() {
+  b.value = untracked(() => a.value + 1);
+});
+
+effect(() {
+  a.value = untracked(() => b.value + 1);
+});
+```
+
+This will prevent the infinite loop and allow the signals to update each other without causing an error.
+
+Signals are synchronous and will update immediately when the value is set. This means that the value will be updated before the next effect is run. This allows you to create bi-directional data flow in a predictable way.
+
+---
+
+## Watch
+
+To watch a signal for changes in Flutter, use the `Watch` widget. This will only rebuild this widget method and not the entire widget tree.
+
+```dart
+final signal = signal(10);
+...
+@override
+Widget build(BuildContext context) {
+  return Watch((context) => Text('$signal'));
+}
+```
+
+This will also automatically unsubscribe when the widget is disposed.
+
+Any inherited widgets referenced to inside the Watch scope will be subscribed to for updates ([MediaQuery](https://api.flutter.dev/flutter/widgets/MediaQuery-class.html), [Theme](https://api.flutter.dev/flutter/material/Theme-class.html), etc.) and retrigger the builder method.
+
+There is also a drop in replacement for builder:
+
+```diff
+final signal = signal(10);
+...
+@override
+Widget build(BuildContext context) {
+-  return Builder(
++  return Watch.builder(
+    builder: (context) => Text('$signal'),
+  );
+}
+```
+
+## WatchBuilder
+
+If you need to pass an optional child widget, use the `WatchBuilder` widget.
+
+```dart
+final signal = signal(10);
+...
+@override
+Widget build(BuildContext context) {
+  return WatchBuilder(
+    builder: (context, child) {
+      return InkWell(
+        onTap: () => signal.value++,
+        child: Row(
+          children: [
+            Text('$signal: '),
+            child!,
+          ],
+        ),
+      );
+    },
+    child: const Icon(Icons.add),
+  );
+}
+```
+
+## .watch(context)
+
+If you need to map to a widget property use the `watch` extension method. This will infer the type and subscribe to the signal.
+
+```dart
+final fontSize = signal(10);
+...
+@override
+Widget build(BuildContext context) {
+  return Text('Hello World',
+    style: TextStyle(fontSize:fontSize.watch(context)),
+  );
+}
+```
+
+It is recommended to use `Watch` instead of `.watch(context)` as it will automatically unsubscribe when the widget is disposed instead of waiting on the garbage collector via [WeakReferences](https://api.flutter.dev/flutter/dart-core/WeakReference-class.html).
+
+### Rebuilds
+
+To protect against unnecessary rebuilds, the `watch` extension will only subscribe once to the nearest element and mark the widget as dirty.
+
+This means that if you have multiple widgets that are watching the same signal, only the first one will be subscribed to the signal and multiple updates will be batched together.
+
+It is also possible to isolate the rebuilds with the `Builder` widget, however it is recommended to use `Watch` or `SignalWidget` instead.
+
+```dart
+final signal = signal(10);
+...
+@override
+Widget build(BuildContext context) {
+  // Called once
+  return Column(
+    children: [
+      Builder(
+        builder: (context) {
+          // Called every time the signal changes
+          final count = signal.watch(context);
+          return Text('$count');
+        },
+      ),
+      Text('Not rebuilt'),
+    ],
+  );
+}
+```
+
+## Selectors
+
+With signals instead of using `select` you instead create a new `computed` signal that is derived from the original signal.
+
+```dart
+final signal = signal((a: 1, b: 2));
+final computed = computed(() => signal.value.a);
+...
+@override
+Widget build(BuildContext context) {
+  return Watch((_) => Text('$computed'));
+}
+```
+
+It is also possible to select from the signal directly:
+
+```dart
+final signal = signal((a: 1, b: 2));
+final computed = signal.select((s) => s.value.a);
+...
+@override
+Widget build(BuildContext context) {
+  return Watch((_) => Text('$computed'));
+}
+```
+
+---
+
+When you need to store the state of your signals between app launches you can create a `PersistedSignal` from this example code.
+
+You need to have a store that can be [SharedPreferences](https://pub.dev/packages/shared_preferences), [SQLite](https://pub.dev/packages/sqlite3), in memory, or any other storage solution. The store just needs to be able to save and restore the data.
+
+```dart
+abstract class KeyValueStore {
+  Future<void> setItem(String key, String value);
+  Future<String?> getItem(String key);
+  Future<void> removeItem(String key);
+}
+```
+
+You can create an in-memory store for testing:
+
+```dart
+class InMemoryStore implements KeyValueStore {
+  final Map<String, String> _store = {};
+
+  @override
+  Future<String?> getItem(String key) async {
+    return _store[key];
+  }
+
+  @override
+  Future<void> removeItem(String key) async {
+    _store.remove(key);
+  }
+
+  @override
+  Future<void> setItem(String key, String value) async {
+    _store[key] = value;
+  }
+}
+```
+
+For this example we are going to be using SharedPreferences:
+
+```dart
+
+class SharedPreferencesStore implements KeyValueStore {
+  SharedPreferencesStore();
+
+  SharedPreferences? prefs;
+
+  Future<SharedPreferences> init() async {
+    prefs ??= await SharedPreferences.getInstance();
+    return prefs!;
+  }
+
+  @override
+  Future<String?> getItem(String key) async {
+    final prefs = await init();
+    return prefs.getString(key);
+  }
+
+  @override
+  Future<void> removeItem(String key) async {
+    final prefs = await init();
+    prefs.remove(key);
+  }
+
+  @override
+  Future<void> setItem(String key, String value) async {
+    final prefs = await init();
+    prefs.setString(key, value);
+  }
+}
+```
+
+:::note
+The `SharedPreferences` will lazy load the instance when it is needed but you can also initialize before and pass it in the constructor.
+:::
+
+By default we can encode and decode the value to and from JSON:
+
+```dart
+
+abstract class PersistedSignal<T> extends FlutterSignal<T>
+    with PersistedSignalMixin<T> {
+  PersistedSignal(
+    super.internalValue, {
+    super.autoDispose,
+    super.debugLabel,
+    required this.key,
+    required this.store,
+  });
+
+  @override
+  final String key;
+
+  @override
+  final KeyValueStore store;
+}
+
+mixin PersistedSignalMixin<T> on Signal<T> {
+  String get key;
+  KeyValueStore get store;
+
+  bool loaded = false;
+
+  Future<void> init() async {
+    try {
+      final val = await load();
+      super.value = val;
+    } catch (e) {
+      debugPrint('Error loading persisted signal: $e');
+    } finally {
+      loaded = true;
+    }
+  }
+
+  @override
+  T get value {
+    if (!loaded) init().ignore();
+    return super.value;
+  }
+
+  @override
+  set value(T value) {
+    super.value = value;
+    save(value).ignore();
+  }
+
+  Future<T> load() async {
+    final val = await store.getItem(key);
+    if (val == null) return value;
+    return decode(val);
+  }
+
+  Future<void> save(T value) async {
+    final str = encode(value);
+    await store.setItem(key, str);
+  }
+
+  T decode(String value) => jsonDecode(value);
+
+  String encode(T value) => jsonEncode(value);
+}
+```
+
+:::note
+We create a mixin so we can use it in other custom signals and share logic between signals_core and signals_flutter.
+:::
+
+This can work in a lot of cases, but we might want to handle specific cases like enums:
+
+```dart
+class EnumSignal<T extends Enum> extends PersistedSignal<T> {
+  EnumSignal(super.val, String key, this.values)
+      : super(
+          key: key,
+          store: SharedPreferencesStore(),
+        );
+
+  final List<T> values;
+
+  @override
+  T decode(String value) => values.firstWhere((e) => e.name == value);
+
+  @override
+  String encode(T value) => value.name;
+}
+```
+
+Or if you are in Flutter we can persist color values:
+
+```dart
+class ColorSignal extends PersistedSignal<Color> {
+  ColorSignal(super.val, String key)
+      : super(
+          key: key,
+          store: SharedPreferencesStore(),
+        );
+
+  @override
+  String encode(Color value) => value.value.toString();
+
+  @override
+  Color decode(String value) => Color(int.parse(value));
+}
+```
+
+## Example
+
+```dart
+class AppTheme {
+  final sourceColor = ColorSignal(
+    Colors.blue,
+    'sourceColor',
+ );
+  final themeMode = EnumSignal(
+    ThemeMode.system,
+    'themeMode',
+    ThemeMode.values,
+ );
+
+  static AppTheme instance = AppTheme();
+
+  Future<void> init() async {
+    await Future.wait([
+      sourceColor.init(),
+      themeMode.init(),
+    ]);
+  }
+}
+
+void main() async{
+    final theme = AppTheme.instance;
+    // We need to init before running the app to prevent the theme from flickering
+    await theme.init();
+    runApp(MyApp());
+}
+
+class MyApp extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    final theme = AppTheme.instance;
+    return MaterialApp(
+      theme: ThemeData.light().copyWith(
+        colorScheme: ColorScheme.fromSeed(
+          seedColor: theme.sourceColor.watch(context),
+          brightness: Brightness.light,
+        ),
+      ),
+      darkTheme: ThemeData.dark().copyWith(
+        colorScheme: ColorScheme.fromSeed(
+          seedColor: theme.sourceColor.watch(context),
+          brightness: Brightness.dark,
+        ),
+      ),
+      themeMode: theme.themeMode.watch(context),
+      home: Scaffold(
+        appBar: AppBar(
+          title: Text('Persisted Signals'),
+        ),
+        body: Center(
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: <Widget>[
+              ElevatedButton(
+                onPressed: () {
+                  theme.sourceColor.value = Colors.red;
+                },
+                child: Text('Change Color'),
+              ),
+              ElevatedButton(
+                onPressed: () {
+                  theme.themeMode.value = ThemeMode.dark;
+                },
+                child: Text('Change Theme'),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
+```
+
+Now when we run the app and make changes, if we close the app and reopen it, the changes will persist offline.
+
+---
+
+Signals is a new **core primitive reactivity library** and not a framework which means it can be used with any dependency injection solution or none at all.
+
+This library aims to adapt to any application architecture and you decide how you want to manage your signals.
+
+This guide will show you how to use Signals with popular DI solutions.
+
+## Provider
+
+[Provider](https://pub.dev/packages/provider) is a simple way to provide objects to your widgets.
+
+```dart
+import 'package:signals/signals_flutter.dart';
+import 'package:provider/provider.dart';
+import 'package:flutter/material.dart';
+
+void main() {
+  runApp(
+    Provider(
+      create: (_) => signal(0),
+      dispose: (_, instance) => instance.dispose(),
+      child: MyApp(),
+    ),
+  );
+}
+
+class MyApp extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    final counter = context.read<Signal<int>>();
+    return MaterialApp(
+      home: Scaffold(
+        appBar: AppBar(
+          title: Text('Signals with Provider'),
+        ),
+        body: Center(
+          child: Watch((context) => Text('Value: $signal')),
+        ),
+        floatingActionButton: FloatingActionButton(
+          onPressed: () => counter.value++,
+          child: Icon(Icons.add),
+        ),
+      ),
+    );
+  }
+}
+```
+
+> Note: `Consumer` can also be used instead of Watch.
+
+## GetIt
+
+[GetIt](https://pub.dev/packages/get_it) is a simple service locator that can be used in any Dart or Flutter project.
+
+```dart
+import 'package:signals/signals_flutter.dart';
+import 'package:get_it/get_it.dart';
+import 'package:flutter/material.dart';
+
+void main() {
+  GetIt.I.registerSingleton<Signal<int>>(signal(0));
+  runApp(MyApp());
+}
+
+class MyApp extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    final counter = GetIt.I.get<Signal<int>>();
+    return MaterialApp(
+      home: Scaffold(
+        appBar: AppBar(
+          title: Text('Signals with GetIt'),
+        ),
+        body: Center(
+          child: Watch((context) => Text('Value: $signal')),
+        ),
+        floatingActionButton: FloatingActionButton(
+          onPressed: () => counter.value++,
+          child: Icon(Icons.add),
+        ),
+      ),
+    );
+  }
+}
+```
+
+## Riverpod
+
+[Riverpod](https://pub.dev/packages/riverpod) is a data-binding and reactive caching framework for Flutter and Dart.
+
+```dart
+import 'package:signals/signals_flutter.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:flutter/material.dart';
+
+part 'main.g.dart';
+
+@riverpod
+Signal<int> counter() => signal(0);
+
+void main() {
+  runApp(ProviderScope(child: MyApp()));
+}
+
+class MyApp extends ConsumerWidget {
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final counter = ref.read(counterProvider);
+    return MaterialApp(
+      home: Scaffold(
+        appBar: AppBar(
+          title: Text('Signals with Riverpod'),
+        ),
+        body: Center(
+          child: Watch((context) => Text('Value: $counter')),
+        ),
+        floatingActionButton: FloatingActionButton(
+          onPressed: () => counter.value++,
+          child: Icon(Icons.add),
+        ),
+      ),
+    );
+  }
+}
+```
+
+## InheritedWidget
+
+InheritedWidget is a simple built in way to provide objects to your widgets. This comes at the cost of storing a single signal per type.
+
+> Note: This is a new feature added in version 5.0.0 and is still experimental.
+
+```dart
+import 'package:signals/signals_flutter.dart';
+import 'package:signals/signals_flutter_extended.dart';
+import 'package:flutter/material.dart';
+
+void main() {
+  runApp(
+    MaterialApp(
+      home: SignalProvider.value(
+        value: 0,
+        child: MyApp(),
+      ),
+    ),
+  );
+}
+
+class MyApp extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    final counter = SignalProvider.of<int>(context);
+    return MaterialApp(
+      home: Scaffold(
+        appBar: AppBar(
+          title: Text('Signals with InheritedWidget'),
+        ),
+        body: Center(
+          child: Watch((context) => Text('Value: $counter')),
+        ),
+        floatingActionButton: FloatingActionButton(
+          onPressed: () => counter.value++,
+          child: Icon(Icons.add),
+        ),
+      ),
+    );
+  }
+}
+```
+
+If you want to define multiple signals with the same type, then you will need to create custom classes for the container.
+
+```dart
+class Counter extends Signal<int> {
+  Counter(int value) : super(value);
+}
+...
+home: SignalProvider<Counter>(
+  instance: Counter(0),
+  child: MyApp(),
+),
+...
+final counter = SignalProvider.of<Counter>(context);
+counter.value++;
+```
+
+## Lite Ref
+
+[Lite Ref](https://pub.dev/packages/lite_ref) is a simple way to provide disposable objects to your widgets.
+
+```dart
+final counterRef = Ref.scoped(
+  (_) => signal(0),
+  dispose: (instance) => instance.dispose(),
+);
+
+void main() {
+  runApp(LiteRefScope(child: MyApp()));
+}
+
+class MyApp extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    final counter = counterRef.of(context);
+    return MaterialApp(
+      home: Scaffold(
+        appBar: AppBar(
+          title: Text('Signals with Zones'),
+        ),
+        body: Center(
+          child: Watch((context) => Text('Value: $counter')),
+        ),
+        floatingActionButton: FloatingActionButton(
+          onPressed: () => counter.value++,
+          child: Icon(Icons.add),
+        ),
+      ),
+    );
+  }
+}
+```
+
+You can use any class that implements `Disposable` and it will be disposed when the widget is removed from the widget tree. You also don't need to provide a `dispose` function for the ScopedRef.
+
+```dart
+class Counter implements Disposable {
+  final value = signal(0);
+  final doubled = computed(() => value.value * 2);
+
+  @override
+  void dispose() {
+    value.dispose();
+    doubled.dispose();
+  }
+}
+
+final counterRef = Ref.scoped((_) => Counter());
+```
+
+## Zones
+
+Zones are another built in way to provide objects to your application via Dart [Zones](https://dart.dev/articles/archive/zones).
+
+[Scoped Deps](https://pub.dev/packages/scoped_deps) is a package that easily integrates Zones with Dart.
+
+```dart
+import 'package:signals/signals_flutter.dart';
+import 'package:scoped_deps/scoped_deps.dart';
+import 'package:flutter/material.dart';
+
+final counter = create(() => signal(0));
+
+void main() {
+  runScoped(() => MyApp(), values: {counter});
+}
+
+class MyApp extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    final counter = read(counter);
+    return MaterialApp(
+      home: Scaffold(
+        appBar: AppBar(
+          title: Text('Signals with Zones'),
+        ),
+        body: Center(
+          child: Watch((context) => Text('Value: $counter')),
+        ),
+        floatingActionButton: FloatingActionButton(
+          onPressed: () => counter.value++,
+          child: Icon(Icons.add),
+        ),
+      ),
+    );
+  }
+}
+```
+
+## Global Signals
+
+Global signals are a simple way to provide objects to your widgets.
+
+This requires you to manage the lifecycle of the signal and dispose it when no longer needed.
+
+> Note: This is not recommended for large applications and useful for select use cases like logging, analytics, auth, etc.
+
+```dart
+import 'package:signals/signals_flutter.dart';
+import 'package:flutter/material.dart';
+
+final counter = signal(0);
+
+void main() {
+  runApp(MyApp());
+}
+
+class MyApp extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return MaterialApp(
+      home: Scaffold(
+        appBar: AppBar(
+          title: Text('Signals with Global Signal'),
+        ),
+        body: Center(
+          child: Watch((context) => Text('Value: $counter')),
+        ),
+        floatingActionButton: FloatingActionButton(
+          onPressed: () => counter.value++,
+          child: Icon(Icons.add),
+        ),
+      ),
+    );
+  }
+}
+```
+
+---
+
+:::tip
+As of Signals 6.0.0 Signal and Computed created with the flutter import implement ValueListenable and ValueNotifier by default.
+
+```dart
+import 'package:signals/signals_flutter.dart';
+
+final count = signal(0);
+assert(count is ValueListenable<int>);
+assert(count is Signal<int>);
+
+final isEven = computed(() => count.value.isEven);
+assert(isEven is ValueListenable<bool>);
+assert(isEven is Computed<bool>);
+```
+
+You can also use the [ValueListenableSignalMixin](/mixins/value-listenable) and [ValueNotifierSignalMixin](/mixins/value-notifier) to add the methods to custom signals.
+:::
+
+## Signal
+
+You may be thinking **"How is Signals different than using ValueNotifier?"** and that is a valid question when first coming to signals because at a glance they look very familiar.
+
+```dart
+// Value Notifier
+final count = ValueNotifier(0);
+
+// Signals
+final count = signal(0);
+```
+
+But there is more to reactive programming than just the containers for the data. We still need to react to when the data changes which requires us to add listeners. This gets even more complicated the more we add.
+
+```dart
+class MyWidget extends ... {
+final count1 = ValueNotifier(0);
+final count2 = ValueNotifier(0);
+
+// React to count 1 changing
+count1.addListener(() {
+    if (mounted) setState(() {});
+});
+
+// React to count 2 changing
+count2.addListener(() {
+    if (mounted) setState(() {});
+});
+
+@override
+void dispose() {
+    super.dispose();
+    count1.dispose();
+    count2.dispose();
+}
+
+@override
+Widget build(BuildContext context) {
+    // If using setState
+    return Text('${count1.value} - ${count2.value}');
+
+    // Or if you are using with ValueListenableBuilder
+    return ValueListenableBuilder(
+        valueListenable: count1,
+        builder: (context, count1Val, child) {
+            // React when count 1 changes
+            return ValueListenableBuilder(
+                valueListenable: count2,
+                builder: (context, count2Val, child) {
+                    // React when count 2 changes
+                    return Text('$count1Val - $count2Val');
+                },
+            );
+        },
+    );
+  }
+}
+```
+
+As you can see there is a lot to keep track of mentally and you are writing more boilerplate than domain logic. 
+
+This also only works for Flutter and not in pure dart applications since [ValueNotifier](https://api.flutter.dev/flutter/foundation/ValueNotifier-class.html) is tied to the Flutter SDK.
+
+The same example above for signals would be the following:
+
+```dart
+import 'package:signals/signals_flutter.dart';
+
+class MyWidget extends ... {
+final count1 = signal(0);
+final count2 = signal(0);
+
+@override
+Widget build(BuildContext context) {
+    // If using setState
+    return Text('${count1.watch(context)} - ${count2.watch(context)}');
+
+    // Or if you are using with Watch
+    return Watch((context) => Text('$count1 - $count2'));
+  }
+}
+```
+
+Lines of code are not everything, but this dramatically reduces the boilerplate needed to achieve the same result.
+
+## Computed
+
+State is not just about the values updated directly but often the derived state needed for any one screen.
+
+In the example above we had two count values, but what if we had a third that was the total result and checked if it was even or odd.
+
+With ValueNotifier you would have to calculate that directly or create a class with ChangeNotifier and start calling notifyListeners.
+
+```dart
+class MyWidget extends ... {
+final count1 = ValueNotifier(0);
+final count2 = ValueNotifier(0);
+
+// React to count 1 changing
+count1.addListener(() {
+    if (mounted) setState(() {});
+});
+
+// React to count 2 changing
+count2.addListener(() {
+    if (mounted) setState(() {});
+});
+
+int get total => count1.value + count2.value;
+int get isEven => total.isEven;
+int get isOdd => total.isOdd;
+
+@override
+void dispose() {
+    super.dispose();
+    count1.dispose();
+    count2.dispose();
+}
+
+@override
+Widget build(BuildContext context) {
+    // If using setState
+    return Text('$total even=$isEven odd=$isOdd');
+
+    // Or if you are using with ValueListenableBuilder
+    return ValueListenableBuilder(
+        valueListenable: count1,
+        builder: (context, count1Val, child) {
+            // React when count 1 changes
+            return ValueListenableBuilder(
+                valueListenable: count2,
+                builder: (context, count2Val, child) {
+                    // React when count 2 changes
+                    return Text('$total even=$isEven odd=$isOdd');
+                },
+            );
+        },
+    );
+  }
+}
+```
+
+This still is possible but not efficient. What we care about is the total and isEven/isOdd result, not the count values themselves. Yet we have to still need to react to them when they change to trigger each computation.
+
+It can be easy to miss an addListener or ValueListenableBuilder if you are unaware of a dependency in the chain.
+
+Of course you could break it out with ChangeNotifier but then you are not using ValueNotifier anymore.
+
+```dart
+class Counter extends ChangeNotifier {
+    int _count1 = 0;
+    int get count1 => _count1;
+    set count1(int value) {
+        _count1 = value;
+        notifyListeners();
+    }
+   
+    int _count2 = 0;
+    int get count2 => _count2;
+    set count2(int value) {
+        _count2 = value;
+        notifyListeners();
+    }
+
+    int get total => count1 + count2;
+    int get isEven => total.isEven;
+    int get isOdd => total.isOdd;
+}
+```
+
+This still recalculates everything on every update. Total/isEven/isOdd are always computed regardless if the value has changed.
+
+But how would this be possible with signals?
+
+```dart
+import 'package:signals/signals_flutter.dart';
+
+class MyWidget extends ... {
+final count1 = signal(0);
+final count2 = signal(0);
+final total = computed(() => count1.value + count2.value);
+final isEven = computed(() => total.value.isEven);
+final isOdd = computed(() => total.value.isOdd);
+
+@override
+Widget build(BuildContext context) {
+    // If using setState
+    return Text('${total.watch(context)} even=${isEven.watch(context)} odd=${isOdd.watch(context)}');
+
+    // Or if you are using with Watch
+    return Watch((context) {
+        return Text('$total even=$isEven odd=$isOdd');
+    });
+  }
+}
+```
+
+There some special things happening here that I want to call out.
+
+Total/isEven/isOdd is only called when the values it depends on change. Each computed signal will store the value and cache it until dependencies change.
+
+If the value is never read the computed callbacks are never called. That means you only calculate the state you use when you use it.
+
+Also the UI logic does not need to care about count1/count2 and only the values you want to read. This leads to fewer mistakes and simpler code.
+
+## Incremental Migration
+
+If you have value notifiers you cannot update because they come from a library you can convert them to a signal.
+
+```dart
+final notifier = ValueNotifier(0);
+final ValueListenable listenable = ...;
+
+final notifierSignal = notifier.toSignal();
+// Will update notifier when the value is set
+notifierSignal.value = 1; // calls notifier.value = 1;
+
+// React to changes to listenable
+final listenableSignal = listenable.toSignal();
+```
+
+You can also provide a signal as a ValueListenable or ValueNotifier depending on if the signal is read-only or not.
+
+```dart
+import 'package:signals/signals_flutter.dart';
+
+final count = signal(0);
+final isEven = computed(() => count.value.isEven);
+
+final ValueNotifier<int> countNotifier = count;
+// Will call count.value when countNotifier is set
+countNotifier.value = 1; // calls count.value = 1;
+
+// React to changes from the host signal
+final ValueListenable<bool> countListenable = isEven;
+```
+
+These extensions will also dispose the ValueNotifier and ValueListenable when the signal is disposed.
+
+## Outside of Flutter
+
+Signals can be used in pure dart applications. This means you can have the same logic for server side, flutter, CLIs, html web apps and more.
+
+```dart
+import 'package:signals/signals.dart';
+
+void main() {
+    final count1 = signal(0);
+    final count2 = signal(0);
+    final total = computed(() => count1.value +     count2.value);
+    final isEven = computed(() => total.value.isEven);
+    final isOdd = computed(() => total.value.isOdd);
+    
+    effect(() {
+        print('$total even=$isEven odd=$isOdd');
+    });
+}
+```
+
+:::note
+It really is that simple.
+:::
+
+All the other signals in the package are syntax sugar for core types or helper methods to connect to Flutter specifics.
+
+With Signals 0.6.0 you can also create a signal that extends both Signal, ValueNotifier and Stream.
+
+```dart
+import 'package:signals/signals_flutter.dart';
+
+class CustomSignal<T> extends Signal<T> with
+  ValueNotifierSignalMixin<T>,
+  SinkSignalMixin<T>,
+  StreamSignalMixin<T> {
+    CustomSignal(T value) : super(value);
+}
+
+class Counter extends CustomSignal<int> {
+    Counter(int value) : super(value);
+}
+
+void main() {
+    final counter = Counter(0);
+
+    assert(counter is Signal<int>);
+    assert(counter is ValueNotifier<int>);
+    assert(counter is Stream<int>);
+
+    // Listen to the stream
+    counter.listen((value) {
+         print('stream: $value');
+    });
+
+    // Subscribe in an effect
+    effect(() {
+        print('effect: $counter');
+    });
+
+    counter.add(1);
+    print(counter.value); // 1
+
+    counter.value = 2;
+    print(counter.value); // 2
+    
+    counter.close();
+    print(counter.disposed); // true
+}
+```
+
+---
+
+SetSignalMixin is a mixin for a Signal that adds reactive methods for [Set](https://api.flutter.dev/flutter/dart-core/Set-class.html).
+
+:::note
+This mixin only works with signals that have a value type of `Set<T>`.
+:::
+
+```dart
+class MySignal extends Signal<Set<int>>
+    with IterableSignalMixin<int, Set<int>>, SetSignalMixin<int, Set<int>> {
+  MySignal(super.internalValue);
+}
+
+void main() {
+  final signal = MySignal({1, 2, 3});
+  
+  effect(() {
+    print(signal.length);
+  });
+
+  signal.add(4);
+  signal.remove(1);
+
+  print(signal.contains(2)); // true
+}
+```
+
+---
+
+SignalsMixin is a mixin for State that auto disposes signals when the widget is removed from the widget tree.
+
+:::note
+The mixin requires a `StatefulWidget` for the widget lifecycle methods.
+:::
+
+## Signals
+
+Signal, computed, value signals, and async signals can be created with helper methods prefixed with `create*`.
+
+```dart
+class _MyState extends State<MyWidget> with SignalsMixin {
+  late final count = createSignal(0);
+  late final isEven = createComputed(() => signal.value.isEven);
+  late final list = createListSignal(0);
+}
+```
+
+## Effects
+
+Effects can be created with the `createEffect` method. They will get disposed when the widget is removed from the widget tree.
+
+:::danger
+Effect can not be created as late field variables because they will never be evaluated.
+
+Example that does not work:
+```dart
+class _MyState extends State<MyWidget> with SignalsMixin {
+  late final effect = createEffect(() => print('Effect created'));
+}
+```
+:::
+
+```dart
+class _MyState extends State<MyWidget> with SignalsMixin {
+  @override
+  void initState() {
+    super.initState();
+    createEffect(() => print('Effect created'));
+  }
+}
+```
+
+---
+
+StreamSignalMixin is a mixin for a Signal that adds reactive methods for [Stream](https://api.flutter.dev/flutter/dart-async/Stream-class.html).
+
+```dart
+class MySignal extends Signal<int> with StreamSignalMixin<int> {
+  MySignal(super.internalValue);
+}
+
+void main() {
+  final signal = MySignal(1);
+  
+  assert(signal is Signal<int>);
+  assert(signal is Stream<int>);
+
+  signal.listen((value) {
+    print(value);
+  });
+
+  signal.value = 2;
+}
+```
+
+This allows you to use the `Stream` API with a Signal and use it anywhere a `Stream` is expected.
+
+## StreamBuilder
+
+You can use `StreamBuilder` to build a widget that automatically updates when the signal emits a new value.
+
+```dart
+import 'package:flutter/material.dart';
+import 'package:signals/signals_flutter.dart';
+
+class Counter extends Signal<int> with StreamSignalMixin<int> {
+  Counter(int value) : super(value);
+}
+
+void main() {
+  final counter = Counter(0);
+
+  runApp(
+    MaterialApp(
+      home: Scaffold(
+        appBar: AppBar(
+          title: Text('StreamSignalMixin Example'),
+        ),
+        body: Center(
+          child: StreamBuilder<int>(
+            stream: counter,
+            builder: (context, snapshot) {
+              return Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Text('You have pushed the button this many times:'),
+                  Text(
+                    '${snapshot.data}',
+                    style: Theme.of(context).textTheme.headline4,
+                  ),
+                ],
+              );
+            },
+          ),
+        ),
+        floatingActionButton: FloatingActionButton(
+          onPressed: () => counter.value++,
+          tooltip: 'Increment',
+          child: Icon(Icons.add),
+        ),
+      ),
+    ),
+  );
+}
+```
+
+---
+
+SinkSignalMixin is a mixin for a Signal that implements [Sink](https://api.flutter.dev/flutter/dart-core/Sink-class.html).
+
+```dart
+class MySignal extends Signal<int> with SinkSignalMixin<int> {
+  MySignal(super.internalValue);
+}
+
+void main() {
+  final signal = MySignal(0);
+  signal.add(1);
+  print(signal.value); // 1
+  signal.close();
+  print(signal.disposed); // true
+}
+```
+
+This allows you to use the signal as a Sink anywhere you would use a Sink in Dart.
+
+## .add()
+
+When `add` is called it will set the value of the signal.
+
+## .close()
+
+When `close` is called it will dispose the signal and remove all listeners.
+
+---
+
+TrackedSignalMixin is a mixin for a Signal that stores the initial and previous value.
+
+:::note
+If you are looking for undo/redo functionality, use the [ChangeStackSignalMixin](/mixins/change-stack).
+:::
+
+```dart
+class MySignal extends Signal<int> with TrackedSignalMixin<int> {
+  MySignal(super.internalValue);
+}
+
+void main() {
+  final signal = MySignal(0);
+  
+  signal.value = 1;
+  print(signal.initialValue); // 0
+  print(signal.previousValue); // null
+
+  signal.value = 2;
+  print(signal.initialValue); // 0
+  print(signal.previousValue); // 1
+}
+```
+
+:::caution
+This mixin only works with values that are immutable or are copied when changed otherwise the initial and previous value will always be the same.
+:::
+
+---
+
+ValueListenableSignalMixin is a mixin for a Readonly Signal that implements [ValueListenable](https://api.flutter.dev/flutter/foundation/ValueListenable-class.html).
+
+This allows you to use the signal as a ValueListenable in Flutter widgets.
+
+```dart
+class MySignal extends Signal<int> with ValueListenableSignalMixin<int> {
+  MySignal(super.internalValue);
+}
+
+void main() {
+  final signal = MySignal(0);
+  assert(signal is ReadonlySignal<int>);
+  assert(signal is ValueListenable<int>);
+  final listener = () => print(signal.value);
+  signal.addListener(listener);
+  signal.value = 1;
+  signal.removeListener(listener);
+  signal.value = 2;
+}
+```
+
+When `addListener` is called it will subscribe to the signal and call the listener when the signal changes.
+
+:::caution
+By default the listener callback will subscribe to dependencies called inside the listener because it is an effect.
+
+To prevent this you can use `untracked` to read the signal without subscribing to it.
+
+```dart
+final signal = MySignal(0);
+final dep = signal(0);
+final listener = () {
+    untracked(() {
+        print(signal.value);
+        print(dep.value);
+    });
+};
+signal.addListener(listener);
+```
+:::
+
+When `removeListener` is called with the same method it will unsubscribe from the signal.
+
+When the signal is disposed it will remove all listeners.
+
+## ValueListenableBuilder
+
+In Flutter you can use the `ValueListenableBuilder` widget to listen to a ValueListenable.
+
+```dart
+import 'package:flutter/material.dart';
+import 'package:signals/signals_flutter.dart';
+
+final counter = signal(0);
+
+class MyWidget extends StatelessWidget { 
+  @override
+  Widget build(BuildContext context) {
+    return ValueListenableBuilder<int>(
+      valueListenable: counter,
+      builder: (context, value, child) {
+        return Text('Count: $value');
+      },
+    );
+  }
+}
+```
+
+---
+
+ValueNotifierSignalMixin is a mixin for a Readonly Signal that implements [ValueNotifier](https://api.flutter.dev/flutter/foundation/ValueNotifier-class.html).
+
+This allows you to use the signal as a ValueNotifier in Flutter widgets.
+
+```dart
+class MySignal extends Signal<int> with ValueNotifierSignalMixin<int> {
+  MySignal(super.internalValue);
+}
+
+void main() {
+  final signal = MySignal(0);
+  assert(signal is ReadonlySignal<int>);
+  assert(signal is ValueNotifier<int>);
+  final listener = () => print(signal.value);
+  signal.addListener(listener);
+  signal.value = 1;
+  signal.removeListener(listener);
+  signal.value = 2;
+}
+```
+
+When `addListener` is called it will subscribe to the signal and call the listener when the signal changes.
+
+:::caution
+By default the listener callback will subscribe to dependencies called inside the listener because it is an effect.
+
+To prevent this you can use `untracked` to read the signal without subscribing to it.
+
+```dart
+final signal = MySignal(0);
+final dep = signal(0);
+final listener = () {
+    untracked(() {
+        print(signal.value);
+        print(dep.value);
+    });
+};
+signal.addListener(listener);
+```
+:::
+
+When `removeListener` is called with the same method it will unsubscribe from the signal.
+
+When the signal is disposed it will remove all listeners.
+
+## ValueListenableBuilder
+
+In Flutter you can use the `ValueListenableBuilder` widget to listen to a ValueNotifier.
+
+```dart
+import 'package:flutter/material.dart';
+import 'package:signals/signals_flutter.dart';
+
+final counter = signal(0);
+
+class MyWidget extends StatelessWidget { 
+  @override
+  Widget build(BuildContext context) {
+    return ValueListenableBuilder<int>(
+      valueListenable: counter,
+      builder: (context, value, child) {
+        return Text('Count: $value');
+      },
+    );
+  }
+}
+```
+
+---
+
+Signals provides a dedicated endpoint for Large Language Models (LLMs) to consume the documentation. This is useful for adding the entire documentation set as context for your AI coding assistant.
+
+## Endpoint
+
+```
+https://dartsignals.dev/llms.txt
+```
+
+This endpoint returns all documentation pages concatenated into a single Markdown file.
+
+## Usage
+
+### Antigravity
+
+You can ask Antigravity to read the documentation by providing the URL in your prompt:
+
+> Read https://dartsignals.dev/llms.txt and explain how to use computed signals.
+
+### Gemini CLI
+
+You can use the Gemini CLI to query the documentation. Create a `GEMINI.md` file in the root of your project with the following content:
+
+```markdown
+https://dartsignals.dev/llms.txt
+```
+
+Then you can query the CLI:
+
+```bash
+gemini "How do I use signals?"
+```
+
+### Firebase Studio
+
+In Firebase Studio, you can download the file as context and reference it locally by adding the file as context to the chat:
+
+```bash
+curl https://dartsignals.dev/llms.txt > signals.md
+```
+
+### VS Code
+
+If you are using **GitHub Copilot** or other AI extensions in VS Code:
+
+1. Download the `llms.txt` file:
+   ```bash
+   curl https://dartsignals.dev/llms.txt > signals.md
+   ```
+2. Open the file in VS Code.
+3. Reference it in your chat (e.g., `@signals.md` or by having it open).
+
+### Zed
+
+In the [Zed](https://zed.dev) editor, you can add the documentation to the assistant's context:
+
+1. Open the Assistant panel (`Cmd-?`).
+2. Type `/file` and select the downloaded `signals.md` (or paste the content).
+3. Ask your question.
+
+### Claude Code
+
+For Claude Code, you can add the documentation to your context:
+
+```bash
+claude --context https://dartsignals.dev/llms.txt
+```
+
+### Codex
+
+For tools powered by OpenAI Codex, you can provide the documentation as context by pasting the content or referencing the file if the tool supports it.
+
+---
+
+import { Code, Tabs, TabItem } from "@astrojs/starlight/components";
+
+Signals can run anywhere Dart can run including VM, WASM, Dart to JS, Dart to Native, Flutter, and on the server.
+
+:::note
+Signals is a single package that contains the imports for flutter and dart and may not show the correct platforms on pub.dev (doesn't show dart only).
+:::
+
+`Signals.dart` is available on pub.dev:
+
+| Package                                                             | Pub                                                                                                              |
+|---------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------|
+| [`signals`](packages/signals)                                       | [![signals](https://img.shields.io/pub/v/signals.svg)](https://pub.dev/packages/signals)                         |
+| [`signals_core`](packages/signals_core)                             | [![signals_core](https://img.shields.io/pub/v/signals_core.svg)](https://pub.dev/packages/signals_core)          |
+| [`signals_flutter`](packages/signals_flutter)                       | [![signals_flutter](https://img.shields.io/pub/v/signals_flutter.svg)](https://pub.dev/packages/signals_flutter) |
+| [`signals_lint`](packages/signals_lint)                             | [![signals_lint](https://img.shields.io/pub/v/signals_lint.svg)](https://pub.dev/packages/signals_lint)          |
+| [`preact_signals`](packages/preact_signals)                             | [![signals_lint](https://img.shields.io/pub/v/preact_signals.svg)](https://pub.dev/packages/preact_signals)          |
+
+
+## Get Started
+
+Add the following to your `pubspec.yaml`:
+
+export const stableYml = `
+dependencies:
+  signals: latest
+`;
+
+export const unstableYml = `
+dependencies:
+  signals:
+    git:
+      url: https://github.com/rodydavis/signals.dart
+      ref: main
+      path: packages/signals
+`;
+
+<Tabs>
+  <TabItem label="Stable">
+    <Code code={stableYml} lang="yaml" />
+  </TabItem>
+  <TabItem label="Unstable">
+    <Code code={unstableYml} lang="yaml" />
+  </TabItem>
+</Tabs>
+
+or from the command line:
+
+<Tabs>
+  <TabItem label="Dart">
+    <Code code="dart pub add signals" lang="sh" />
+  </TabItem>
+  <TabItem label="Flutter">
+    <Code code="flutter pub add signals" lang="sh" />
+  </TabItem>
+</Tabs>
+
+## Usage
+
+<Tabs>
+  <TabItem label="Dart">
+    <Code code="import 'package:signals/signals.dart';" lang="dart" />
+  </TabItem>
+  <TabItem label="Flutter">
+    <Code code="import 'package:signals/signals_flutter.dart';" lang="dart" />
+  </TabItem>
+</Tabs>
+
+---
+
+QueueSignalMixin is a mixin for a Signal that adds reactive methods for [Queue](https://api.flutter.dev/flutter/dart-collection/Queue-class.html).
+
+:::note
+This mixin only works with signals that have a value type of `Queue<T>`.
+:::
+
+```dart
+class MySignal extends Signal<Queue<int>>
+    with QueueSignalMixin<int, Queue<int>> {
+  MySignal(super.internalValue);
+}
+
+void main() {
+  final q = Queue<int>();
+  a.addFirst(1);
+  final signal = MySignal(q);
+  
+  effect(() {
+    print(signal.length);
+  });
+
+  signal.addLast(4);
+}
+```
+
+---
+
+Signals are not new and have been around for a long time. They are also known as [signals](https://en.wikipedia.org/wiki/Signals_and_slots) or [observables](https://en.wikipedia.org/wiki/Observable_pattern).
+
+Many popular JavaScript frameworks now include signals as part of their core library. Each of the implementations have their own unique features and APIs. `Signals.dart` is a port of the [Preact signals library](https://preactjs.com/blog/introducing-signals/) and is designed to be as close to the original API as possible in the core API.
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/Jp7QBjY5K34?si=qYs2Harl0NogWtqk" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+
+Signals in preact started off by being implemented with dependencies tracked using a set but was later changed to use a linked list. The linked list implementation is more performant by taking advantage of [signal boosting](https://preactjs.com/blog/signal-boosting/) and is the implementation used in `Signals.dart`.
+
+There is also a [DartPad](https://dartpad.dev/?id=d5f16f6be22e716d90419e41d10f281a) playground with some of the core methods that you can use to experiment!
+
+:::note
+If you are coming from the JS world and are comfortable with signals this should feel very familiar. If you are looking for a state management library in Flutter that can be used in the JS world and outside of Dart then look no further!
+:::
+
+## Minimal Updates
+
+An advantage with signals is the computation you get to save. **If you never read a signal it never gets computed.** That means that if you have a chain of computed values and never read the value of the last one then none of the callbacks would be called.
+
+```dart
+import 'package:signals/signals.dart';
+
+final a = signal(0);
+final b = computed(() => a.value + 1);
+final c = computed(() => b.value + 1);
+final d = computed(() => c.value + 1);
+
+// if you never read `d` then none of the callbacks will be called
+
+// All the callbacks will be called
+print(d.value); // 3
+
+// None of the callbacks will be called because the 
+// value is cached at each node
+print(d.value); // 3
+```
+
+Signals also are a `pull` based state management library unlike most `push` based systems. This means that just because you update a signal value it does not mean that it will propagate (i.e. notifyListeners) to its targets.
+
+Computed is also a special signal that keeps track of its dependencies and caches its value so it will only recompute on read and when the dependencies change. This can be pretty extensive and you can have a chain of computed signals and each of them are optimizing for the minimal amount of updates.
+
+```dart
+import 'package:signals/signals.dart';
+
+final a = signal(0);
+final b = signal(0);
+
+final c = computed(() => a.value + b.value);
+final d = computed(() => c.value + 1);
+final e = computed(() => d.value + 1);
+
+// All the callbacks will be called
+print(e.value); // 2
+
+// None of the callbacks will be called because the
+// value is cached at each node
+print(e.value); // 2
+
+// Only the callbacks that need to be updated
+// will be called
+b.value = 1;
+print(e.value); // 3
+```
+
+## Further reading
+
+- https://signia.tldraw.dev/docs/what-are-signals
+- https://www.solidjs.com/guides/reactivity
+- https://angular.io/guide/signals
+- https://vuejs.org/guide/extras/reactivity-in-depth.html
+
+---
+
+You can observe all signal values in the dart application by providing an implementation of `SignalsObserver`:
+
+```dart
+abstract class SignalsObserver {
+  void onSignalCreated(Signal instance, dynamic value);
+  void onSignalUpdated(Signal instance, dynamic value);
+  void onComputedCreated(Computed instance);
+  void onComputedUpdated(Computed instance, dynamic value);
+  static SignalsObserver? instance;
+}
+```
+
+:::note
+There is a prebuilt `LoggingSignalsObserver` for printing updates to the console.
+:::
+
+To add the observer override the instance at the start of the application:
+
+```dart
+void main() {
+    SignalsObserver.instance = LoggingSignalsObserver(); // or custom observer
+    ...
+}
+```
+
+This will have a slight performance hit since every update will be tracked via the observer. It is recommended to only set the `SignalsObserver.instance` in debug or profile mode.
+
+## Disable Logging
+
+To disable logging you can use the following code:
+
+```dart
+void main() {
+  SignalsObserver.instance = null;
+  ...
+}
+
+---
+
+## changeStack, ChangeStack
+
+Change stack is a way to track the signal values overtime and undo or redo values.
+
+```dart
+final s = ChangeStackSignal(0, limit: 5);
+s.value = 1;
+s.value = 2;
+s.value = 3;
+print(s.value); // 3
+s.undo();
+print(s.value); // 2
+s.redo();
+print(s.value); // 3
+```
+
+## .clear
+
+Clear the undo/redo stack.
+
+## .canUndo
+
+Returns true if there are changes in the undo stack and can move backward.
+
+## .canRedo
+
+Returns true if there are changes in the redo stack and can move forward.
+
+## .limit
+
+There is an optional limit that can be set for explicit stack size.
+
+```dart
+final s = ChangeStackSignal(0, limit: 2);
+s.value = 1;
+s.value = 2;
+s.value = 3;
+print(s.value); // 3
+s.undo();
+s.undo();
+print(s.value); // 1
+print(s.canUndo); // false
+s.redo();
+print(s.value); // 2
+```
+
+---
+
+Signal container used to create signals based on args.
+
+```dart
+final container = readonlySignalContainer<Cache, String>((e) {
+  return signal(Cache(e));
+});
+final cacheA = container('cache-a');
+final cacheB = container('cache-b');
+final cacheC = container('cache-c');
+```
+
+If you need the signal to be mutable use `signalContainer`.
+
+```dart
+final counters = signalContainer<int, int>((e) {
+  return signal(e);
+});
+final counterA = counters(1);
+final counterB = counters(2);
+final counterC = counters(3);
+counterA.value = 2;
+counterB.value = 3;
+counterC.value = 4;
+```
+
+By default the signal container does not cache signals and will return new ones every time. To cache pass in the flag.
+
+```dart
+final container = readonlySignalContainer<Cache, String>((e) {
+  return signal(Cache(e));
+}, cache: true);
+final cacheA = container('cache-a');
+final cacheB = container('cache-a');
+print(cacheA == cacheB); // true
+```
+
+Example of signal container for settings and SharedPreferences:
+
+```dart
+class Settings {
+  final SharedPreferences prefs;
+  EffectCleanup? _cleanup;
+  Settings(this.prefs) {
+    _cleanup = effect(() {
+      for (final entry in setting.store.entries) {
+        final value = entry.value.peek();
+        if (prefs.getString(entry.key.$1) != value) {
+          prefs.setString(entry.key.$1, value).ignore();
+        }
+      }
+    });
+  }
+  late final setting = signalContainer<String, (String, String)>(
+    (val) => signal(prefs.getString(val.$1) ?? val.$2),
+    cache: true,
+  );
+  Signal<String> get darkMode => setting(('dark-mode', 'false'));
+  void dispose() {
+    _cleanup?.call();
+    setting.dispose();
+  }
+}
+
+void main() {
+  // Load or find instance
+  late final SharedPreferences prefs = ...;
+
+  // Create settings
+  final settings = Settings(prefs);
+
+  // Get value
+  print('dark mode: ${settings.darkMode}');
+
+  // Update value
+  settings.darkMode.value = 'true';
+}
+```
+
+---
+
+Iterable signals can be created by extension or method and implement the [Iterable](https://api.dart.dev/stable/3.2.1/dart-core/Iterable-class.html) interface.
+
+### iterableSignal, IterableSignal
+
+```dart
+final iterable = () sync* {...};
+
+final s = iterableSignal(iterable);
+```
+
+### toSignal()
+
+```dart
+final iterable = () sync* {...};
+
+final s = iterable.toSignal();
+```
+
+---
+
+List signals can be created by extension or method and implement the [List](https://api.dart.dev/stable/3.2.1/dart-core/List-class.html) interface.
+
+This makes them useful for creating signals from existing lists, or for creating signals that can be used as lists.
+
+### listSignal, ListSignal
+
+```dart
+final s = listSignal([1, 2, 3]);
+```
+
+### toSignal()
+
+```dart
+final s = [1, 2, 3].toSignal();
+```
+
+## Methods
+
+List modifications are done directly on the underlying list and will trigger signals as expected.
+
+```dart
+final s1 = listSignal([1, 2, 3]);
+
+// by index
+s1[0] = -1;
+print(s1.length); // 3
+
+// expose common Dart List interfaces
+s1.addAll([4, 5, 6]);
+s1.first = 1;
+
+// extended operators
+final s2 = s1 & [3, 4, 5];
+```
+
+---
+
+Map signals can be created by extension or method and implement the [Map](https://api.dart.dev/stable/3.2.1/dart-core/Map-class.html) interface.
+
+### mapSignal, MapSignal
+
+```dart
+final s = mapSignal({'a': 1, 'b': 2, 'c': 3});
+```
+
+### toSignal()
+
+```dart
+final s = {'a': 1, 'b': 2, 'c': 3}.toSignal();
+```
+
+## Methods
+
+Map modifications are done directly on the underlying map and will trigger signals as expected.
+
+```dart
+final s1 = mapSignal({'a': 1, 'b': 2, 'c': 3});
+
+// by key
+s1['a'] = -1;
+s1['d'] = 7;
+s1['d'];         // 7
+
+// expose common Dart Map interfaces
+s1.addAll({'e': 6, 'f': 7});
+s1.remove('b');
+s1.keys.length;  // 5
+```
+
+---
+
+Set signals can be created by extension or method and implement the [Set](https://api.dart.dev/stable/3.2.1/dart-core/Set-class.html) interface.
+
+This makes them useful for creating signals from existing sets, or for creating signals that can be used as sets.
+
+### setSignal, SetSignal
+
+```dart
+final s = setSignal({1, 2, 3});
+```
+
+### toSignal()
+
+```dart
+final s = {1, 2, 3}.toSignal();
+```
+
+## Methods
+
+Set modifications are done directly on the underlying set and will trigger signals as expected.
+
+```dart
+final s1 = setSignal({1, 2, 3});
+
+// mutations
+s1.add(4);
+s1.remove(2);
+
+// expose common Dart Set interfaces
+s1.length;                   // 3
+s1.contains(3);              // true
+s1.intersection({6, 2, 1});  // {1}
+```
\ No newline at end of file
diff --git a/school_data_hub_flutter/test/pupil/pupil_identity_date_roundtrip_test.dart b/school_data_hub_flutter/test/pupil/pupil_identity_date_roundtrip_test.dart
new file mode 100644
index 00000000..cf807a96
--- /dev/null
+++ b/school_data_hub_flutter/test/pupil/pupil_identity_date_roundtrip_test.dart
@@ -0,0 +1,55 @@
+import 'dart:convert';
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:school_data_hub_client/school_data_hub_client.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/models/pupil_identity_extensions.dart';
+import 'package:school_data_hub_flutter/features/pupil/domain/pupil_identity_helper.dart';
+
+void main() {
+  group('PupilIdentity date handling', () {
+    test('keeps date-only fields stable through CSV -> JSON -> CSV', () {
+      final sourceLine = [
+        '1', // id
+        'Jane',
+        'Doe',
+        'G1',
+        'Tutor',
+        'E2',
+        '', // specialNeeds
+        '', // specialNeeds second part
+        'F', // gender
+        'DE', // language
+        '', // family
+        '2015-12-08', // birthday
+        '', // migrationSupportEnds
+        '2020-08-01', // pupilSince
+        'OFFGANZ', // afterSchoolCare
+        '', // religion
+        '', // religionLessonsSince
+        '', // religionLessonsCancelledAt
+        '', // familyLanguageLessonsSince
+        '', // leavingDate
+      ].join(',');
+
+      final identity = PupilIdentityHelper.decodePupilIdentityFromTextLine(
+        sourceLine,
+      );
+
+      expect(identity.birthday.isUtc, isTrue);
+      expect(identity.birthday, DateTime.utc(2015, 12, 8));
+      expect(identity.pupilSince, DateTime.utc(2020, 8, 1));
+
+      final serialized = jsonEncode(identity.toJson());
+      final reloaded = PupilIdentity.fromJson(
+        jsonDecode(serialized) as Map<String, dynamic>,
+      );
+
+      expect(reloaded.birthday, DateTime.utc(2015, 12, 8));
+      expect(reloaded.pupilSince, DateTime.utc(2020, 8, 1));
+
+      final lineOut = reloaded.toTextLine().split(',');
+      expect(lineOut[11], '2015-12-08');
+      expect(lineOut[13], '2020-08-01');
+    });
+  });
+}
diff --git a/school_data_hub_flutter/test_enc.dart b/school_data_hub_flutter/test_enc.dart
index f88804aa..40a59308 100644
--- a/school_data_hub_flutter/test_enc.dart
+++ b/school_data_hub_flutter/test_enc.dart
@@ -1,14 +1,14 @@
 import 'package:encrypt/encrypt.dart' as enc;
-import 'dart:math' as math;
+// import 'dart:math' as math;
 
 void main() {
-  String generateRandomUtf8StringOfLength(int length) {
-    const chars =
-        'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-    final random = math.Random.secure();
-    return List.generate(length, (index) => chars[random.nextInt(chars.length)])
-        .join();
-  }
+  // String generateRandomUtf8StringOfLength(int length) {
+  //   const chars =
+  //       'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+  //   final random = math.Random.secure();
+  //   return List.generate(length, (index) => chars[random.nextInt(chars.length)])
+  //       .join();
+  // }
 
   final key =
       'zRvyjwzJRg05dQEBMhCQxjGcGz3tMc0Y'; // generateRandomUtf8StringOfLength(32);
@@ -17,14 +17,16 @@ void main() {
 
   print('Key: $key');
   print('iv: $iv');
-  final encrypter =
-      enc.Encrypter(enc.AES(enc.Key.fromUtf8(key), mode: enc.AESMode.cbc));
+  final encrypter = enc.Encrypter(
+    enc.AES(enc.Key.fromUtf8(key), mode: enc.AESMode.cbc),
+  );
 
   final ivFromUtf8 = enc.IV.fromUtf8(iv);
 
   String encryptString(String nonEncryptedString) {
-    final encryptedString =
-        encrypter.encrypt(nonEncryptedString, iv: ivFromUtf8).base64;
+    final encryptedString = encrypter
+        .encrypt(nonEncryptedString, iv: ivFromUtf8)
+        .base64;
     return encryptedString;
   }
 
diff --git a/school_data_hub_server/lib/src/_features/admin/endpoints/admin_endpoint.dart b/school_data_hub_server/lib/src/_features/admin/endpoints/admin_endpoint.dart
index 1ab3fe14..160fa2e8 100644
--- a/school_data_hub_server/lib/src/_features/admin/endpoints/admin_endpoint.dart
+++ b/school_data_hub_server/lib/src/_features/admin/endpoints/admin_endpoint.dart
@@ -180,7 +180,7 @@ class AdminEndpoint extends Endpoint {
         // If the pupil exists, we process it updating just the after care status
         // This is the second string of the line
         if (line.split(',')[1] == 'true') {
-          // we just check if the after achool care is set
+          // we check if the after achool care is set
           // if it is already set we leave it alone
           // if not, we set the after school care as an empty object
           // the user will have to fill it later
@@ -188,8 +188,6 @@ class AdminEndpoint extends Endpoint {
             existingPupil.afterSchoolCare = AfterSchoolCare();
 
             await session.db.updateRow(existingPupil);
-          } else {
-            // the after school care is already set, we leave it alone
           }
         } else {
           // there is no entry for after School care
@@ -202,7 +200,8 @@ class AdminEndpoint extends Endpoint {
         // we have processed the pupil, let's remove it from the unprocessed list
         unprocessedPupilsList.remove(existingPupil);
       } else {
-        // If the pupil doesn't exist, we first need to check if it exists and should be activated
+        // The pupil is not in the active pupils list
+        // We first need to check if it exists but is inactive and should be activated
         // if it doesn't exist, we'll created a new one
         final inactivePupil = await PupilData.db.findFirstRow(
           session,
@@ -222,14 +221,15 @@ class AdminEndpoint extends Endpoint {
       }
     }
     // if there are unprocessed pupils, they are not active in the school data system
-    // we set them to inactive
+    // so we set them to inactive
     for (final pupil in unprocessedPupilsList) {
       pupil.status = PupilStatus.inactive;
       await session.db.updateRow(pupil);
     }
 
     // we return the updated set of pupils that are active in the school data system
-    final pupils = await PupilData.db.find(session);
+    final pupils = await PupilData.db
+        .find(session, where: (t) => t.status.equals(PupilStatus.active));
     return pupils.toSet();
   }
 
diff --git a/school_data_hub_server/lib/src/_features/learning/endpoints/competence_goal_endpoint.dart b/school_data_hub_server/lib/src/_features/learning/endpoints/competence_goal_endpoint.dart
new file mode 100644
index 00000000..a518f257
--- /dev/null
+++ b/school_data_hub_server/lib/src/_features/learning/endpoints/competence_goal_endpoint.dart
@@ -0,0 +1,223 @@
+import 'package:school_data_hub_server/src/generated/protocol.dart';
+import 'package:school_data_hub_server/src/helpers/hub_document_helper.dart';
+import 'package:school_data_hub_server/src/schemas/pupil_schemas.dart';
+import 'package:serverpod/serverpod.dart';
+
+class CompetenceGoalEndpoint extends Endpoint {
+  @override
+  bool get requireLogin => true;
+
+  //- create
+  Future<PupilData> postCompetenceGoal(
+    Session session, {
+    required int competenceId,
+    required int pupilId,
+    required String description,
+    List<String>? strategies,
+    required String createdBy,
+    String? modifiedBy,
+    int? score,
+    DateTime? achievedAt,
+  }) async {
+    final competenceGoal = CompetenceGoal(
+      publicId: Uuid().v4(),
+      description: description,
+      strategies: strategies,
+      createdBy: createdBy,
+      createdAt: DateTime.now().toUtc(),
+      modifiedBy: modifiedBy ?? createdBy,
+      score: score,
+      achievedAt: achievedAt ?? DateTime.now().toUtc(),
+      pupilId: pupilId,
+      competenceId: competenceId,
+    );
+
+    var transactionResult = await session.db.transaction((transaction) async {
+      final competenceGoalInDatabase = await CompetenceGoal.db.insertRow(
+        session,
+        competenceGoal,
+        transaction: transaction,
+      );
+      final pupil = await PupilData.db.findById(
+        session,
+        pupilId,
+        transaction: transaction,
+      );
+      await PupilData.db.attachRow.competenceGoals(
+          session, pupil!, competenceGoalInDatabase,
+          transaction: transaction);
+
+      final competence = await Competence.db.findById(
+        session,
+        competenceId,
+        transaction: transaction,
+      );
+
+      await Competence.db.attachRow.competenceGoals(
+          session, competence!, competenceGoalInDatabase,
+          transaction: transaction);
+
+      final pupilResponse = await PupilData.db.findById(
+        session,
+        pupilId,
+        include: PupilSchemas.allInclude,
+        transaction: transaction,
+      );
+      return pupilResponse!;
+    });
+
+    return transactionResult;
+  }
+
+  Future<PupilData> updateCompetenceGoal(
+    Session session,
+    String publicId, {
+    ({String value})? description,
+    ({List<String>? value})? strategies,
+    ({String value})? modifiedBy,
+    ({int? value})? score,
+    ({DateTime value})? achievedAt,
+  }) async {
+    final competenceGoal = await CompetenceGoal.db
+        .findFirstRow(session, where: (t) => t.publicId.equals(publicId));
+    if (competenceGoal == null) {
+      throw Exception('Competence goal with id $publicId not found.');
+    }
+    if (description != null) {
+      competenceGoal.description = description.value;
+    }
+    if (strategies != null) {
+      competenceGoal.strategies = strategies.value;
+    }
+    if (modifiedBy != null) {
+      competenceGoal.modifiedBy = modifiedBy.value;
+    }
+    if (score != null) {
+      competenceGoal.score = score.value;
+    }
+    if (achievedAt != null) {
+      competenceGoal.achievedAt = achievedAt.value;
+    }
+    await CompetenceGoal.db.updateRow(session, competenceGoal);
+    final pupil = await PupilData.db.findById(
+      session,
+      competenceGoal.pupilId,
+      include: PupilSchemas.allInclude,
+    );
+    return pupil!;
+  }
+
+  Future<PupilData> deleteCompetenceGoal(
+      Session session, String publicId) async {
+    final competenceGoal = await CompetenceGoal.db
+        .findFirstRow(session, where: (t) => t.publicId.equals(publicId));
+    if (competenceGoal == null) {
+      throw Exception('Competence goal with id $publicId not found.');
+    }
+    await CompetenceGoal.db.deleteRow(session, competenceGoal);
+    final pupil = await PupilData.db.findById(
+      session,
+      competenceGoal.pupilId,
+      include: PupilSchemas.allInclude,
+    );
+    return pupil!;
+  }
+
+  Future<PupilData> addFileToCompetenceGoal(
+    Session session,
+    String publicId,
+    String filePath,
+    String createdBy,
+  ) async {
+    final competenceGoal = await CompetenceGoal.db.findFirstRow(
+      session,
+      where: (t) => t.publicId.equals(publicId),
+      include: CompetenceGoal.include(
+        documents: HubDocument.includeList(),
+      ),
+    );
+    if (competenceGoal == null) {
+      throw Exception('CompetenceGoal with id $publicId not found');
+    }
+
+    final document = HubDocumentHelper().createHubDocumentObject(
+      session: session,
+      createdBy: createdBy,
+      path: filePath,
+    );
+
+    final documentInDatabase = await HubDocument.db.insertRow(
+      session,
+      document,
+    );
+
+    await CompetenceGoal.db.attachRow.documents(
+      session,
+      competenceGoal,
+      documentInDatabase,
+    );
+
+    final pupil = await PupilData.db.findById(
+      session,
+      competenceGoal.pupilId,
+      include: PupilSchemas.allInclude,
+    );
+    return pupil!;
+  }
+
+  Future<PupilData> removeFileFromCompetenceGoal(
+    Session session,
+    String publicId,
+    String documentId,
+  ) async {
+    final competenceGoal = await CompetenceGoal.db.findFirstRow(
+      session,
+      where: (t) => t.publicId.equals(publicId),
+      include: CompetenceGoal.include(
+        documents: HubDocument.includeList(),
+      ),
+    );
+    if (competenceGoal == null) {
+      throw Exception('CompetenceGoal with id $publicId not found');
+    }
+
+    final documentToRemove = competenceGoal.documents?.firstWhere(
+      (doc) => doc.documentId == documentId,
+      orElse: () => throw Exception(
+          'Document with id $documentId not found in competence goal'),
+    );
+
+    if (documentToRemove == null) {
+      throw Exception(
+          'Document with id $documentId not found in competence goal');
+    }
+
+    // Use a transaction
+    await session.db.transaction((transaction) async {
+      // Detach the file from the competence goal
+      await CompetenceGoal.db.detachRow.documents(
+        session,
+        documentToRemove,
+        transaction: transaction,
+      );
+      // Delete the file from the database
+      await HubDocument.db.deleteRow(
+        session,
+        documentToRemove,
+        transaction: transaction,
+      );
+      // Delete the file from the storage
+      await session.storage.deleteFile(
+        storageId: 'private',
+        path: documentToRemove.documentPath!,
+      );
+    });
+
+    final pupilData = await PupilData.db.findById(
+      session,
+      competenceGoal.pupilId,
+      include: PupilSchemas.allInclude,
+    );
+    return pupilData!;
+  }
+}
diff --git a/school_data_hub_server/lib/src/_features/pupil/endpooints/pupil_identity_enpoint.dart b/school_data_hub_server/lib/src/_features/pupil/endpooints/pupil_identity_enpoint.dart
index 685ea638..0f45feac 100644
--- a/school_data_hub_server/lib/src/_features/pupil/endpooints/pupil_identity_enpoint.dart
+++ b/school_data_hub_server/lib/src/_features/pupil/endpooints/pupil_identity_enpoint.dart
@@ -33,6 +33,8 @@ class PupilIdentityEndpoint extends Endpoint {
     // Find the last update for the user's pupil identities
     var lastUpdate = await LastPupilIdentiesUpdate.db.findFirstRow(
       session,
+      orderBy: (t) => t.date,
+      orderDescending: true,
     );
     // If no update is found, return null
     if (lastUpdate == null) {
@@ -42,27 +44,23 @@ class PupilIdentityEndpoint extends Endpoint {
     return lastUpdate.date;
   }
 
-  Future<bool> updateLastPupilIdentitiesUpdate(
+  Future<DateTime?> updateLastPupilIdentitiesUpdate(
       Session session, DateTime date) async {
     // Create or update the last identities update record
     var lastUpdate = await LastPupilIdentiesUpdate.db.findFirstRow(
       session,
     );
     try {
-      if (lastUpdate == null) {
-        // Create a new record if it doesn't exist
-        lastUpdate = LastPupilIdentiesUpdate(date: date);
-        await LastPupilIdentiesUpdate.db.insertRow(session, lastUpdate);
-      } else {
-        // Update the existing record
-        lastUpdate.date = date;
-        await LastPupilIdentiesUpdate.db.updateRow(session, lastUpdate);
-      }
-      return true;
+      // Create a new record
+      lastUpdate = LastPupilIdentiesUpdate(date: date);
+      final newLastUpdate =
+          await LastPupilIdentiesUpdate.db.insertRow(session, lastUpdate);
+
+      return newLastUpdate.date;
     } catch (e) {
       // Handle any errors that occur during the update
       log('Error updating last pupil identities: $e');
-      return false;
+      return null;
     }
   }
 
diff --git a/school_data_hub_server/lib/src/_features/schoolday_events/models/schoolday_event.spy.yaml b/school_data_hub_server/lib/src/_features/schoolday_events/models/schoolday_event.spy.yaml
index 128be965..befcb9cd 100644
--- a/school_data_hub_server/lib/src/_features/schoolday_events/models/schoolday_event.spy.yaml
+++ b/school_data_hub_server/lib/src/_features/schoolday_events/models/schoolday_event.spy.yaml
@@ -4,6 +4,7 @@ fields:
   eventId: String
   eventType: SchooldayEventType
   eventReason: String
+  eventTime: String?
   createdBy: String
   processed: bool
   processedBy: String?
@@ -12,4 +13,5 @@ fields:
   processedDocument: HubDocument?, relation(optional)
   schoolday: Schoolday?, relation(name=schoolday_event_schoolday)
   pupil: PupilData?, relation(name=schoolday_event_pupil)
+  ## TODO: Add eventTime
   comment: String?
diff --git a/school_data_hub_server/lib/src/generated/_features/schoolday_events/models/schoolday_event.dart b/school_data_hub_server/lib/src/generated/_features/schoolday_events/models/schoolday_event.dart
index 798de148..0193e755 100644
--- a/school_data_hub_server/lib/src/generated/_features/schoolday_events/models/schoolday_event.dart
+++ b/school_data_hub_server/lib/src/generated/_features/schoolday_events/models/schoolday_event.dart
@@ -25,6 +25,7 @@ abstract class SchooldayEvent
     required this.eventId,
     required this.eventType,
     required this.eventReason,
+    this.eventTime,
     required this.createdBy,
     required this.processed,
     this.processedBy,
@@ -45,6 +46,7 @@ abstract class SchooldayEvent
     required String eventId,
     required _i2.SchooldayEventType eventType,
     required String eventReason,
+    String? eventTime,
     required String createdBy,
     required bool processed,
     String? processedBy,
@@ -67,6 +69,7 @@ abstract class SchooldayEvent
       eventType: _i2.SchooldayEventType.fromJson(
           (jsonSerialization['eventType'] as String)),
       eventReason: jsonSerialization['eventReason'] as String,
+      eventTime: jsonSerialization['eventTime'] as String?,
       createdBy: jsonSerialization['createdBy'] as String,
       processed: jsonSerialization['processed'] as bool,
       processedBy: jsonSerialization['processedBy'] as String?,
@@ -111,6 +114,8 @@ abstract class SchooldayEvent
 
   String eventReason;
 
+  String? eventTime;
+
   String createdBy;
 
   bool processed;
@@ -148,6 +153,7 @@ abstract class SchooldayEvent
     String? eventId,
     _i2.SchooldayEventType? eventType,
     String? eventReason,
+    String? eventTime,
     String? createdBy,
     bool? processed,
     String? processedBy,
@@ -169,6 +175,7 @@ abstract class SchooldayEvent
       'eventId': eventId,
       'eventType': eventType.toJson(),
       'eventReason': eventReason,
+      if (eventTime != null) 'eventTime': eventTime,
       'createdBy': createdBy,
       'processed': processed,
       if (processedBy != null) 'processedBy': processedBy,
@@ -194,6 +201,7 @@ abstract class SchooldayEvent
       'eventId': eventId,
       'eventType': eventType.toJson(),
       'eventReason': eventReason,
+      if (eventTime != null) 'eventTime': eventTime,
       'createdBy': createdBy,
       'processed': processed,
       if (processedBy != null) 'processedBy': processedBy,
@@ -260,6 +268,7 @@ class _SchooldayEventImpl extends SchooldayEvent {
     required String eventId,
     required _i2.SchooldayEventType eventType,
     required String eventReason,
+    String? eventTime,
     required String createdBy,
     required bool processed,
     String? processedBy,
@@ -278,6 +287,7 @@ class _SchooldayEventImpl extends SchooldayEvent {
           eventId: eventId,
           eventType: eventType,
           eventReason: eventReason,
+          eventTime: eventTime,
           createdBy: createdBy,
           processed: processed,
           processedBy: processedBy,
@@ -302,6 +312,7 @@ class _SchooldayEventImpl extends SchooldayEvent {
     String? eventId,
     _i2.SchooldayEventType? eventType,
     String? eventReason,
+    Object? eventTime = _Undefined,
     String? createdBy,
     bool? processed,
     Object? processedBy = _Undefined,
@@ -321,6 +332,7 @@ class _SchooldayEventImpl extends SchooldayEvent {
       eventId: eventId ?? this.eventId,
       eventType: eventType ?? this.eventType,
       eventReason: eventReason ?? this.eventReason,
+      eventTime: eventTime is String? ? eventTime : this.eventTime,
       createdBy: createdBy ?? this.createdBy,
       processed: processed ?? this.processed,
       processedBy: processedBy is String? ? processedBy : this.processedBy,
@@ -360,6 +372,10 @@ class SchooldayEventTable extends _i1.Table<int?> {
       'eventReason',
       this,
     );
+    eventTime = _i1.ColumnString(
+      'eventTime',
+      this,
+    );
     createdBy = _i1.ColumnString(
       'createdBy',
       this,
@@ -404,6 +420,8 @@ class SchooldayEventTable extends _i1.Table<int?> {
 
   late final _i1.ColumnString eventReason;
 
+  late final _i1.ColumnString eventTime;
+
   late final _i1.ColumnString createdBy;
 
   late final _i1.ColumnBool processed;
@@ -488,6 +506,7 @@ class SchooldayEventTable extends _i1.Table<int?> {
         eventId,
         eventType,
         eventReason,
+        eventTime,
         createdBy,
         processed,
         processedBy,
diff --git a/school_data_hub_server/lib/src/generated/endpoints.dart b/school_data_hub_server/lib/src/generated/endpoints.dart
index 3c4857a0..a3a69c4b 100644
--- a/school_data_hub_server/lib/src/generated/endpoints.dart
+++ b/school_data_hub_server/lib/src/generated/endpoints.dart
@@ -27,118 +27,119 @@ import '../_features/books/endpoints/library_books/library_books_endpoint.dart'
 import '../_features/books/endpoints/pupil_book_lending_endpoint.dart' as _i11;
 import '../_features/learning/endpoints/competence_check_endpoint.dart' as _i12;
 import '../_features/learning/endpoints/competence_endpoint.dart' as _i13;
+import '../_features/learning/endpoints/competence_goal_endpoint.dart' as _i14;
 import '../_features/learning_support/endpoints/learning_support_plan_endpoint.dart'
-    as _i14;
-import '../_features/learning_support/endpoints/pre_school_medical_endpoint.dart'
     as _i15;
-import '../_features/learning_support/endpoints/support_category_endpoint.dart'
+import '../_features/learning_support/endpoints/pre_school_medical_endpoint.dart'
     as _i16;
-import '../_features/matrix/matrix_endpoint.dart' as _i17;
-import '../_features/pupil/endpooints/pupil_endpoint.dart' as _i18;
-import '../_features/pupil/endpooints/pupil_identity_enpoint.dart' as _i19;
-import '../_features/pupil/endpooints/pupil_update_endpoint.dart' as _i20;
-import '../_features/school_data/endpoints/school_data_endpoint.dart' as _i21;
-import '../_features/school_lists/endpoints/school_list_endpoint.dart' as _i22;
-import '../_features/schoolday/endpoints/schoolday_admin_endpoint.dart' as _i23;
+import '../_features/learning_support/endpoints/support_category_endpoint.dart'
+    as _i17;
+import '../_features/matrix/matrix_endpoint.dart' as _i18;
+import '../_features/pupil/endpooints/pupil_endpoint.dart' as _i19;
+import '../_features/pupil/endpooints/pupil_identity_enpoint.dart' as _i20;
+import '../_features/pupil/endpooints/pupil_update_endpoint.dart' as _i21;
+import '../_features/school_data/endpoints/school_data_endpoint.dart' as _i22;
+import '../_features/school_lists/endpoints/school_list_endpoint.dart' as _i23;
+import '../_features/schoolday/endpoints/schoolday_admin_endpoint.dart' as _i24;
 import '../_features/schoolday_events/endpoints/schoolday_event_endpoint.dart'
-    as _i24;
-import '../_features/timetable/endpoints/classroom_endpoint.dart' as _i25;
-import '../_features/timetable/endpoints/learning_group_endpoint.dart' as _i26;
+    as _i25;
+import '../_features/timetable/endpoints/classroom_endpoint.dart' as _i26;
+import '../_features/timetable/endpoints/learning_group_endpoint.dart' as _i27;
 import '../_features/timetable/endpoints/scheduled_lesson_endpoint.dart'
-    as _i27;
-import '../_features/timetable/endpoints/scheduled_lesson_group_membership_endpoint.dart'
     as _i28;
-import '../_features/timetable/endpoints/subject_endpoint.dart' as _i29;
-import '../_features/timetable/endpoints/timetable_endpoint.dart' as _i30;
-import '../_features/timetable/endpoints/timetable_slot_endpoint.dart' as _i31;
-import '../_features/user/endpoints/user_endpoints.dart' as _i32;
-import '../_features/workbooks/endpoints/pupil_workbooks_endpoint.dart' as _i33;
-import '../_features/workbooks/endpoints/workbooks_endpoint.dart' as _i34;
-import '../_shared/endpoints/file_endpoints.dart' as _i35;
+import '../_features/timetable/endpoints/scheduled_lesson_group_membership_endpoint.dart'
+    as _i29;
+import '../_features/timetable/endpoints/subject_endpoint.dart' as _i30;
+import '../_features/timetable/endpoints/timetable_endpoint.dart' as _i31;
+import '../_features/timetable/endpoints/timetable_slot_endpoint.dart' as _i32;
+import '../_features/user/endpoints/user_endpoints.dart' as _i33;
+import '../_features/workbooks/endpoints/pupil_workbooks_endpoint.dart' as _i34;
+import '../_features/workbooks/endpoints/workbooks_endpoint.dart' as _i35;
+import '../_shared/endpoints/file_endpoints.dart' as _i36;
 import 'package:school_data_hub_server/src/generated/_features/user/models/roles.dart'
-    as _i36;
-import 'package:school_data_hub_server/src/generated/_features/school_data/models/school_data.dart'
     as _i37;
-import 'package:school_data_hub_server/src/generated/_features/attendance/models/missed_schoolday.dart'
+import 'package:school_data_hub_server/src/generated/_features/school_data/models/school_data.dart'
     as _i38;
-import 'package:school_data_hub_server/src/generated/_features/auth/models/device_info.dart'
+import 'package:school_data_hub_server/src/generated/_features/attendance/models/missed_schoolday.dart'
     as _i39;
-import 'package:school_data_hub_server/src/generated/protocol.dart' as _i40;
+import 'package:school_data_hub_server/src/generated/_features/auth/models/device_info.dart'
+    as _i40;
+import 'package:school_data_hub_server/src/generated/protocol.dart' as _i41;
 import 'package:school_data_hub_server/src/generated/_shared/models/member_operation.dart'
-    as _i41;
-import 'package:school_data_hub_server/src/generated/_features/authorizations/models/pupil_authorization.dart'
     as _i42;
-import 'package:school_data_hub_server/src/generated/_features/books/models/book_tagging/book_tag.dart'
+import 'package:school_data_hub_server/src/generated/_features/authorizations/models/pupil_authorization.dart'
     as _i43;
-import 'package:school_data_hub_server/src/generated/_features/books/models/book.dart'
+import 'package:school_data_hub_server/src/generated/_features/books/models/book_tagging/book_tag.dart'
     as _i44;
-import 'package:school_data_hub_server/src/generated/_features/books/models/library_book_location.dart'
+import 'package:school_data_hub_server/src/generated/_features/books/models/book.dart'
     as _i45;
-import 'package:school_data_hub_server/src/generated/_features/books/models/library_book_query.dart'
+import 'package:school_data_hub_server/src/generated/_features/books/models/library_book_location.dart'
     as _i46;
-import 'package:school_data_hub_server/src/generated/_features/books/models/pupil_book_lending.dart'
+import 'package:school_data_hub_server/src/generated/_features/books/models/library_book_query.dart'
     as _i47;
-import 'package:school_data_hub_server/src/generated/_features/learning/models/competence.dart'
+import 'package:school_data_hub_server/src/generated/_features/books/models/pupil_book_lending.dart'
     as _i48;
-import 'package:school_data_hub_server/src/generated/_features/learning_support/models/learning_support_plan.dart'
+import 'package:school_data_hub_server/src/generated/_features/learning/models/competence.dart'
     as _i49;
-import 'package:school_data_hub_server/src/generated/_features/pupil/models/pupil_data/preschool/pre_school_medical_status.dart'
+import 'package:school_data_hub_server/src/generated/_features/learning_support/models/learning_support_plan.dart'
     as _i50;
-import 'package:school_data_hub_server/src/generated/_features/learning_support/models/support_category.dart'
+import 'package:school_data_hub_server/src/generated/_features/pupil/models/pupil_data/preschool/pre_school_medical_status.dart'
     as _i51;
-import 'package:school_data_hub_server/src/generated/_features/matrix/compulsory_room.dart'
+import 'package:school_data_hub_server/src/generated/_features/learning_support/models/support_category.dart'
     as _i52;
-import 'package:school_data_hub_server/src/generated/_features/pupil/models/pupil_data/dto/pupil_document_type.dart'
+import 'package:school_data_hub_server/src/generated/_features/matrix/compulsory_room.dart'
     as _i53;
-import 'package:school_data_hub_server/src/generated/_features/learning_support/models/support_level_legacy_dto.dart'
+import 'package:school_data_hub_server/src/generated/_features/pupil/models/pupil_data/dto/pupil_document_type.dart'
     as _i54;
-import 'package:school_data_hub_server/src/generated/_features/pupil/models/pupil_identity/pupil_identity_dto.dart'
+import 'package:school_data_hub_server/src/generated/_features/learning_support/models/support_level_legacy_dto.dart'
     as _i55;
-import 'package:school_data_hub_server/src/generated/_features/pupil/models/pupil_data/pupil_data.dart'
+import 'package:school_data_hub_server/src/generated/_features/pupil/models/pupil_identity/pupil_identity_dto.dart'
     as _i56;
-import 'package:school_data_hub_server/src/generated/_features/pupil/models/pupil_data/communication/communication_skills.dart'
+import 'package:school_data_hub_server/src/generated/_features/pupil/models/pupil_data/pupil_data.dart'
     as _i57;
-import 'package:school_data_hub_server/src/generated/_features/pupil/models/pupil_data/communication/tutor_info.dart'
+import 'package:school_data_hub_server/src/generated/_features/pupil/models/pupil_data/communication/communication_skills.dart'
     as _i58;
-import 'package:school_data_hub_server/src/generated/_features/pupil/models/pupil_data/dto/siblings_tutor_info_dto.dart'
+import 'package:school_data_hub_server/src/generated/_features/pupil/models/pupil_data/communication/tutor_info.dart'
     as _i59;
-import 'package:school_data_hub_server/src/generated/_features/pupil/models/pupil_data/communication/public_media_auth.dart'
+import 'package:school_data_hub_server/src/generated/_features/pupil/models/pupil_data/dto/siblings_tutor_info_dto.dart'
     as _i60;
-import 'package:school_data_hub_server/src/generated/_features/learning_support/models/support_level.dart'
+import 'package:school_data_hub_server/src/generated/_features/pupil/models/pupil_data/communication/public_media_auth.dart'
     as _i61;
-import 'package:school_data_hub_server/src/generated/_features/pupil/models/pupil_data/after_school_care/after_school_care.dart'
+import 'package:school_data_hub_server/src/generated/_features/learning_support/models/support_level.dart'
     as _i62;
-import 'package:school_data_hub_server/src/generated/_features/school_lists/models/pupil_entry.dart'
+import 'package:school_data_hub_server/src/generated/_features/pupil/models/pupil_data/after_school_care/after_school_care.dart'
     as _i63;
-import 'package:school_data_hub_server/src/generated/_features/schoolday/models/school_semester.dart'
+import 'package:school_data_hub_server/src/generated/_features/school_lists/models/pupil_entry.dart'
     as _i64;
-import 'package:school_data_hub_server/src/generated/_features/schoolday/models/schoolday.dart'
+import 'package:school_data_hub_server/src/generated/_features/schoolday/models/school_semester.dart'
     as _i65;
-import 'package:school_data_hub_server/src/generated/_features/schoolday_events/models/schoolday_event_type.dart'
+import 'package:school_data_hub_server/src/generated/_features/schoolday/models/schoolday.dart'
     as _i66;
-import 'package:school_data_hub_server/src/generated/_features/schoolday_events/models/schoolday_event.dart'
+import 'package:school_data_hub_server/src/generated/_features/schoolday_events/models/schoolday_event_type.dart'
     as _i67;
-import 'package:school_data_hub_server/src/generated/_features/timetable/models/classroom.dart'
+import 'package:school_data_hub_server/src/generated/_features/schoolday_events/models/schoolday_event.dart'
     as _i68;
-import 'package:school_data_hub_server/src/generated/_features/timetable/models/lesson/lesson_group.dart'
+import 'package:school_data_hub_server/src/generated/_features/timetable/models/classroom.dart'
     as _i69;
-import 'package:school_data_hub_server/src/generated/_features/timetable/models/scheduled_lesson/scheduled_lesson.dart'
+import 'package:school_data_hub_server/src/generated/_features/timetable/models/lesson/lesson_group.dart'
     as _i70;
-import 'package:school_data_hub_server/src/generated/_features/timetable/models/scheduled_lesson/lesson_group_membership.dart'
+import 'package:school_data_hub_server/src/generated/_features/timetable/models/scheduled_lesson/scheduled_lesson.dart'
     as _i71;
-import 'package:school_data_hub_server/src/generated/_features/timetable/models/scheduled_lesson/subject.dart'
+import 'package:school_data_hub_server/src/generated/_features/timetable/models/scheduled_lesson/lesson_group_membership.dart'
     as _i72;
-import 'package:school_data_hub_server/src/generated/_features/timetable/models/timetable.dart'
+import 'package:school_data_hub_server/src/generated/_features/timetable/models/scheduled_lesson/subject.dart'
     as _i73;
-import 'package:school_data_hub_server/src/generated/_features/timetable/models/scheduled_lesson/timetable_slot.dart'
+import 'package:school_data_hub_server/src/generated/_features/timetable/models/timetable.dart'
     as _i74;
-import 'package:school_data_hub_server/src/generated/_features/timetable/models/scheduled_lesson/weekday_enum.dart'
+import 'package:school_data_hub_server/src/generated/_features/timetable/models/scheduled_lesson/timetable_slot.dart'
     as _i75;
-import 'package:school_data_hub_server/src/generated/_features/workbooks/models/pupil_workbook.dart'
+import 'package:school_data_hub_server/src/generated/_features/timetable/models/scheduled_lesson/weekday_enum.dart'
     as _i76;
-import 'package:school_data_hub_server/src/generated/_features/workbooks/models/workbook.dart'
+import 'package:school_data_hub_server/src/generated/_features/workbooks/models/pupil_workbook.dart'
     as _i77;
-import 'package:serverpod_auth_server/serverpod_auth_server.dart' as _i78;
+import 'package:school_data_hub_server/src/generated/_features/workbooks/models/workbook.dart'
+    as _i78;
+import 'package:serverpod_auth_server/serverpod_auth_server.dart' as _i79;
 
 class Endpoints extends _i1.EndpointDispatch {
   @override
@@ -216,140 +217,146 @@ class Endpoints extends _i1.EndpointDispatch {
           'competence',
           null,
         ),
-      'learningSupportPlan': _i14.LearningSupportPlanEndpoint()
+      'competenceGoal': _i14.CompetenceGoalEndpoint()
+        ..initialize(
+          server,
+          'competenceGoal',
+          null,
+        ),
+      'learningSupportPlan': _i15.LearningSupportPlanEndpoint()
         ..initialize(
           server,
           'learningSupportPlan',
           null,
         ),
-      'preSchoolMedical': _i15.PreSchoolMedicalEndpoint()
+      'preSchoolMedical': _i16.PreSchoolMedicalEndpoint()
         ..initialize(
           server,
           'preSchoolMedical',
           null,
         ),
-      'supportCategory': _i16.SupportCategoryEndpoint()
+      'supportCategory': _i17.SupportCategoryEndpoint()
         ..initialize(
           server,
           'supportCategory',
           null,
         ),
-      'matrix': _i17.MatrixEndpoint()
+      'matrix': _i18.MatrixEndpoint()
         ..initialize(
           server,
           'matrix',
           null,
         ),
-      'pupil': _i18.PupilEndpoint()
+      'pupil': _i19.PupilEndpoint()
         ..initialize(
           server,
           'pupil',
           null,
         ),
-      'pupilIdentity': _i19.PupilIdentityEndpoint()
+      'pupilIdentity': _i20.PupilIdentityEndpoint()
         ..initialize(
           server,
           'pupilIdentity',
           null,
         ),
-      'pupilUpdate': _i20.PupilUpdateEndpoint()
+      'pupilUpdate': _i21.PupilUpdateEndpoint()
         ..initialize(
           server,
           'pupilUpdate',
           null,
         ),
-      'schoolData': _i21.SchoolDataEndpoint()
+      'schoolData': _i22.SchoolDataEndpoint()
         ..initialize(
           server,
           'schoolData',
           null,
         ),
-      'schoolList': _i22.SchoolListEndpoint()
+      'schoolList': _i23.SchoolListEndpoint()
         ..initialize(
           server,
           'schoolList',
           null,
         ),
-      'schooldayAdmin': _i23.SchooldayAdminEndpoint()
+      'schooldayAdmin': _i24.SchooldayAdminEndpoint()
         ..initialize(
           server,
           'schooldayAdmin',
           null,
         ),
-      'schoolday': _i23.SchooldayEndpoint()
+      'schoolday': _i24.SchooldayEndpoint()
         ..initialize(
           server,
           'schoolday',
           null,
         ),
-      'schooldayEvent': _i24.SchooldayEventEndpoint()
+      'schooldayEvent': _i25.SchooldayEventEndpoint()
         ..initialize(
           server,
           'schooldayEvent',
           null,
         ),
-      'classroom': _i25.ClassroomEndpoint()
+      'classroom': _i26.ClassroomEndpoint()
         ..initialize(
           server,
           'classroom',
           null,
         ),
-      'learningGroup': _i26.LearningGroupEndpoint()
+      'learningGroup': _i27.LearningGroupEndpoint()
         ..initialize(
           server,
           'learningGroup',
           null,
         ),
-      'scheduledLesson': _i27.ScheduledLessonEndpoint()
+      'scheduledLesson': _i28.ScheduledLessonEndpoint()
         ..initialize(
           server,
           'scheduledLesson',
           null,
         ),
       'scheduledLessonGroupMembership':
-          _i28.ScheduledLessonGroupMembershipEndpoint()
+          _i29.ScheduledLessonGroupMembershipEndpoint()
             ..initialize(
               server,
               'scheduledLessonGroupMembership',
               null,
             ),
-      'subject': _i29.SubjectEndpoint()
+      'subject': _i30.SubjectEndpoint()
         ..initialize(
           server,
           'subject',
           null,
         ),
-      'timetable': _i30.TimetableEndpoint()
+      'timetable': _i31.TimetableEndpoint()
         ..initialize(
           server,
           'timetable',
           null,
         ),
-      'timetableSlot': _i31.TimetableSlotEndpoint()
+      'timetableSlot': _i32.TimetableSlotEndpoint()
         ..initialize(
           server,
           'timetableSlot',
           null,
         ),
-      'user': _i32.UserEndpoint()
+      'user': _i33.UserEndpoint()
         ..initialize(
           server,
           'user',
           null,
         ),
-      'pupilWorkbooks': _i33.PupilWorkbooksEndpoint()
+      'pupilWorkbooks': _i34.PupilWorkbooksEndpoint()
         ..initialize(
           server,
           'pupilWorkbooks',
           null,
         ),
-      'workbooks': _i34.WorkbooksEndpoint()
+      'workbooks': _i35.WorkbooksEndpoint()
         ..initialize(
           server,
           'workbooks',
           null,
         ),
-      'files': _i35.FilesEndpoint()
+      'files': _i36.FilesEndpoint()
         ..initialize(
           server,
           'files',
@@ -385,7 +392,7 @@ class Endpoints extends _i1.EndpointDispatch {
             ),
             'role': _i1.ParameterDescription(
               name: 'role',
-              type: _i1.getType<_i36.Role>(),
+              type: _i1.getType<_i37.Role>(),
               nullable: false,
             ),
             'timeUnits': _i1.ParameterDescription(
@@ -615,7 +622,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'schoolData': _i1.ParameterDescription(
               name: 'schoolData',
-              type: _i1.getType<_i37.SchoolData>(),
+              type: _i1.getType<_i38.SchoolData>(),
               nullable: false,
             )
           },
@@ -639,7 +646,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'missedClass': _i1.ParameterDescription(
               name: 'missedClass',
-              type: _i1.getType<_i38.MissedSchoolday>(),
+              type: _i1.getType<_i39.MissedSchoolday>(),
               nullable: false,
             )
           },
@@ -658,7 +665,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'missedClasses': _i1.ParameterDescription(
               name: 'missedClasses',
-              type: _i1.getType<List<_i38.MissedSchoolday>>(),
+              type: _i1.getType<List<_i39.MissedSchoolday>>(),
               nullable: false,
             )
           },
@@ -731,7 +738,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'missedSchoolday': _i1.ParameterDescription(
               name: 'missedSchoolday',
-              type: _i1.getType<_i38.MissedSchoolday>(),
+              type: _i1.getType<_i39.MissedSchoolday>(),
               nullable: false,
             )
           },
@@ -779,7 +786,7 @@ class Endpoints extends _i1.EndpointDispatch {
             ),
             'deviceInfo': _i1.ParameterDescription(
               name: 'deviceInfo',
-              type: _i1.getType<_i39.DeviceInfo>(),
+              type: _i1.getType<_i40.DeviceInfo>(),
               nullable: false,
             ),
           },
@@ -794,7 +801,7 @@ class Endpoints extends _i1.EndpointDispatch {
                     params['password'],
                     params['deviceInfo'],
                   )
-                  .then((record) => _i40.mapRecordToJson(record)),
+                  .then((record) => _i41.mapRecordToJson(record)),
         ),
         'logOut': _i1.MethodConnector(
           name: 'logOut',
@@ -907,7 +914,7 @@ class Endpoints extends _i1.EndpointDispatch {
             'updateMembers': _i1.ParameterDescription(
               name: 'updateMembers',
               type: _i1.getType<
-                  ({_i41.MemberOperation operation, List<int> pupilIds})?>(),
+                  ({_i42.MemberOperation operation, List<int> pupilIds})?>(),
               nullable: true,
             ),
           },
@@ -954,7 +961,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'authorization': _i1.ParameterDescription(
               name: 'authorization',
-              type: _i1.getType<_i42.PupilAuthorization>(),
+              type: _i1.getType<_i43.PupilAuthorization>(),
               nullable: false,
             )
           },
@@ -1032,7 +1039,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'bookTag': _i1.ParameterDescription(
               name: 'bookTag',
-              type: _i1.getType<_i43.BookTag>(),
+              type: _i1.getType<_i44.BookTag>(),
               nullable: false,
             )
           },
@@ -1060,7 +1067,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'bookTag': _i1.ParameterDescription(
               name: 'bookTag',
-              type: _i1.getType<_i43.BookTag>(),
+              type: _i1.getType<_i44.BookTag>(),
               nullable: false,
             )
           },
@@ -1078,7 +1085,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'bookTag': _i1.ParameterDescription(
               name: 'bookTag',
-              type: _i1.getType<_i43.BookTag>(),
+              type: _i1.getType<_i44.BookTag>(),
               nullable: false,
             )
           },
@@ -1102,7 +1109,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'book': _i1.ParameterDescription(
               name: 'book',
-              type: _i1.getType<_i44.Book>(),
+              type: _i1.getType<_i45.Book>(),
               nullable: false,
             )
           },
@@ -1161,7 +1168,7 @@ class Endpoints extends _i1.EndpointDispatch {
             ),
             'tags': _i1.ParameterDescription(
               name: 'tags',
-              type: _i1.getType<List<_i43.BookTag>?>(),
+              type: _i1.getType<List<_i44.BookTag>?>(),
               nullable: true,
             ),
           },
@@ -1204,7 +1211,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'libraryBookLocation': _i1.ParameterDescription(
               name: 'libraryBookLocation',
-              type: _i1.getType<_i45.LibraryBookLocation>(),
+              type: _i1.getType<_i46.LibraryBookLocation>(),
               nullable: false,
             )
           },
@@ -1235,7 +1242,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'libraryBookLocation': _i1.ParameterDescription(
               name: 'libraryBookLocation',
-              type: _i1.getType<_i45.LibraryBookLocation>(),
+              type: _i1.getType<_i46.LibraryBookLocation>(),
               nullable: false,
             )
           },
@@ -1255,7 +1262,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'location': _i1.ParameterDescription(
               name: 'location',
-              type: _i1.getType<_i45.LibraryBookLocation>(),
+              type: _i1.getType<_i46.LibraryBookLocation>(),
               nullable: false,
             )
           },
@@ -1291,7 +1298,7 @@ class Endpoints extends _i1.EndpointDispatch {
             ),
             'location': _i1.ParameterDescription(
               name: 'location',
-              type: _i1.getType<_i45.LibraryBookLocation>(),
+              type: _i1.getType<_i46.LibraryBookLocation>(),
               nullable: false,
             ),
           },
@@ -1360,7 +1367,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'libraryBookQuery': _i1.ParameterDescription(
               name: 'libraryBookQuery',
-              type: _i1.getType<_i46.LibraryBookQuery>(),
+              type: _i1.getType<_i47.LibraryBookQuery>(),
               nullable: false,
             )
           },
@@ -1394,7 +1401,7 @@ class Endpoints extends _i1.EndpointDispatch {
             ),
             'location': _i1.ParameterDescription(
               name: 'location',
-              type: _i1.getType<_i45.LibraryBookLocation?>(),
+              type: _i1.getType<_i46.LibraryBookLocation?>(),
               nullable: true,
             ),
             'title': _i1.ParameterDescription(
@@ -1419,7 +1426,7 @@ class Endpoints extends _i1.EndpointDispatch {
             ),
             'tags': _i1.ParameterDescription(
               name: 'tags',
-              type: _i1.getType<List<_i43.BookTag>?>(),
+              type: _i1.getType<List<_i44.BookTag>?>(),
               nullable: true,
             ),
           },
@@ -1531,7 +1538,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'pupilBookLending': _i1.ParameterDescription(
               name: 'pupilBookLending',
-              type: _i1.getType<_i47.PupilBookLending>(),
+              type: _i1.getType<_i48.PupilBookLending>(),
               nullable: false,
             )
           },
@@ -1795,7 +1802,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'competence': _i1.ParameterDescription(
               name: 'competence',
-              type: _i1.getType<_i48.Competence>(),
+              type: _i1.getType<_i49.Competence>(),
               nullable: false,
             )
           },
@@ -1830,6 +1837,197 @@ class Endpoints extends _i1.EndpointDispatch {
         ),
       },
     );
+    connectors['competenceGoal'] = _i1.EndpointConnector(
+      name: 'competenceGoal',
+      endpoint: endpoints['competenceGoal']!,
+      methodConnectors: {
+        'postCompetenceGoal': _i1.MethodConnector(
+          name: 'postCompetenceGoal',
+          params: {
+            'competenceId': _i1.ParameterDescription(
+              name: 'competenceId',
+              type: _i1.getType<int>(),
+              nullable: false,
+            ),
+            'pupilId': _i1.ParameterDescription(
+              name: 'pupilId',
+              type: _i1.getType<int>(),
+              nullable: false,
+            ),
+            'description': _i1.ParameterDescription(
+              name: 'description',
+              type: _i1.getType<String>(),
+              nullable: false,
+            ),
+            'strategies': _i1.ParameterDescription(
+              name: 'strategies',
+              type: _i1.getType<List<String>?>(),
+              nullable: true,
+            ),
+            'createdBy': _i1.ParameterDescription(
+              name: 'createdBy',
+              type: _i1.getType<String>(),
+              nullable: false,
+            ),
+            'modifiedBy': _i1.ParameterDescription(
+              name: 'modifiedBy',
+              type: _i1.getType<String?>(),
+              nullable: true,
+            ),
+            'score': _i1.ParameterDescription(
+              name: 'score',
+              type: _i1.getType<int?>(),
+              nullable: true,
+            ),
+            'achievedAt': _i1.ParameterDescription(
+              name: 'achievedAt',
+              type: _i1.getType<DateTime?>(),
+              nullable: true,
+            ),
+          },
+          call: (
+            _i1.Session session,
+            Map<String, dynamic> params,
+          ) async =>
+              (endpoints['competenceGoal'] as _i14.CompetenceGoalEndpoint)
+                  .postCompetenceGoal(
+            session,
+            competenceId: params['competenceId'],
+            pupilId: params['pupilId'],
+            description: params['description'],
+            strategies: params['strategies'],
+            createdBy: params['createdBy'],
+            modifiedBy: params['modifiedBy'],
+            score: params['score'],
+            achievedAt: params['achievedAt'],
+          ),
+        ),
+        'updateCompetenceGoal': _i1.MethodConnector(
+          name: 'updateCompetenceGoal',
+          params: {
+            'publicId': _i1.ParameterDescription(
+              name: 'publicId',
+              type: _i1.getType<String>(),
+              nullable: false,
+            ),
+            'description': _i1.ParameterDescription(
+              name: 'description',
+              type: _i1.getType<({String value})?>(),
+              nullable: true,
+            ),
+            'strategies': _i1.ParameterDescription(
+              name: 'strategies',
+              type: _i1.getType<({List<String>? value})?>(),
+              nullable: true,
+            ),
+            'modifiedBy': _i1.ParameterDescription(
+              name: 'modifiedBy',
+              type: _i1.getType<({String value})?>(),
+              nullable: true,
+            ),
+            'score': _i1.ParameterDescription(
+              name: 'score',
+              type: _i1.getType<({int? value})?>(),
+              nullable: true,
+            ),
+            'achievedAt': _i1.ParameterDescription(
+              name: 'achievedAt',
+              type: _i1.getType<({DateTime value})?>(),
+              nullable: true,
+            ),
+          },
+          call: (
+            _i1.Session session,
+            Map<String, dynamic> params,
+          ) async =>
+              (endpoints['competenceGoal'] as _i14.CompetenceGoalEndpoint)
+                  .updateCompetenceGoal(
+            session,
+            params['publicId'],
+            description: params['description'],
+            strategies: params['strategies'],
+            modifiedBy: params['modifiedBy'],
+            score: params['score'],
+            achievedAt: params['achievedAt'],
+          ),
+        ),
+        'deleteCompetenceGoal': _i1.MethodConnector(
+          name: 'deleteCompetenceGoal',
+          params: {
+            'publicId': _i1.ParameterDescription(
+              name: 'publicId',
+              type: _i1.getType<String>(),
+              nullable: false,
+            )
+          },
+          call: (
+            _i1.Session session,
+            Map<String, dynamic> params,
+          ) async =>
+              (endpoints['competenceGoal'] as _i14.CompetenceGoalEndpoint)
+                  .deleteCompetenceGoal(
+            session,
+            params['publicId'],
+          ),
+        ),
+        'addFileToCompetenceGoal': _i1.MethodConnector(
+          name: 'addFileToCompetenceGoal',
+          params: {
+            'publicId': _i1.ParameterDescription(
+              name: 'publicId',
+              type: _i1.getType<String>(),
+              nullable: false,
+            ),
+            'filePath': _i1.ParameterDescription(
+              name: 'filePath',
+              type: _i1.getType<String>(),
+              nullable: false,
+            ),
+            'createdBy': _i1.ParameterDescription(
+              name: 'createdBy',
+              type: _i1.getType<String>(),
+              nullable: false,
+            ),
+          },
+          call: (
+            _i1.Session session,
+            Map<String, dynamic> params,
+          ) async =>
+              (endpoints['competenceGoal'] as _i14.CompetenceGoalEndpoint)
+                  .addFileToCompetenceGoal(
+            session,
+            params['publicId'],
+            params['filePath'],
+            params['createdBy'],
+          ),
+        ),
+        'removeFileFromCompetenceGoal': _i1.MethodConnector(
+          name: 'removeFileFromCompetenceGoal',
+          params: {
+            'publicId': _i1.ParameterDescription(
+              name: 'publicId',
+              type: _i1.getType<String>(),
+              nullable: false,
+            ),
+            'documentId': _i1.ParameterDescription(
+              name: 'documentId',
+              type: _i1.getType<String>(),
+              nullable: false,
+            ),
+          },
+          call: (
+            _i1.Session session,
+            Map<String, dynamic> params,
+          ) async =>
+              (endpoints['competenceGoal'] as _i14.CompetenceGoalEndpoint)
+                  .removeFileFromCompetenceGoal(
+            session,
+            params['publicId'],
+            params['documentId'],
+          ),
+        ),
+      },
+    );
     connectors['learningSupportPlan'] = _i1.EndpointConnector(
       name: 'learningSupportPlan',
       endpoint: endpoints['learningSupportPlan']!,
@@ -1842,7 +2040,7 @@ class Endpoints extends _i1.EndpointDispatch {
             Map<String, dynamic> params,
           ) async =>
               (endpoints['learningSupportPlan']
-                      as _i14.LearningSupportPlanEndpoint)
+                      as _i15.LearningSupportPlanEndpoint)
                   .fetchLearningSupportPlans(session),
         ),
         'createLearningSupportPlan': _i1.MethodConnector(
@@ -1850,7 +2048,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'plan': _i1.ParameterDescription(
               name: 'plan',
-              type: _i1.getType<_i49.LearningSupportPlan>(),
+              type: _i1.getType<_i50.LearningSupportPlan>(),
               nullable: false,
             )
           },
@@ -1859,7 +2057,7 @@ class Endpoints extends _i1.EndpointDispatch {
             Map<String, dynamic> params,
           ) async =>
               (endpoints['learningSupportPlan']
-                      as _i14.LearningSupportPlanEndpoint)
+                      as _i15.LearningSupportPlanEndpoint)
                   .createLearningSupportPlan(
             session,
             params['plan'],
@@ -1870,7 +2068,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'plan': _i1.ParameterDescription(
               name: 'plan',
-              type: _i1.getType<_i49.LearningSupportPlan>(),
+              type: _i1.getType<_i50.LearningSupportPlan>(),
               nullable: false,
             )
           },
@@ -1879,7 +2077,7 @@ class Endpoints extends _i1.EndpointDispatch {
             Map<String, dynamic> params,
           ) async =>
               (endpoints['learningSupportPlan']
-                      as _i14.LearningSupportPlanEndpoint)
+                      as _i15.LearningSupportPlanEndpoint)
                   .updateLearningSupportPlan(
             session,
             params['plan'],
@@ -1890,7 +2088,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'plan': _i1.ParameterDescription(
               name: 'plan',
-              type: _i1.getType<_i49.LearningSupportPlan>(),
+              type: _i1.getType<_i50.LearningSupportPlan>(),
               nullable: false,
             )
           },
@@ -1899,7 +2097,7 @@ class Endpoints extends _i1.EndpointDispatch {
             Map<String, dynamic> params,
           ) async =>
               (endpoints['learningSupportPlan']
-                      as _i14.LearningSupportPlanEndpoint)
+                      as _i15.LearningSupportPlanEndpoint)
                   .deleteLearningSupportPlan(
             session,
             params['plan'],
@@ -1944,7 +2142,7 @@ class Endpoints extends _i1.EndpointDispatch {
             Map<String, dynamic> params,
           ) async =>
               (endpoints['learningSupportPlan']
-                      as _i14.LearningSupportPlanEndpoint)
+                      as _i15.LearningSupportPlanEndpoint)
                   .postSupportCategoryStatus(
             session,
             params['pupilId'],
@@ -1969,7 +2167,7 @@ class Endpoints extends _i1.EndpointDispatch {
             Map<String, dynamic> params,
           ) async =>
               (endpoints['learningSupportPlan']
-                      as _i14.LearningSupportPlanEndpoint)
+                      as _i15.LearningSupportPlanEndpoint)
                   .fetchSupportCategoryStatus(
             session,
             params['pupilId'],
@@ -1989,7 +2187,7 @@ class Endpoints extends _i1.EndpointDispatch {
             Map<String, dynamic> params,
           ) async =>
               (endpoints['learningSupportPlan']
-                      as _i14.LearningSupportPlanEndpoint)
+                      as _i15.LearningSupportPlanEndpoint)
                   .fetchSupportCategoryStatusFromPupil(
             session,
             params['pupilId'],
@@ -2034,7 +2232,7 @@ class Endpoints extends _i1.EndpointDispatch {
             Map<String, dynamic> params,
           ) async =>
               (endpoints['learningSupportPlan']
-                      as _i14.LearningSupportPlanEndpoint)
+                      as _i15.LearningSupportPlanEndpoint)
                   .updateCategoryStatus(
             session,
             params['pupilId'],
@@ -2064,7 +2262,7 @@ class Endpoints extends _i1.EndpointDispatch {
             Map<String, dynamic> params,
           ) async =>
               (endpoints['learningSupportPlan']
-                      as _i14.LearningSupportPlanEndpoint)
+                      as _i15.LearningSupportPlanEndpoint)
                   .deleteSupportCategoryStatus(
             session,
             params['pupilId'],
@@ -2105,7 +2303,7 @@ class Endpoints extends _i1.EndpointDispatch {
             Map<String, dynamic> params,
           ) async =>
               (endpoints['learningSupportPlan']
-                      as _i14.LearningSupportPlanEndpoint)
+                      as _i15.LearningSupportPlanEndpoint)
                   .postCategoryGoal(
             session,
             params['pupilId'],
@@ -2131,7 +2329,7 @@ class Endpoints extends _i1.EndpointDispatch {
             ),
             'preschoolMedicalStatus': _i1.ParameterDescription(
               name: 'preschoolMedicalStatus',
-              type: _i1.getType<_i50.PreSchoolMedicalStatus?>(),
+              type: _i1.getType<_i51.PreSchoolMedicalStatus?>(),
               nullable: true,
             ),
             'createdBy': _i1.ParameterDescription(
@@ -2144,7 +2342,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['preSchoolMedical'] as _i15.PreSchoolMedicalEndpoint)
+              (endpoints['preSchoolMedical'] as _i16.PreSchoolMedicalEndpoint)
                   .createPreSchoolMedical(
             session,
             params['pupilId'],
@@ -2162,7 +2360,7 @@ class Endpoints extends _i1.EndpointDispatch {
             ),
             'preschoolMedicalStatus': _i1.ParameterDescription(
               name: 'preschoolMedicalStatus',
-              type: _i1.getType<_i50.PreSchoolMedicalStatus?>(),
+              type: _i1.getType<_i51.PreSchoolMedicalStatus?>(),
               nullable: true,
             ),
             'updatedBy': _i1.ParameterDescription(
@@ -2175,7 +2373,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['preSchoolMedical'] as _i15.PreSchoolMedicalEndpoint)
+              (endpoints['preSchoolMedical'] as _i16.PreSchoolMedicalEndpoint)
                   .updatePreSchoolMedical(
             session,
             params['preSchoolMedicalId'],
@@ -2196,7 +2394,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['preSchoolMedical'] as _i15.PreSchoolMedicalEndpoint)
+              (endpoints['preSchoolMedical'] as _i16.PreSchoolMedicalEndpoint)
                   .getPreSchoolMedical(
             session,
             params['preSchoolMedicalId'],
@@ -2215,7 +2413,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['preSchoolMedical'] as _i15.PreSchoolMedicalEndpoint)
+              (endpoints['preSchoolMedical'] as _i16.PreSchoolMedicalEndpoint)
                   .getPreSchoolMedicalByPupilId(
             session,
             params['pupilId'],
@@ -2234,7 +2432,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['preSchoolMedical'] as _i15.PreSchoolMedicalEndpoint)
+              (endpoints['preSchoolMedical'] as _i16.PreSchoolMedicalEndpoint)
                   .deletePreSchoolMedical(
             session,
             params['preSchoolMedicalId'],
@@ -2263,7 +2461,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['preSchoolMedical'] as _i15.PreSchoolMedicalEndpoint)
+              (endpoints['preSchoolMedical'] as _i16.PreSchoolMedicalEndpoint)
                   .addFileToPreSchoolMedical(
             session,
             params['preSchoolMedicalId'],
@@ -2289,7 +2487,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['preSchoolMedical'] as _i15.PreSchoolMedicalEndpoint)
+              (endpoints['preSchoolMedical'] as _i16.PreSchoolMedicalEndpoint)
                   .removeFileFromPreSchoolMedical(
             session,
             params['preSchoolMedicalId'],
@@ -2303,7 +2501,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['preSchoolMedical'] as _i15.PreSchoolMedicalEndpoint)
+              (endpoints['preSchoolMedical'] as _i16.PreSchoolMedicalEndpoint)
                   .getAllPreSchoolMedicalRecords(session),
         ),
         'getPreSchoolMedicalByStatus': _i1.MethodConnector(
@@ -2311,7 +2509,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'status': _i1.ParameterDescription(
               name: 'status',
-              type: _i1.getType<_i50.PreSchoolMedicalStatus>(),
+              type: _i1.getType<_i51.PreSchoolMedicalStatus>(),
               nullable: false,
             )
           },
@@ -2319,7 +2517,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['preSchoolMedical'] as _i15.PreSchoolMedicalEndpoint)
+              (endpoints['preSchoolMedical'] as _i16.PreSchoolMedicalEndpoint)
                   .getPreSchoolMedicalByStatus(
             session,
             params['status'],
@@ -2338,7 +2536,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['supportCategory'] as _i16.SupportCategoryEndpoint)
+              (endpoints['supportCategory'] as _i17.SupportCategoryEndpoint)
                   .fetchSupportCategories(session),
         ),
         'importSupportCategoriesFromJsonFile': _i1.MethodConnector(
@@ -2354,7 +2552,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['supportCategory'] as _i16.SupportCategoryEndpoint)
+              (endpoints['supportCategory'] as _i17.SupportCategoryEndpoint)
                   .importSupportCategoriesFromJsonFile(
             session,
             params['jsonFilePath'],
@@ -2365,7 +2563,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'category': _i1.ParameterDescription(
               name: 'category',
-              type: _i1.getType<_i51.SupportCategory>(),
+              type: _i1.getType<_i52.SupportCategory>(),
               nullable: false,
             )
           },
@@ -2373,7 +2571,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['supportCategory'] as _i16.SupportCategoryEndpoint)
+              (endpoints['supportCategory'] as _i17.SupportCategoryEndpoint)
                   .createSupportCategory(
             session,
             params['category'],
@@ -2384,7 +2582,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'category': _i1.ParameterDescription(
               name: 'category',
-              type: _i1.getType<_i51.SupportCategory>(),
+              type: _i1.getType<_i52.SupportCategory>(),
               nullable: false,
             )
           },
@@ -2392,7 +2590,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['supportCategory'] as _i16.SupportCategoryEndpoint)
+              (endpoints['supportCategory'] as _i17.SupportCategoryEndpoint)
                   .updateSupportCategory(
             session,
             params['category'],
@@ -2403,7 +2601,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'category': _i1.ParameterDescription(
               name: 'category',
-              type: _i1.getType<_i51.SupportCategory>(),
+              type: _i1.getType<_i52.SupportCategory>(),
               nullable: false,
             )
           },
@@ -2411,7 +2609,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['supportCategory'] as _i16.SupportCategoryEndpoint)
+              (endpoints['supportCategory'] as _i17.SupportCategoryEndpoint)
                   .deleteSupportCategory(
             session,
             params['category'],
@@ -2430,7 +2628,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['matrix'] as _i17.MatrixEndpoint)
+              (endpoints['matrix'] as _i18.MatrixEndpoint)
                   .getCompulsoryRooms(session),
         ),
         'setCompulsoryRooms': _i1.MethodConnector(
@@ -2438,7 +2636,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'compulsoryRooms': _i1.ParameterDescription(
               name: 'compulsoryRooms',
-              type: _i1.getType<List<_i52.CompulsoryRoom>>(),
+              type: _i1.getType<List<_i53.CompulsoryRoom>>(),
               nullable: false,
             )
           },
@@ -2446,7 +2644,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['matrix'] as _i17.MatrixEndpoint).setCompulsoryRooms(
+              (endpoints['matrix'] as _i18.MatrixEndpoint).setCompulsoryRooms(
             session,
             params['compulsoryRooms'],
           ),
@@ -2464,7 +2662,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['matrix'] as _i17.MatrixEndpoint).deleteCompulsoryRoom(
+              (endpoints['matrix'] as _i18.MatrixEndpoint).deleteCompulsoryRoom(
             session,
             params['roomId'],
           ),
@@ -2482,7 +2680,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupil'] as _i18.PupilEndpoint).fetchPupils(session),
+              (endpoints['pupil'] as _i19.PupilEndpoint).fetchPupils(session),
         ),
         'fetchPupilsById': _i1.MethodConnector(
           name: 'fetchPupilsById',
@@ -2497,7 +2695,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupil'] as _i18.PupilEndpoint).fetchPupilsById(
+              (endpoints['pupil'] as _i19.PupilEndpoint).fetchPupilsById(
             session,
             params['internalIds'],
           ),
@@ -2512,7 +2710,7 @@ class Endpoints extends _i1.EndpointDispatch {
             ),
             'documentType': _i1.ParameterDescription(
               name: 'documentType',
-              type: _i1.getType<_i53.PupilDocumentType>(),
+              type: _i1.getType<_i54.PupilDocumentType>(),
               nullable: false,
             ),
           },
@@ -2520,7 +2718,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupil'] as _i18.PupilEndpoint).deletePupilDocument(
+              (endpoints['pupil'] as _i19.PupilEndpoint).deletePupilDocument(
             session,
             params['pupilId'],
             params['documentType'],
@@ -2544,7 +2742,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupil'] as _i18.PupilEndpoint).resetPublicMediaAuth(
+              (endpoints['pupil'] as _i19.PupilEndpoint).resetPublicMediaAuth(
             session,
             params['pupilId'],
             params['createdBy'],
@@ -2568,7 +2766,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupil'] as _i18.PupilEndpoint)
+              (endpoints['pupil'] as _i19.PupilEndpoint)
                   .deleteSupportLevelHistoryItem(
             session,
             params['pupilId'],
@@ -2580,7 +2778,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'supportLevelData': _i1.ParameterDescription(
               name: 'supportLevelData',
-              type: _i1.getType<List<_i54.SupportLevelLegacyDto>>(),
+              type: _i1.getType<List<_i55.SupportLevelLegacyDto>>(),
               nullable: false,
             )
           },
@@ -2588,7 +2786,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupil'] as _i18.PupilEndpoint).bulkAddSupportLevels(
+              (endpoints['pupil'] as _i19.PupilEndpoint).bulkAddSupportLevels(
             session,
             params['supportLevelData'],
           ),
@@ -2603,7 +2801,7 @@ class Endpoints extends _i1.EndpointDispatch {
             Map<String, dynamic> params,
             Map<String, Stream> streamParams,
           ) =>
-              (endpoints['pupil'] as _i18.PupilEndpoint)
+              (endpoints['pupil'] as _i19.PupilEndpoint)
                   .fetchPupilsAsStream(session),
         ),
       },
@@ -2622,7 +2820,7 @@ class Endpoints extends _i1.EndpointDispatch {
             ),
             'pupilIdentityMessage': _i1.ParameterDescription(
               name: 'pupilIdentityMessage',
-              type: _i1.getType<_i55.PupilIdentityDto>(),
+              type: _i1.getType<_i56.PupilIdentityDto>(),
               nullable: false,
             ),
           },
@@ -2630,7 +2828,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupilIdentity'] as _i19.PupilIdentityEndpoint)
+              (endpoints['pupilIdentity'] as _i20.PupilIdentityEndpoint)
                   .sendPupilIdentityMessage(
             session,
             params['pupilIdentityChannel'],
@@ -2644,7 +2842,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupilIdentity'] as _i19.PupilIdentityEndpoint)
+              (endpoints['pupilIdentity'] as _i20.PupilIdentityEndpoint)
                   .fetchLastPupilIdentitiesUpdate(session),
         ),
         'updateLastPupilIdentitiesUpdate': _i1.MethodConnector(
@@ -2660,7 +2858,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupilIdentity'] as _i19.PupilIdentityEndpoint)
+              (endpoints['pupilIdentity'] as _i20.PupilIdentityEndpoint)
                   .updateLastPupilIdentitiesUpdate(
             session,
             params['date'],
@@ -2673,7 +2871,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupilIdentity'] as _i19.PupilIdentityEndpoint)
+              (endpoints['pupilIdentity'] as _i20.PupilIdentityEndpoint)
                   .deleteLastPupilIdentitiesUpdate(session),
         ),
         'streamEncryptedPupilIds': _i1.MethodStreamConnector(
@@ -2692,7 +2890,7 @@ class Endpoints extends _i1.EndpointDispatch {
             Map<String, dynamic> params,
             Map<String, Stream> streamParams,
           ) =>
-              (endpoints['pupilIdentity'] as _i19.PupilIdentityEndpoint)
+              (endpoints['pupilIdentity'] as _i20.PupilIdentityEndpoint)
                   .streamEncryptedPupilIds(
             session,
             params['channelName'],
@@ -2709,7 +2907,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'pupil': _i1.ParameterDescription(
               name: 'pupil',
-              type: _i1.getType<_i56.PupilData>(),
+              type: _i1.getType<_i57.PupilData>(),
               nullable: false,
             )
           },
@@ -2717,7 +2915,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupilUpdate'] as _i20.PupilUpdateEndpoint)
+              (endpoints['pupilUpdate'] as _i21.PupilUpdateEndpoint)
                   .updatePupil(
             session,
             params['pupil'],
@@ -2733,7 +2931,7 @@ class Endpoints extends _i1.EndpointDispatch {
             ),
             'communicationSkills': _i1.ParameterDescription(
               name: 'communicationSkills',
-              type: _i1.getType<_i57.CommunicationSkills?>(),
+              type: _i1.getType<_i58.CommunicationSkills?>(),
               nullable: true,
             ),
           },
@@ -2741,7 +2939,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupilUpdate'] as _i20.PupilUpdateEndpoint)
+              (endpoints['pupilUpdate'] as _i21.PupilUpdateEndpoint)
                   .updateCommunicationSkills(
             session,
             pupilId: params['pupilId'],
@@ -2758,7 +2956,7 @@ class Endpoints extends _i1.EndpointDispatch {
             ),
             'tutorInfo': _i1.ParameterDescription(
               name: 'tutorInfo',
-              type: _i1.getType<_i58.TutorInfo?>(),
+              type: _i1.getType<_i59.TutorInfo?>(),
               nullable: true,
             ),
           },
@@ -2766,7 +2964,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupilUpdate'] as _i20.PupilUpdateEndpoint)
+              (endpoints['pupilUpdate'] as _i21.PupilUpdateEndpoint)
                   .updateTutorInfo(
             session,
             params['pupilId'],
@@ -2778,7 +2976,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'siblingsTutorInfo': _i1.ParameterDescription(
               name: 'siblingsTutorInfo',
-              type: _i1.getType<_i59.SiblingsTutorInfo>(),
+              type: _i1.getType<_i60.SiblingsTutorInfo>(),
               nullable: false,
             )
           },
@@ -2786,7 +2984,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupilUpdate'] as _i20.PupilUpdateEndpoint)
+              (endpoints['pupilUpdate'] as _i21.PupilUpdateEndpoint)
                   .updateSiblingsTutorInfo(
             session,
             params['siblingsTutorInfo'],
@@ -2812,7 +3010,7 @@ class Endpoints extends _i1.EndpointDispatch {
             ),
             'documentType': _i1.ParameterDescription(
               name: 'documentType',
-              type: _i1.getType<_i53.PupilDocumentType>(),
+              type: _i1.getType<_i54.PupilDocumentType>(),
               nullable: false,
             ),
           },
@@ -2820,7 +3018,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupilUpdate'] as _i20.PupilUpdateEndpoint)
+              (endpoints['pupilUpdate'] as _i21.PupilUpdateEndpoint)
                   .updatePupilDocument(
             session,
             params['pupilId'],
@@ -2852,7 +3050,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupilUpdate'] as _i20.PupilUpdateEndpoint)
+              (endpoints['pupilUpdate'] as _i21.PupilUpdateEndpoint)
                   .updateStringProperty(
             session,
             params['pupilId'],
@@ -2888,7 +3086,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupilUpdate'] as _i20.PupilUpdateEndpoint)
+              (endpoints['pupilUpdate'] as _i21.PupilUpdateEndpoint)
                   .updateCredit(
             session,
             params['pupilId'],
@@ -2907,7 +3105,7 @@ class Endpoints extends _i1.EndpointDispatch {
             ),
             'preSchoolMedicalStatus': _i1.ParameterDescription(
               name: 'preSchoolMedicalStatus',
-              type: _i1.getType<_i50.PreSchoolMedicalStatus>(),
+              type: _i1.getType<_i51.PreSchoolMedicalStatus>(),
               nullable: false,
             ),
             'updatedBy': _i1.ParameterDescription(
@@ -2920,7 +3118,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupilUpdate'] as _i20.PupilUpdateEndpoint)
+              (endpoints['pupilUpdate'] as _i21.PupilUpdateEndpoint)
                   .updatePreSchoolMedicalStatus(
             session,
             params['pupilId'],
@@ -2938,7 +3136,7 @@ class Endpoints extends _i1.EndpointDispatch {
             ),
             'publicMediaAuth': _i1.ParameterDescription(
               name: 'publicMediaAuth',
-              type: _i1.getType<_i60.PublicMediaAuth>(),
+              type: _i1.getType<_i61.PublicMediaAuth>(),
               nullable: false,
             ),
           },
@@ -2946,7 +3144,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupilUpdate'] as _i20.PupilUpdateEndpoint)
+              (endpoints['pupilUpdate'] as _i21.PupilUpdateEndpoint)
                   .updatePublicMediaAuth(
             session,
             params['pupilId'],
@@ -2958,7 +3156,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'supportLevel': _i1.ParameterDescription(
               name: 'supportLevel',
-              type: _i1.getType<_i61.SupportLevel>(),
+              type: _i1.getType<_i62.SupportLevel>(),
               nullable: false,
             ),
             'pupilId': _i1.ParameterDescription(
@@ -2971,7 +3169,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupilUpdate'] as _i20.PupilUpdateEndpoint)
+              (endpoints['pupilUpdate'] as _i21.PupilUpdateEndpoint)
                   .updateSupportLevel(
             session,
             params['supportLevel'],
@@ -2996,7 +3194,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupilUpdate'] as _i20.PupilUpdateEndpoint)
+              (endpoints['pupilUpdate'] as _i21.PupilUpdateEndpoint)
                   .updateSchoolyearHeldBackDate(
             session,
             params['pupilId'],
@@ -3013,7 +3211,7 @@ class Endpoints extends _i1.EndpointDispatch {
             ),
             'afterSchoolCare': _i1.ParameterDescription(
               name: 'afterSchoolCare',
-              type: _i1.getType<_i62.AfterSchoolCare>(),
+              type: _i1.getType<_i63.AfterSchoolCare>(),
               nullable: false,
             ),
           },
@@ -3021,7 +3219,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupilUpdate'] as _i20.PupilUpdateEndpoint)
+              (endpoints['pupilUpdate'] as _i21.PupilUpdateEndpoint)
                   .updateAfterSchoolCare(
             session,
             params['pupilId'],
@@ -3041,7 +3239,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['schoolData'] as _i21.SchoolDataEndpoint)
+              (endpoints['schoolData'] as _i22.SchoolDataEndpoint)
                   .getSchoolData(session),
         )
       },
@@ -3063,7 +3261,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['schoolList'] as _i22.SchoolListEndpoint)
+              (endpoints['schoolList'] as _i23.SchoolListEndpoint)
                   .fetchSchoolLists(
             session,
             params['userName'],
@@ -3102,7 +3300,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['schoolList'] as _i22.SchoolListEndpoint)
+              (endpoints['schoolList'] as _i23.SchoolListEndpoint)
                   .postSchoolList(
             session,
             params['name'],
@@ -3143,7 +3341,7 @@ class Endpoints extends _i1.EndpointDispatch {
             'updateMembers': _i1.ParameterDescription(
               name: 'updateMembers',
               type: _i1.getType<
-                  ({_i41.MemberOperation operation, List<int> pupilIds})?>(),
+                  ({_i42.MemberOperation operation, List<int> pupilIds})?>(),
               nullable: true,
             ),
           },
@@ -3151,7 +3349,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['schoolList'] as _i22.SchoolListEndpoint)
+              (endpoints['schoolList'] as _i23.SchoolListEndpoint)
                   .updateSchoolList(
             session,
             params['listId'],
@@ -3175,7 +3373,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['schoolList'] as _i22.SchoolListEndpoint)
+              (endpoints['schoolList'] as _i23.SchoolListEndpoint)
                   .deleteSchoolList(
             session,
             params['listId'],
@@ -3186,7 +3384,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'entry': _i1.ParameterDescription(
               name: 'entry',
-              type: _i1.getType<_i63.PupilListEntry>(),
+              type: _i1.getType<_i64.PupilListEntry>(),
               nullable: false,
             )
           },
@@ -3194,7 +3392,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['schoolList'] as _i22.SchoolListEndpoint)
+              (endpoints['schoolList'] as _i23.SchoolListEndpoint)
                   .updatePupilListEntry(
             session,
             params['entry'],
@@ -3254,7 +3452,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['schooldayAdmin'] as _i23.SchooldayAdminEndpoint)
+              (endpoints['schooldayAdmin'] as _i24.SchooldayAdminEndpoint)
                   .createSchoolSemester(
             session,
             params['schoolYearName'],
@@ -3274,7 +3472,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['schooldayAdmin'] as _i23.SchooldayAdminEndpoint)
+              (endpoints['schooldayAdmin'] as _i24.SchooldayAdminEndpoint)
                   .getAllSchoolSemesters(session),
         ),
         'getCurrentSchoolSemester': _i1.MethodConnector(
@@ -3284,7 +3482,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['schooldayAdmin'] as _i23.SchooldayAdminEndpoint)
+              (endpoints['schooldayAdmin'] as _i24.SchooldayAdminEndpoint)
                   .getCurrentSchoolSemester(session),
         ),
         'updateSchoolSemester': _i1.MethodConnector(
@@ -3292,7 +3490,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'schoolSemester': _i1.ParameterDescription(
               name: 'schoolSemester',
-              type: _i1.getType<_i64.SchoolSemester>(),
+              type: _i1.getType<_i65.SchoolSemester>(),
               nullable: false,
             )
           },
@@ -3300,7 +3498,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['schooldayAdmin'] as _i23.SchooldayAdminEndpoint)
+              (endpoints['schooldayAdmin'] as _i24.SchooldayAdminEndpoint)
                   .updateSchoolSemester(
             session,
             params['schoolSemester'],
@@ -3311,7 +3509,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'semester': _i1.ParameterDescription(
               name: 'semester',
-              type: _i1.getType<_i64.SchoolSemester>(),
+              type: _i1.getType<_i65.SchoolSemester>(),
               nullable: false,
             )
           },
@@ -3319,7 +3517,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['schooldayAdmin'] as _i23.SchooldayAdminEndpoint)
+              (endpoints['schooldayAdmin'] as _i24.SchooldayAdminEndpoint)
                   .deleteSchoolSemester(
             session,
             params['semester'],
@@ -3338,7 +3536,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['schooldayAdmin'] as _i23.SchooldayAdminEndpoint)
+              (endpoints['schooldayAdmin'] as _i24.SchooldayAdminEndpoint)
                   .createSchoolday(
             session,
             params['date'],
@@ -3357,7 +3555,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['schooldayAdmin'] as _i23.SchooldayAdminEndpoint)
+              (endpoints['schooldayAdmin'] as _i24.SchooldayAdminEndpoint)
                   .createSchooldays(
             session,
             params['dates'],
@@ -3376,7 +3574,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['schooldayAdmin'] as _i23.SchooldayAdminEndpoint)
+              (endpoints['schooldayAdmin'] as _i24.SchooldayAdminEndpoint)
                   .deleteSchoolday(
             session,
             params['date'],
@@ -3387,7 +3585,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'schoolday': _i1.ParameterDescription(
               name: 'schoolday',
-              type: _i1.getType<_i65.Schoolday>(),
+              type: _i1.getType<_i66.Schoolday>(),
               nullable: false,
             )
           },
@@ -3395,7 +3593,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['schooldayAdmin'] as _i23.SchooldayAdminEndpoint)
+              (endpoints['schooldayAdmin'] as _i24.SchooldayAdminEndpoint)
                   .updateSchoolday(
             session,
             params['schoolday'],
@@ -3414,7 +3612,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['schoolday'] as _i23.SchooldayEndpoint)
+              (endpoints['schoolday'] as _i24.SchooldayEndpoint)
                   .getSchoolSemesters(session),
         ),
         'getSchooldays': _i1.MethodConnector(
@@ -3424,7 +3622,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['schoolday'] as _i23.SchooldayEndpoint)
+              (endpoints['schoolday'] as _i24.SchooldayEndpoint)
                   .getSchooldays(session),
         ),
       },
@@ -3440,7 +3638,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['schooldayEvent'] as _i24.SchooldayEventEndpoint)
+              (endpoints['schooldayEvent'] as _i25.SchooldayEventEndpoint)
                   .fetchSchooldayEvents(session),
         ),
         'createSchooldayEvent': _i1.MethodConnector(
@@ -3468,7 +3666,7 @@ class Endpoints extends _i1.EndpointDispatch {
             ),
             'type': _i1.ParameterDescription(
               name: 'type',
-              type: _i1.getType<_i66.SchooldayEventType>(),
+              type: _i1.getType<_i67.SchooldayEventType>(),
               nullable: false,
             ),
             'reason': _i1.ParameterDescription(
@@ -3491,7 +3689,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['schooldayEvent'] as _i24.SchooldayEventEndpoint)
+              (endpoints['schooldayEvent'] as _i25.SchooldayEventEndpoint)
                   .createSchooldayEvent(
             session,
             pupilId: params['pupilId'],
@@ -3509,7 +3707,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'schooldayEvent': _i1.ParameterDescription(
               name: 'schooldayEvent',
-              type: _i1.getType<_i67.SchooldayEvent>(),
+              type: _i1.getType<_i68.SchooldayEvent>(),
               nullable: false,
             ),
             'changedProcessedStatus': _i1.ParameterDescription(
@@ -3542,7 +3740,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['schooldayEvent'] as _i24.SchooldayEventEndpoint)
+              (endpoints['schooldayEvent'] as _i25.SchooldayEventEndpoint)
                   .updateSchooldayEvent(
             session,
             params['schooldayEvent'],
@@ -3566,7 +3764,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['schooldayEvent'] as _i24.SchooldayEventEndpoint)
+              (endpoints['schooldayEvent'] as _i25.SchooldayEventEndpoint)
                   .deleteSchooldayEvent(
             session,
             params['schooldayEventId'],
@@ -3600,7 +3798,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['schooldayEvent'] as _i24.SchooldayEventEndpoint)
+              (endpoints['schooldayEvent'] as _i25.SchooldayEventEndpoint)
                   .updateSchooldayEventFile(
             session,
             params['schooldayEventId'],
@@ -3627,7 +3825,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['schooldayEvent'] as _i24.SchooldayEventEndpoint)
+              (endpoints['schooldayEvent'] as _i25.SchooldayEventEndpoint)
                   .deleteSchooldayEventFile(
             session,
             params['schooldayEventId'],
@@ -3645,7 +3843,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'classroom': _i1.ParameterDescription(
               name: 'classroom',
-              type: _i1.getType<_i68.Classroom>(),
+              type: _i1.getType<_i69.Classroom>(),
               nullable: false,
             )
           },
@@ -3653,7 +3851,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['classroom'] as _i25.ClassroomEndpoint)
+              (endpoints['classroom'] as _i26.ClassroomEndpoint)
                   .createClassroom(
             session,
             params['classroom'],
@@ -3666,7 +3864,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['classroom'] as _i25.ClassroomEndpoint)
+              (endpoints['classroom'] as _i26.ClassroomEndpoint)
                   .fetchClassrooms(session),
         ),
         'fetchClassroomById': _i1.MethodConnector(
@@ -3682,7 +3880,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['classroom'] as _i25.ClassroomEndpoint)
+              (endpoints['classroom'] as _i26.ClassroomEndpoint)
                   .fetchClassroomById(
             session,
             params['id'],
@@ -3701,7 +3899,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['classroom'] as _i25.ClassroomEndpoint)
+              (endpoints['classroom'] as _i26.ClassroomEndpoint)
                   .fetchClassroomByRoomCode(
             session,
             params['roomCode'],
@@ -3720,7 +3918,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['classroom'] as _i25.ClassroomEndpoint)
+              (endpoints['classroom'] as _i26.ClassroomEndpoint)
                   .fetchClassroomsByRoomName(
             session,
             params['roomName'],
@@ -3731,7 +3929,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'classroom': _i1.ParameterDescription(
               name: 'classroom',
-              type: _i1.getType<_i68.Classroom>(),
+              type: _i1.getType<_i69.Classroom>(),
               nullable: false,
             )
           },
@@ -3739,7 +3937,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['classroom'] as _i25.ClassroomEndpoint)
+              (endpoints['classroom'] as _i26.ClassroomEndpoint)
                   .updateClassroom(
             session,
             params['classroom'],
@@ -3758,7 +3956,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['classroom'] as _i25.ClassroomEndpoint)
+              (endpoints['classroom'] as _i26.ClassroomEndpoint)
                   .deleteClassroom(
             session,
             params['id'],
@@ -3775,7 +3973,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'lessonGroup': _i1.ParameterDescription(
               name: 'lessonGroup',
-              type: _i1.getType<_i69.LessonGroup>(),
+              type: _i1.getType<_i70.LessonGroup>(),
               nullable: false,
             )
           },
@@ -3783,7 +3981,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['learningGroup'] as _i26.LearningGroupEndpoint)
+              (endpoints['learningGroup'] as _i27.LearningGroupEndpoint)
                   .createLessonGroup(
             session,
             params['lessonGroup'],
@@ -3796,7 +3994,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['learningGroup'] as _i26.LearningGroupEndpoint)
+              (endpoints['learningGroup'] as _i27.LearningGroupEndpoint)
                   .fetchLessonGroups(session),
         ),
         'fetchLessonGroupById': _i1.MethodConnector(
@@ -3812,7 +4010,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['learningGroup'] as _i26.LearningGroupEndpoint)
+              (endpoints['learningGroup'] as _i27.LearningGroupEndpoint)
                   .fetchLessonGroupById(
             session,
             params['id'],
@@ -3831,7 +4029,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['learningGroup'] as _i26.LearningGroupEndpoint)
+              (endpoints['learningGroup'] as _i27.LearningGroupEndpoint)
                   .fetchLessonGroupByPublicId(
             session,
             params['publicId'],
@@ -3850,7 +4048,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['learningGroup'] as _i26.LearningGroupEndpoint)
+              (endpoints['learningGroup'] as _i27.LearningGroupEndpoint)
                   .fetchLessonGroupsByName(
             session,
             params['name'],
@@ -3869,7 +4067,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['learningGroup'] as _i26.LearningGroupEndpoint)
+              (endpoints['learningGroup'] as _i27.LearningGroupEndpoint)
                   .fetchLessonGroupsByCreator(
             session,
             params['createdBy'],
@@ -3888,7 +4086,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['learningGroup'] as _i26.LearningGroupEndpoint)
+              (endpoints['learningGroup'] as _i27.LearningGroupEndpoint)
                   .fetchLessonGroupsByTimetable(
             session,
             params['timetableId'],
@@ -3899,7 +4097,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'lessonGroup': _i1.ParameterDescription(
               name: 'lessonGroup',
-              type: _i1.getType<_i69.LessonGroup>(),
+              type: _i1.getType<_i70.LessonGroup>(),
               nullable: false,
             )
           },
@@ -3907,7 +4105,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['learningGroup'] as _i26.LearningGroupEndpoint)
+              (endpoints['learningGroup'] as _i27.LearningGroupEndpoint)
                   .updateLessonGroup(
             session,
             params['lessonGroup'],
@@ -3926,7 +4124,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['learningGroup'] as _i26.LearningGroupEndpoint)
+              (endpoints['learningGroup'] as _i27.LearningGroupEndpoint)
                   .deleteLessonGroup(
             session,
             params['id'],
@@ -3943,7 +4141,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'scheduledLesson': _i1.ParameterDescription(
               name: 'scheduledLesson',
-              type: _i1.getType<_i70.ScheduledLesson>(),
+              type: _i1.getType<_i71.ScheduledLesson>(),
               nullable: false,
             )
           },
@@ -3951,7 +4149,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['scheduledLesson'] as _i27.ScheduledLessonEndpoint)
+              (endpoints['scheduledLesson'] as _i28.ScheduledLessonEndpoint)
                   .createScheduledLesson(
             session,
             params['scheduledLesson'],
@@ -3964,7 +4162,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['scheduledLesson'] as _i27.ScheduledLessonEndpoint)
+              (endpoints['scheduledLesson'] as _i28.ScheduledLessonEndpoint)
                   .fetchScheduledLessons(session),
         ),
         'fetchScheduledLessonById': _i1.MethodConnector(
@@ -3980,7 +4178,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['scheduledLesson'] as _i27.ScheduledLessonEndpoint)
+              (endpoints['scheduledLesson'] as _i28.ScheduledLessonEndpoint)
                   .fetchScheduledLessonById(
             session,
             params['id'],
@@ -3999,7 +4197,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['scheduledLesson'] as _i27.ScheduledLessonEndpoint)
+              (endpoints['scheduledLesson'] as _i28.ScheduledLessonEndpoint)
                   .fetchScheduledLessonsByTimetable(
             session,
             params['timetableId'],
@@ -4018,7 +4216,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['scheduledLesson'] as _i27.ScheduledLessonEndpoint)
+              (endpoints['scheduledLesson'] as _i28.ScheduledLessonEndpoint)
                   .fetchScheduledLessonsBySubject(
             session,
             params['subjectId'],
@@ -4037,7 +4235,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['scheduledLesson'] as _i27.ScheduledLessonEndpoint)
+              (endpoints['scheduledLesson'] as _i28.ScheduledLessonEndpoint)
                   .fetchScheduledLessonsByRoom(
             session,
             params['roomId'],
@@ -4056,7 +4254,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['scheduledLesson'] as _i27.ScheduledLessonEndpoint)
+              (endpoints['scheduledLesson'] as _i28.ScheduledLessonEndpoint)
                   .fetchScheduledLessonsBySlotId(
             session,
             params['slotId'],
@@ -4069,7 +4267,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['scheduledLesson'] as _i27.ScheduledLessonEndpoint)
+              (endpoints['scheduledLesson'] as _i28.ScheduledLessonEndpoint)
                   .fetchActiveScheduledLessons(session),
         ),
         'updateScheduledLesson': _i1.MethodConnector(
@@ -4077,7 +4275,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'scheduledLesson': _i1.ParameterDescription(
               name: 'scheduledLesson',
-              type: _i1.getType<_i70.ScheduledLesson>(),
+              type: _i1.getType<_i71.ScheduledLesson>(),
               nullable: false,
             )
           },
@@ -4085,7 +4283,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['scheduledLesson'] as _i27.ScheduledLessonEndpoint)
+              (endpoints['scheduledLesson'] as _i28.ScheduledLessonEndpoint)
                   .updateScheduledLesson(
             session,
             params['scheduledLesson'],
@@ -4104,7 +4302,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['scheduledLesson'] as _i27.ScheduledLessonEndpoint)
+              (endpoints['scheduledLesson'] as _i28.ScheduledLessonEndpoint)
                   .deactivateScheduledLesson(
             session,
             params['id'],
@@ -4123,7 +4321,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['scheduledLesson'] as _i27.ScheduledLessonEndpoint)
+              (endpoints['scheduledLesson'] as _i28.ScheduledLessonEndpoint)
                   .deleteScheduledLesson(
             session,
             params['id'],
@@ -4140,7 +4338,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'membership': _i1.ParameterDescription(
               name: 'membership',
-              type: _i1.getType<_i71.ScheduledLessonGroupMembership>(),
+              type: _i1.getType<_i72.ScheduledLessonGroupMembership>(),
               nullable: false,
             )
           },
@@ -4149,7 +4347,7 @@ class Endpoints extends _i1.EndpointDispatch {
             Map<String, dynamic> params,
           ) async =>
               (endpoints['scheduledLessonGroupMembership']
-                      as _i28.ScheduledLessonGroupMembershipEndpoint)
+                      as _i29.ScheduledLessonGroupMembershipEndpoint)
                   .createScheduledLessonGroupMembership(
             session,
             params['membership'],
@@ -4163,7 +4361,7 @@ class Endpoints extends _i1.EndpointDispatch {
             Map<String, dynamic> params,
           ) async =>
               (endpoints['scheduledLessonGroupMembership']
-                      as _i28.ScheduledLessonGroupMembershipEndpoint)
+                      as _i29.ScheduledLessonGroupMembershipEndpoint)
                   .fetchScheduledLessonGroupMemberships(session),
         ),
         'fetchScheduledLessonGroupMembershipById': _i1.MethodConnector(
@@ -4180,7 +4378,7 @@ class Endpoints extends _i1.EndpointDispatch {
             Map<String, dynamic> params,
           ) async =>
               (endpoints['scheduledLessonGroupMembership']
-                      as _i28.ScheduledLessonGroupMembershipEndpoint)
+                      as _i29.ScheduledLessonGroupMembershipEndpoint)
                   .fetchScheduledLessonGroupMembershipById(
             session,
             params['id'],
@@ -4200,7 +4398,7 @@ class Endpoints extends _i1.EndpointDispatch {
             Map<String, dynamic> params,
           ) async =>
               (endpoints['scheduledLessonGroupMembership']
-                      as _i28.ScheduledLessonGroupMembershipEndpoint)
+                      as _i29.ScheduledLessonGroupMembershipEndpoint)
                   .fetchMembershipsByLessonGroupId(
             session,
             params['lessonGroupId'],
@@ -4220,7 +4418,7 @@ class Endpoints extends _i1.EndpointDispatch {
             Map<String, dynamic> params,
           ) async =>
               (endpoints['scheduledLessonGroupMembership']
-                      as _i28.ScheduledLessonGroupMembershipEndpoint)
+                      as _i29.ScheduledLessonGroupMembershipEndpoint)
                   .fetchMembershipsByPupilDataId(
             session,
             params['pupilDataId'],
@@ -4245,7 +4443,7 @@ class Endpoints extends _i1.EndpointDispatch {
             Map<String, dynamic> params,
           ) async =>
               (endpoints['scheduledLessonGroupMembership']
-                      as _i28.ScheduledLessonGroupMembershipEndpoint)
+                      as _i29.ScheduledLessonGroupMembershipEndpoint)
                   .fetchMembershipByLessonGroupAndPupil(
             session,
             params['lessonGroupId'],
@@ -4257,7 +4455,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'membership': _i1.ParameterDescription(
               name: 'membership',
-              type: _i1.getType<_i71.ScheduledLessonGroupMembership>(),
+              type: _i1.getType<_i72.ScheduledLessonGroupMembership>(),
               nullable: false,
             )
           },
@@ -4266,7 +4464,7 @@ class Endpoints extends _i1.EndpointDispatch {
             Map<String, dynamic> params,
           ) async =>
               (endpoints['scheduledLessonGroupMembership']
-                      as _i28.ScheduledLessonGroupMembershipEndpoint)
+                      as _i29.ScheduledLessonGroupMembershipEndpoint)
                   .updateScheduledLessonGroupMembership(
             session,
             params['membership'],
@@ -4286,7 +4484,7 @@ class Endpoints extends _i1.EndpointDispatch {
             Map<String, dynamic> params,
           ) async =>
               (endpoints['scheduledLessonGroupMembership']
-                      as _i28.ScheduledLessonGroupMembershipEndpoint)
+                      as _i29.ScheduledLessonGroupMembershipEndpoint)
                   .deleteScheduledLessonGroupMembership(
             session,
             params['id'],
@@ -4311,7 +4509,7 @@ class Endpoints extends _i1.EndpointDispatch {
             Map<String, dynamic> params,
           ) async =>
               (endpoints['scheduledLessonGroupMembership']
-                      as _i28.ScheduledLessonGroupMembershipEndpoint)
+                      as _i29.ScheduledLessonGroupMembershipEndpoint)
                   .deletePupilFromLessonGroup(
             session,
             params['lessonGroupId'],
@@ -4337,7 +4535,7 @@ class Endpoints extends _i1.EndpointDispatch {
             Map<String, dynamic> params,
           ) async =>
               (endpoints['scheduledLessonGroupMembership']
-                      as _i28.ScheduledLessonGroupMembershipEndpoint)
+                      as _i29.ScheduledLessonGroupMembershipEndpoint)
                   .updatePupilMembershipsForLessonGroup(
             session,
             params['lessonGroupId'],
@@ -4355,7 +4553,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'subject': _i1.ParameterDescription(
               name: 'subject',
-              type: _i1.getType<_i72.Subject>(),
+              type: _i1.getType<_i73.Subject>(),
               nullable: false,
             )
           },
@@ -4363,7 +4561,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['subject'] as _i29.SubjectEndpoint).createSubject(
+              (endpoints['subject'] as _i30.SubjectEndpoint).createSubject(
             session,
             params['subject'],
           ),
@@ -4375,7 +4573,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['subject'] as _i29.SubjectEndpoint)
+              (endpoints['subject'] as _i30.SubjectEndpoint)
                   .fetchSubjects(session),
         ),
         'fetchSubjectById': _i1.MethodConnector(
@@ -4391,7 +4589,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['subject'] as _i29.SubjectEndpoint).fetchSubjectById(
+              (endpoints['subject'] as _i30.SubjectEndpoint).fetchSubjectById(
             session,
             params['id'],
           ),
@@ -4409,7 +4607,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['subject'] as _i29.SubjectEndpoint)
+              (endpoints['subject'] as _i30.SubjectEndpoint)
                   .fetchSubjectByPublicId(
             session,
             params['publicId'],
@@ -4428,7 +4626,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['subject'] as _i29.SubjectEndpoint)
+              (endpoints['subject'] as _i30.SubjectEndpoint)
                   .fetchSubjectsByName(
             session,
             params['name'],
@@ -4447,7 +4645,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['subject'] as _i29.SubjectEndpoint)
+              (endpoints['subject'] as _i30.SubjectEndpoint)
                   .fetchSubjectsByCreator(
             session,
             params['createdBy'],
@@ -4458,7 +4656,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'subject': _i1.ParameterDescription(
               name: 'subject',
-              type: _i1.getType<_i72.Subject>(),
+              type: _i1.getType<_i73.Subject>(),
               nullable: false,
             )
           },
@@ -4466,7 +4664,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['subject'] as _i29.SubjectEndpoint).updateSubject(
+              (endpoints['subject'] as _i30.SubjectEndpoint).updateSubject(
             session,
             params['subject'],
           ),
@@ -4484,7 +4682,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['subject'] as _i29.SubjectEndpoint).deleteSubject(
+              (endpoints['subject'] as _i30.SubjectEndpoint).deleteSubject(
             session,
             params['id'],
           ),
@@ -4500,7 +4698,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'timetable': _i1.ParameterDescription(
               name: 'timetable',
-              type: _i1.getType<_i73.Timetable>(),
+              type: _i1.getType<_i74.Timetable>(),
               nullable: false,
             )
           },
@@ -4508,7 +4706,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['timetable'] as _i30.TimetableEndpoint)
+              (endpoints['timetable'] as _i31.TimetableEndpoint)
                   .createTimetable(
             session,
             params['timetable'],
@@ -4521,7 +4719,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['timetable'] as _i30.TimetableEndpoint)
+              (endpoints['timetable'] as _i31.TimetableEndpoint)
                   .fetchTimetables(session),
         ),
         'fetchTimetableById': _i1.MethodConnector(
@@ -4537,7 +4735,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['timetable'] as _i30.TimetableEndpoint)
+              (endpoints['timetable'] as _i31.TimetableEndpoint)
                   .fetchTimetableById(
             session,
             params['id'],
@@ -4550,7 +4748,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['timetable'] as _i30.TimetableEndpoint)
+              (endpoints['timetable'] as _i31.TimetableEndpoint)
                   .fetchTimetable(session),
         ),
         'fetchCompleteTimetableData': _i1.MethodConnector(
@@ -4560,7 +4758,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['timetable'] as _i30.TimetableEndpoint)
+              (endpoints['timetable'] as _i31.TimetableEndpoint)
                   .fetchCompleteTimetableData(session),
         ),
         'fetchActiveTimetables': _i1.MethodConnector(
@@ -4570,7 +4768,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['timetable'] as _i30.TimetableEndpoint)
+              (endpoints['timetable'] as _i31.TimetableEndpoint)
                   .fetchActiveTimetables(session),
         ),
         'fetchTimetablesBySemester': _i1.MethodConnector(
@@ -4586,7 +4784,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['timetable'] as _i30.TimetableEndpoint)
+              (endpoints['timetable'] as _i31.TimetableEndpoint)
                   .fetchTimetablesBySemester(
             session,
             params['schoolSemesterId'],
@@ -4597,7 +4795,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'timetable': _i1.ParameterDescription(
               name: 'timetable',
-              type: _i1.getType<_i73.Timetable>(),
+              type: _i1.getType<_i74.Timetable>(),
               nullable: false,
             )
           },
@@ -4605,7 +4803,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['timetable'] as _i30.TimetableEndpoint)
+              (endpoints['timetable'] as _i31.TimetableEndpoint)
                   .updateTimetable(
             session,
             params['timetable'],
@@ -4624,7 +4822,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['timetable'] as _i30.TimetableEndpoint)
+              (endpoints['timetable'] as _i31.TimetableEndpoint)
                   .deactivateTimetable(
             session,
             params['id'],
@@ -4643,7 +4841,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['timetable'] as _i30.TimetableEndpoint)
+              (endpoints['timetable'] as _i31.TimetableEndpoint)
                   .deleteTimetable(
             session,
             params['id'],
@@ -4660,7 +4858,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'timetableSlot': _i1.ParameterDescription(
               name: 'timetableSlot',
-              type: _i1.getType<_i74.TimetableSlot>(),
+              type: _i1.getType<_i75.TimetableSlot>(),
               nullable: false,
             )
           },
@@ -4668,7 +4866,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['timetableSlot'] as _i31.TimetableSlotEndpoint)
+              (endpoints['timetableSlot'] as _i32.TimetableSlotEndpoint)
                   .createTimetableSlot(
             session,
             params['timetableSlot'],
@@ -4681,7 +4879,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['timetableSlot'] as _i31.TimetableSlotEndpoint)
+              (endpoints['timetableSlot'] as _i32.TimetableSlotEndpoint)
                   .fetchTimetableSlots(session),
         ),
         'fetchTimetableSlotById': _i1.MethodConnector(
@@ -4697,7 +4895,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['timetableSlot'] as _i31.TimetableSlotEndpoint)
+              (endpoints['timetableSlot'] as _i32.TimetableSlotEndpoint)
                   .fetchTimetableSlotById(
             session,
             params['id'],
@@ -4716,7 +4914,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['timetableSlot'] as _i31.TimetableSlotEndpoint)
+              (endpoints['timetableSlot'] as _i32.TimetableSlotEndpoint)
                   .fetchTimetableSlotsByTimetableId(
             session,
             params['timetableId'],
@@ -4727,7 +4925,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'day': _i1.ParameterDescription(
               name: 'day',
-              type: _i1.getType<_i75.Weekday>(),
+              type: _i1.getType<_i76.Weekday>(),
               nullable: false,
             )
           },
@@ -4735,7 +4933,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['timetableSlot'] as _i31.TimetableSlotEndpoint)
+              (endpoints['timetableSlot'] as _i32.TimetableSlotEndpoint)
                   .fetchTimetableSlotsByDay(
             session,
             params['day'],
@@ -4746,7 +4944,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'timetableSlot': _i1.ParameterDescription(
               name: 'timetableSlot',
-              type: _i1.getType<_i74.TimetableSlot>(),
+              type: _i1.getType<_i75.TimetableSlot>(),
               nullable: false,
             )
           },
@@ -4754,7 +4952,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['timetableSlot'] as _i31.TimetableSlotEndpoint)
+              (endpoints['timetableSlot'] as _i32.TimetableSlotEndpoint)
                   .updateTimetableSlot(
             session,
             params['timetableSlot'],
@@ -4773,7 +4971,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['timetableSlot'] as _i31.TimetableSlotEndpoint)
+              (endpoints['timetableSlot'] as _i32.TimetableSlotEndpoint)
                   .deleteTimetableSlot(
             session,
             params['id'],
@@ -4792,7 +4990,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['user'] as _i32.UserEndpoint).getCurrentUser(session),
+              (endpoints['user'] as _i33.UserEndpoint).getCurrentUser(session),
         ),
         'getAllUsers': _i1.MethodConnector(
           name: 'getAllUsers',
@@ -4801,7 +4999,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['user'] as _i32.UserEndpoint).getAllUsers(session),
+              (endpoints['user'] as _i33.UserEndpoint).getAllUsers(session),
         ),
         'changePassword': _i1.MethodConnector(
           name: 'changePassword',
@@ -4821,7 +5019,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['user'] as _i32.UserEndpoint).changePassword(
+              (endpoints['user'] as _i33.UserEndpoint).changePassword(
             session,
             params['oldPassword'],
             params['newPassword'],
@@ -4834,7 +5032,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['user'] as _i32.UserEndpoint)
+              (endpoints['user'] as _i33.UserEndpoint)
                   .increaseStaffCredit(session),
         ),
       },
@@ -4866,7 +5064,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupilWorkbooks'] as _i33.PupilWorkbooksEndpoint)
+              (endpoints['pupilWorkbooks'] as _i34.PupilWorkbooksEndpoint)
                   .postPupilWorkbook(
             session,
             params['isbn'],
@@ -4881,7 +5079,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupilWorkbooks'] as _i33.PupilWorkbooksEndpoint)
+              (endpoints['pupilWorkbooks'] as _i34.PupilWorkbooksEndpoint)
                   .fetchPupilWorkbooks(session),
         ),
         'fetchPupilWorkbooksFromPupil': _i1.MethodConnector(
@@ -4897,7 +5095,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupilWorkbooks'] as _i33.PupilWorkbooksEndpoint)
+              (endpoints['pupilWorkbooks'] as _i34.PupilWorkbooksEndpoint)
                   .fetchPupilWorkbooksFromPupil(
             session,
             params['pupilId'],
@@ -4908,7 +5106,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'pupilWorkbook': _i1.ParameterDescription(
               name: 'pupilWorkbook',
-              type: _i1.getType<_i76.PupilWorkbook>(),
+              type: _i1.getType<_i77.PupilWorkbook>(),
               nullable: false,
             )
           },
@@ -4916,7 +5114,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupilWorkbooks'] as _i33.PupilWorkbooksEndpoint)
+              (endpoints['pupilWorkbooks'] as _i34.PupilWorkbooksEndpoint)
                   .updatePupilWorkbook(
             session,
             params['pupilWorkbook'],
@@ -4935,7 +5133,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['pupilWorkbooks'] as _i33.PupilWorkbooksEndpoint)
+              (endpoints['pupilWorkbooks'] as _i34.PupilWorkbooksEndpoint)
                   .deletePupilWorkbook(
             session,
             params['pupilWorkbookId'],
@@ -4952,7 +5150,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'workbook': _i1.ParameterDescription(
               name: 'workbook',
-              type: _i1.getType<_i77.Workbook>(),
+              type: _i1.getType<_i78.Workbook>(),
               nullable: false,
             )
           },
@@ -4960,7 +5158,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['workbooks'] as _i34.WorkbooksEndpoint).postWorkbook(
+              (endpoints['workbooks'] as _i35.WorkbooksEndpoint).postWorkbook(
             session,
             params['workbook'],
           ),
@@ -4978,7 +5176,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['workbooks'] as _i34.WorkbooksEndpoint)
+              (endpoints['workbooks'] as _i35.WorkbooksEndpoint)
                   .fetchWorkbookByIsbn(
             session,
             params['isbn'],
@@ -4991,7 +5189,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['workbooks'] as _i34.WorkbooksEndpoint)
+              (endpoints['workbooks'] as _i35.WorkbooksEndpoint)
                   .fetchWorkbooks(session),
         ),
         'updateWorkbook': _i1.MethodConnector(
@@ -4999,7 +5197,7 @@ class Endpoints extends _i1.EndpointDispatch {
           params: {
             'workbook': _i1.ParameterDescription(
               name: 'workbook',
-              type: _i1.getType<_i77.Workbook>(),
+              type: _i1.getType<_i78.Workbook>(),
               nullable: false,
             )
           },
@@ -5007,7 +5205,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['workbooks'] as _i34.WorkbooksEndpoint).updateWorkbook(
+              (endpoints['workbooks'] as _i35.WorkbooksEndpoint).updateWorkbook(
             session,
             params['workbook'],
           ),
@@ -5025,7 +5223,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['workbooks'] as _i34.WorkbooksEndpoint).deleteWorkbook(
+              (endpoints['workbooks'] as _i35.WorkbooksEndpoint).deleteWorkbook(
             session,
             params['id'],
           ),
@@ -5054,7 +5252,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['files'] as _i35.FilesEndpoint).getUploadDescription(
+              (endpoints['files'] as _i36.FilesEndpoint).getUploadDescription(
             session,
             params['storageId'],
             params['path'],
@@ -5078,7 +5276,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['files'] as _i35.FilesEndpoint).verifyUpload(
+              (endpoints['files'] as _i36.FilesEndpoint).verifyUpload(
             session,
             params['storageId'],
             params['path'],
@@ -5097,7 +5295,7 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['files'] as _i35.FilesEndpoint).getImage(
+              (endpoints['files'] as _i36.FilesEndpoint).getImage(
             session,
             params['documentId'],
           ),
@@ -5115,13 +5313,13 @@ class Endpoints extends _i1.EndpointDispatch {
             _i1.Session session,
             Map<String, dynamic> params,
           ) async =>
-              (endpoints['files'] as _i35.FilesEndpoint).getUnencryptedImage(
+              (endpoints['files'] as _i36.FilesEndpoint).getUnencryptedImage(
             session,
             params['path'],
           ),
         ),
       },
     );
-    modules['serverpod_auth'] = _i78.Endpoints()..initializeEndpoints(server);
+    modules['serverpod_auth'] = _i79.Endpoints()..initializeEndpoints(server);
   }
 }
diff --git a/school_data_hub_server/lib/src/generated/protocol.dart b/school_data_hub_server/lib/src/generated/protocol.dart
index f5b7f840..a5053c6e 100644
--- a/school_data_hub_server/lib/src/generated/protocol.dart
+++ b/school_data_hub_server/lib/src/generated/protocol.dart
@@ -3732,6 +3732,12 @@ class Protocol extends _i1.SerializationManagerServer {
           isNullable: false,
           dartType: 'String',
         ),
+        _i2.ColumnDefinition(
+          name: 'eventTime',
+          columnType: _i2.ColumnType.text,
+          isNullable: true,
+          dartType: 'String?',
+        ),
         _i2.ColumnDefinition(
           name: 'createdBy',
           columnType: _i2.ColumnType.text,
@@ -5956,6 +5962,37 @@ class Protocol extends _i1.SerializationManagerServer {
                   : deserialize<String>(data['n']['value']),
             ) as T;
     }
+    if (t == _i1.getType<List<String>?>()) {
+      return (data != null
+          ? (data as List).map((e) => deserialize<String>(e)).toList()
+          : null) as T;
+    }
+    if (t == _i1.getType<({List<String>? value})?>()) {
+      return (data == null)
+          ? null as T
+          : (
+              value: ((data as Map)['n'] as Map)['value'] == null
+                  ? null
+                  : deserialize<List<String>>(data['n']['value']),
+            ) as T;
+    }
+    if (t == _i1.getType<({int? value})?>()) {
+      return (data == null)
+          ? null as T
+          : (
+              value: ((data as Map)['n'] as Map)['value'] == null
+                  ? null
+                  : deserialize<int>(data['n']['value']),
+            ) as T;
+    }
+    if (t == _i1.getType<({DateTime value})?>()) {
+      return (data == null)
+          ? null as T
+          : (
+              value:
+                  deserialize<DateTime>(((data as Map)['n'] as Map)['value']),
+            ) as T;
+    }
     if (t == List<_i94.LearningSupportPlan>) {
       return (data as List)
           .map((e) => deserialize<_i94.LearningSupportPlan>(e))
@@ -6796,6 +6833,27 @@ Map<String, dynamic>? mapRecordToJson(Record? record) {
       },
     };
   }
+  if (record is ({List<String>? value})) {
+    return {
+      "n": {
+        "value": record.value,
+      },
+    };
+  }
+  if (record is ({int? value})) {
+    return {
+      "n": {
+        "value": record.value,
+      },
+    };
+  }
+  if (record is ({DateTime value})) {
+    return {
+      "n": {
+        "value": record.value,
+      },
+    };
+  }
   if (record is ({DateTime? value})) {
     return {
       "n": {
diff --git a/school_data_hub_server/lib/src/generated/protocol.yaml b/school_data_hub_server/lib/src/generated/protocol.yaml
index 476d6eea..2408f601 100644
--- a/school_data_hub_server/lib/src/generated/protocol.yaml
+++ b/school_data_hub_server/lib/src/generated/protocol.yaml
@@ -72,6 +72,12 @@ competence:
   - getAllCompetences:
   - updateCompetence:
   - deleteCompetence:
+competenceGoal:
+  - postCompetenceGoal:
+  - updateCompetenceGoal:
+  - deleteCompetenceGoal:
+  - addFileToCompetenceGoal:
+  - removeFileFromCompetenceGoal:
 learningSupportPlan:
   - fetchLearningSupportPlans:
   - createLearningSupportPlan:
diff --git a/school_data_hub_server/migrations/20251208135524075/definition.json b/school_data_hub_server/migrations/20251208135524075/definition.json
new file mode 100644
index 00000000..5859ce63
--- /dev/null
+++ b/school_data_hub_server/migrations/20251208135524075/definition.json
@@ -0,0 +1,6538 @@
+{
+  "moduleName": "school_data_hub",
+  "tables": [
+    {
+      "name": "authorization",
+      "dartName": "Authorization",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('authorization_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "description",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "authorization_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "book",
+      "dartName": "Book",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('book_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "isbn",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "title",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "author",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "description",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "readingLevel",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "imagePath",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "book_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "book_id_unique_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "isbn"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "book_tag",
+      "dartName": "BookTag",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('book_tag_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "book_tag_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "book_tagging",
+      "dartName": "BookTagging",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('book_tagging_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "bookId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "bookTagId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "book_tagging_fk_0",
+          "columns": [
+            "bookId"
+          ],
+          "referenceTable": "book",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "book_tagging_fk_1",
+          "columns": [
+            "bookTagId"
+          ],
+          "referenceTable": "book_tag",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "book_tagging_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "book_tagging_index_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "bookId"
+            },
+            {
+              "type": 0,
+              "definition": "bookTagId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "competence",
+      "dartName": "Competence",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('competence_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "publicId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "parentCompetence",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "level",
+          "columnType": 8,
+          "isNullable": true,
+          "dartType": "List<String>?"
+        },
+        {
+          "name": "indicators",
+          "columnType": 8,
+          "isNullable": true,
+          "dartType": "List<String>?"
+        },
+        {
+          "name": "order",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "competence_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "competence_check",
+      "dartName": "CompetenceCheck",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('competence_check_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "checkId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "score",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "valueFactor",
+          "columnType": 3,
+          "isNullable": false,
+          "dartType": "double"
+        },
+        {
+          "name": "groupCheckId",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "groupCheckName",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "competenceId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "competence_check_fk_0",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "competence_check_fk_1",
+          "columns": [
+            "competenceId"
+          ],
+          "referenceTable": "competence",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "competence_check_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "competence_goal",
+      "dartName": "CompetenceGoal",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('competence_goal_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "publicId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "description",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "strategies",
+          "columnType": 8,
+          "isNullable": true,
+          "dartType": "List<String>?"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "modifiedBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "score",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "achievedAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "competenceId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "competence_goal_fk_0",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "competence_goal_fk_1",
+          "columns": [
+            "competenceId"
+          ],
+          "referenceTable": "competence",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "competence_goal_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "competence_report",
+      "dartName": "CompetenceReport",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('competence_report_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "reportId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "modifiedBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "achievement",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "achievedAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "schoolSemesterId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "competence_report_fk_0",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "competence_report_fk_1",
+          "columns": [
+            "schoolSemesterId"
+          ],
+          "referenceTable": "school_semester",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "competence_report_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "competence_report_check",
+      "dartName": "CompetenceReportCheck",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('competence_report_check_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "publicId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "achievement",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "competenceId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "competenceReportId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "competence_report_check_fk_0",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "competence_report_check_fk_1",
+          "columns": [
+            "competenceId"
+          ],
+          "referenceTable": "competence_report_item",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "competence_report_check_fk_2",
+          "columns": [
+            "competenceReportId"
+          ],
+          "referenceTable": "competence_report",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "competence_report_check_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "competence_report_item",
+      "dartName": "CompetenceReportItem",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('competence_report_item_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "publicId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "parentItem",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "level",
+          "columnType": 8,
+          "isNullable": true,
+          "dartType": "List<String>?"
+        },
+        {
+          "name": "order",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "competence_report_item_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "compulsory_room",
+      "dartName": "CompulsoryRoom",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('compulsory_room_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "roomId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "roomType",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "protocol:MatrixRoomType"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "compulsory_room_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "credit_transaction",
+      "dartName": "CreditTransaction",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('credit_transaction_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "sender",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "receiver",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "amount",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "dateTime",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "description",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "_pupilDataCredittransactionsPupilDataId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "credit_transaction_fk_0",
+          "columns": [
+            "_pupilDataCredittransactionsPupilDataId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "credit_transaction_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "reciever_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "receiver"
+            }
+          ],
+          "type": "btree",
+          "isUnique": false,
+          "isPrimary": false
+        },
+        {
+          "indexName": "sender_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "sender"
+            }
+          ],
+          "type": "btree",
+          "isUnique": false,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "hub_document",
+      "dartName": "HubDocument",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('hub_document_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "documentId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "documentPath",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "_pupilBookLendingPupilbooklendingfilesPupilBookLendingId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "_competenceCheckDocumentsCompetenceCheckId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "_competenceGoalDocumentsCompetenceGoalId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "_supportCategoryStatusDocumentsSupportCategoryStatusId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "_supportGoalCheckDocumentsSupportGoalCheckId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "_preSchoolMedicalPreschoolmedicalfilesPreSchoolMedicalId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "_preSchoolTestPreschooltestdocumentsPreSchoolTestId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "hub_document_fk_0",
+          "columns": [
+            "_pupilBookLendingPupilbooklendingfilesPupilBookLendingId"
+          ],
+          "referenceTable": "pupil_book_lending",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "hub_document_fk_1",
+          "columns": [
+            "_competenceCheckDocumentsCompetenceCheckId"
+          ],
+          "referenceTable": "competence_check",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "hub_document_fk_2",
+          "columns": [
+            "_competenceGoalDocumentsCompetenceGoalId"
+          ],
+          "referenceTable": "competence_goal",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "hub_document_fk_3",
+          "columns": [
+            "_supportCategoryStatusDocumentsSupportCategoryStatusId"
+          ],
+          "referenceTable": "support_category_status",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "hub_document_fk_4",
+          "columns": [
+            "_supportGoalCheckDocumentsSupportGoalCheckId"
+          ],
+          "referenceTable": "support_goal_check",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "hub_document_fk_5",
+          "columns": [
+            "_preSchoolMedicalPreschoolmedicalfilesPreSchoolMedicalId"
+          ],
+          "referenceTable": "pre_school_medical",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "hub_document_fk_6",
+          "columns": [
+            "_preSchoolTestPreschooltestdocumentsPreSchoolTestId"
+          ],
+          "referenceTable": "pre_school_test",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "hub_document_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "kindergarden",
+      "dartName": "Kindergarden",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('kindergarden_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "phone",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "address",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "email",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "contactPerson",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "kindergarden_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "last_pupil_identities_update",
+      "dartName": "LastPupilIdentiesUpdate",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('last_pupil_identities_update_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "date",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "last_pupil_identities_update_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "learning_support_plan",
+      "dartName": "LearningSupportPlan",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('learning_support_plan_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "planId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "number",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "socialPedagogue",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "proffesionalsInvolved",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "strengthsDescription",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "problemsDescription",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "learningSupportLevelId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "schoolSemesterId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "learning_support_plan_fk_0",
+          "columns": [
+            "learningSupportLevelId"
+          ],
+          "referenceTable": "support_level",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "learning_support_plan_fk_1",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "learning_support_plan_fk_2",
+          "columns": [
+            "schoolSemesterId"
+          ],
+          "referenceTable": "school_semester",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "learning_support_plan_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "lesson",
+      "dartName": "Lesson",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('lesson_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "publicId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "subjectId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "lesson_fk_0",
+          "columns": [
+            "subjectId"
+          ],
+          "referenceTable": "subject",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "lesson_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "lesson_attendance",
+      "dartName": "LessonAttendance",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('lesson_attendance_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "lessonId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "modifiedBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "modifiedAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "lesson_attendance_fk_0",
+          "columns": [
+            "lessonId"
+          ],
+          "referenceTable": "lesson",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "lesson_attendance_fk_1",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "lesson_attendance_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "lesson_group",
+      "dartName": "LessonGroup",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('lesson_group_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "publicId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "color",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "timetableId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "modifiedBy",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "modifiedAt",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "lesson_group_fk_0",
+          "columns": [
+            "timetableId"
+          ],
+          "referenceTable": "timetable",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "lesson_group_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "lesson_group_pupil",
+      "dartName": "ScheduledLessonGroupMembership",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('lesson_group_pupil_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "lessonGroupId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "pupilDataId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "lesson_group_pupil_fk_0",
+          "columns": [
+            "lessonGroupId"
+          ],
+          "referenceTable": "lesson_group",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "lesson_group_pupil_fk_1",
+          "columns": [
+            "pupilDataId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "lesson_group_pupil_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "lesson_group_membership_index_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "lessonGroupId"
+            },
+            {
+              "type": 0,
+              "definition": "pupilDataId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "lesson_teacher",
+      "dartName": "LessonTeacher",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('lesson_teacher_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "userId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "scheduledLessonId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "lesson_teacher_fk_0",
+          "columns": [
+            "userId"
+          ],
+          "referenceTable": "user",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "lesson_teacher_fk_1",
+          "columns": [
+            "scheduledLessonId"
+          ],
+          "referenceTable": "lesson",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "lesson_teacher_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "lesson_teacher_unique_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "userId"
+            },
+            {
+              "type": 0,
+              "definition": "scheduledLessonId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "library_book",
+      "dartName": "LibraryBook",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('library_book_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "libraryId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "bookId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "locationId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "available",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "library_book_fk_0",
+          "columns": [
+            "bookId"
+          ],
+          "referenceTable": "book",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "library_book_fk_1",
+          "columns": [
+            "locationId"
+          ],
+          "referenceTable": "library_book_location",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "library_book_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "library_id_unique_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "libraryId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "library_book_location",
+      "dartName": "LibraryBookLocation",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('library_book_location_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "location",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "library_book_location_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "location_unique_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "location"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "missed_class",
+      "dartName": "MissedSchoolday",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('missed_class_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "missedType",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "protocol:MissedType"
+        },
+        {
+          "name": "unexcused",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "contacted",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "protocol:ContactedType"
+        },
+        {
+          "name": "returned",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "returnedAt",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        },
+        {
+          "name": "writtenExcuse",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "minutesLate",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "modifiedBy",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "schooldayId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "missed_class_fk_0",
+          "columns": [
+            "schooldayId"
+          ],
+          "referenceTable": "schoolday",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        },
+        {
+          "constraintName": "missed_class_fk_1",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "missed_class_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "schoolday_pupil_data_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "schooldayId"
+            },
+            {
+              "type": 0,
+              "definition": "pupilId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "pre_school_medical",
+      "dartName": "PreSchoolMedical",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('pre_school_medical_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "preschoolMedicalStatus",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "protocol:PreSchoolMedicalStatus?"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "updatedBy",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "updatedAt",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "pre_school_medical_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "pre_school_test",
+      "dartName": "PreSchoolTest",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('pre_school_test_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "careNeedsIntensity",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "pre_school_test_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "pupil_authorization",
+      "dartName": "PupilAuthorization",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('pupil_authorization_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "status",
+          "columnType": 1,
+          "isNullable": true,
+          "dartType": "bool?"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "fileId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "authorizationId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "pupil_authorization_fk_0",
+          "columns": [
+            "fileId"
+          ],
+          "referenceTable": "hub_document",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        },
+        {
+          "constraintName": "pupil_authorization_fk_1",
+          "columns": [
+            "authorizationId"
+          ],
+          "referenceTable": "authorization",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "pupil_authorization_fk_2",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "pupil_authorization_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "pupil_book_lending",
+      "dartName": "PupilBookLending",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('pupil_book_lending_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "lendingId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "status",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "score",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "lentAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "lentBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "returnedAt",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        },
+        {
+          "name": "receivedBy",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "isbn",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "libraryBookId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "pupil_book_lending_fk_0",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "pupil_book_lending_fk_1",
+          "columns": [
+            "libraryBookId"
+          ],
+          "referenceTable": "library_book",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "pupil_book_lending_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "pupil_data",
+      "dartName": "PupilData",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('pupil_data_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "status",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "protocol:PupilStatus"
+        },
+        {
+          "name": "internalId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "password",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "preSchoolMedicalId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "kindergardenId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "kindergardenData",
+          "columnType": 8,
+          "isNullable": true,
+          "dartType": "protocol:KindergardenInfo?"
+        },
+        {
+          "name": "preSchoolTestId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "avatarId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "avatarAuthId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "publicMediaAuth",
+          "columnType": 8,
+          "isNullable": false,
+          "dartType": "protocol:PublicMediaAuth"
+        },
+        {
+          "name": "publicMediaAuthDocumentId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "contact",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "communicationPupil",
+          "columnType": 8,
+          "isNullable": true,
+          "dartType": "protocol:CommunicationSkills?"
+        },
+        {
+          "name": "specialInformation",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "tutorInfo",
+          "columnType": 8,
+          "isNullable": true,
+          "dartType": "protocol:TutorInfo?"
+        },
+        {
+          "name": "afterSchoolCare",
+          "columnType": 8,
+          "isNullable": true,
+          "dartType": "protocol:AfterSchoolCare?"
+        },
+        {
+          "name": "credit",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "creditEarned",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "schoolyearHeldBackAt",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        },
+        {
+          "name": "swimmer",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "_kindergardenPupilsKindergardenId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "pupil_data_fk_0",
+          "columns": [
+            "preSchoolMedicalId"
+          ],
+          "referenceTable": "pre_school_medical",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "pupil_data_fk_1",
+          "columns": [
+            "kindergardenId"
+          ],
+          "referenceTable": "kindergarden",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "pupil_data_fk_2",
+          "columns": [
+            "preSchoolTestId"
+          ],
+          "referenceTable": "pre_school_test",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "pupil_data_fk_3",
+          "columns": [
+            "avatarId"
+          ],
+          "referenceTable": "hub_document",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "pupil_data_fk_4",
+          "columns": [
+            "avatarAuthId"
+          ],
+          "referenceTable": "hub_document",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "pupil_data_fk_5",
+          "columns": [
+            "publicMediaAuthDocumentId"
+          ],
+          "referenceTable": "hub_document",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "pupil_data_fk_6",
+          "columns": [
+            "_kindergardenPupilsKindergardenId"
+          ],
+          "referenceTable": "kindergarden",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "pupil_data_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "pupil_data_status_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "status"
+            },
+            {
+              "type": 0,
+              "definition": "internalId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": false,
+          "isPrimary": false
+        },
+        {
+          "indexName": "pupil_data_internal_id_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "internalId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "pupil_list_entry",
+      "dartName": "PupilListEntry",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('pupil_list_entry_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "status",
+          "columnType": 1,
+          "isNullable": true,
+          "dartType": "bool?"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "entryBy",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "schoolListId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "pupil_list_entry_fk_0",
+          "columns": [
+            "schoolListId"
+          ],
+          "referenceTable": "school_list",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        },
+        {
+          "constraintName": "pupil_list_entry_fk_1",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "pupil_list_entry_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "pupil_workbook",
+      "dartName": "PupilWorkbook",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('pupil_workbook_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "isbn",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "score",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "finishedAt",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "workbookId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "pupil_workbook_fk_0",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        },
+        {
+          "constraintName": "pupil_workbook_fk_1",
+          "columns": [
+            "workbookId"
+          ],
+          "referenceTable": "workbook",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "pupil_workbook_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "room",
+      "dartName": "Classroom",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('room_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "roomCode",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "roomName",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "room_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "scheduled_lesson",
+      "dartName": "ScheduledLesson",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('scheduled_lesson_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "active",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "subjectId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "scheduledAtId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "timetableSlotOrder",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "timetableId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "mainTeacherId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "lessonId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "roomId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "lessonGroupId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "modifiedBy",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "modifiedAt",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        },
+        {
+          "name": "recordtest",
+          "columnType": 8,
+          "isNullable": true,
+          "dartType": "( {int testint, String testString})?"
+        },
+        {
+          "name": "_roomScheduledlessonsRoomId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "scheduled_lesson_fk_0",
+          "columns": [
+            "subjectId"
+          ],
+          "referenceTable": "subject",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "scheduled_lesson_fk_1",
+          "columns": [
+            "scheduledAtId"
+          ],
+          "referenceTable": "timetable_slot",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "scheduled_lesson_fk_2",
+          "columns": [
+            "timetableId"
+          ],
+          "referenceTable": "timetable",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "scheduled_lesson_fk_3",
+          "columns": [
+            "roomId"
+          ],
+          "referenceTable": "room",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "scheduled_lesson_fk_4",
+          "columns": [
+            "lessonGroupId"
+          ],
+          "referenceTable": "lesson_group",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "scheduled_lesson_fk_5",
+          "columns": [
+            "_roomScheduledlessonsRoomId"
+          ],
+          "referenceTable": "room",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "scheduled_lesson_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "scheduled_lesson_teacher",
+      "dartName": "ScheduledLessonTeacher",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('scheduled_lesson_teacher_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "userId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "scheduledLessonId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "scheduled_lesson_teacher_fk_0",
+          "columns": [
+            "userId"
+          ],
+          "referenceTable": "user",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "scheduled_lesson_teacher_fk_1",
+          "columns": [
+            "scheduledLessonId"
+          ],
+          "referenceTable": "scheduled_lesson",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "scheduled_lesson_teacher_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "scheduled_lesson_teacher_unique_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "userId"
+            },
+            {
+              "type": 0,
+              "definition": "scheduledLessonId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "school_data",
+      "dartName": "SchoolData",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('school_data_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "officialName",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "address",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "schoolNumber",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "telephoneNumber",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "email",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "website",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "logoId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "officialSealId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "school_data_fk_0",
+          "columns": [
+            "logoId"
+          ],
+          "referenceTable": "hub_document",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "school_data_fk_1",
+          "columns": [
+            "officialSealId"
+          ],
+          "referenceTable": "hub_document",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "school_data_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "school_list",
+      "dartName": "SchoolList",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('school_list_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "listId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "archived",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "description",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "public",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "authorizedUsers",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "school_list_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "school_semester",
+      "dartName": "SchoolSemester",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('school_semester_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "schoolYear",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "isFirst",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "startDate",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "endDate",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "classConferenceDate",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        },
+        {
+          "name": "supportConferenceDate",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        },
+        {
+          "name": "reportConferenceDate",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        },
+        {
+          "name": "reportSignedDate",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "school_semester_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "schoolday",
+      "dartName": "Schoolday",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('schoolday_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "schoolday",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "schoolSemesterId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "schoolday_fk_0",
+          "columns": [
+            "schoolSemesterId"
+          ],
+          "referenceTable": "school_semester",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "schoolday_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "schoolday_event",
+      "dartName": "SchooldayEvent",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('schoolday_event_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "eventId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "eventType",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "protocol:SchooldayEventType"
+        },
+        {
+          "name": "eventReason",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "eventTime",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "processed",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "processedBy",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "processedAt",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        },
+        {
+          "name": "documentId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "processedDocumentId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "schooldayId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "schoolday_event_fk_0",
+          "columns": [
+            "documentId"
+          ],
+          "referenceTable": "hub_document",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "schoolday_event_fk_1",
+          "columns": [
+            "processedDocumentId"
+          ],
+          "referenceTable": "hub_document",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "schoolday_event_fk_2",
+          "columns": [
+            "schooldayId"
+          ],
+          "referenceTable": "schoolday",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "schoolday_event_fk_3",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "schoolday_event_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "subject",
+      "dartName": "Subject",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('subject_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "publicId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "description",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "color",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "modifiedBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "subject_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "support_category",
+      "dartName": "SupportCategory",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('support_category_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "categoryId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "parentCategory",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "support_category_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "support_category_goal",
+      "dartName": "SupportGoal",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('support_category_goal_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "goalId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "score",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "achievedAt",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        },
+        {
+          "name": "description",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "strategies",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "supportCategoryId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "_learningSupportPlanSupportgoalsLearningSupportPlanId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "_supportCategoryCategorygoalsSupportCategoryId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "_pupilDataSupportgoalsPupilDataId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "support_category_goal_fk_0",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "support_category_goal_fk_1",
+          "columns": [
+            "supportCategoryId"
+          ],
+          "referenceTable": "support_category",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        },
+        {
+          "constraintName": "support_category_goal_fk_2",
+          "columns": [
+            "_learningSupportPlanSupportgoalsLearningSupportPlanId"
+          ],
+          "referenceTable": "learning_support_plan",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "support_category_goal_fk_3",
+          "columns": [
+            "_supportCategoryCategorygoalsSupportCategoryId"
+          ],
+          "referenceTable": "support_category",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "support_category_goal_fk_4",
+          "columns": [
+            "_pupilDataSupportgoalsPupilDataId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "support_category_goal_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "support_category_status",
+      "dartName": "SupportCategoryStatus",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('support_category_status_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "score",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "supportCategoryId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "learningSupportPlanId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "_learningSupportPlanSupportcategorystatusesLearningSupporfb7bId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "_supportCategoryCategorystatuesSupportCategoryId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "_pupilDataSupportcategorystatusesPupilDataId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "support_category_status_fk_0",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "support_category_status_fk_1",
+          "columns": [
+            "supportCategoryId"
+          ],
+          "referenceTable": "support_category",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "support_category_status_fk_2",
+          "columns": [
+            "learningSupportPlanId"
+          ],
+          "referenceTable": "learning_support_plan",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "support_category_status_fk_3",
+          "columns": [
+            "_learningSupportPlanSupportcategorystatusesLearningSupporfb7bId"
+          ],
+          "referenceTable": "learning_support_plan",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "support_category_status_fk_4",
+          "columns": [
+            "_supportCategoryCategorystatuesSupportCategoryId"
+          ],
+          "referenceTable": "support_category",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "support_category_status_fk_5",
+          "columns": [
+            "_pupilDataSupportcategorystatusesPupilDataId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "support_category_status_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "support_goal_check",
+      "dartName": "SupportGoalCheck",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('support_goal_check_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "checkId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "score",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "supportGoalId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "_supportCategoryGoalGoalchecksSupportCategoryGoalId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "support_goal_check_fk_0",
+          "columns": [
+            "supportGoalId"
+          ],
+          "referenceTable": "support_category_goal",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        },
+        {
+          "constraintName": "support_goal_check_fk_1",
+          "columns": [
+            "_supportCategoryGoalGoalchecksSupportCategoryGoalId"
+          ],
+          "referenceTable": "support_category_goal",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "support_goal_check_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "support_level",
+      "dartName": "SupportLevel",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('support_level_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "level",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "support_level_fk_0",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "support_level_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "timetable",
+      "dartName": "Timetable",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('timetable_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "active",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "startsAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "endsAt",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "schoolSemesterId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "modified",
+          "columnType": 8,
+          "isNullable": true,
+          "dartType": "List<( {String modifiedBy, DateTime modifiedAt})>?"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "timetable_fk_0",
+          "columns": [
+            "schoolSemesterId"
+          ],
+          "referenceTable": "school_semester",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "timetable_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "timetable_school_semester_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "schoolSemesterId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": false,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "timetable_slot",
+      "dartName": "TimetableSlot",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('timetable_slot_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "day",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "protocol:Weekday"
+        },
+        {
+          "name": "startTime",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "endTime",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "timetableId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "timetable_slot_fk_0",
+          "columns": [
+            "timetableId"
+          ],
+          "referenceTable": "timetable",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "timetable_slot_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "user",
+      "dartName": "User",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('user_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "userInfoId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "role",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "protocol:Role"
+        },
+        {
+          "name": "matrixUserId",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "timeUnits",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "reliefTimeUnits",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "pupilsAuth",
+          "columnType": 8,
+          "isNullable": true,
+          "dartType": "Set<int>?"
+        },
+        {
+          "name": "schooldayEventsProcessingTeam",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "credit",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "userFlags",
+          "columnType": 8,
+          "isNullable": false,
+          "dartType": "protocol:UserFlags"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "user_fk_0",
+          "columns": [
+            "userInfoId"
+          ],
+          "referenceTable": "serverpod_user_info",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "user_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "user_info_id_unique_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "userInfoId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "user_device",
+      "dartName": "UserDevice",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('user_device_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "userInfoId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "deviceId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "deviceName",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "lastLogin",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "isActive",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "authId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "user_device_fk_0",
+          "columns": [
+            "userInfoId"
+          ],
+          "referenceTable": "serverpod_user_info",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "user_device_fk_1",
+          "columns": [
+            "authId"
+          ],
+          "referenceTable": "serverpod_auth_key",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "user_device_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "auth_key_user_device_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "authId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "workbook",
+      "dartName": "Workbook",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('workbook_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "isbn",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "subject",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "level",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "amount",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "imageUrl",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "workbook_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "serverpod_cloud_storage",
+      "dartName": "CloudStorageEntry",
+      "module": "serverpod",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('serverpod_cloud_storage_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "storageId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "path",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "addedTime",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "expiration",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        },
+        {
+          "name": "byteData",
+          "columnType": 5,
+          "isNullable": false,
+          "dartType": "dart:typed_data:ByteData"
+        },
+        {
+          "name": "verified",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "serverpod_cloud_storage_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "serverpod_cloud_storage_path_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "storageId"
+            },
+            {
+              "type": 0,
+              "definition": "path"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        },
+        {
+          "indexName": "serverpod_cloud_storage_expiration",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "expiration"
+            }
+          ],
+          "type": "btree",
+          "isUnique": false,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "serverpod_cloud_storage_direct_upload",
+      "dartName": "CloudStorageDirectUploadEntry",
+      "module": "serverpod",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('serverpod_cloud_storage_direct_upload_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "storageId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "path",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "expiration",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "authKey",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "serverpod_cloud_storage_direct_upload_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "serverpod_cloud_storage_direct_upload_storage_path",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "storageId"
+            },
+            {
+              "type": 0,
+              "definition": "path"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "serverpod_future_call",
+      "dartName": "FutureCallEntry",
+      "module": "serverpod",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('serverpod_future_call_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "time",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "serializedObject",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "serverId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "identifier",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "serverpod_future_call_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "serverpod_future_call_time_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "time"
+            }
+          ],
+          "type": "btree",
+          "isUnique": false,
+          "isPrimary": false
+        },
+        {
+          "indexName": "serverpod_future_call_serverId_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "serverId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": false,
+          "isPrimary": false
+        },
+        {
+          "indexName": "serverpod_future_call_identifier_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "identifier"
+            }
+          ],
+          "type": "btree",
+          "isUnique": false,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "serverpod_health_connection_info",
+      "dartName": "ServerHealthConnectionInfo",
+      "module": "serverpod",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('serverpod_health_connection_info_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "serverId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "timestamp",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "active",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "closing",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "idle",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "granularity",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "serverpod_health_connection_info_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "serverpod_health_connection_info_timestamp_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "timestamp"
+            },
+            {
+              "type": 0,
+              "definition": "serverId"
+            },
+            {
+              "type": 0,
+              "definition": "granularity"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "serverpod_health_metric",
+      "dartName": "ServerHealthMetric",
+      "module": "serverpod",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('serverpod_health_metric_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "serverId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "timestamp",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "isHealthy",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "value",
+          "columnType": 3,
+          "isNullable": false,
+          "dartType": "double"
+        },
+        {
+          "name": "granularity",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "serverpod_health_metric_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "serverpod_health_metric_timestamp_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "timestamp"
+            },
+            {
+              "type": 0,
+              "definition": "serverId"
+            },
+            {
+              "type": 0,
+              "definition": "name"
+            },
+            {
+              "type": 0,
+              "definition": "granularity"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "serverpod_log",
+      "dartName": "LogEntry",
+      "module": "serverpod",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('serverpod_log_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "sessionLogId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "messageId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "reference",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "serverId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "time",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "logLevel",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "protocol:LogLevel"
+        },
+        {
+          "name": "message",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "error",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "stackTrace",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "order",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "serverpod_log_fk_0",
+          "columns": [
+            "sessionLogId"
+          ],
+          "referenceTable": "serverpod_session_log",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "serverpod_log_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "serverpod_log_sessionLogId_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "sessionLogId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": false,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "serverpod_message_log",
+      "dartName": "MessageLogEntry",
+      "module": "serverpod",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('serverpod_message_log_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "sessionLogId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "serverId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "messageId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "endpoint",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "messageName",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "duration",
+          "columnType": 3,
+          "isNullable": false,
+          "dartType": "double"
+        },
+        {
+          "name": "error",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "stackTrace",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "slow",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "order",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "serverpod_message_log_fk_0",
+          "columns": [
+            "sessionLogId"
+          ],
+          "referenceTable": "serverpod_session_log",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "serverpod_message_log_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "serverpod_method",
+      "dartName": "MethodInfo",
+      "module": "serverpod",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('serverpod_method_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "endpoint",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "method",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "serverpod_method_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "serverpod_method_endpoint_method_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "endpoint"
+            },
+            {
+              "type": 0,
+              "definition": "method"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "serverpod_migrations",
+      "dartName": "DatabaseMigrationVersion",
+      "module": "serverpod",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('serverpod_migrations_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "module",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "version",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "timestamp",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "serverpod_migrations_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "serverpod_migrations_ids",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "module"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "serverpod_query_log",
+      "dartName": "QueryLogEntry",
+      "module": "serverpod",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('serverpod_query_log_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "serverId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "sessionLogId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "messageId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "query",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "duration",
+          "columnType": 3,
+          "isNullable": false,
+          "dartType": "double"
+        },
+        {
+          "name": "numRows",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "error",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "stackTrace",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "slow",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "order",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "serverpod_query_log_fk_0",
+          "columns": [
+            "sessionLogId"
+          ],
+          "referenceTable": "serverpod_session_log",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "serverpod_query_log_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "serverpod_query_log_sessionLogId_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "sessionLogId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": false,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "serverpod_readwrite_test",
+      "dartName": "ReadWriteTestEntry",
+      "module": "serverpod",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('serverpod_readwrite_test_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "number",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "serverpod_readwrite_test_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "serverpod_runtime_settings",
+      "dartName": "RuntimeSettings",
+      "module": "serverpod",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('serverpod_runtime_settings_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "logSettings",
+          "columnType": 8,
+          "isNullable": false,
+          "dartType": "protocol:LogSettings"
+        },
+        {
+          "name": "logSettingsOverrides",
+          "columnType": 8,
+          "isNullable": false,
+          "dartType": "List<protocol:LogSettingsOverride>"
+        },
+        {
+          "name": "logServiceCalls",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "logMalformedCalls",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "serverpod_runtime_settings_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "serverpod_session_log",
+      "dartName": "SessionLogEntry",
+      "module": "serverpod",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('serverpod_session_log_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "serverId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "time",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "module",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "endpoint",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "method",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "duration",
+          "columnType": 3,
+          "isNullable": true,
+          "dartType": "double?"
+        },
+        {
+          "name": "numQueries",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "slow",
+          "columnType": 1,
+          "isNullable": true,
+          "dartType": "bool?"
+        },
+        {
+          "name": "error",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "stackTrace",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "authenticatedUserId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "isOpen",
+          "columnType": 1,
+          "isNullable": true,
+          "dartType": "bool?"
+        },
+        {
+          "name": "touched",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "serverpod_session_log_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "serverpod_session_log_serverid_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "serverId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": false,
+          "isPrimary": false
+        },
+        {
+          "indexName": "serverpod_session_log_touched_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "touched"
+            }
+          ],
+          "type": "btree",
+          "isUnique": false,
+          "isPrimary": false
+        },
+        {
+          "indexName": "serverpod_session_log_isopen_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "isOpen"
+            }
+          ],
+          "type": "btree",
+          "isUnique": false,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "serverpod_auth_key",
+      "dartName": "AuthKey",
+      "module": "serverpod_auth",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('serverpod_auth_key_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "userId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "hash",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "scopeNames",
+          "columnType": 8,
+          "isNullable": false,
+          "dartType": "List<String>"
+        },
+        {
+          "name": "method",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "serverpod_auth_key_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "serverpod_auth_key_userId_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "userId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": false,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "serverpod_email_auth",
+      "dartName": "EmailAuth",
+      "module": "serverpod_auth",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('serverpod_email_auth_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "userId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "email",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "hash",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "serverpod_email_auth_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "serverpod_email_auth_email",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "email"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "serverpod_email_create_request",
+      "dartName": "EmailCreateAccountRequest",
+      "module": "serverpod_auth",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('serverpod_email_create_request_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "userName",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "email",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "hash",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "verificationCode",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "serverpod_email_create_request_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "serverpod_email_auth_create_account_request_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "email"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "serverpod_email_failed_sign_in",
+      "dartName": "EmailFailedSignIn",
+      "module": "serverpod_auth",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('serverpod_email_failed_sign_in_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "email",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "time",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "ipAddress",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "serverpod_email_failed_sign_in_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "serverpod_email_failed_sign_in_email_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "email"
+            }
+          ],
+          "type": "btree",
+          "isUnique": false,
+          "isPrimary": false
+        },
+        {
+          "indexName": "serverpod_email_failed_sign_in_time_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "time"
+            }
+          ],
+          "type": "btree",
+          "isUnique": false,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "serverpod_email_reset",
+      "dartName": "EmailReset",
+      "module": "serverpod_auth",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('serverpod_email_reset_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "userId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "verificationCode",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "expiration",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "serverpod_email_reset_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "serverpod_email_reset_verification_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "verificationCode"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "serverpod_google_refresh_token",
+      "dartName": "GoogleRefreshToken",
+      "module": "serverpod_auth",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('serverpod_google_refresh_token_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "userId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "refreshToken",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "serverpod_google_refresh_token_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "serverpod_google_refresh_token_userId_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "userId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "serverpod_user_image",
+      "dartName": "UserImage",
+      "module": "serverpod_auth",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('serverpod_user_image_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "userId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "version",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "url",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "serverpod_user_image_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "serverpod_user_image_user_id",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "userId"
+            },
+            {
+              "type": 0,
+              "definition": "version"
+            }
+          ],
+          "type": "btree",
+          "isUnique": false,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "serverpod_user_info",
+      "dartName": "UserInfo",
+      "module": "serverpod_auth",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('serverpod_user_info_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "userIdentifier",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "userName",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "fullName",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "email",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "created",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "imageUrl",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "scopeNames",
+          "columnType": 8,
+          "isNullable": false,
+          "dartType": "List<String>"
+        },
+        {
+          "name": "blocked",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "serverpod_user_info_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "serverpod_user_info_user_identifier",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "userIdentifier"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        },
+        {
+          "indexName": "serverpod_user_info_email",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "email"
+            }
+          ],
+          "type": "btree",
+          "isUnique": false,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    }
+  ],
+  "installedModules": [
+    {
+      "module": "school_data_hub",
+      "version": "20251208135524075"
+    },
+    {
+      "module": "serverpod",
+      "version": "20240516151843329"
+    },
+    {
+      "module": "serverpod_auth",
+      "version": "20240520102713718"
+    }
+  ],
+  "migrationApiVersion": 1
+}
\ No newline at end of file
diff --git a/school_data_hub_server/migrations/20251208135524075/definition.sql b/school_data_hub_server/migrations/20251208135524075/definition.sql
new file mode 100644
index 00000000..ff01ae9c
--- /dev/null
+++ b/school_data_hub_server/migrations/20251208135524075/definition.sql
@@ -0,0 +1,1729 @@
+BEGIN;
+
+--
+-- Class Authorization as table authorization
+--
+CREATE TABLE "authorization" (
+    "id" bigserial PRIMARY KEY,
+    "name" text NOT NULL,
+    "description" text NOT NULL,
+    "createdBy" text NOT NULL
+);
+
+--
+-- Class Book as table book
+--
+CREATE TABLE "book" (
+    "id" bigserial PRIMARY KEY,
+    "isbn" bigint NOT NULL,
+    "title" text NOT NULL,
+    "author" text NOT NULL,
+    "description" text NOT NULL,
+    "readingLevel" text,
+    "imagePath" text NOT NULL
+);
+
+-- Indexes
+CREATE UNIQUE INDEX "book_id_unique_idx" ON "book" USING btree ("isbn");
+
+--
+-- Class BookTag as table book_tag
+--
+CREATE TABLE "book_tag" (
+    "id" bigserial PRIMARY KEY,
+    "name" text NOT NULL
+);
+
+--
+-- Class BookTagging as table book_tagging
+--
+CREATE TABLE "book_tagging" (
+    "id" bigserial PRIMARY KEY,
+    "bookId" bigint NOT NULL,
+    "bookTagId" bigint NOT NULL
+);
+
+-- Indexes
+CREATE UNIQUE INDEX "book_tagging_index_idx" ON "book_tagging" USING btree ("bookId", "bookTagId");
+
+--
+-- Class Competence as table competence
+--
+CREATE TABLE "competence" (
+    "id" bigserial PRIMARY KEY,
+    "publicId" bigint NOT NULL,
+    "parentCompetence" bigint,
+    "name" text NOT NULL,
+    "level" json,
+    "indicators" json,
+    "order" bigint
+);
+
+--
+-- Class CompetenceCheck as table competence_check
+--
+CREATE TABLE "competence_check" (
+    "id" bigserial PRIMARY KEY,
+    "checkId" text NOT NULL,
+    "score" bigint NOT NULL,
+    "comment" text,
+    "createdBy" text NOT NULL,
+    "createdAt" timestamp without time zone NOT NULL,
+    "valueFactor" double precision NOT NULL,
+    "groupCheckId" text,
+    "groupCheckName" text,
+    "pupilId" bigint NOT NULL,
+    "competenceId" bigint NOT NULL
+);
+
+--
+-- Class CompetenceGoal as table competence_goal
+--
+CREATE TABLE "competence_goal" (
+    "id" bigserial PRIMARY KEY,
+    "publicId" text NOT NULL,
+    "description" text NOT NULL,
+    "strategies" json,
+    "createdBy" text NOT NULL,
+    "createdAt" timestamp without time zone NOT NULL,
+    "modifiedBy" text NOT NULL,
+    "score" bigint,
+    "achievedAt" timestamp without time zone NOT NULL,
+    "pupilId" bigint NOT NULL,
+    "competenceId" bigint NOT NULL
+);
+
+--
+-- Class CompetenceReport as table competence_report
+--
+CREATE TABLE "competence_report" (
+    "id" bigserial PRIMARY KEY,
+    "reportId" text NOT NULL,
+    "createdBy" text NOT NULL,
+    "createdAt" timestamp without time zone NOT NULL,
+    "modifiedBy" text NOT NULL,
+    "achievement" text NOT NULL,
+    "achievedAt" timestamp without time zone NOT NULL,
+    "pupilId" bigint NOT NULL,
+    "schoolSemesterId" bigint NOT NULL
+);
+
+--
+-- Class CompetenceReportCheck as table competence_report_check
+--
+CREATE TABLE "competence_report_check" (
+    "id" bigserial PRIMARY KEY,
+    "publicId" text NOT NULL,
+    "achievement" bigint NOT NULL,
+    "comment" text NOT NULL,
+    "createdBy" text NOT NULL,
+    "createdAt" timestamp without time zone NOT NULL,
+    "pupilId" bigint NOT NULL,
+    "competenceId" bigint NOT NULL,
+    "competenceReportId" bigint NOT NULL
+);
+
+--
+-- Class CompetenceReportItem as table competence_report_item
+--
+CREATE TABLE "competence_report_item" (
+    "id" bigserial PRIMARY KEY,
+    "publicId" bigint NOT NULL,
+    "parentItem" bigint,
+    "name" text NOT NULL,
+    "level" json,
+    "order" bigint
+);
+
+--
+-- Class CompulsoryRoom as table compulsory_room
+--
+CREATE TABLE "compulsory_room" (
+    "id" bigserial PRIMARY KEY,
+    "roomId" text NOT NULL,
+    "roomType" text NOT NULL
+);
+
+--
+-- Class CreditTransaction as table credit_transaction
+--
+CREATE TABLE "credit_transaction" (
+    "id" bigserial PRIMARY KEY,
+    "sender" text NOT NULL,
+    "receiver" bigint NOT NULL,
+    "amount" bigint NOT NULL,
+    "dateTime" timestamp without time zone NOT NULL,
+    "description" text,
+    "_pupilDataCredittransactionsPupilDataId" bigint
+);
+
+-- Indexes
+CREATE INDEX "reciever_idx" ON "credit_transaction" USING btree ("receiver");
+CREATE INDEX "sender_idx" ON "credit_transaction" USING btree ("sender");
+
+--
+-- Class HubDocument as table hub_document
+--
+CREATE TABLE "hub_document" (
+    "id" bigserial PRIMARY KEY,
+    "documentId" text NOT NULL,
+    "documentPath" text,
+    "createdBy" text NOT NULL,
+    "createdAt" timestamp without time zone NOT NULL,
+    "_pupilBookLendingPupilbooklendingfilesPupilBookLendingId" bigint,
+    "_competenceCheckDocumentsCompetenceCheckId" bigint,
+    "_competenceGoalDocumentsCompetenceGoalId" bigint,
+    "_supportCategoryStatusDocumentsSupportCategoryStatusId" bigint,
+    "_supportGoalCheckDocumentsSupportGoalCheckId" bigint,
+    "_preSchoolMedicalPreschoolmedicalfilesPreSchoolMedicalId" bigint,
+    "_preSchoolTestPreschooltestdocumentsPreSchoolTestId" bigint
+);
+
+--
+-- Class Kindergarden as table kindergarden
+--
+CREATE TABLE "kindergarden" (
+    "id" bigserial PRIMARY KEY,
+    "name" text NOT NULL,
+    "phone" text NOT NULL,
+    "address" text NOT NULL,
+    "email" text NOT NULL,
+    "contactPerson" text NOT NULL
+);
+
+--
+-- Class LastPupilIdentiesUpdate as table last_pupil_identities_update
+--
+CREATE TABLE "last_pupil_identities_update" (
+    "id" bigserial PRIMARY KEY,
+    "date" timestamp without time zone
+);
+
+--
+-- Class LearningSupportPlan as table learning_support_plan
+--
+CREATE TABLE "learning_support_plan" (
+    "id" bigserial PRIMARY KEY,
+    "planId" text NOT NULL,
+    "number" bigint,
+    "createdBy" text NOT NULL,
+    "socialPedagogue" text,
+    "proffesionalsInvolved" text,
+    "strengthsDescription" text,
+    "problemsDescription" text,
+    "learningSupportLevelId" bigint NOT NULL,
+    "createdAt" timestamp without time zone NOT NULL,
+    "comment" text,
+    "pupilId" bigint NOT NULL,
+    "schoolSemesterId" bigint NOT NULL
+);
+
+--
+-- Class Lesson as table lesson
+--
+CREATE TABLE "lesson" (
+    "id" bigserial PRIMARY KEY,
+    "publicId" text NOT NULL,
+    "subjectId" bigint NOT NULL
+);
+
+--
+-- Class LessonAttendance as table lesson_attendance
+--
+CREATE TABLE "lesson_attendance" (
+    "id" bigserial PRIMARY KEY,
+    "lessonId" bigint NOT NULL,
+    "pupilId" bigint NOT NULL,
+    "comment" text,
+    "createdBy" text NOT NULL,
+    "createdAt" timestamp without time zone NOT NULL,
+    "modifiedBy" text NOT NULL,
+    "modifiedAt" timestamp without time zone NOT NULL
+);
+
+--
+-- Class LessonGroup as table lesson_group
+--
+CREATE TABLE "lesson_group" (
+    "id" bigserial PRIMARY KEY,
+    "publicId" text NOT NULL,
+    "name" text NOT NULL,
+    "color" text,
+    "timetableId" bigint NOT NULL,
+    "createdBy" text NOT NULL,
+    "createdAt" timestamp without time zone NOT NULL,
+    "modifiedBy" text,
+    "modifiedAt" timestamp without time zone
+);
+
+--
+-- Class ScheduledLessonGroupMembership as table lesson_group_pupil
+--
+CREATE TABLE "lesson_group_pupil" (
+    "id" bigserial PRIMARY KEY,
+    "lessonGroupId" bigint NOT NULL,
+    "pupilDataId" bigint NOT NULL
+);
+
+-- Indexes
+CREATE UNIQUE INDEX "lesson_group_membership_index_idx" ON "lesson_group_pupil" USING btree ("lessonGroupId", "pupilDataId");
+
+--
+-- Class LessonTeacher as table lesson_teacher
+--
+CREATE TABLE "lesson_teacher" (
+    "id" bigserial PRIMARY KEY,
+    "userId" bigint NOT NULL,
+    "scheduledLessonId" bigint NOT NULL
+);
+
+-- Indexes
+CREATE UNIQUE INDEX "lesson_teacher_unique_idx" ON "lesson_teacher" USING btree ("userId", "scheduledLessonId");
+
+--
+-- Class LibraryBook as table library_book
+--
+CREATE TABLE "library_book" (
+    "id" bigserial PRIMARY KEY,
+    "libraryId" text NOT NULL,
+    "bookId" bigint NOT NULL,
+    "locationId" bigint NOT NULL,
+    "available" boolean NOT NULL
+);
+
+-- Indexes
+CREATE UNIQUE INDEX "library_id_unique_idx" ON "library_book" USING btree ("libraryId");
+
+--
+-- Class LibraryBookLocation as table library_book_location
+--
+CREATE TABLE "library_book_location" (
+    "id" bigserial PRIMARY KEY,
+    "location" text NOT NULL
+);
+
+-- Indexes
+CREATE UNIQUE INDEX "location_unique_idx" ON "library_book_location" USING btree ("location");
+
+--
+-- Class MissedSchoolday as table missed_class
+--
+CREATE TABLE "missed_class" (
+    "id" bigserial PRIMARY KEY,
+    "missedType" text NOT NULL,
+    "unexcused" boolean NOT NULL,
+    "contacted" text NOT NULL,
+    "returned" boolean NOT NULL,
+    "returnedAt" timestamp without time zone,
+    "writtenExcuse" boolean NOT NULL,
+    "minutesLate" bigint,
+    "createdBy" text NOT NULL,
+    "modifiedBy" text,
+    "comment" text,
+    "schooldayId" bigint NOT NULL,
+    "pupilId" bigint NOT NULL
+);
+
+-- Indexes
+CREATE UNIQUE INDEX "schoolday_pupil_data_idx" ON "missed_class" USING btree ("schooldayId", "pupilId");
+
+--
+-- Class PreSchoolMedical as table pre_school_medical
+--
+CREATE TABLE "pre_school_medical" (
+    "id" bigserial PRIMARY KEY,
+    "preschoolMedicalStatus" text,
+    "createdBy" text NOT NULL,
+    "createdAt" timestamp without time zone NOT NULL,
+    "updatedBy" text,
+    "updatedAt" timestamp without time zone
+);
+
+--
+-- Class PreSchoolTest as table pre_school_test
+--
+CREATE TABLE "pre_school_test" (
+    "id" bigserial PRIMARY KEY,
+    "careNeedsIntensity" bigint
+);
+
+--
+-- Class PupilAuthorization as table pupil_authorization
+--
+CREATE TABLE "pupil_authorization" (
+    "id" bigserial PRIMARY KEY,
+    "status" boolean,
+    "comment" text,
+    "createdBy" text,
+    "fileId" bigint,
+    "authorizationId" bigint NOT NULL,
+    "pupilId" bigint NOT NULL
+);
+
+--
+-- Class PupilBookLending as table pupil_book_lending
+--
+CREATE TABLE "pupil_book_lending" (
+    "id" bigserial PRIMARY KEY,
+    "lendingId" text NOT NULL,
+    "status" text,
+    "score" bigint NOT NULL,
+    "lentAt" timestamp without time zone NOT NULL,
+    "lentBy" text NOT NULL,
+    "returnedAt" timestamp without time zone,
+    "receivedBy" text,
+    "pupilId" bigint NOT NULL,
+    "isbn" bigint NOT NULL,
+    "libraryBookId" bigint NOT NULL
+);
+
+--
+-- Class PupilData as table pupil_data
+--
+CREATE TABLE "pupil_data" (
+    "id" bigserial PRIMARY KEY,
+    "status" text NOT NULL,
+    "internalId" bigint NOT NULL,
+    "password" text,
+    "preSchoolMedicalId" bigint,
+    "kindergardenId" bigint,
+    "kindergardenData" json,
+    "preSchoolTestId" bigint,
+    "avatarId" bigint,
+    "avatarAuthId" bigint,
+    "publicMediaAuth" json NOT NULL,
+    "publicMediaAuthDocumentId" bigint,
+    "contact" text,
+    "communicationPupil" json,
+    "specialInformation" text,
+    "tutorInfo" json,
+    "afterSchoolCare" json,
+    "credit" bigint NOT NULL,
+    "creditEarned" bigint NOT NULL,
+    "schoolyearHeldBackAt" timestamp without time zone,
+    "swimmer" text,
+    "_kindergardenPupilsKindergardenId" bigint
+);
+
+-- Indexes
+CREATE INDEX "pupil_data_status_idx" ON "pupil_data" USING btree ("status", "internalId");
+CREATE UNIQUE INDEX "pupil_data_internal_id_idx" ON "pupil_data" USING btree ("internalId");
+
+--
+-- Class PupilListEntry as table pupil_list_entry
+--
+CREATE TABLE "pupil_list_entry" (
+    "id" bigserial PRIMARY KEY,
+    "status" boolean,
+    "comment" text,
+    "entryBy" text,
+    "schoolListId" bigint NOT NULL,
+    "pupilId" bigint NOT NULL
+);
+
+--
+-- Class PupilWorkbook as table pupil_workbook
+--
+CREATE TABLE "pupil_workbook" (
+    "id" bigserial PRIMARY KEY,
+    "isbn" bigint NOT NULL,
+    "comment" text,
+    "score" bigint NOT NULL,
+    "createdBy" text NOT NULL,
+    "createdAt" timestamp without time zone NOT NULL,
+    "finishedAt" timestamp without time zone,
+    "pupilId" bigint NOT NULL,
+    "workbookId" bigint NOT NULL
+);
+
+--
+-- Class Classroom as table room
+--
+CREATE TABLE "room" (
+    "id" bigserial PRIMARY KEY,
+    "roomCode" text NOT NULL,
+    "roomName" text NOT NULL
+);
+
+--
+-- Class ScheduledLesson as table scheduled_lesson
+--
+CREATE TABLE "scheduled_lesson" (
+    "id" bigserial PRIMARY KEY,
+    "active" boolean NOT NULL,
+    "subjectId" bigint NOT NULL,
+    "scheduledAtId" bigint NOT NULL,
+    "timetableSlotOrder" bigint NOT NULL,
+    "timetableId" bigint NOT NULL,
+    "mainTeacherId" bigint NOT NULL,
+    "lessonId" text NOT NULL,
+    "roomId" bigint NOT NULL,
+    "lessonGroupId" bigint NOT NULL,
+    "createdBy" text NOT NULL,
+    "createdAt" timestamp without time zone NOT NULL,
+    "modifiedBy" text,
+    "modifiedAt" timestamp without time zone,
+    "recordtest" json,
+    "_roomScheduledlessonsRoomId" bigint
+);
+
+--
+-- Class ScheduledLessonTeacher as table scheduled_lesson_teacher
+--
+CREATE TABLE "scheduled_lesson_teacher" (
+    "id" bigserial PRIMARY KEY,
+    "userId" bigint NOT NULL,
+    "scheduledLessonId" bigint NOT NULL
+);
+
+-- Indexes
+CREATE UNIQUE INDEX "scheduled_lesson_teacher_unique_idx" ON "scheduled_lesson_teacher" USING btree ("userId", "scheduledLessonId");
+
+--
+-- Class SchoolData as table school_data
+--
+CREATE TABLE "school_data" (
+    "id" bigserial PRIMARY KEY,
+    "name" text NOT NULL,
+    "officialName" text NOT NULL,
+    "address" text NOT NULL,
+    "schoolNumber" text NOT NULL,
+    "telephoneNumber" text NOT NULL,
+    "email" text NOT NULL,
+    "website" text NOT NULL,
+    "logoId" bigint,
+    "officialSealId" bigint
+);
+
+--
+-- Class SchoolList as table school_list
+--
+CREATE TABLE "school_list" (
+    "id" bigserial PRIMARY KEY,
+    "listId" text NOT NULL,
+    "archived" boolean NOT NULL,
+    "name" text NOT NULL,
+    "description" text NOT NULL,
+    "createdBy" text NOT NULL,
+    "public" boolean NOT NULL,
+    "authorizedUsers" text
+);
+
+--
+-- Class SchoolSemester as table school_semester
+--
+CREATE TABLE "school_semester" (
+    "id" bigserial PRIMARY KEY,
+    "schoolYear" text NOT NULL,
+    "isFirst" boolean NOT NULL,
+    "startDate" timestamp without time zone NOT NULL,
+    "endDate" timestamp without time zone NOT NULL,
+    "classConferenceDate" timestamp without time zone,
+    "supportConferenceDate" timestamp without time zone,
+    "reportConferenceDate" timestamp without time zone,
+    "reportSignedDate" timestamp without time zone
+);
+
+--
+-- Class Schoolday as table schoolday
+--
+CREATE TABLE "schoolday" (
+    "id" bigserial PRIMARY KEY,
+    "schoolday" timestamp without time zone NOT NULL,
+    "schoolSemesterId" bigint NOT NULL
+);
+
+--
+-- Class SchooldayEvent as table schoolday_event
+--
+CREATE TABLE "schoolday_event" (
+    "id" bigserial PRIMARY KEY,
+    "eventId" text NOT NULL,
+    "eventType" text NOT NULL,
+    "eventReason" text NOT NULL,
+    "eventTime" text,
+    "createdBy" text NOT NULL,
+    "processed" boolean NOT NULL,
+    "processedBy" text,
+    "processedAt" timestamp without time zone,
+    "documentId" bigint,
+    "processedDocumentId" bigint,
+    "schooldayId" bigint NOT NULL,
+    "pupilId" bigint NOT NULL,
+    "comment" text
+);
+
+--
+-- Class Subject as table subject
+--
+CREATE TABLE "subject" (
+    "id" bigserial PRIMARY KEY,
+    "publicId" text NOT NULL,
+    "name" text NOT NULL,
+    "description" text,
+    "color" text,
+    "createdBy" text NOT NULL,
+    "createdAt" timestamp without time zone NOT NULL,
+    "modifiedBy" text NOT NULL
+);
+
+--
+-- Class SupportCategory as table support_category
+--
+CREATE TABLE "support_category" (
+    "id" bigserial PRIMARY KEY,
+    "name" text NOT NULL,
+    "categoryId" bigint NOT NULL,
+    "parentCategory" bigint
+);
+
+--
+-- Class SupportGoal as table support_category_goal
+--
+CREATE TABLE "support_category_goal" (
+    "id" bigserial PRIMARY KEY,
+    "goalId" text NOT NULL,
+    "createdBy" text NOT NULL,
+    "createdAt" timestamp without time zone NOT NULL,
+    "score" bigint NOT NULL,
+    "achievedAt" timestamp without time zone,
+    "description" text NOT NULL,
+    "strategies" text NOT NULL,
+    "pupilId" bigint NOT NULL,
+    "supportCategoryId" bigint NOT NULL,
+    "_learningSupportPlanSupportgoalsLearningSupportPlanId" bigint,
+    "_supportCategoryCategorygoalsSupportCategoryId" bigint,
+    "_pupilDataSupportgoalsPupilDataId" bigint
+);
+
+--
+-- Class SupportCategoryStatus as table support_category_status
+--
+CREATE TABLE "support_category_status" (
+    "id" bigserial PRIMARY KEY,
+    "score" bigint NOT NULL,
+    "createdBy" text NOT NULL,
+    "createdAt" timestamp without time zone NOT NULL,
+    "comment" text NOT NULL,
+    "pupilId" bigint NOT NULL,
+    "supportCategoryId" bigint NOT NULL,
+    "learningSupportPlanId" bigint NOT NULL,
+    "_learningSupportPlanSupportcategorystatusesLearningSupporfb7bId" bigint,
+    "_supportCategoryCategorystatuesSupportCategoryId" bigint,
+    "_pupilDataSupportcategorystatusesPupilDataId" bigint
+);
+
+--
+-- Class SupportGoalCheck as table support_goal_check
+--
+CREATE TABLE "support_goal_check" (
+    "id" bigserial PRIMARY KEY,
+    "checkId" text NOT NULL,
+    "createdBy" text NOT NULL,
+    "createdAt" timestamp without time zone NOT NULL,
+    "score" bigint NOT NULL,
+    "comment" text NOT NULL,
+    "supportGoalId" bigint NOT NULL,
+    "_supportCategoryGoalGoalchecksSupportCategoryGoalId" bigint
+);
+
+--
+-- Class SupportLevel as table support_level
+--
+CREATE TABLE "support_level" (
+    "id" bigserial PRIMARY KEY,
+    "level" bigint NOT NULL,
+    "comment" text NOT NULL,
+    "createdAt" timestamp without time zone NOT NULL,
+    "createdBy" text NOT NULL,
+    "pupilId" bigint NOT NULL
+);
+
+--
+-- Class Timetable as table timetable
+--
+CREATE TABLE "timetable" (
+    "id" bigserial PRIMARY KEY,
+    "active" boolean NOT NULL,
+    "startsAt" timestamp without time zone NOT NULL,
+    "endsAt" timestamp without time zone,
+    "name" text NOT NULL,
+    "schoolSemesterId" bigint NOT NULL,
+    "createdBy" text NOT NULL,
+    "createdAt" timestamp without time zone NOT NULL,
+    "modified" json
+);
+
+-- Indexes
+CREATE INDEX "timetable_school_semester_idx" ON "timetable" USING btree ("schoolSemesterId");
+
+--
+-- Class TimetableSlot as table timetable_slot
+--
+CREATE TABLE "timetable_slot" (
+    "id" bigserial PRIMARY KEY,
+    "day" text NOT NULL,
+    "startTime" text NOT NULL,
+    "endTime" text NOT NULL,
+    "timetableId" bigint NOT NULL
+);
+
+--
+-- Class User as table user
+--
+CREATE TABLE "user" (
+    "id" bigserial PRIMARY KEY,
+    "userInfoId" bigint NOT NULL,
+    "role" text NOT NULL,
+    "matrixUserId" text,
+    "timeUnits" bigint NOT NULL,
+    "reliefTimeUnits" bigint NOT NULL,
+    "pupilsAuth" json,
+    "schooldayEventsProcessingTeam" text,
+    "credit" bigint NOT NULL,
+    "userFlags" json NOT NULL
+);
+
+-- Indexes
+CREATE UNIQUE INDEX "user_info_id_unique_idx" ON "user" USING btree ("userInfoId");
+
+--
+-- Class UserDevice as table user_device
+--
+CREATE TABLE "user_device" (
+    "id" bigserial PRIMARY KEY,
+    "userInfoId" bigint NOT NULL,
+    "deviceId" text NOT NULL,
+    "deviceName" text NOT NULL,
+    "lastLogin" timestamp without time zone NOT NULL,
+    "isActive" boolean NOT NULL,
+    "authId" bigint NOT NULL
+);
+
+-- Indexes
+CREATE UNIQUE INDEX "auth_key_user_device_idx" ON "user_device" USING btree ("authId");
+
+--
+-- Class Workbook as table workbook
+--
+CREATE TABLE "workbook" (
+    "id" bigserial PRIMARY KEY,
+    "isbn" bigint NOT NULL,
+    "name" text NOT NULL,
+    "subject" text,
+    "level" text,
+    "amount" bigint,
+    "imageUrl" text NOT NULL
+);
+
+--
+-- Class CloudStorageEntry as table serverpod_cloud_storage
+--
+CREATE TABLE "serverpod_cloud_storage" (
+    "id" bigserial PRIMARY KEY,
+    "storageId" text NOT NULL,
+    "path" text NOT NULL,
+    "addedTime" timestamp without time zone NOT NULL,
+    "expiration" timestamp without time zone,
+    "byteData" bytea NOT NULL,
+    "verified" boolean NOT NULL
+);
+
+-- Indexes
+CREATE UNIQUE INDEX "serverpod_cloud_storage_path_idx" ON "serverpod_cloud_storage" USING btree ("storageId", "path");
+CREATE INDEX "serverpod_cloud_storage_expiration" ON "serverpod_cloud_storage" USING btree ("expiration");
+
+--
+-- Class CloudStorageDirectUploadEntry as table serverpod_cloud_storage_direct_upload
+--
+CREATE TABLE "serverpod_cloud_storage_direct_upload" (
+    "id" bigserial PRIMARY KEY,
+    "storageId" text NOT NULL,
+    "path" text NOT NULL,
+    "expiration" timestamp without time zone NOT NULL,
+    "authKey" text NOT NULL
+);
+
+-- Indexes
+CREATE UNIQUE INDEX "serverpod_cloud_storage_direct_upload_storage_path" ON "serverpod_cloud_storage_direct_upload" USING btree ("storageId", "path");
+
+--
+-- Class FutureCallEntry as table serverpod_future_call
+--
+CREATE TABLE "serverpod_future_call" (
+    "id" bigserial PRIMARY KEY,
+    "name" text NOT NULL,
+    "time" timestamp without time zone NOT NULL,
+    "serializedObject" text,
+    "serverId" text NOT NULL,
+    "identifier" text
+);
+
+-- Indexes
+CREATE INDEX "serverpod_future_call_time_idx" ON "serverpod_future_call" USING btree ("time");
+CREATE INDEX "serverpod_future_call_serverId_idx" ON "serverpod_future_call" USING btree ("serverId");
+CREATE INDEX "serverpod_future_call_identifier_idx" ON "serverpod_future_call" USING btree ("identifier");
+
+--
+-- Class ServerHealthConnectionInfo as table serverpod_health_connection_info
+--
+CREATE TABLE "serverpod_health_connection_info" (
+    "id" bigserial PRIMARY KEY,
+    "serverId" text NOT NULL,
+    "timestamp" timestamp without time zone NOT NULL,
+    "active" bigint NOT NULL,
+    "closing" bigint NOT NULL,
+    "idle" bigint NOT NULL,
+    "granularity" bigint NOT NULL
+);
+
+-- Indexes
+CREATE UNIQUE INDEX "serverpod_health_connection_info_timestamp_idx" ON "serverpod_health_connection_info" USING btree ("timestamp", "serverId", "granularity");
+
+--
+-- Class ServerHealthMetric as table serverpod_health_metric
+--
+CREATE TABLE "serverpod_health_metric" (
+    "id" bigserial PRIMARY KEY,
+    "name" text NOT NULL,
+    "serverId" text NOT NULL,
+    "timestamp" timestamp without time zone NOT NULL,
+    "isHealthy" boolean NOT NULL,
+    "value" double precision NOT NULL,
+    "granularity" bigint NOT NULL
+);
+
+-- Indexes
+CREATE UNIQUE INDEX "serverpod_health_metric_timestamp_idx" ON "serverpod_health_metric" USING btree ("timestamp", "serverId", "name", "granularity");
+
+--
+-- Class LogEntry as table serverpod_log
+--
+CREATE TABLE "serverpod_log" (
+    "id" bigserial PRIMARY KEY,
+    "sessionLogId" bigint NOT NULL,
+    "messageId" bigint,
+    "reference" text,
+    "serverId" text NOT NULL,
+    "time" timestamp without time zone NOT NULL,
+    "logLevel" bigint NOT NULL,
+    "message" text NOT NULL,
+    "error" text,
+    "stackTrace" text,
+    "order" bigint NOT NULL
+);
+
+-- Indexes
+CREATE INDEX "serverpod_log_sessionLogId_idx" ON "serverpod_log" USING btree ("sessionLogId");
+
+--
+-- Class MessageLogEntry as table serverpod_message_log
+--
+CREATE TABLE "serverpod_message_log" (
+    "id" bigserial PRIMARY KEY,
+    "sessionLogId" bigint NOT NULL,
+    "serverId" text NOT NULL,
+    "messageId" bigint NOT NULL,
+    "endpoint" text NOT NULL,
+    "messageName" text NOT NULL,
+    "duration" double precision NOT NULL,
+    "error" text,
+    "stackTrace" text,
+    "slow" boolean NOT NULL,
+    "order" bigint NOT NULL
+);
+
+--
+-- Class MethodInfo as table serverpod_method
+--
+CREATE TABLE "serverpod_method" (
+    "id" bigserial PRIMARY KEY,
+    "endpoint" text NOT NULL,
+    "method" text NOT NULL
+);
+
+-- Indexes
+CREATE UNIQUE INDEX "serverpod_method_endpoint_method_idx" ON "serverpod_method" USING btree ("endpoint", "method");
+
+--
+-- Class DatabaseMigrationVersion as table serverpod_migrations
+--
+CREATE TABLE "serverpod_migrations" (
+    "id" bigserial PRIMARY KEY,
+    "module" text NOT NULL,
+    "version" text NOT NULL,
+    "timestamp" timestamp without time zone
+);
+
+-- Indexes
+CREATE UNIQUE INDEX "serverpod_migrations_ids" ON "serverpod_migrations" USING btree ("module");
+
+--
+-- Class QueryLogEntry as table serverpod_query_log
+--
+CREATE TABLE "serverpod_query_log" (
+    "id" bigserial PRIMARY KEY,
+    "serverId" text NOT NULL,
+    "sessionLogId" bigint NOT NULL,
+    "messageId" bigint,
+    "query" text NOT NULL,
+    "duration" double precision NOT NULL,
+    "numRows" bigint,
+    "error" text,
+    "stackTrace" text,
+    "slow" boolean NOT NULL,
+    "order" bigint NOT NULL
+);
+
+-- Indexes
+CREATE INDEX "serverpod_query_log_sessionLogId_idx" ON "serverpod_query_log" USING btree ("sessionLogId");
+
+--
+-- Class ReadWriteTestEntry as table serverpod_readwrite_test
+--
+CREATE TABLE "serverpod_readwrite_test" (
+    "id" bigserial PRIMARY KEY,
+    "number" bigint NOT NULL
+);
+
+--
+-- Class RuntimeSettings as table serverpod_runtime_settings
+--
+CREATE TABLE "serverpod_runtime_settings" (
+    "id" bigserial PRIMARY KEY,
+    "logSettings" json NOT NULL,
+    "logSettingsOverrides" json NOT NULL,
+    "logServiceCalls" boolean NOT NULL,
+    "logMalformedCalls" boolean NOT NULL
+);
+
+--
+-- Class SessionLogEntry as table serverpod_session_log
+--
+CREATE TABLE "serverpod_session_log" (
+    "id" bigserial PRIMARY KEY,
+    "serverId" text NOT NULL,
+    "time" timestamp without time zone NOT NULL,
+    "module" text,
+    "endpoint" text,
+    "method" text,
+    "duration" double precision,
+    "numQueries" bigint,
+    "slow" boolean,
+    "error" text,
+    "stackTrace" text,
+    "authenticatedUserId" bigint,
+    "isOpen" boolean,
+    "touched" timestamp without time zone NOT NULL
+);
+
+-- Indexes
+CREATE INDEX "serverpod_session_log_serverid_idx" ON "serverpod_session_log" USING btree ("serverId");
+CREATE INDEX "serverpod_session_log_touched_idx" ON "serverpod_session_log" USING btree ("touched");
+CREATE INDEX "serverpod_session_log_isopen_idx" ON "serverpod_session_log" USING btree ("isOpen");
+
+--
+-- Class AuthKey as table serverpod_auth_key
+--
+CREATE TABLE "serverpod_auth_key" (
+    "id" bigserial PRIMARY KEY,
+    "userId" bigint NOT NULL,
+    "hash" text NOT NULL,
+    "scopeNames" json NOT NULL,
+    "method" text NOT NULL
+);
+
+-- Indexes
+CREATE INDEX "serverpod_auth_key_userId_idx" ON "serverpod_auth_key" USING btree ("userId");
+
+--
+-- Class EmailAuth as table serverpod_email_auth
+--
+CREATE TABLE "serverpod_email_auth" (
+    "id" bigserial PRIMARY KEY,
+    "userId" bigint NOT NULL,
+    "email" text NOT NULL,
+    "hash" text NOT NULL
+);
+
+-- Indexes
+CREATE UNIQUE INDEX "serverpod_email_auth_email" ON "serverpod_email_auth" USING btree ("email");
+
+--
+-- Class EmailCreateAccountRequest as table serverpod_email_create_request
+--
+CREATE TABLE "serverpod_email_create_request" (
+    "id" bigserial PRIMARY KEY,
+    "userName" text NOT NULL,
+    "email" text NOT NULL,
+    "hash" text NOT NULL,
+    "verificationCode" text NOT NULL
+);
+
+-- Indexes
+CREATE UNIQUE INDEX "serverpod_email_auth_create_account_request_idx" ON "serverpod_email_create_request" USING btree ("email");
+
+--
+-- Class EmailFailedSignIn as table serverpod_email_failed_sign_in
+--
+CREATE TABLE "serverpod_email_failed_sign_in" (
+    "id" bigserial PRIMARY KEY,
+    "email" text NOT NULL,
+    "time" timestamp without time zone NOT NULL,
+    "ipAddress" text NOT NULL
+);
+
+-- Indexes
+CREATE INDEX "serverpod_email_failed_sign_in_email_idx" ON "serverpod_email_failed_sign_in" USING btree ("email");
+CREATE INDEX "serverpod_email_failed_sign_in_time_idx" ON "serverpod_email_failed_sign_in" USING btree ("time");
+
+--
+-- Class EmailReset as table serverpod_email_reset
+--
+CREATE TABLE "serverpod_email_reset" (
+    "id" bigserial PRIMARY KEY,
+    "userId" bigint NOT NULL,
+    "verificationCode" text NOT NULL,
+    "expiration" timestamp without time zone NOT NULL
+);
+
+-- Indexes
+CREATE UNIQUE INDEX "serverpod_email_reset_verification_idx" ON "serverpod_email_reset" USING btree ("verificationCode");
+
+--
+-- Class GoogleRefreshToken as table serverpod_google_refresh_token
+--
+CREATE TABLE "serverpod_google_refresh_token" (
+    "id" bigserial PRIMARY KEY,
+    "userId" bigint NOT NULL,
+    "refreshToken" text NOT NULL
+);
+
+-- Indexes
+CREATE UNIQUE INDEX "serverpod_google_refresh_token_userId_idx" ON "serverpod_google_refresh_token" USING btree ("userId");
+
+--
+-- Class UserImage as table serverpod_user_image
+--
+CREATE TABLE "serverpod_user_image" (
+    "id" bigserial PRIMARY KEY,
+    "userId" bigint NOT NULL,
+    "version" bigint NOT NULL,
+    "url" text NOT NULL
+);
+
+-- Indexes
+CREATE INDEX "serverpod_user_image_user_id" ON "serverpod_user_image" USING btree ("userId", "version");
+
+--
+-- Class UserInfo as table serverpod_user_info
+--
+CREATE TABLE "serverpod_user_info" (
+    "id" bigserial PRIMARY KEY,
+    "userIdentifier" text NOT NULL,
+    "userName" text,
+    "fullName" text,
+    "email" text,
+    "created" timestamp without time zone NOT NULL,
+    "imageUrl" text,
+    "scopeNames" json NOT NULL,
+    "blocked" boolean NOT NULL
+);
+
+-- Indexes
+CREATE UNIQUE INDEX "serverpod_user_info_user_identifier" ON "serverpod_user_info" USING btree ("userIdentifier");
+CREATE INDEX "serverpod_user_info_email" ON "serverpod_user_info" USING btree ("email");
+
+--
+-- Foreign relations for "book_tagging" table
+--
+ALTER TABLE ONLY "book_tagging"
+    ADD CONSTRAINT "book_tagging_fk_0"
+    FOREIGN KEY("bookId")
+    REFERENCES "book"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "book_tagging"
+    ADD CONSTRAINT "book_tagging_fk_1"
+    FOREIGN KEY("bookTagId")
+    REFERENCES "book_tag"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "competence_check" table
+--
+ALTER TABLE ONLY "competence_check"
+    ADD CONSTRAINT "competence_check_fk_0"
+    FOREIGN KEY("pupilId")
+    REFERENCES "pupil_data"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "competence_check"
+    ADD CONSTRAINT "competence_check_fk_1"
+    FOREIGN KEY("competenceId")
+    REFERENCES "competence"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "competence_goal" table
+--
+ALTER TABLE ONLY "competence_goal"
+    ADD CONSTRAINT "competence_goal_fk_0"
+    FOREIGN KEY("pupilId")
+    REFERENCES "pupil_data"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "competence_goal"
+    ADD CONSTRAINT "competence_goal_fk_1"
+    FOREIGN KEY("competenceId")
+    REFERENCES "competence"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "competence_report" table
+--
+ALTER TABLE ONLY "competence_report"
+    ADD CONSTRAINT "competence_report_fk_0"
+    FOREIGN KEY("pupilId")
+    REFERENCES "pupil_data"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "competence_report"
+    ADD CONSTRAINT "competence_report_fk_1"
+    FOREIGN KEY("schoolSemesterId")
+    REFERENCES "school_semester"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "competence_report_check" table
+--
+ALTER TABLE ONLY "competence_report_check"
+    ADD CONSTRAINT "competence_report_check_fk_0"
+    FOREIGN KEY("pupilId")
+    REFERENCES "pupil_data"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "competence_report_check"
+    ADD CONSTRAINT "competence_report_check_fk_1"
+    FOREIGN KEY("competenceId")
+    REFERENCES "competence_report_item"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "competence_report_check"
+    ADD CONSTRAINT "competence_report_check_fk_2"
+    FOREIGN KEY("competenceReportId")
+    REFERENCES "competence_report"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "credit_transaction" table
+--
+ALTER TABLE ONLY "credit_transaction"
+    ADD CONSTRAINT "credit_transaction_fk_0"
+    FOREIGN KEY("_pupilDataCredittransactionsPupilDataId")
+    REFERENCES "pupil_data"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "hub_document" table
+--
+ALTER TABLE ONLY "hub_document"
+    ADD CONSTRAINT "hub_document_fk_0"
+    FOREIGN KEY("_pupilBookLendingPupilbooklendingfilesPupilBookLendingId")
+    REFERENCES "pupil_book_lending"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "hub_document"
+    ADD CONSTRAINT "hub_document_fk_1"
+    FOREIGN KEY("_competenceCheckDocumentsCompetenceCheckId")
+    REFERENCES "competence_check"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "hub_document"
+    ADD CONSTRAINT "hub_document_fk_2"
+    FOREIGN KEY("_competenceGoalDocumentsCompetenceGoalId")
+    REFERENCES "competence_goal"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "hub_document"
+    ADD CONSTRAINT "hub_document_fk_3"
+    FOREIGN KEY("_supportCategoryStatusDocumentsSupportCategoryStatusId")
+    REFERENCES "support_category_status"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "hub_document"
+    ADD CONSTRAINT "hub_document_fk_4"
+    FOREIGN KEY("_supportGoalCheckDocumentsSupportGoalCheckId")
+    REFERENCES "support_goal_check"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "hub_document"
+    ADD CONSTRAINT "hub_document_fk_5"
+    FOREIGN KEY("_preSchoolMedicalPreschoolmedicalfilesPreSchoolMedicalId")
+    REFERENCES "pre_school_medical"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "hub_document"
+    ADD CONSTRAINT "hub_document_fk_6"
+    FOREIGN KEY("_preSchoolTestPreschooltestdocumentsPreSchoolTestId")
+    REFERENCES "pre_school_test"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "learning_support_plan" table
+--
+ALTER TABLE ONLY "learning_support_plan"
+    ADD CONSTRAINT "learning_support_plan_fk_0"
+    FOREIGN KEY("learningSupportLevelId")
+    REFERENCES "support_level"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "learning_support_plan"
+    ADD CONSTRAINT "learning_support_plan_fk_1"
+    FOREIGN KEY("pupilId")
+    REFERENCES "pupil_data"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "learning_support_plan"
+    ADD CONSTRAINT "learning_support_plan_fk_2"
+    FOREIGN KEY("schoolSemesterId")
+    REFERENCES "school_semester"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "lesson" table
+--
+ALTER TABLE ONLY "lesson"
+    ADD CONSTRAINT "lesson_fk_0"
+    FOREIGN KEY("subjectId")
+    REFERENCES "subject"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "lesson_attendance" table
+--
+ALTER TABLE ONLY "lesson_attendance"
+    ADD CONSTRAINT "lesson_attendance_fk_0"
+    FOREIGN KEY("lessonId")
+    REFERENCES "lesson"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "lesson_attendance"
+    ADD CONSTRAINT "lesson_attendance_fk_1"
+    FOREIGN KEY("pupilId")
+    REFERENCES "pupil_data"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "lesson_group" table
+--
+ALTER TABLE ONLY "lesson_group"
+    ADD CONSTRAINT "lesson_group_fk_0"
+    FOREIGN KEY("timetableId")
+    REFERENCES "timetable"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "lesson_group_pupil" table
+--
+ALTER TABLE ONLY "lesson_group_pupil"
+    ADD CONSTRAINT "lesson_group_pupil_fk_0"
+    FOREIGN KEY("lessonGroupId")
+    REFERENCES "lesson_group"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "lesson_group_pupil"
+    ADD CONSTRAINT "lesson_group_pupil_fk_1"
+    FOREIGN KEY("pupilDataId")
+    REFERENCES "pupil_data"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "lesson_teacher" table
+--
+ALTER TABLE ONLY "lesson_teacher"
+    ADD CONSTRAINT "lesson_teacher_fk_0"
+    FOREIGN KEY("userId")
+    REFERENCES "user"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "lesson_teacher"
+    ADD CONSTRAINT "lesson_teacher_fk_1"
+    FOREIGN KEY("scheduledLessonId")
+    REFERENCES "lesson"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "library_book" table
+--
+ALTER TABLE ONLY "library_book"
+    ADD CONSTRAINT "library_book_fk_0"
+    FOREIGN KEY("bookId")
+    REFERENCES "book"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "library_book"
+    ADD CONSTRAINT "library_book_fk_1"
+    FOREIGN KEY("locationId")
+    REFERENCES "library_book_location"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "missed_class" table
+--
+ALTER TABLE ONLY "missed_class"
+    ADD CONSTRAINT "missed_class_fk_0"
+    FOREIGN KEY("schooldayId")
+    REFERENCES "schoolday"("id")
+    ON DELETE CASCADE
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "missed_class"
+    ADD CONSTRAINT "missed_class_fk_1"
+    FOREIGN KEY("pupilId")
+    REFERENCES "pupil_data"("id")
+    ON DELETE CASCADE
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "pupil_authorization" table
+--
+ALTER TABLE ONLY "pupil_authorization"
+    ADD CONSTRAINT "pupil_authorization_fk_0"
+    FOREIGN KEY("fileId")
+    REFERENCES "hub_document"("id")
+    ON DELETE CASCADE
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "pupil_authorization"
+    ADD CONSTRAINT "pupil_authorization_fk_1"
+    FOREIGN KEY("authorizationId")
+    REFERENCES "authorization"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "pupil_authorization"
+    ADD CONSTRAINT "pupil_authorization_fk_2"
+    FOREIGN KEY("pupilId")
+    REFERENCES "pupil_data"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "pupil_book_lending" table
+--
+ALTER TABLE ONLY "pupil_book_lending"
+    ADD CONSTRAINT "pupil_book_lending_fk_0"
+    FOREIGN KEY("pupilId")
+    REFERENCES "pupil_data"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "pupil_book_lending"
+    ADD CONSTRAINT "pupil_book_lending_fk_1"
+    FOREIGN KEY("libraryBookId")
+    REFERENCES "library_book"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "pupil_data" table
+--
+ALTER TABLE ONLY "pupil_data"
+    ADD CONSTRAINT "pupil_data_fk_0"
+    FOREIGN KEY("preSchoolMedicalId")
+    REFERENCES "pre_school_medical"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "pupil_data"
+    ADD CONSTRAINT "pupil_data_fk_1"
+    FOREIGN KEY("kindergardenId")
+    REFERENCES "kindergarden"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "pupil_data"
+    ADD CONSTRAINT "pupil_data_fk_2"
+    FOREIGN KEY("preSchoolTestId")
+    REFERENCES "pre_school_test"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "pupil_data"
+    ADD CONSTRAINT "pupil_data_fk_3"
+    FOREIGN KEY("avatarId")
+    REFERENCES "hub_document"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "pupil_data"
+    ADD CONSTRAINT "pupil_data_fk_4"
+    FOREIGN KEY("avatarAuthId")
+    REFERENCES "hub_document"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "pupil_data"
+    ADD CONSTRAINT "pupil_data_fk_5"
+    FOREIGN KEY("publicMediaAuthDocumentId")
+    REFERENCES "hub_document"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "pupil_data"
+    ADD CONSTRAINT "pupil_data_fk_6"
+    FOREIGN KEY("_kindergardenPupilsKindergardenId")
+    REFERENCES "kindergarden"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "pupil_list_entry" table
+--
+ALTER TABLE ONLY "pupil_list_entry"
+    ADD CONSTRAINT "pupil_list_entry_fk_0"
+    FOREIGN KEY("schoolListId")
+    REFERENCES "school_list"("id")
+    ON DELETE CASCADE
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "pupil_list_entry"
+    ADD CONSTRAINT "pupil_list_entry_fk_1"
+    FOREIGN KEY("pupilId")
+    REFERENCES "pupil_data"("id")
+    ON DELETE CASCADE
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "pupil_workbook" table
+--
+ALTER TABLE ONLY "pupil_workbook"
+    ADD CONSTRAINT "pupil_workbook_fk_0"
+    FOREIGN KEY("pupilId")
+    REFERENCES "pupil_data"("id")
+    ON DELETE CASCADE
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "pupil_workbook"
+    ADD CONSTRAINT "pupil_workbook_fk_1"
+    FOREIGN KEY("workbookId")
+    REFERENCES "workbook"("id")
+    ON DELETE CASCADE
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "scheduled_lesson" table
+--
+ALTER TABLE ONLY "scheduled_lesson"
+    ADD CONSTRAINT "scheduled_lesson_fk_0"
+    FOREIGN KEY("subjectId")
+    REFERENCES "subject"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "scheduled_lesson"
+    ADD CONSTRAINT "scheduled_lesson_fk_1"
+    FOREIGN KEY("scheduledAtId")
+    REFERENCES "timetable_slot"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "scheduled_lesson"
+    ADD CONSTRAINT "scheduled_lesson_fk_2"
+    FOREIGN KEY("timetableId")
+    REFERENCES "timetable"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "scheduled_lesson"
+    ADD CONSTRAINT "scheduled_lesson_fk_3"
+    FOREIGN KEY("roomId")
+    REFERENCES "room"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "scheduled_lesson"
+    ADD CONSTRAINT "scheduled_lesson_fk_4"
+    FOREIGN KEY("lessonGroupId")
+    REFERENCES "lesson_group"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "scheduled_lesson"
+    ADD CONSTRAINT "scheduled_lesson_fk_5"
+    FOREIGN KEY("_roomScheduledlessonsRoomId")
+    REFERENCES "room"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "scheduled_lesson_teacher" table
+--
+ALTER TABLE ONLY "scheduled_lesson_teacher"
+    ADD CONSTRAINT "scheduled_lesson_teacher_fk_0"
+    FOREIGN KEY("userId")
+    REFERENCES "user"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "scheduled_lesson_teacher"
+    ADD CONSTRAINT "scheduled_lesson_teacher_fk_1"
+    FOREIGN KEY("scheduledLessonId")
+    REFERENCES "scheduled_lesson"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "school_data" table
+--
+ALTER TABLE ONLY "school_data"
+    ADD CONSTRAINT "school_data_fk_0"
+    FOREIGN KEY("logoId")
+    REFERENCES "hub_document"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "school_data"
+    ADD CONSTRAINT "school_data_fk_1"
+    FOREIGN KEY("officialSealId")
+    REFERENCES "hub_document"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "schoolday" table
+--
+ALTER TABLE ONLY "schoolday"
+    ADD CONSTRAINT "schoolday_fk_0"
+    FOREIGN KEY("schoolSemesterId")
+    REFERENCES "school_semester"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "schoolday_event" table
+--
+ALTER TABLE ONLY "schoolday_event"
+    ADD CONSTRAINT "schoolday_event_fk_0"
+    FOREIGN KEY("documentId")
+    REFERENCES "hub_document"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "schoolday_event"
+    ADD CONSTRAINT "schoolday_event_fk_1"
+    FOREIGN KEY("processedDocumentId")
+    REFERENCES "hub_document"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "schoolday_event"
+    ADD CONSTRAINT "schoolday_event_fk_2"
+    FOREIGN KEY("schooldayId")
+    REFERENCES "schoolday"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "schoolday_event"
+    ADD CONSTRAINT "schoolday_event_fk_3"
+    FOREIGN KEY("pupilId")
+    REFERENCES "pupil_data"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "support_category_goal" table
+--
+ALTER TABLE ONLY "support_category_goal"
+    ADD CONSTRAINT "support_category_goal_fk_0"
+    FOREIGN KEY("pupilId")
+    REFERENCES "pupil_data"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "support_category_goal"
+    ADD CONSTRAINT "support_category_goal_fk_1"
+    FOREIGN KEY("supportCategoryId")
+    REFERENCES "support_category"("id")
+    ON DELETE CASCADE
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "support_category_goal"
+    ADD CONSTRAINT "support_category_goal_fk_2"
+    FOREIGN KEY("_learningSupportPlanSupportgoalsLearningSupportPlanId")
+    REFERENCES "learning_support_plan"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "support_category_goal"
+    ADD CONSTRAINT "support_category_goal_fk_3"
+    FOREIGN KEY("_supportCategoryCategorygoalsSupportCategoryId")
+    REFERENCES "support_category"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "support_category_goal"
+    ADD CONSTRAINT "support_category_goal_fk_4"
+    FOREIGN KEY("_pupilDataSupportgoalsPupilDataId")
+    REFERENCES "pupil_data"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "support_category_status" table
+--
+ALTER TABLE ONLY "support_category_status"
+    ADD CONSTRAINT "support_category_status_fk_0"
+    FOREIGN KEY("pupilId")
+    REFERENCES "pupil_data"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "support_category_status"
+    ADD CONSTRAINT "support_category_status_fk_1"
+    FOREIGN KEY("supportCategoryId")
+    REFERENCES "support_category"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "support_category_status"
+    ADD CONSTRAINT "support_category_status_fk_2"
+    FOREIGN KEY("learningSupportPlanId")
+    REFERENCES "learning_support_plan"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "support_category_status"
+    ADD CONSTRAINT "support_category_status_fk_3"
+    FOREIGN KEY("_learningSupportPlanSupportcategorystatusesLearningSupporfb7bId")
+    REFERENCES "learning_support_plan"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "support_category_status"
+    ADD CONSTRAINT "support_category_status_fk_4"
+    FOREIGN KEY("_supportCategoryCategorystatuesSupportCategoryId")
+    REFERENCES "support_category"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "support_category_status"
+    ADD CONSTRAINT "support_category_status_fk_5"
+    FOREIGN KEY("_pupilDataSupportcategorystatusesPupilDataId")
+    REFERENCES "pupil_data"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "support_goal_check" table
+--
+ALTER TABLE ONLY "support_goal_check"
+    ADD CONSTRAINT "support_goal_check_fk_0"
+    FOREIGN KEY("supportGoalId")
+    REFERENCES "support_category_goal"("id")
+    ON DELETE CASCADE
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "support_goal_check"
+    ADD CONSTRAINT "support_goal_check_fk_1"
+    FOREIGN KEY("_supportCategoryGoalGoalchecksSupportCategoryGoalId")
+    REFERENCES "support_category_goal"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "support_level" table
+--
+ALTER TABLE ONLY "support_level"
+    ADD CONSTRAINT "support_level_fk_0"
+    FOREIGN KEY("pupilId")
+    REFERENCES "pupil_data"("id")
+    ON DELETE CASCADE
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "timetable" table
+--
+ALTER TABLE ONLY "timetable"
+    ADD CONSTRAINT "timetable_fk_0"
+    FOREIGN KEY("schoolSemesterId")
+    REFERENCES "school_semester"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "timetable_slot" table
+--
+ALTER TABLE ONLY "timetable_slot"
+    ADD CONSTRAINT "timetable_slot_fk_0"
+    FOREIGN KEY("timetableId")
+    REFERENCES "timetable"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "user" table
+--
+ALTER TABLE ONLY "user"
+    ADD CONSTRAINT "user_fk_0"
+    FOREIGN KEY("userInfoId")
+    REFERENCES "serverpod_user_info"("id")
+    ON DELETE CASCADE
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "user_device" table
+--
+ALTER TABLE ONLY "user_device"
+    ADD CONSTRAINT "user_device_fk_0"
+    FOREIGN KEY("userInfoId")
+    REFERENCES "serverpod_user_info"("id")
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION;
+ALTER TABLE ONLY "user_device"
+    ADD CONSTRAINT "user_device_fk_1"
+    FOREIGN KEY("authId")
+    REFERENCES "serverpod_auth_key"("id")
+    ON DELETE CASCADE
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "serverpod_log" table
+--
+ALTER TABLE ONLY "serverpod_log"
+    ADD CONSTRAINT "serverpod_log_fk_0"
+    FOREIGN KEY("sessionLogId")
+    REFERENCES "serverpod_session_log"("id")
+    ON DELETE CASCADE
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "serverpod_message_log" table
+--
+ALTER TABLE ONLY "serverpod_message_log"
+    ADD CONSTRAINT "serverpod_message_log_fk_0"
+    FOREIGN KEY("sessionLogId")
+    REFERENCES "serverpod_session_log"("id")
+    ON DELETE CASCADE
+    ON UPDATE NO ACTION;
+
+--
+-- Foreign relations for "serverpod_query_log" table
+--
+ALTER TABLE ONLY "serverpod_query_log"
+    ADD CONSTRAINT "serverpod_query_log_fk_0"
+    FOREIGN KEY("sessionLogId")
+    REFERENCES "serverpod_session_log"("id")
+    ON DELETE CASCADE
+    ON UPDATE NO ACTION;
+
+
+--
+-- MIGRATION VERSION FOR school_data_hub
+--
+INSERT INTO "serverpod_migrations" ("module", "version", "timestamp")
+    VALUES ('school_data_hub', '20251208135524075', now())
+    ON CONFLICT ("module")
+    DO UPDATE SET "version" = '20251208135524075', "timestamp" = now();
+
+--
+-- MIGRATION VERSION FOR serverpod
+--
+INSERT INTO "serverpod_migrations" ("module", "version", "timestamp")
+    VALUES ('serverpod', '20240516151843329', now())
+    ON CONFLICT ("module")
+    DO UPDATE SET "version" = '20240516151843329', "timestamp" = now();
+
+--
+-- MIGRATION VERSION FOR serverpod_auth
+--
+INSERT INTO "serverpod_migrations" ("module", "version", "timestamp")
+    VALUES ('serverpod_auth', '20240520102713718', now())
+    ON CONFLICT ("module")
+    DO UPDATE SET "version" = '20240520102713718', "timestamp" = now();
+
+
+COMMIT;
diff --git a/school_data_hub_server/migrations/20251208135524075/definition_project.json b/school_data_hub_server/migrations/20251208135524075/definition_project.json
new file mode 100644
index 00000000..0c6cbd61
--- /dev/null
+++ b/school_data_hub_server/migrations/20251208135524075/definition_project.json
@@ -0,0 +1,4845 @@
+{
+  "moduleName": "school_data_hub",
+  "tables": [
+    {
+      "name": "authorization",
+      "dartName": "Authorization",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('authorization_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "description",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "authorization_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "book",
+      "dartName": "Book",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('book_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "isbn",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "title",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "author",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "description",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "readingLevel",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "imagePath",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "book_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "book_id_unique_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "isbn"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "book_tag",
+      "dartName": "BookTag",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('book_tag_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "book_tag_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "book_tagging",
+      "dartName": "BookTagging",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('book_tagging_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "bookId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "bookTagId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "book_tagging_fk_0",
+          "columns": [
+            "bookId"
+          ],
+          "referenceTable": "book",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "book_tagging_fk_1",
+          "columns": [
+            "bookTagId"
+          ],
+          "referenceTable": "book_tag",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "book_tagging_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "book_tagging_index_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "bookId"
+            },
+            {
+              "type": 0,
+              "definition": "bookTagId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "competence",
+      "dartName": "Competence",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('competence_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "publicId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "parentCompetence",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "level",
+          "columnType": 8,
+          "isNullable": true,
+          "dartType": "List<String>?"
+        },
+        {
+          "name": "indicators",
+          "columnType": 8,
+          "isNullable": true,
+          "dartType": "List<String>?"
+        },
+        {
+          "name": "order",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "competence_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "competence_check",
+      "dartName": "CompetenceCheck",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('competence_check_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "checkId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "score",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "valueFactor",
+          "columnType": 3,
+          "isNullable": false,
+          "dartType": "double"
+        },
+        {
+          "name": "groupCheckId",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "groupCheckName",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "competenceId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "competence_check_fk_0",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "competence_check_fk_1",
+          "columns": [
+            "competenceId"
+          ],
+          "referenceTable": "competence",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "competence_check_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "competence_goal",
+      "dartName": "CompetenceGoal",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('competence_goal_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "publicId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "description",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "strategies",
+          "columnType": 8,
+          "isNullable": true,
+          "dartType": "List<String>?"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "modifiedBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "score",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "achievedAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "competenceId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "competence_goal_fk_0",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "competence_goal_fk_1",
+          "columns": [
+            "competenceId"
+          ],
+          "referenceTable": "competence",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "competence_goal_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "competence_report",
+      "dartName": "CompetenceReport",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('competence_report_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "reportId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "modifiedBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "achievement",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "achievedAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "schoolSemesterId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "competence_report_fk_0",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "competence_report_fk_1",
+          "columns": [
+            "schoolSemesterId"
+          ],
+          "referenceTable": "school_semester",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "competence_report_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "competence_report_check",
+      "dartName": "CompetenceReportCheck",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('competence_report_check_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "publicId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "achievement",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "competenceId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "competenceReportId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "competence_report_check_fk_0",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "competence_report_check_fk_1",
+          "columns": [
+            "competenceId"
+          ],
+          "referenceTable": "competence_report_item",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "competence_report_check_fk_2",
+          "columns": [
+            "competenceReportId"
+          ],
+          "referenceTable": "competence_report",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "competence_report_check_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "competence_report_item",
+      "dartName": "CompetenceReportItem",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('competence_report_item_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "publicId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "parentItem",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "level",
+          "columnType": 8,
+          "isNullable": true,
+          "dartType": "List<String>?"
+        },
+        {
+          "name": "order",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "competence_report_item_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "compulsory_room",
+      "dartName": "CompulsoryRoom",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('compulsory_room_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "roomId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "roomType",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "protocol:MatrixRoomType"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "compulsory_room_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "credit_transaction",
+      "dartName": "CreditTransaction",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('credit_transaction_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "sender",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "receiver",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "amount",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "dateTime",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "description",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "_pupilDataCredittransactionsPupilDataId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "credit_transaction_fk_0",
+          "columns": [
+            "_pupilDataCredittransactionsPupilDataId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "credit_transaction_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "reciever_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "receiver"
+            }
+          ],
+          "type": "btree",
+          "isUnique": false,
+          "isPrimary": false
+        },
+        {
+          "indexName": "sender_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "sender"
+            }
+          ],
+          "type": "btree",
+          "isUnique": false,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "hub_document",
+      "dartName": "HubDocument",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('hub_document_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "documentId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "documentPath",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "_pupilBookLendingPupilbooklendingfilesPupilBookLendingId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "_competenceCheckDocumentsCompetenceCheckId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "_competenceGoalDocumentsCompetenceGoalId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "_supportCategoryStatusDocumentsSupportCategoryStatusId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "_supportGoalCheckDocumentsSupportGoalCheckId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "_preSchoolMedicalPreschoolmedicalfilesPreSchoolMedicalId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "_preSchoolTestPreschooltestdocumentsPreSchoolTestId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "hub_document_fk_0",
+          "columns": [
+            "_pupilBookLendingPupilbooklendingfilesPupilBookLendingId"
+          ],
+          "referenceTable": "pupil_book_lending",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "hub_document_fk_1",
+          "columns": [
+            "_competenceCheckDocumentsCompetenceCheckId"
+          ],
+          "referenceTable": "competence_check",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "hub_document_fk_2",
+          "columns": [
+            "_competenceGoalDocumentsCompetenceGoalId"
+          ],
+          "referenceTable": "competence_goal",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "hub_document_fk_3",
+          "columns": [
+            "_supportCategoryStatusDocumentsSupportCategoryStatusId"
+          ],
+          "referenceTable": "support_category_status",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "hub_document_fk_4",
+          "columns": [
+            "_supportGoalCheckDocumentsSupportGoalCheckId"
+          ],
+          "referenceTable": "support_goal_check",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "hub_document_fk_5",
+          "columns": [
+            "_preSchoolMedicalPreschoolmedicalfilesPreSchoolMedicalId"
+          ],
+          "referenceTable": "pre_school_medical",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "hub_document_fk_6",
+          "columns": [
+            "_preSchoolTestPreschooltestdocumentsPreSchoolTestId"
+          ],
+          "referenceTable": "pre_school_test",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "hub_document_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "kindergarden",
+      "dartName": "Kindergarden",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('kindergarden_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "phone",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "address",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "email",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "contactPerson",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "kindergarden_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "last_pupil_identities_update",
+      "dartName": "LastPupilIdentiesUpdate",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('last_pupil_identities_update_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "date",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "last_pupil_identities_update_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "learning_support_plan",
+      "dartName": "LearningSupportPlan",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('learning_support_plan_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "planId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "number",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "socialPedagogue",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "proffesionalsInvolved",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "strengthsDescription",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "problemsDescription",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "learningSupportLevelId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "schoolSemesterId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "learning_support_plan_fk_0",
+          "columns": [
+            "learningSupportLevelId"
+          ],
+          "referenceTable": "support_level",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "learning_support_plan_fk_1",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "learning_support_plan_fk_2",
+          "columns": [
+            "schoolSemesterId"
+          ],
+          "referenceTable": "school_semester",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "learning_support_plan_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "lesson",
+      "dartName": "Lesson",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('lesson_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "publicId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "subjectId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "lesson_fk_0",
+          "columns": [
+            "subjectId"
+          ],
+          "referenceTable": "subject",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "lesson_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "lesson_attendance",
+      "dartName": "LessonAttendance",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('lesson_attendance_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "lessonId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "modifiedBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "modifiedAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "lesson_attendance_fk_0",
+          "columns": [
+            "lessonId"
+          ],
+          "referenceTable": "lesson",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "lesson_attendance_fk_1",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "lesson_attendance_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "lesson_group",
+      "dartName": "LessonGroup",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('lesson_group_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "publicId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "color",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "timetableId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "modifiedBy",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "modifiedAt",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "lesson_group_fk_0",
+          "columns": [
+            "timetableId"
+          ],
+          "referenceTable": "timetable",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "lesson_group_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "lesson_group_pupil",
+      "dartName": "ScheduledLessonGroupMembership",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('lesson_group_pupil_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "lessonGroupId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "pupilDataId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "lesson_group_pupil_fk_0",
+          "columns": [
+            "lessonGroupId"
+          ],
+          "referenceTable": "lesson_group",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "lesson_group_pupil_fk_1",
+          "columns": [
+            "pupilDataId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "lesson_group_pupil_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "lesson_group_membership_index_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "lessonGroupId"
+            },
+            {
+              "type": 0,
+              "definition": "pupilDataId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "lesson_teacher",
+      "dartName": "LessonTeacher",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('lesson_teacher_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "userId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "scheduledLessonId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "lesson_teacher_fk_0",
+          "columns": [
+            "userId"
+          ],
+          "referenceTable": "user",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "lesson_teacher_fk_1",
+          "columns": [
+            "scheduledLessonId"
+          ],
+          "referenceTable": "lesson",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "lesson_teacher_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "lesson_teacher_unique_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "userId"
+            },
+            {
+              "type": 0,
+              "definition": "scheduledLessonId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "library_book",
+      "dartName": "LibraryBook",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('library_book_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "libraryId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "bookId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "locationId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "available",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "library_book_fk_0",
+          "columns": [
+            "bookId"
+          ],
+          "referenceTable": "book",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "library_book_fk_1",
+          "columns": [
+            "locationId"
+          ],
+          "referenceTable": "library_book_location",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "library_book_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "library_id_unique_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "libraryId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "library_book_location",
+      "dartName": "LibraryBookLocation",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('library_book_location_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "location",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "library_book_location_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "location_unique_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "location"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "missed_class",
+      "dartName": "MissedSchoolday",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('missed_class_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "missedType",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "protocol:MissedType"
+        },
+        {
+          "name": "unexcused",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "contacted",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "protocol:ContactedType"
+        },
+        {
+          "name": "returned",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "returnedAt",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        },
+        {
+          "name": "writtenExcuse",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "minutesLate",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "modifiedBy",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "schooldayId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "missed_class_fk_0",
+          "columns": [
+            "schooldayId"
+          ],
+          "referenceTable": "schoolday",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        },
+        {
+          "constraintName": "missed_class_fk_1",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "missed_class_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "schoolday_pupil_data_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "schooldayId"
+            },
+            {
+              "type": 0,
+              "definition": "pupilId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "pre_school_medical",
+      "dartName": "PreSchoolMedical",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('pre_school_medical_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "preschoolMedicalStatus",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "protocol:PreSchoolMedicalStatus?"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "updatedBy",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "updatedAt",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "pre_school_medical_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "pre_school_test",
+      "dartName": "PreSchoolTest",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('pre_school_test_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "careNeedsIntensity",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "pre_school_test_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "pupil_authorization",
+      "dartName": "PupilAuthorization",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('pupil_authorization_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "status",
+          "columnType": 1,
+          "isNullable": true,
+          "dartType": "bool?"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "fileId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "authorizationId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "pupil_authorization_fk_0",
+          "columns": [
+            "fileId"
+          ],
+          "referenceTable": "hub_document",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        },
+        {
+          "constraintName": "pupil_authorization_fk_1",
+          "columns": [
+            "authorizationId"
+          ],
+          "referenceTable": "authorization",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "pupil_authorization_fk_2",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "pupil_authorization_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "pupil_book_lending",
+      "dartName": "PupilBookLending",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('pupil_book_lending_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "lendingId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "status",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "score",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "lentAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "lentBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "returnedAt",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        },
+        {
+          "name": "receivedBy",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "isbn",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "libraryBookId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "pupil_book_lending_fk_0",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "pupil_book_lending_fk_1",
+          "columns": [
+            "libraryBookId"
+          ],
+          "referenceTable": "library_book",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "pupil_book_lending_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "pupil_data",
+      "dartName": "PupilData",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('pupil_data_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "status",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "protocol:PupilStatus"
+        },
+        {
+          "name": "internalId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "password",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "preSchoolMedicalId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "kindergardenId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "kindergardenData",
+          "columnType": 8,
+          "isNullable": true,
+          "dartType": "protocol:KindergardenInfo?"
+        },
+        {
+          "name": "preSchoolTestId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "avatarId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "avatarAuthId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "publicMediaAuth",
+          "columnType": 8,
+          "isNullable": false,
+          "dartType": "protocol:PublicMediaAuth"
+        },
+        {
+          "name": "publicMediaAuthDocumentId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "contact",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "communicationPupil",
+          "columnType": 8,
+          "isNullable": true,
+          "dartType": "protocol:CommunicationSkills?"
+        },
+        {
+          "name": "specialInformation",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "tutorInfo",
+          "columnType": 8,
+          "isNullable": true,
+          "dartType": "protocol:TutorInfo?"
+        },
+        {
+          "name": "afterSchoolCare",
+          "columnType": 8,
+          "isNullable": true,
+          "dartType": "protocol:AfterSchoolCare?"
+        },
+        {
+          "name": "credit",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "creditEarned",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "schoolyearHeldBackAt",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        },
+        {
+          "name": "swimmer",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "_kindergardenPupilsKindergardenId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "pupil_data_fk_0",
+          "columns": [
+            "preSchoolMedicalId"
+          ],
+          "referenceTable": "pre_school_medical",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "pupil_data_fk_1",
+          "columns": [
+            "kindergardenId"
+          ],
+          "referenceTable": "kindergarden",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "pupil_data_fk_2",
+          "columns": [
+            "preSchoolTestId"
+          ],
+          "referenceTable": "pre_school_test",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "pupil_data_fk_3",
+          "columns": [
+            "avatarId"
+          ],
+          "referenceTable": "hub_document",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "pupil_data_fk_4",
+          "columns": [
+            "avatarAuthId"
+          ],
+          "referenceTable": "hub_document",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "pupil_data_fk_5",
+          "columns": [
+            "publicMediaAuthDocumentId"
+          ],
+          "referenceTable": "hub_document",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "pupil_data_fk_6",
+          "columns": [
+            "_kindergardenPupilsKindergardenId"
+          ],
+          "referenceTable": "kindergarden",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "pupil_data_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "pupil_data_status_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "status"
+            },
+            {
+              "type": 0,
+              "definition": "internalId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": false,
+          "isPrimary": false
+        },
+        {
+          "indexName": "pupil_data_internal_id_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "internalId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "pupil_list_entry",
+      "dartName": "PupilListEntry",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('pupil_list_entry_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "status",
+          "columnType": 1,
+          "isNullable": true,
+          "dartType": "bool?"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "entryBy",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "schoolListId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "pupil_list_entry_fk_0",
+          "columns": [
+            "schoolListId"
+          ],
+          "referenceTable": "school_list",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        },
+        {
+          "constraintName": "pupil_list_entry_fk_1",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "pupil_list_entry_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "pupil_workbook",
+      "dartName": "PupilWorkbook",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('pupil_workbook_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "isbn",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "score",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "finishedAt",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "workbookId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "pupil_workbook_fk_0",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        },
+        {
+          "constraintName": "pupil_workbook_fk_1",
+          "columns": [
+            "workbookId"
+          ],
+          "referenceTable": "workbook",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "pupil_workbook_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "room",
+      "dartName": "Classroom",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('room_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "roomCode",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "roomName",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "room_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "scheduled_lesson",
+      "dartName": "ScheduledLesson",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('scheduled_lesson_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "active",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "subjectId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "scheduledAtId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "timetableSlotOrder",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "timetableId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "mainTeacherId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "lessonId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "roomId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "lessonGroupId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "modifiedBy",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "modifiedAt",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        },
+        {
+          "name": "recordtest",
+          "columnType": 8,
+          "isNullable": true,
+          "dartType": "( {int testint, String testString})?"
+        },
+        {
+          "name": "_roomScheduledlessonsRoomId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "scheduled_lesson_fk_0",
+          "columns": [
+            "subjectId"
+          ],
+          "referenceTable": "subject",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "scheduled_lesson_fk_1",
+          "columns": [
+            "scheduledAtId"
+          ],
+          "referenceTable": "timetable_slot",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "scheduled_lesson_fk_2",
+          "columns": [
+            "timetableId"
+          ],
+          "referenceTable": "timetable",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "scheduled_lesson_fk_3",
+          "columns": [
+            "roomId"
+          ],
+          "referenceTable": "room",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "scheduled_lesson_fk_4",
+          "columns": [
+            "lessonGroupId"
+          ],
+          "referenceTable": "lesson_group",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "scheduled_lesson_fk_5",
+          "columns": [
+            "_roomScheduledlessonsRoomId"
+          ],
+          "referenceTable": "room",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "scheduled_lesson_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "scheduled_lesson_teacher",
+      "dartName": "ScheduledLessonTeacher",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('scheduled_lesson_teacher_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "userId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "scheduledLessonId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "scheduled_lesson_teacher_fk_0",
+          "columns": [
+            "userId"
+          ],
+          "referenceTable": "user",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "scheduled_lesson_teacher_fk_1",
+          "columns": [
+            "scheduledLessonId"
+          ],
+          "referenceTable": "scheduled_lesson",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "scheduled_lesson_teacher_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "scheduled_lesson_teacher_unique_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "userId"
+            },
+            {
+              "type": 0,
+              "definition": "scheduledLessonId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "school_data",
+      "dartName": "SchoolData",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('school_data_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "officialName",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "address",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "schoolNumber",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "telephoneNumber",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "email",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "website",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "logoId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "officialSealId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "school_data_fk_0",
+          "columns": [
+            "logoId"
+          ],
+          "referenceTable": "hub_document",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "school_data_fk_1",
+          "columns": [
+            "officialSealId"
+          ],
+          "referenceTable": "hub_document",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "school_data_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "school_list",
+      "dartName": "SchoolList",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('school_list_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "listId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "archived",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "description",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "public",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "authorizedUsers",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "school_list_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "school_semester",
+      "dartName": "SchoolSemester",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('school_semester_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "schoolYear",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "isFirst",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "startDate",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "endDate",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "classConferenceDate",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        },
+        {
+          "name": "supportConferenceDate",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        },
+        {
+          "name": "reportConferenceDate",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        },
+        {
+          "name": "reportSignedDate",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "school_semester_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "schoolday",
+      "dartName": "Schoolday",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('schoolday_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "schoolday",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "schoolSemesterId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "schoolday_fk_0",
+          "columns": [
+            "schoolSemesterId"
+          ],
+          "referenceTable": "school_semester",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "schoolday_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "schoolday_event",
+      "dartName": "SchooldayEvent",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('schoolday_event_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "eventId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "eventType",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "protocol:SchooldayEventType"
+        },
+        {
+          "name": "eventReason",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "eventTime",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "processed",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "processedBy",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "processedAt",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        },
+        {
+          "name": "documentId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "processedDocumentId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "schooldayId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "schoolday_event_fk_0",
+          "columns": [
+            "documentId"
+          ],
+          "referenceTable": "hub_document",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "schoolday_event_fk_1",
+          "columns": [
+            "processedDocumentId"
+          ],
+          "referenceTable": "hub_document",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "schoolday_event_fk_2",
+          "columns": [
+            "schooldayId"
+          ],
+          "referenceTable": "schoolday",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "schoolday_event_fk_3",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "schoolday_event_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "subject",
+      "dartName": "Subject",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('subject_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "publicId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "description",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "color",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "modifiedBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "subject_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "support_category",
+      "dartName": "SupportCategory",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('support_category_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "categoryId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "parentCategory",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "support_category_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "support_category_goal",
+      "dartName": "SupportGoal",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('support_category_goal_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "goalId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "score",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "achievedAt",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        },
+        {
+          "name": "description",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "strategies",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "supportCategoryId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "_learningSupportPlanSupportgoalsLearningSupportPlanId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "_supportCategoryCategorygoalsSupportCategoryId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "_pupilDataSupportgoalsPupilDataId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "support_category_goal_fk_0",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "support_category_goal_fk_1",
+          "columns": [
+            "supportCategoryId"
+          ],
+          "referenceTable": "support_category",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        },
+        {
+          "constraintName": "support_category_goal_fk_2",
+          "columns": [
+            "_learningSupportPlanSupportgoalsLearningSupportPlanId"
+          ],
+          "referenceTable": "learning_support_plan",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "support_category_goal_fk_3",
+          "columns": [
+            "_supportCategoryCategorygoalsSupportCategoryId"
+          ],
+          "referenceTable": "support_category",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "support_category_goal_fk_4",
+          "columns": [
+            "_pupilDataSupportgoalsPupilDataId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "support_category_goal_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "support_category_status",
+      "dartName": "SupportCategoryStatus",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('support_category_status_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "score",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "supportCategoryId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "learningSupportPlanId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "_learningSupportPlanSupportcategorystatusesLearningSupporfb7bId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "_supportCategoryCategorystatuesSupportCategoryId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "_pupilDataSupportcategorystatusesPupilDataId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "support_category_status_fk_0",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "support_category_status_fk_1",
+          "columns": [
+            "supportCategoryId"
+          ],
+          "referenceTable": "support_category",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "support_category_status_fk_2",
+          "columns": [
+            "learningSupportPlanId"
+          ],
+          "referenceTable": "learning_support_plan",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "support_category_status_fk_3",
+          "columns": [
+            "_learningSupportPlanSupportcategorystatusesLearningSupporfb7bId"
+          ],
+          "referenceTable": "learning_support_plan",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "support_category_status_fk_4",
+          "columns": [
+            "_supportCategoryCategorystatuesSupportCategoryId"
+          ],
+          "referenceTable": "support_category",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "support_category_status_fk_5",
+          "columns": [
+            "_pupilDataSupportcategorystatusesPupilDataId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "support_category_status_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "support_goal_check",
+      "dartName": "SupportGoalCheck",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('support_goal_check_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "checkId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "score",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "supportGoalId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "_supportCategoryGoalGoalchecksSupportCategoryGoalId",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "support_goal_check_fk_0",
+          "columns": [
+            "supportGoalId"
+          ],
+          "referenceTable": "support_category_goal",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        },
+        {
+          "constraintName": "support_goal_check_fk_1",
+          "columns": [
+            "_supportCategoryGoalGoalchecksSupportCategoryGoalId"
+          ],
+          "referenceTable": "support_category_goal",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "support_goal_check_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "support_level",
+      "dartName": "SupportLevel",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('support_level_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "level",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "comment",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "pupilId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "support_level_fk_0",
+          "columns": [
+            "pupilId"
+          ],
+          "referenceTable": "pupil_data",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "support_level_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "timetable",
+      "dartName": "Timetable",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('timetable_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "active",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "startsAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "endsAt",
+          "columnType": 4,
+          "isNullable": true,
+          "dartType": "DateTime?"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "schoolSemesterId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "createdBy",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "createdAt",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "modified",
+          "columnType": 8,
+          "isNullable": true,
+          "dartType": "List<( {String modifiedBy, DateTime modifiedAt})>?"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "timetable_fk_0",
+          "columns": [
+            "schoolSemesterId"
+          ],
+          "referenceTable": "school_semester",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "timetable_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "timetable_school_semester_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "schoolSemesterId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": false,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "timetable_slot",
+      "dartName": "TimetableSlot",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('timetable_slot_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "day",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "protocol:Weekday"
+        },
+        {
+          "name": "startTime",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "endTime",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "timetableId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "timetable_slot_fk_0",
+          "columns": [
+            "timetableId"
+          ],
+          "referenceTable": "timetable",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "timetable_slot_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "user",
+      "dartName": "User",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('user_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "userInfoId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "role",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "protocol:Role"
+        },
+        {
+          "name": "matrixUserId",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "timeUnits",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "reliefTimeUnits",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "pupilsAuth",
+          "columnType": 8,
+          "isNullable": true,
+          "dartType": "Set<int>?"
+        },
+        {
+          "name": "schooldayEventsProcessingTeam",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "credit",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "userFlags",
+          "columnType": 8,
+          "isNullable": false,
+          "dartType": "protocol:UserFlags"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "user_fk_0",
+          "columns": [
+            "userInfoId"
+          ],
+          "referenceTable": "serverpod_user_info",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "user_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "user_info_id_unique_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "userInfoId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "user_device",
+      "dartName": "UserDevice",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('user_device_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "userInfoId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "deviceId",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "deviceName",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "lastLogin",
+          "columnType": 4,
+          "isNullable": false,
+          "dartType": "DateTime"
+        },
+        {
+          "name": "isActive",
+          "columnType": 1,
+          "isNullable": false,
+          "dartType": "bool"
+        },
+        {
+          "name": "authId",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        }
+      ],
+      "foreignKeys": [
+        {
+          "constraintName": "user_device_fk_0",
+          "columns": [
+            "userInfoId"
+          ],
+          "referenceTable": "serverpod_user_info",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 3
+        },
+        {
+          "constraintName": "user_device_fk_1",
+          "columns": [
+            "authId"
+          ],
+          "referenceTable": "serverpod_auth_key",
+          "referenceTableSchema": "public",
+          "referenceColumns": [
+            "id"
+          ],
+          "onUpdate": 3,
+          "onDelete": 4
+        }
+      ],
+      "indexes": [
+        {
+          "indexName": "user_device_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        },
+        {
+          "indexName": "auth_key_user_device_idx",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "authId"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": false
+        }
+      ],
+      "managed": true
+    },
+    {
+      "name": "workbook",
+      "dartName": "Workbook",
+      "module": "school_data_hub",
+      "schema": "public",
+      "columns": [
+        {
+          "name": "id",
+          "columnType": 6,
+          "isNullable": false,
+          "columnDefault": "nextval('workbook_id_seq'::regclass)",
+          "dartType": "int?"
+        },
+        {
+          "name": "isbn",
+          "columnType": 6,
+          "isNullable": false,
+          "dartType": "int"
+        },
+        {
+          "name": "name",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        },
+        {
+          "name": "subject",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "level",
+          "columnType": 0,
+          "isNullable": true,
+          "dartType": "String?"
+        },
+        {
+          "name": "amount",
+          "columnType": 6,
+          "isNullable": true,
+          "dartType": "int?"
+        },
+        {
+          "name": "imageUrl",
+          "columnType": 0,
+          "isNullable": false,
+          "dartType": "String"
+        }
+      ],
+      "foreignKeys": [],
+      "indexes": [
+        {
+          "indexName": "workbook_pkey",
+          "elements": [
+            {
+              "type": 0,
+              "definition": "id"
+            }
+          ],
+          "type": "btree",
+          "isUnique": true,
+          "isPrimary": true
+        }
+      ],
+      "managed": true
+    }
+  ],
+  "installedModules": [
+    {
+      "module": "serverpod",
+      "version": "20240516151843329"
+    },
+    {
+      "module": "serverpod_auth",
+      "version": "20240520102713718"
+    }
+  ],
+  "migrationApiVersion": 1
+}
\ No newline at end of file
diff --git a/school_data_hub_server/migrations/20251208135524075/migration.json b/school_data_hub_server/migrations/20251208135524075/migration.json
new file mode 100644
index 00000000..56c2347e
--- /dev/null
+++ b/school_data_hub_server/migrations/20251208135524075/migration.json
@@ -0,0 +1,28 @@
+{
+  "actions": [
+    {
+      "type": "alterTable",
+      "alterTable": {
+        "name": "schoolday_event",
+        "schema": "public",
+        "addColumns": [
+          {
+            "name": "eventTime",
+            "columnType": 0,
+            "isNullable": true,
+            "dartType": "String?"
+          }
+        ],
+        "deleteColumns": [],
+        "modifyColumns": [],
+        "addIndexes": [],
+        "deleteIndexes": [],
+        "addForeignKeys": [],
+        "deleteForeignKeys": [],
+        "warnings": []
+      }
+    }
+  ],
+  "warnings": [],
+  "migrationApiVersion": 1
+}
\ No newline at end of file
diff --git a/school_data_hub_server/migrations/20251208135524075/migration.sql b/school_data_hub_server/migrations/20251208135524075/migration.sql
new file mode 100644
index 00000000..32876599
--- /dev/null
+++ b/school_data_hub_server/migrations/20251208135524075/migration.sql
@@ -0,0 +1,33 @@
+BEGIN;
+
+--
+-- ACTION ALTER TABLE
+--
+ALTER TABLE "schoolday_event" ADD COLUMN "eventTime" text;
+
+--
+-- MIGRATION VERSION FOR school_data_hub
+--
+INSERT INTO "serverpod_migrations" ("module", "version", "timestamp")
+    VALUES ('school_data_hub', '20251208135524075', now())
+    ON CONFLICT ("module")
+    DO UPDATE SET "version" = '20251208135524075', "timestamp" = now();
+
+--
+-- MIGRATION VERSION FOR serverpod
+--
+INSERT INTO "serverpod_migrations" ("module", "version", "timestamp")
+    VALUES ('serverpod', '20240516151843329', now())
+    ON CONFLICT ("module")
+    DO UPDATE SET "version" = '20240516151843329', "timestamp" = now();
+
+--
+-- MIGRATION VERSION FOR serverpod_auth
+--
+INSERT INTO "serverpod_migrations" ("module", "version", "timestamp")
+    VALUES ('serverpod_auth', '20240520102713718', now())
+    ON CONFLICT ("module")
+    DO UPDATE SET "version" = '20240520102713718', "timestamp" = now();
+
+
+COMMIT;
diff --git a/school_data_hub_server/migrations/migration_registry.txt b/school_data_hub_server/migrations/migration_registry.txt
index ec2f17be..43157d0a 100644
--- a/school_data_hub_server/migrations/migration_registry.txt
+++ b/school_data_hub_server/migrations/migration_registry.txt
@@ -14,3 +14,4 @@
 20251121184735230
 20251123092602494
 20251204113239243
+20251208135524075
diff --git a/school_data_hub_server/pubspec.lock b/school_data_hub_server/pubspec.lock
index 96b6436c..d00acfc0 100644
--- a/school_data_hub_server/pubspec.lock
+++ b/school_data_hub_server/pubspec.lock
@@ -477,50 +477,50 @@ packages:
     dependency: "direct main"
     description:
       name: serverpod
-      sha256: ffb358e9ff84bf546ee612b4b5a5f5556bd9840e4a8f06d825efb77a4dd3009e
+      sha256: e9d57fa4185c2d5ed093745fbc4ca4e8b8dc351d00c2fc7a76bd1aabd509ee6e
       url: "https://pub.dev"
     source: hosted
-    version: "2.9.1"
+    version: "2.9.2"
   serverpod_auth_server:
     dependency: "direct main"
     description:
       name: serverpod_auth_server
-      sha256: ad393f09b5ed82b624c9d299b61d945fb07729a0a704faa67795588200168369
+      sha256: "10f3c97d9598a840cc0d5fa770b3a69044fa4b843e3de3cbd3c43ba59499aa4b"
       url: "https://pub.dev"
     source: hosted
-    version: "2.9.1"
+    version: "2.9.2"
   serverpod_lints:
     dependency: transitive
     description:
       name: serverpod_lints
-      sha256: dc6f9c52fbbb39ca6b8f4a3dbdfaceb17c30fd5299a1a9bbd05da942d8bc2fd8
+      sha256: d1dd6ebe72eb63ad89986814025cd9d59225ac00d2e0c214a76043c839e709d4
       url: "https://pub.dev"
     source: hosted
-    version: "2.9.1"
+    version: "2.9.2"
   serverpod_serialization:
     dependency: transitive
     description:
       name: serverpod_serialization
-      sha256: c301a5e45610c062e51e1ba580f51f3257c3404ce2dd2f7e216dccbd93869502
+      sha256: e68bee9f9e5d609ae6249365826748c43742fd05080bae8549eabf939294271c
       url: "https://pub.dev"
     source: hosted
-    version: "2.9.1"
+    version: "2.9.2"
   serverpod_shared:
     dependency: transitive
     description:
       name: serverpod_shared
-      sha256: "4c88ca57d90138a01d70a5e28f206c86f9ec43a9215de06ee6a5d0c95049d519"
+      sha256: "5a35101167050fdb2213407248bc0063c0eea523606da35b9f29cf567ee13a48"
       url: "https://pub.dev"
     source: hosted
-    version: "2.9.1"
+    version: "2.9.2"
   serverpod_test:
     dependency: "direct dev"
     description:
       name: serverpod_test
-      sha256: c0ad3a29f9b60dbf3e47cd313cf48a0d87d4db2f26e21a14e44734146dc5a22b
+      sha256: "63b166b2c3f2d5ae6f536c7794f6004f2415b4296770efd3cf958bb8d438221a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.9.1"
+    version: "2.9.2"
   shelf:
     dependency: transitive
     description:
diff --git a/school_data_hub_server/pubspec.yaml b/school_data_hub_server/pubspec.yaml
index 0dc56e39..9b6c7ad8 100644
--- a/school_data_hub_server/pubspec.yaml
+++ b/school_data_hub_server/pubspec.yaml
@@ -12,13 +12,13 @@ dependencies:
   http: ^1.4.0
   logging: ^1.3.0
   path: ^1.9.1
-  serverpod: 2.9.1
-  serverpod_auth_server: 2.9.1
+  serverpod: 2.9.2
+  serverpod_auth_server: 2.9.2
   uml_for_serverpod: 0.0.5
   mailer: ^6.5.0
 
 dev_dependencies:
   lints: '>=3.0.0 <6.0.0'
   test: '^1.24.2'
-  serverpod_test: 2.9.1
+  serverpod_test: 2.9.2
 
diff --git a/school_data_hub_server/test/integration/test_tools/serverpod_test_tools.dart b/school_data_hub_server/test/integration/test_tools/serverpod_test_tools.dart
index 828294fe..d5818bbe 100644
--- a/school_data_hub_server/test/integration/test_tools/serverpod_test_tools.dart
+++ b/school_data_hub_server/test/integration/test_tools/serverpod_test_tools.dart
@@ -227,6 +227,8 @@ class TestEndpoints {
 
   late final _CompetenceEndpoint competence;
 
+  late final _CompetenceGoalEndpoint competenceGoal;
+
   late final _LearningSupportPlanEndpoint learningSupportPlan;
 
   late final _PreSchoolMedicalEndpoint preSchoolMedical;
@@ -330,6 +332,10 @@ class _InternalTestEndpoints extends TestEndpoints
       endpoints,
       serializationManager,
     );
+    competenceGoal = _CompetenceGoalEndpoint(
+      endpoints,
+      serializationManager,
+    );
     learningSupportPlan = _LearningSupportPlanEndpoint(
       endpoints,
       serializationManager,
@@ -2494,6 +2500,200 @@ class _CompetenceEndpoint {
   }
 }
 
+class _CompetenceGoalEndpoint {
+  _CompetenceGoalEndpoint(
+    this._endpointDispatch,
+    this._serializationManager,
+  );
+
+  final _i2.EndpointDispatch _endpointDispatch;
+
+  final _i2.SerializationManager _serializationManager;
+
+  _i3.Future<_i6.PupilData> postCompetenceGoal(
+    _i1.TestSessionBuilder sessionBuilder, {
+    required int competenceId,
+    required int pupilId,
+    required String description,
+    List<String>? strategies,
+    required String createdBy,
+    String? modifiedBy,
+    int? score,
+    DateTime? achievedAt,
+  }) async {
+    return _i1.callAwaitableFunctionAndHandleExceptions(() async {
+      var _localUniqueSession =
+          (sessionBuilder as _i1.InternalTestSessionBuilder).internalBuild(
+        endpoint: 'competenceGoal',
+        method: 'postCompetenceGoal',
+      );
+      try {
+        var _localCallContext = await _endpointDispatch.getMethodCallContext(
+          createSessionCallback: (_) => _localUniqueSession,
+          endpointPath: 'competenceGoal',
+          methodName: 'postCompetenceGoal',
+          parameters: _i1.testObjectToJson({
+            'competenceId': competenceId,
+            'pupilId': pupilId,
+            'description': description,
+            'strategies': strategies,
+            'createdBy': createdBy,
+            'modifiedBy': modifiedBy,
+            'score': score,
+            'achievedAt': achievedAt,
+          }),
+          serializationManager: _serializationManager,
+        );
+        var _localReturnValue = await (_localCallContext.method.call(
+          _localUniqueSession,
+          _localCallContext.arguments,
+        ) as _i3.Future<_i6.PupilData>);
+        return _localReturnValue;
+      } finally {
+        await _localUniqueSession.close();
+      }
+    });
+  }
+
+  _i3.Future<_i6.PupilData> updateCompetenceGoal(
+    _i1.TestSessionBuilder sessionBuilder,
+    String publicId, {
+    ({String value})? description,
+    ({List<String>? value})? strategies,
+    ({String value})? modifiedBy,
+    ({int? value})? score,
+    ({DateTime value})? achievedAt,
+  }) async {
+    return _i1.callAwaitableFunctionAndHandleExceptions(() async {
+      var _localUniqueSession =
+          (sessionBuilder as _i1.InternalTestSessionBuilder).internalBuild(
+        endpoint: 'competenceGoal',
+        method: 'updateCompetenceGoal',
+      );
+      try {
+        var _localCallContext = await _endpointDispatch.getMethodCallContext(
+          createSessionCallback: (_) => _localUniqueSession,
+          endpointPath: 'competenceGoal',
+          methodName: 'updateCompetenceGoal',
+          parameters: _i1.testObjectToJson({
+            'publicId': publicId,
+            'description': _i15.mapRecordToJson(description),
+            'strategies': _i15.mapRecordToJson(strategies),
+            'modifiedBy': _i15.mapRecordToJson(modifiedBy),
+            'score': _i15.mapRecordToJson(score),
+            'achievedAt': _i15.mapRecordToJson(achievedAt),
+          }),
+          serializationManager: _serializationManager,
+        );
+        var _localReturnValue = await (_localCallContext.method.call(
+          _localUniqueSession,
+          _localCallContext.arguments,
+        ) as _i3.Future<_i6.PupilData>);
+        return _localReturnValue;
+      } finally {
+        await _localUniqueSession.close();
+      }
+    });
+  }
+
+  _i3.Future<_i6.PupilData> deleteCompetenceGoal(
+    _i1.TestSessionBuilder sessionBuilder,
+    String publicId,
+  ) async {
+    return _i1.callAwaitableFunctionAndHandleExceptions(() async {
+      var _localUniqueSession =
+          (sessionBuilder as _i1.InternalTestSessionBuilder).internalBuild(
+        endpoint: 'competenceGoal',
+        method: 'deleteCompetenceGoal',
+      );
+      try {
+        var _localCallContext = await _endpointDispatch.getMethodCallContext(
+          createSessionCallback: (_) => _localUniqueSession,
+          endpointPath: 'competenceGoal',
+          methodName: 'deleteCompetenceGoal',
+          parameters: _i1.testObjectToJson({'publicId': publicId}),
+          serializationManager: _serializationManager,
+        );
+        var _localReturnValue = await (_localCallContext.method.call(
+          _localUniqueSession,
+          _localCallContext.arguments,
+        ) as _i3.Future<_i6.PupilData>);
+        return _localReturnValue;
+      } finally {
+        await _localUniqueSession.close();
+      }
+    });
+  }
+
+  _i3.Future<_i6.PupilData> addFileToCompetenceGoal(
+    _i1.TestSessionBuilder sessionBuilder,
+    String publicId,
+    String filePath,
+    String createdBy,
+  ) async {
+    return _i1.callAwaitableFunctionAndHandleExceptions(() async {
+      var _localUniqueSession =
+          (sessionBuilder as _i1.InternalTestSessionBuilder).internalBuild(
+        endpoint: 'competenceGoal',
+        method: 'addFileToCompetenceGoal',
+      );
+      try {
+        var _localCallContext = await _endpointDispatch.getMethodCallContext(
+          createSessionCallback: (_) => _localUniqueSession,
+          endpointPath: 'competenceGoal',
+          methodName: 'addFileToCompetenceGoal',
+          parameters: _i1.testObjectToJson({
+            'publicId': publicId,
+            'filePath': filePath,
+            'createdBy': createdBy,
+          }),
+          serializationManager: _serializationManager,
+        );
+        var _localReturnValue = await (_localCallContext.method.call(
+          _localUniqueSession,
+          _localCallContext.arguments,
+        ) as _i3.Future<_i6.PupilData>);
+        return _localReturnValue;
+      } finally {
+        await _localUniqueSession.close();
+      }
+    });
+  }
+
+  _i3.Future<_i6.PupilData> removeFileFromCompetenceGoal(
+    _i1.TestSessionBuilder sessionBuilder,
+    String publicId,
+    String documentId,
+  ) async {
+    return _i1.callAwaitableFunctionAndHandleExceptions(() async {
+      var _localUniqueSession =
+          (sessionBuilder as _i1.InternalTestSessionBuilder).internalBuild(
+        endpoint: 'competenceGoal',
+        method: 'removeFileFromCompetenceGoal',
+      );
+      try {
+        var _localCallContext = await _endpointDispatch.getMethodCallContext(
+          createSessionCallback: (_) => _localUniqueSession,
+          endpointPath: 'competenceGoal',
+          methodName: 'removeFileFromCompetenceGoal',
+          parameters: _i1.testObjectToJson({
+            'publicId': publicId,
+            'documentId': documentId,
+          }),
+          serializationManager: _serializationManager,
+        );
+        var _localReturnValue = await (_localCallContext.method.call(
+          _localUniqueSession,
+          _localCallContext.arguments,
+        ) as _i3.Future<_i6.PupilData>);
+        return _localReturnValue;
+      } finally {
+        await _localUniqueSession.close();
+      }
+    });
+  }
+}
+
 class _LearningSupportPlanEndpoint {
   _LearningSupportPlanEndpoint(
     this._endpointDispatch,
@@ -3706,7 +3906,7 @@ class _PupilIdentityEndpoint {
     });
   }
 
-  _i3.Future<bool> updateLastPupilIdentitiesUpdate(
+  _i3.Future<DateTime?> updateLastPupilIdentitiesUpdate(
     _i1.TestSessionBuilder sessionBuilder,
     DateTime date,
   ) async {
@@ -3727,7 +3927,7 @@ class _PupilIdentityEndpoint {
         var _localReturnValue = await (_localCallContext.method.call(
           _localUniqueSession,
           _localCallContext.arguments,
-        ) as _i3.Future<bool>);
+        ) as _i3.Future<DateTime?>);
         return _localReturnValue;
       } finally {
         await _localUniqueSession.close();