diff --git a/src/server/BreCal/schemas/model.py b/src/server/BreCal/schemas/model.py
index 5ca1f18..15ea755 100644
--- a/src/server/BreCal/schemas/model.py
+++ b/src/server/BreCal/schemas/model.py
@@ -16,6 +16,7 @@ class Berth(Schema):
     lock: bool
     created: datetime
     modified: datetime
+
     id = fields.Int()
     name = fields.String()
     participant_id = fields.Int()
@@ -32,13 +33,23 @@ class GetVerifyInlineResp(Schema):
 
 
 class Notification(Schema):
-    acknowledged = fields.Boolean()
-    id = fields.Int()
-    notification_type = fields.String()
-    participant_id = fields.Int()
-    times_id = fields.Int()
-    timestamp = fields.DateTime()
 
+    id: int
+    times_id: int
+    acknowledged: bool
+    level: int
+    type: int
+    message: str
+    created: datetime
+    modified: datetime
+
+    id = fields.Int()
+    times_id = fields.Int()
+    acknowledged = fields.Boolean()
+    level = fields.Int()
+    type = fields.Int()
+    created = fields.DateTime()
+    modified = fields.DateTime()
 
 @dataclass
 class Participant(Schema):
@@ -65,10 +76,49 @@ class ParticipantList(Participant):
     pass
 
 class Shipcall(Schema):
-    description = fields.String()
-    id = fields.Raw(required=True,)
+    id: int
+    ship_id: int
+    type: int
+    eta: datetime
+    voyage: str
+    etd: datetime
+    arrival_berth_id: int
+    departure_berth_id: int
+    tug_required: bool
+    pilot_required: bool
+    flags: int
+    pier_side: bool
+    bunkering: bool
+    replenishing: bool
+    draft: float
+    tidal_window_from: datetime
+    tidal_window_to: datetime
+    rain_sensitive_cargo: bool
+    recommended_tugs: int
+    created: datetime
+    modified: datetime
 
-    type = fields.String(required=True,)
+    id = fields.Int()
+    ship_id = fields.Int()
+    type = fields.Int()
+    eta = fields.DateTime()
+    voyage = fields.Str()
+    etd = fields.DateTime()
+    arrival_berth_id = fields.Int()
+    departure_berth_id = fields.Int()
+    tug_required = fields.Bool()
+    pilot_required = fields.Bool()
+    flags = fields.Int()
+    pier_side = fields.Bool()
+    bunkering = fields.Bool()
+    replenishing = fields.Bool()
+    draft = fields.Float()
+    tidal_window_from = fields.DateTime()
+    tidal_window_to = fields.DateTime()
+    rain_sensitive_cargo = fields.Bool()
+    recommended_tugs = fields.Int()
+    created = fields.DateTime()
+    modified = fields.DateTime()
 
 
 class ShipcallId(Schema):
@@ -76,19 +126,46 @@ class ShipcallId(Schema):
 
 
 class Times(Schema):
-    duration_planned = fields.Int()
-    end_actual = fields.DateTime()
-
-    end_planned = fields.DateTime()
+    id: int
+    start_planned: datetime
+    end_planned: datetime
+    duration_planned: int
+    start_actual: datetime
+    end_actual: datetime
+    duration_actual: int
+    participant_id: int
+    created: datetime
+    modified: datetime
 
     id = fields.Int()
-    participant_id = fields.Int(required=True,)
-    shipcall_id = fields.Int(required=True,)
-    start_actual = fields.DateTime()
-
     start_planned = fields.DateTime()
+    end_planned = fields.DateTime()
+    duration_planned = fields.Int()
+    start_actual = fields.DateTime()
+    end_actual = fields.DateTime()
+    duration_actual = fields.Int()
+    participant_id = fields.Int()
+    created = fields.DateTime()
+    modified = fields.DateTime()
 
+class Ship(Schema):
+    id: int
+    name: str
+    imo: int
+    callsign: str
+    length: float
+    width: float
+    created: datetime
+    modified: datetime
 
+    id = fields.Int()
+    name = fields.Str()
+    imo = fields.Int()
+    callsign = fields.Str()
+    length = fields.Float()
+    width = fields.Float()
+    created = fields.DateTime()
+    modified = fields.DateTime()
 
 class TimesId(Schema):
     pass