diff --git a/misc/BreCalApi.cs b/misc/BreCalApi.cs
index ecefbc4..65bd1f9 100644
--- a/misc/BreCalApi.cs
+++ b/misc/BreCalApi.cs
@@ -1,8 +1,8 @@
 
 //----------------------
 // <auto-generated>
-//     Generated REST API Client Code Generator v1.11.0.0 on 15.09.2024 15:38:00
-//     Using the tool OpenAPI Generator v7.8.0
+//     Generated REST API Client Code Generator v1.16.0.0 on 05.12.2024 17:03:25
+//     Using the tool OpenAPI Generator v7.9.0
 // </auto-generated>
 //----------------------
 
@@ -1586,10 +1586,10 @@ namespace BreCalClient.misc.Api
         /// List of notifications (tbd)
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="shipcallId">**Id of ship call**. *Example: 52*. Id given in ship call list</param>
+        /// <param name="shipcallId">**Id of ship call**. *Example: 52*. Id given in ship call list (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <returns>List&lt;Notification&gt;</returns>
-        List<Notification> NotificationsGet(int shipcallId, int operationIndex = 0);
+        List<Notification> NotificationsGet(int? shipcallId = default(int?), int operationIndex = 0);
         /// <summary>
         /// Gets a list of notifications pursuant to a specified participant and ship call
         /// </summary>
@@ -1597,10 +1597,10 @@ namespace BreCalClient.misc.Api
         /// List of notifications (tbd)
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="shipcallId">**Id of ship call**. *Example: 52*. Id given in ship call list</param>
+        /// <param name="shipcallId">**Id of ship call**. *Example: 52*. Id given in ship call list (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <returns>ApiResponse of List&lt;Notification&gt;</returns>
-        ApiResponse<List<Notification>> NotificationsGetWithHttpInfo(int shipcallId, int operationIndex = 0);
+        ApiResponse<List<Notification>> NotificationsGetWithHttpInfo(int? shipcallId = default(int?), int operationIndex = 0);
         /// <summary>
         /// gets one or all participants
         /// </summary>
@@ -1706,11 +1706,11 @@ namespace BreCalClient.misc.Api
         /// List of notifications (tbd)
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="shipcallId">**Id of ship call**. *Example: 52*. Id given in ship call list</param>
+        /// <param name="shipcallId">**Id of ship call**. *Example: 52*. Id given in ship call list (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of List&lt;Notification&gt;</returns>
-        System.Threading.Tasks.Task<List<Notification>> NotificationsGetAsync(int shipcallId, int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<List<Notification>> NotificationsGetAsync(int? shipcallId = default(int?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
         /// <summary>
         /// Gets a list of notifications pursuant to a specified participant and ship call
         /// </summary>
@@ -1718,11 +1718,11 @@ namespace BreCalClient.misc.Api
         /// List of notifications (tbd)
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="shipcallId">**Id of ship call**. *Example: 52*. Id given in ship call list</param>
+        /// <param name="shipcallId">**Id of ship call**. *Example: 52*. Id given in ship call list (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (List&lt;Notification&gt;)</returns>
-        System.Threading.Tasks.Task<ApiResponse<List<Notification>>> NotificationsGetWithHttpInfoAsync(int shipcallId, int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ApiResponse<List<Notification>>> NotificationsGetWithHttpInfoAsync(int? shipcallId = default(int?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken));
         /// <summary>
         /// gets one or all participants
         /// </summary>
@@ -2198,10 +2198,10 @@ namespace BreCalClient.misc.Api
         /// Gets a list of notifications pursuant to a specified participant and ship call List of notifications (tbd)
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="shipcallId">**Id of ship call**. *Example: 52*. Id given in ship call list</param>
+        /// <param name="shipcallId">**Id of ship call**. *Example: 52*. Id given in ship call list (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <returns>List&lt;Notification&gt;</returns>
-        public List<Notification> NotificationsGet(int shipcallId, int operationIndex = 0)
+        public List<Notification> NotificationsGet(int? shipcallId = default(int?), int operationIndex = 0)
         {
             BreCalClient.misc.Client.ApiResponse<List<Notification>> localVarResponse = NotificationsGetWithHttpInfo(shipcallId);
             return localVarResponse.Data;
@@ -2210,10 +2210,10 @@ namespace BreCalClient.misc.Api
         /// Gets a list of notifications pursuant to a specified participant and ship call List of notifications (tbd)
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="shipcallId">**Id of ship call**. *Example: 52*. Id given in ship call list</param>
+        /// <param name="shipcallId">**Id of ship call**. *Example: 52*. Id given in ship call list (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <returns>ApiResponse of List&lt;Notification&gt;</returns>
-        public BreCalClient.misc.Client.ApiResponse<List<Notification>> NotificationsGetWithHttpInfo(int shipcallId, int operationIndex = 0)
+        public BreCalClient.misc.Client.ApiResponse<List<Notification>> NotificationsGetWithHttpInfo(int? shipcallId = default(int?), int operationIndex = 0)
         {
             BreCalClient.misc.Client.RequestOptions localVarRequestOptions = new BreCalClient.misc.Client.RequestOptions();
             string[] _contentTypes = new string[] {
@@ -2232,7 +2232,10 @@ namespace BreCalClient.misc.Api
             {
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
-            localVarRequestOptions.QueryParameters.Add(BreCalClient.misc.Client.ClientUtils.ParameterToMultiMap("", "shipcall_id", shipcallId));
+            if (shipcallId != null)
+            {
+                localVarRequestOptions.QueryParameters.Add(BreCalClient.misc.Client.ClientUtils.ParameterToMultiMap("", "shipcall_id", shipcallId));
+            }
             localVarRequestOptions.Operation = "StaticApi.NotificationsGet";
             localVarRequestOptions.OperationIndex = operationIndex;
             // authentication (ApiKey) required
@@ -2256,11 +2259,11 @@ namespace BreCalClient.misc.Api
         /// Gets a list of notifications pursuant to a specified participant and ship call List of notifications (tbd)
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="shipcallId">**Id of ship call**. *Example: 52*. Id given in ship call list</param>
+        /// <param name="shipcallId">**Id of ship call**. *Example: 52*. Id given in ship call list (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of List&lt;Notification&gt;</returns>
-        public async System.Threading.Tasks.Task<List<Notification>> NotificationsGetAsync(int shipcallId, int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<List<Notification>> NotificationsGetAsync(int? shipcallId = default(int?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
         {
             BreCalClient.misc.Client.ApiResponse<List<Notification>> localVarResponse = await NotificationsGetWithHttpInfoAsync(shipcallId, operationIndex, cancellationToken).ConfigureAwait(false);
             return localVarResponse.Data;
@@ -2269,11 +2272,11 @@ namespace BreCalClient.misc.Api
         /// Gets a list of notifications pursuant to a specified participant and ship call List of notifications (tbd)
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
-        /// <param name="shipcallId">**Id of ship call**. *Example: 52*. Id given in ship call list</param>
+        /// <param name="shipcallId">**Id of ship call**. *Example: 52*. Id given in ship call list (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse (List&lt;Notification&gt;)</returns>
-        public async System.Threading.Tasks.Task<BreCalClient.misc.Client.ApiResponse<List<Notification>>> NotificationsGetWithHttpInfoAsync(int shipcallId, int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<BreCalClient.misc.Client.ApiResponse<List<Notification>>> NotificationsGetWithHttpInfoAsync(int? shipcallId = default(int?), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(global::System.Threading.CancellationToken))
         {
             BreCalClient.misc.Client.RequestOptions localVarRequestOptions = new BreCalClient.misc.Client.RequestOptions();
             string[] _contentTypes = new string[] {
@@ -2292,7 +2295,10 @@ namespace BreCalClient.misc.Api
             {
                 localVarRequestOptions.HeaderParameters.Add("Accept", localVarAccept);
             }
-            localVarRequestOptions.QueryParameters.Add(BreCalClient.misc.Client.ClientUtils.ParameterToMultiMap("", "shipcall_id", shipcallId));
+            if (shipcallId != null)
+            {
+                localVarRequestOptions.QueryParameters.Add(BreCalClient.misc.Client.ClientUtils.ParameterToMultiMap("", "shipcall_id", shipcallId));
+            }
             localVarRequestOptions.Operation = "StaticApi.NotificationsGet";
             localVarRequestOptions.OperationIndex = operationIndex;
             // authentication (ApiKey) required
@@ -4750,6 +4756,12 @@ namespace BreCalClient.misc.Client
                 // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8
                 // For example: 2009-06-15T13:45:30.0000000
                 return dateTimeOffset.ToString((configuration ?? GlobalConfiguration.Instance).DateTimeFormat);
+            if (obj is DateOnly dateOnly)
+                // Return a formatted date string - Can be customized with Configuration.DateTimeFormat
+                // Defaults to an ISO 8601, using the known as a Round-trip date/time pattern ("o")
+                // https://msdn.microsoft.com/en-us/library/az4se3k1(v=vs.110).aspx#Anchor_8
+                // For example: 2009-06-15
+                return dateOnly.ToString((configuration ?? GlobalConfiguration.Instance).DateTimeFormat);
             if (obj is bool boolean)
                 return boolean ? "true" : "false";
             if (obj is ICollection collection) {
@@ -6339,62 +6351,80 @@ namespace BreCalClient.misc.Model
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
-        /// <example>3</example>
+        /*
+        <example>3</example>
+        */
         [DataMember(Name = "id", EmitDefaultValue = true)]
         public int Id { get; set; }
         /// <summary>
         /// Gets or Sets Name
         /// </summary>
-        /// <example>Pier 1</example>
+        /*
+        <example>Pier 1</example>
+        */
         [DataMember(Name = "name", EmitDefaultValue = true)]
         public string Name { get; set; }
         /// <summary>
         /// Optional reference to a participant (terminal)
         /// </summary>
         /// <value>Optional reference to a participant (terminal)</value>
-        /// <example>5</example>
+        /*
+        <example>5</example>
+        */
         [DataMember(Name = "owner_id", EmitDefaultValue = true)]
         public int? OwnerId { get; set; }
         /// <summary>
         /// Optional reference to a participant (port authority)
         /// </summary>
         /// <value>Optional reference to a participant (port authority)</value>
-        /// <example>6</example>
+        /*
+        <example>6</example>
+        */
         [DataMember(Name = "authority_id", EmitDefaultValue = true)]
         public int? AuthorityId { get; set; }
         /// <summary>
         /// If true lock must be passed
         /// </summary>
         /// <value>If true lock must be passed</value>
-        /// <example>true</example>
+        /*
+        <example>true</example>
+        */
         [DataMember(Name = "lock", EmitDefaultValue = true)]
         public bool? Lock { get; set; }
         /// <summary>
         /// Required reference to a port
         /// </summary>
         /// <value>Required reference to a port</value>
-        /// <example>1</example>
+        /*
+        <example>1</example>
+        */
         [DataMember(Name = "port_id", EmitDefaultValue = true)]
         public int PortId { get; set; }
         /// <summary>
         /// Readonly field set by the database when berth was created
         /// </summary>
         /// <value>Readonly field set by the database when berth was created</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "created", EmitDefaultValue = true)]
         public DateTime Created { get; set; }
         /// <summary>
         /// Readonly field set by the database when berth was last modified
         /// </summary>
         /// <value>Readonly field set by the database when berth was last modified</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "modified", EmitDefaultValue = true)]
         public DateTime? Modified { get; set; }
         /// <summary>
         /// marks the berth as logically deleted
         /// </summary>
         /// <value>marks the berth as logically deleted</value>
-        /// <example>false</example>
+        /*
+        <example>false</example>
+        */
         [DataMember(Name = "deleted", EmitDefaultValue = true)]
         public bool Deleted { get; set; }
         /// <summary>
@@ -6487,13 +6517,17 @@ namespace BreCalClient.misc.Model
         /// <summary>
         /// Gets or Sets Username
         /// </summary>
-        /// <example>alfred</example>
+        /*
+        <example>alfred</example>
+        */
         [DataMember(Name = "username", IsRequired = true, EmitDefaultValue = true)]
         public string Username { get; set; }
         /// <summary>
         /// Gets or Sets Password
         /// </summary>
-        /// <example>123456</example>
+        /*
+        <example>123456</example>
+        */
         [DataMember(Name = "password", IsRequired = true, EmitDefaultValue = true)]
         public string Password { get; set; }
         /// <summary>
@@ -6570,14 +6604,18 @@ namespace BreCalClient.misc.Model
         /// Input field that caused the error or general error message
         /// </summary>
         /// <value>Input field that caused the error or general error message</value>
-        /// <example>eta</example>
+        /*
+        <example>eta</example>
+        */
         [DataMember(Name = "error_field", IsRequired = true, EmitDefaultValue = true)]
         public string ErrorField { get; set; }
         /// <summary>
         /// Detailed description if error_field was an input field
         /// </summary>
         /// <value>Detailed description if error_field was an input field</value>
-        /// <example>eta must be in the future</example>
+        /*
+        <example>eta must be in the future</example>
+        */
         [DataMember(Name = "error_description", EmitDefaultValue = true)]
         public string ErrorDescription { get; set; }
         /// <summary>
@@ -6704,31 +6742,41 @@ namespace BreCalClient.misc.Model
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
-        /// <example>3</example>
+        /*
+        <example>3</example>
+        */
         [DataMember(Name = "id", EmitDefaultValue = true)]
         public int Id { get; set; }
         /// <summary>
         /// Gets or Sets ParticipantId
         /// </summary>
-        /// <example>5</example>
+        /*
+        <example>5</example>
+        */
         [DataMember(Name = "participant_id", EmitDefaultValue = true)]
         public int ParticipantId { get; set; }
         /// <summary>
         /// Gets or Sets ShipcallId
         /// </summary>
-        /// <example>42</example>
+        /*
+        <example>42</example>
+        */
         [DataMember(Name = "shipcall_id", EmitDefaultValue = true)]
         public int ShipcallId { get; set; }
         /// <summary>
         /// Gets or Sets Timestamp
         /// </summary>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "timestamp", EmitDefaultValue = true)]
         public DateTime Timestamp { get; set; }
         /// <summary>
         /// Gets or Sets Eta
         /// </summary>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "eta", EmitDefaultValue = true)]
         public DateTime Eta { get; set; }
         /// <summary>
@@ -6797,7 +6845,9 @@ namespace BreCalClient.misc.Model
         /// <summary>
         /// Gets or Sets VarId
         /// </summary>
-        /// <example>42</example>
+        /*
+        <example>42</example>
+        */
         [DataMember(Name = "id", EmitDefaultValue = true)]
         public int VarId { get; set; }
         /// <summary>
@@ -6876,55 +6926,73 @@ namespace BreCalClient.misc.Model
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
-        /// <example>42</example>
+        /*
+        <example>42</example>
+        */
         [DataMember(Name = "id", EmitDefaultValue = true)]
         public int Id { get; set; }
         /// <summary>
         /// Gets or Sets ParticipantId
         /// </summary>
-        /// <example>5</example>
+        /*
+        <example>5</example>
+        */
         [DataMember(Name = "participant_id", EmitDefaultValue = true)]
         public int ParticipantId { get; set; }
         /// <summary>
         /// Gets or Sets FirstName
         /// </summary>
-        /// <example>John</example>
+        /*
+        <example>John</example>
+        */
         [DataMember(Name = "first_name", EmitDefaultValue = true)]
         public string FirstName { get; set; }
         /// <summary>
         /// Gets or Sets LastName
         /// </summary>
-        /// <example>Doe</example>
+        /*
+        <example>Doe</example>
+        */
         [DataMember(Name = "last_name", EmitDefaultValue = true)]
         public string LastName { get; set; }
         /// <summary>
         /// Gets or Sets UserName
         /// </summary>
-        /// <example>johndoe</example>
+        /*
+        <example>johndoe</example>
+        */
         [DataMember(Name = "user_name", EmitDefaultValue = true)]
         public string UserName { get; set; }
         /// <summary>
         /// Gets or Sets UserPhone
         /// </summary>
-        /// <example>1234567890</example>
+        /*
+        <example>1234567890</example>
+        */
         [DataMember(Name = "user_phone", EmitDefaultValue = true)]
         public string UserPhone { get; set; }
         /// <summary>
         /// Gets or Sets UserEmail
         /// </summary>
-        /// <example>no@where.com</example>
+        /*
+        <example>no@where.com</example>
+        */
         [DataMember(Name = "user_email", EmitDefaultValue = true)]
         public string UserEmail { get; set; }
         /// <summary>
         /// Gets or Sets Exp
         /// </summary>
-        /// <example>1630000000</example>
+        /*
+        <example>1630000000</example>
+        */
         [DataMember(Name = "exp", EmitDefaultValue = true)]
         public float Exp { get; set; }
         /// <summary>
         /// Gets or Sets Token
         /// </summary>
-        /// <example>eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c</example>
+        /*
+        <example>eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c</example>
+        */
         [DataMember(Name = "token", EmitDefaultValue = true)]
         public string Token { get; set; }
         /// <summary>
@@ -7010,33 +7078,43 @@ namespace BreCalClient.misc.Model
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
-        /// <example>42</example>
+        /*
+        <example>42</example>
+        */
         [DataMember(Name = "id", EmitDefaultValue = true)]
         public int Id { get; set; }
         /// <summary>
         /// Gets or Sets ShipcallId
         /// </summary>
-        /// <example>5</example>
+        /*
+        <example>5</example>
+        */
         [DataMember(Name = "shipcall_id", EmitDefaultValue = true)]
         public int ShipcallId { get; set; }
         /// <summary>
         /// Gets or Sets Message
         /// </summary>
-        /// <example>Entry XY violates rule Z</example>
+        /*
+        <example>Entry XY violates rule Z</example>
+        */
         [DataMember(Name = "message", EmitDefaultValue = true)]
         public string Message { get; set; }
         /// <summary>
         /// Readonly field set by the database when notification was created
         /// </summary>
         /// <value>Readonly field set by the database when notification was created</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "created", EmitDefaultValue = true)]
         public DateTime Created { get; set; }
         /// <summary>
         /// Readonly field set by the database when notification was last modified
         /// </summary>
         /// <value>Readonly field set by the database when notification was last modified</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "modified", EmitDefaultValue = true)]
         public DateTime? Modified { get; set; }
         /// <summary>
@@ -7095,20 +7173,25 @@ namespace BreCalClient.misc.Model
     public enum NotificationType
     {
         /// <summary>
-        /// Enum Undefined for value: undefined
+        /// Enum Assignment for value: assignment
         /// </summary>
-        [EnumMember(Value = "undefined")]
-        Undefined = 1,
+        [EnumMember(Value = "assignment")]
+        Assignment = 1,
         /// <summary>
-        /// Enum Email for value: email
+        /// Enum Next24h for value: next24h
         /// </summary>
-        [EnumMember(Value = "email")]
-        Email = 2,
+        [EnumMember(Value = "next24h")]
+        Next24h = 2,
         /// <summary>
-        /// Enum Push for value: push
+        /// Enum TimeConflict for value: time_conflict
         /// </summary>
-        [EnumMember(Value = "push")]
-        Push = 3
+        [EnumMember(Value = "time_conflict")]
+        TimeConflict = 3,
+        /// <summary>
+        /// Enum TimeConflictResolved for value: time_conflict_resolved
+        /// </summary>
+        [EnumMember(Value = "time_conflict_resolved")]
+        TimeConflictResolved = 4
     }
 }
 
@@ -7232,72 +7315,94 @@ namespace BreCalClient.misc.Model
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
-        /// <example>42</example>
+        /*
+        <example>42</example>
+        */
         [DataMember(Name = "id", EmitDefaultValue = true)]
         public int Id { get; set; }
         /// <summary>
         /// Gets or Sets Name
         /// </summary>
-        /// <example>BSMD</example>
+        /*
+        <example>BSMD</example>
+        */
         [DataMember(Name = "name", EmitDefaultValue = true)]
         public string Name { get; set; }
         /// <summary>
         /// Gets or Sets Street
         /// </summary>
-        /// <example>Hermann-Hollerith-Str. 7</example>
+        /*
+        <example>Hermann-Hollerith-Str. 7</example>
+        */
         [DataMember(Name = "street", EmitDefaultValue = true)]
         public string Street { get; set; }
         /// <summary>
         /// Gets or Sets PostalCode
         /// </summary>
-        /// <example>28359</example>
+        /*
+        <example>28359</example>
+        */
         [DataMember(Name = "postal code", EmitDefaultValue = true)]
         public string PostalCode { get; set; }
         /// <summary>
         /// Gets or Sets City
         /// </summary>
-        /// <example>Bremen</example>
+        /*
+        <example>Bremen</example>
+        */
         [DataMember(Name = "city", EmitDefaultValue = true)]
         public string City { get; set; }
         /// <summary>
         /// a logical combination (bitflag) of possible values. This cannot be encoded in a Enumeration type with discrete values in OpenAPI version &lt; 3.1.
         /// </summary>
         /// <value>a logical combination (bitflag) of possible values. This cannot be encoded in a Enumeration type with discrete values in OpenAPI version &lt; 3.1.</value>
-        /// <example>10</example>
+        /*
+        <example>10</example>
+        */
         [DataMember(Name = "type", EmitDefaultValue = true)]
         public int Type { get; set; }
         /// <summary>
         /// Bit-encoded flag array for internal use
         /// </summary>
         /// <value>Bit-encoded flag array for internal use</value>
-        /// <example>0</example>
+        /*
+        <example>0</example>
+        */
         [DataMember(Name = "flags", EmitDefaultValue = true)]
         public int? Flags { get; set; }
         /// <summary>
         /// Gets or Sets Ports
         /// </summary>
-        /// <example>[1,2]</example>
+        /*
+        <example>[1,2]</example>
+        */
         [DataMember(Name = "ports", EmitDefaultValue = true)]
         public List<int> Ports { get; set; }
         /// <summary>
         /// Readonly field set by the database when participant was created
         /// </summary>
         /// <value>Readonly field set by the database when participant was created</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "created", EmitDefaultValue = true)]
         public DateTime Created { get; set; }
         /// <summary>
         /// Readonly field set by the database when participant was last modified
         /// </summary>
         /// <value>Readonly field set by the database when participant was last modified</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "modified", EmitDefaultValue = true)]
         public DateTime? Modified { get; set; }
         /// <summary>
         /// marks the participant as logically deleted
         /// </summary>
         /// <value>marks the participant as logically deleted</value>
-        /// <example>false</example>
+        /*
+        <example>false</example>
+        */
         [DataMember(Name = "deleted", EmitDefaultValue = true)]
         public bool Deleted { get; set; }
         /// <summary>
@@ -7397,14 +7502,18 @@ namespace BreCalClient.misc.Model
         /// <summary>
         /// Gets or Sets ParticipantId
         /// </summary>
-        /// <example>5</example>
+        /*
+        <example>5</example>
+        */
         [DataMember(Name = "participant_id", IsRequired = true, EmitDefaultValue = true)]
         public int ParticipantId { get; set; }
         /// <summary>
         /// Possible role values: 1: BSMD 2: TERMINAL, 4: PILOT, 8: AGENCY, 16: MOORING, 32: PORT_ADMINISTRATION, 64: TUG.   A participant may appear multiple times with different roles.
         /// </summary>
         /// <value>Possible role values: 1: BSMD 2: TERMINAL, 4: PILOT, 8: AGENCY, 16: MOORING, 32: PORT_ADMINISTRATION, 64: TUG.   A participant may appear multiple times with different roles.</value>
-        /// <example>4</example>
+        /*
+        <example>4</example>
+        */
         [DataMember(Name = "type", IsRequired = true, EmitDefaultValue = true)]
         public int Type { get; set; }
         /// <summary>
@@ -7478,40 +7587,52 @@ namespace BreCalClient.misc.Model
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
-        /// <example>2</example>
+        /*
+        <example>2</example>
+        */
         [DataMember(Name = "id", EmitDefaultValue = true)]
         public int Id { get; set; }
         /// <summary>
         /// Gets or Sets Name
         /// </summary>
-        /// <example>Hamburg</example>
+        /*
+        <example>Hamburg</example>
+        */
         [DataMember(Name = "name", EmitDefaultValue = true)]
         public string Name { get; set; }
         /// <summary>
         /// Gets or Sets Locode
         /// </summary>
-        /// <example>DEHAM</example>
+        /*
+        <example>DEHAM</example>
+        */
         [DataMember(Name = "locode", EmitDefaultValue = true)]
         public string Locode { get; set; }
         /// <summary>
         /// Readonly field set by the database when port was created
         /// </summary>
         /// <value>Readonly field set by the database when port was created</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "created", EmitDefaultValue = true)]
         public DateTime Created { get; set; }
         /// <summary>
         /// Readonly field set by the database when port was last modified
         /// </summary>
         /// <value>Readonly field set by the database when port was last modified</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "modified", EmitDefaultValue = true)]
         public DateTime? Modified { get; set; }
         /// <summary>
         /// marks the port as logically deleted
         /// </summary>
         /// <value>marks the port as logically deleted</value>
-        /// <example>false</example>
+        /*
+        <example>false</example>
+        */
         [DataMember(Name = "deleted", EmitDefaultValue = true)]
         public bool Deleted { get; set; }
         /// <summary>
@@ -7618,84 +7739,110 @@ namespace BreCalClient.misc.Model
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
-        /// <example>8</example>
+        /*
+        <example>8</example>
+        */
         [DataMember(Name = "id", EmitDefaultValue = true)]
         public int Id { get; set; }
         /// <summary>
         /// Gets or Sets Name
         /// </summary>
-        /// <example>MS Bremen</example>
+        /*
+        <example>MS Bremen</example>
+        */
         [DataMember(Name = "name", EmitDefaultValue = true)]
         public string Name { get; set; }
         /// <summary>
         /// Gets or Sets Imo
         /// </summary>
-        /// <example>1234567</example>
+        /*
+        <example>1234567</example>
+        */
         [DataMember(Name = "imo", EmitDefaultValue = true)]
         public int? Imo { get; set; }
         /// <summary>
         /// Gets or Sets Callsign
         /// </summary>
-        /// <example>DBRE</example>
+        /*
+        <example>DBRE</example>
+        */
         [DataMember(Name = "callsign", EmitDefaultValue = true)]
         public string Callsign { get; set; }
         /// <summary>
         /// Optional reference to participant (tug role)
         /// </summary>
         /// <value>Optional reference to participant (tug role)</value>
-        /// <example>9</example>
+        /*
+        <example>9</example>
+        */
         [DataMember(Name = "participant_id", EmitDefaultValue = true)]
         public int? ParticipantId { get; set; }
         /// <summary>
         /// Gets or Sets Length
         /// </summary>
-        /// <example>200</example>
+        /*
+        <example>200</example>
+        */
         [DataMember(Name = "length", EmitDefaultValue = true)]
         public double? Length { get; set; }
         /// <summary>
         /// Gets or Sets Width
         /// </summary>
-        /// <example>30</example>
+        /*
+        <example>30</example>
+        */
         [DataMember(Name = "width", EmitDefaultValue = true)]
         public double? Width { get; set; }
         /// <summary>
         /// Gets or Sets IsTug
         /// </summary>
-        /// <example>false</example>
+        /*
+        <example>false</example>
+        */
         [DataMember(Name = "is_tug", EmitDefaultValue = true)]
         public bool IsTug { get; set; }
         /// <summary>
         /// Gets or Sets BollardPull
         /// </summary>
-        /// <example>100</example>
+        /*
+        <example>100</example>
+        */
         [DataMember(Name = "bollard_pull", EmitDefaultValue = true)]
         public int? BollardPull { get; set; }
         /// <summary>
         /// BSMD internal use
         /// </summary>
         /// <value>BSMD internal use</value>
-        /// <example>1234567</example>
+        /*
+        <example>1234567</example>
+        */
         [DataMember(Name = "eni", EmitDefaultValue = true)]
         public int? Eni { get; set; }
         /// <summary>
         /// Readonly field set by the database when ship was created
         /// </summary>
         /// <value>Readonly field set by the database when ship was created</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "created", EmitDefaultValue = true)]
         public DateTime Created { get; set; }
         /// <summary>
         /// Readonly field set by the database when ship was last modified
         /// </summary>
         /// <value>Readonly field set by the database when ship was last modified</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "modified", EmitDefaultValue = true)]
         public DateTime? Modified { get; set; }
         /// <summary>
         /// marks the ship as logically deleted
         /// </summary>
         /// <value>marks the ship as logically deleted</value>
-        /// <example>false</example>
+        /*
+        <example>false</example>
+        */
         [DataMember(Name = "deleted", EmitDefaultValue = true)]
         public bool Deleted { get; set; }
         /// <summary>
@@ -7851,145 +7998,193 @@ namespace BreCalClient.misc.Model
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
-        /// <example>6</example>
+        /*
+        <example>6</example>
+        */
         [DataMember(Name = "id", EmitDefaultValue = true)]
         public int Id { get; set; }
         /// <summary>
         /// Gets or Sets ShipId
         /// </summary>
-        /// <example>8</example>
+        /*
+        <example>8</example>
+        */
         [DataMember(Name = "ship_id", IsRequired = true, EmitDefaultValue = true)]
         public int ShipId { get; set; }
         /// <summary>
         /// Gets or Sets PortId
         /// </summary>
-        /// <example>3</example>
+        /*
+        <example>3</example>
+        */
         [DataMember(Name = "port_id", EmitDefaultValue = true)]
         public int PortId { get; set; }
         /// <summary>
         /// Gets or Sets Eta
         /// </summary>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "eta", EmitDefaultValue = true)]
         public DateTime? Eta { get; set; }
         /// <summary>
         /// Gets or Sets Voyage
         /// </summary>
-        /// <example>Voyage 123</example>
+        /*
+        <example>Voyage 123</example>
+        */
         [DataMember(Name = "voyage", EmitDefaultValue = true)]
         public string Voyage { get; set; }
         /// <summary>
         /// Gets or Sets Etd
         /// </summary>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "etd", EmitDefaultValue = true)]
         public DateTime? Etd { get; set; }
         /// <summary>
         /// Gets or Sets ArrivalBerthId
         /// </summary>
-        /// <example>3</example>
+        /*
+        <example>3</example>
+        */
         [DataMember(Name = "arrival_berth_id", EmitDefaultValue = true)]
         public int? ArrivalBerthId { get; set; }
         /// <summary>
         /// Gets or Sets DepartureBerthId
         /// </summary>
-        /// <example>4</example>
+        /*
+        <example>4</example>
+        */
         [DataMember(Name = "departure_berth_id", EmitDefaultValue = true)]
         public int? DepartureBerthId { get; set; }
         /// <summary>
         /// Gets or Sets TugRequired
         /// </summary>
-        /// <example>true</example>
+        /*
+        <example>true</example>
+        */
         [DataMember(Name = "tug_required", EmitDefaultValue = true)]
         public bool? TugRequired { get; set; }
         /// <summary>
         /// Gets or Sets PilotRequired
         /// </summary>
-        /// <example>true</example>
+        /*
+        <example>true</example>
+        */
         [DataMember(Name = "pilot_required", EmitDefaultValue = true)]
         public bool? PilotRequired { get; set; }
         /// <summary>
         /// Gets or Sets Flags
         /// </summary>
-        /// <example>1</example>
+        /*
+        <example>1</example>
+        */
         [DataMember(Name = "flags", EmitDefaultValue = true)]
         public int? Flags { get; set; }
         /// <summary>
         /// Gets or Sets PierSide
         /// </summary>
-        /// <example>false</example>
+        /*
+        <example>false</example>
+        */
         [DataMember(Name = "pier_side", EmitDefaultValue = true)]
         public bool? PierSide { get; set; }
         /// <summary>
         /// Gets or Sets Bunkering
         /// </summary>
-        /// <example>false</example>
+        /*
+        <example>false</example>
+        */
         [DataMember(Name = "bunkering", EmitDefaultValue = true)]
         public bool? Bunkering { get; set; }
         /// <summary>
         /// Gets or Sets ReplenishingTerminal
         /// </summary>
-        /// <example>false</example>
+        /*
+        <example>false</example>
+        */
         [DataMember(Name = "replenishing_terminal", EmitDefaultValue = true)]
         public bool? ReplenishingTerminal { get; set; }
         /// <summary>
         /// Gets or Sets ReplenishingLock
         /// </summary>
-        /// <example>false</example>
+        /*
+        <example>false</example>
+        */
         [DataMember(Name = "replenishing_lock", EmitDefaultValue = true)]
         public bool? ReplenishingLock { get; set; }
         /// <summary>
         /// Gets or Sets Draft
         /// </summary>
-        /// <example>10.5</example>
+        /*
+        <example>10.5</example>
+        */
         [DataMember(Name = "draft", EmitDefaultValue = true)]
         public double? Draft { get; set; }
         /// <summary>
         /// Gets or Sets TidalWindowFrom
         /// </summary>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "tidal_window_from", EmitDefaultValue = true)]
         public DateTime? TidalWindowFrom { get; set; }
         /// <summary>
         /// Gets or Sets TidalWindowTo
         /// </summary>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "tidal_window_to", EmitDefaultValue = true)]
         public DateTime? TidalWindowTo { get; set; }
         /// <summary>
         /// Gets or Sets RainSensitiveCargo
         /// </summary>
-        /// <example>false</example>
+        /*
+        <example>false</example>
+        */
         [DataMember(Name = "rain_sensitive_cargo", EmitDefaultValue = true)]
         public bool? RainSensitiveCargo { get; set; }
         /// <summary>
         /// Gets or Sets RecommendedTugs
         /// </summary>
-        /// <example>2</example>
+        /*
+        <example>2</example>
+        */
         [DataMember(Name = "recommended_tugs", EmitDefaultValue = true)]
         public int? RecommendedTugs { get; set; }
         /// <summary>
         /// Gets or Sets Anchored
         /// </summary>
-        /// <example>false</example>
+        /*
+        <example>false</example>
+        */
         [DataMember(Name = "anchored", EmitDefaultValue = true)]
         public bool? Anchored { get; set; }
         /// <summary>
         /// Gets or Sets MooredLock
         /// </summary>
-        /// <example>false</example>
+        /*
+        <example>false</example>
+        */
         [DataMember(Name = "moored_lock", EmitDefaultValue = true)]
         public bool? MooredLock { get; set; }
         /// <summary>
         /// Gets or Sets Canceled
         /// </summary>
-        /// <example>false</example>
+        /*
+        <example>false</example>
+        */
         [DataMember(Name = "canceled", EmitDefaultValue = true)]
         public bool? Canceled { get; set; }
         /// <summary>
         /// Gets or Sets EvaluationMessage
         /// </summary>
-        /// <example>Time window too short</example>
+        /*
+        <example>Time window too short</example>
+        */
         [DataMember(Name = "evaluation_message", EmitDefaultValue = true)]
         public string EvaluationMessage { get; private set; }
         /// <summary>
@@ -8008,27 +8203,35 @@ namespace BreCalClient.misc.Model
         /// Physical reference point for all times given in shipcall and depending times entries
         /// </summary>
         /// <value>Physical reference point for all times given in shipcall and depending times entries</value>
-        /// <example>1</example>
+        /*
+        <example>1</example>
+        */
         [DataMember(Name = "time_ref_point", EmitDefaultValue = true)]
         public int? TimeRefPoint { get; set; }
         /// <summary>
         /// Gets or Sets Participants
         /// </summary>
-        /// <example>[{&quot;participant_id&quot;:5,&quot;type&quot;:4},{&quot;participant_id&quot;:6,&quot;type&quot;:8}]</example>
+        /*
+        <example>[{&quot;participant_id&quot;:5,&quot;type&quot;:4},{&quot;participant_id&quot;:6,&quot;type&quot;:8}]</example>
+        */
         [DataMember(Name = "participants", EmitDefaultValue = true)]
         public List<ParticipantAssignment> Participants { get; set; }
         /// <summary>
         /// Readonly field set by the database when shipcall was created
         /// </summary>
         /// <value>Readonly field set by the database when shipcall was created</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "created", EmitDefaultValue = true)]
         public DateTime Created { get; set; }
         /// <summary>
         /// Readonly field set by the database when shipcall was last modified
         /// </summary>
         /// <value>Readonly field set by the database when shipcall was last modified</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "modified", EmitDefaultValue = true)]
         public DateTime? Modified { get; set; }
         /// <summary>
@@ -8222,167 +8425,215 @@ namespace BreCalClient.misc.Model
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
-        /// <example>2</example>
+        /*
+        <example>2</example>
+        */
         [DataMember(Name = "id", EmitDefaultValue = true)]
         public int Id { get; set; }
         /// <summary>
         /// Arrival time at berth
         /// </summary>
         /// <value>Arrival time at berth</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "eta_berth", EmitDefaultValue = true)]
         public DateTime? EtaBerth { get; set; }
         /// <summary>
         /// If true, the eta is fixed and cannot be changed
         /// </summary>
         /// <value>If true, the eta is fixed and cannot be changed</value>
-        /// <example>true</example>
+        /*
+        <example>true</example>
+        */
         [DataMember(Name = "eta_berth_fixed", EmitDefaultValue = true)]
         public bool? EtaBerthFixed { get; set; }
         /// <summary>
         /// departure time from berth
         /// </summary>
         /// <value>departure time from berth</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "etd_berth", EmitDefaultValue = true)]
         public DateTime? EtdBerth { get; set; }
         /// <summary>
         /// If true, the etd is fixed and cannot be changed
         /// </summary>
         /// <value>If true, the etd is fixed and cannot be changed</value>
-        /// <example>true</example>
+        /*
+        <example>true</example>
+        */
         [DataMember(Name = "etd_berth_fixed", EmitDefaultValue = true)]
         public bool? EtdBerthFixed { get; set; }
         /// <summary>
         /// arrival time at lock
         /// </summary>
         /// <value>arrival time at lock</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "lock_time", EmitDefaultValue = true)]
         public DateTime? LockTime { get; set; }
         /// <summary>
         /// If true, the lock time is fixed and cannot be changed
         /// </summary>
         /// <value>If true, the lock time is fixed and cannot be changed</value>
-        /// <example>true</example>
+        /*
+        <example>true</example>
+        */
         [DataMember(Name = "lock_time_fixed", EmitDefaultValue = true)]
         public bool? LockTimeFixed { get; set; }
         /// <summary>
         /// Expected time of entry into the zone
         /// </summary>
         /// <value>Expected time of entry into the zone</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "zone_entry", EmitDefaultValue = true)]
         public DateTime? ZoneEntry { get; set; }
         /// <summary>
         /// If true, the zone entry time is fixed and cannot be changed
         /// </summary>
         /// <value>If true, the zone entry time is fixed and cannot be changed</value>
-        /// <example>true</example>
+        /*
+        <example>true</example>
+        */
         [DataMember(Name = "zone_entry_fixed", EmitDefaultValue = true)]
         public bool? ZoneEntryFixed { get; set; }
         /// <summary>
         /// Start time for terminal operations
         /// </summary>
         /// <value>Start time for terminal operations</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "operations_start", EmitDefaultValue = true)]
         public DateTime? OperationsStart { get; set; }
         /// <summary>
         /// End time for terminal operations
         /// </summary>
         /// <value>End time for terminal operations</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "operations_end", EmitDefaultValue = true)]
         public DateTime? OperationsEnd { get; set; }
         /// <summary>
         /// Additional remarks
         /// </summary>
         /// <value>Additional remarks</value>
-        /// <example>Please be aware of the strong current</example>
+        /*
+        <example>Please be aware of the strong current</example>
+        */
         [DataMember(Name = "remarks", EmitDefaultValue = true)]
         public string Remarks { get; set; }
         /// <summary>
         /// Reference to a shipcall id
         /// </summary>
         /// <value>Reference to a shipcall id</value>
-        /// <example>23</example>
+        /*
+        <example>23</example>
+        */
         [DataMember(Name = "shipcall_id", IsRequired = true, EmitDefaultValue = true)]
         public int ShipcallId { get; set; }
         /// <summary>
         /// Reference to a participant id
         /// </summary>
         /// <value>Reference to a participant id</value>
-        /// <example>34</example>
+        /*
+        <example>34</example>
+        */
         [DataMember(Name = "participant_id", IsRequired = true, EmitDefaultValue = true)]
         public int ParticipantId { get; set; }
         /// <summary>
         /// Reference to a berth id
         /// </summary>
         /// <value>Reference to a berth id</value>
-        /// <example>1</example>
+        /*
+        <example>1</example>
+        */
         [DataMember(Name = "berth_id", EmitDefaultValue = true)]
         public int? BerthId { get; set; }
         /// <summary>
         /// Additional info text for berth
         /// </summary>
         /// <value>Additional info text for berth</value>
-        /// <example>200m length</example>
+        /*
+        <example>200m length</example>
+        */
         [DataMember(Name = "berth_info", EmitDefaultValue = true)]
         public string BerthInfo { get; set; }
         /// <summary>
         /// true if ship is rotated, false otherwise
         /// </summary>
         /// <value>true if ship is rotated, false otherwise</value>
-        /// <example>true</example>
+        /*
+        <example>true</example>
+        */
         [DataMember(Name = "pier_side", EmitDefaultValue = true)]
         public bool? PierSide { get; set; }
         /// <summary>
         /// Gets or Sets ParticipantType
         /// </summary>
-        /// <example>4</example>
+        /*
+        <example>4</example>
+        */
         [DataMember(Name = "participant_type", EmitDefaultValue = true)]
         public int ParticipantType { get; set; }
         /// <summary>
         /// ata can be set by mooring if actual times are different from planned
         /// </summary>
         /// <value>ata can be set by mooring if actual times are different from planned</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "ata", EmitDefaultValue = true)]
         public DateTime? Ata { get; set; }
         /// <summary>
         /// atd can be set by mooring if actual times are different from planned
         /// </summary>
         /// <value>atd can be set by mooring if actual times are different from planned</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "atd", EmitDefaultValue = true)]
         public DateTime? Atd { get; set; }
         /// <summary>
         /// Optional end of the interval for the times eta entry
         /// </summary>
         /// <value>Optional end of the interval for the times eta entry</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "eta_interval_end", EmitDefaultValue = true)]
         public DateTime? EtaIntervalEnd { get; set; }
         /// <summary>
         /// Optional end of the interval for the times etd entry
         /// </summary>
         /// <value>Optional end of the interval for the times etd entry</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "etd_interval_end", EmitDefaultValue = true)]
         public DateTime? EtdIntervalEnd { get; set; }
         /// <summary>
         /// Readonly field set by the database when times record was created
         /// </summary>
         /// <value>Readonly field set by the database when times record was created</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "created", EmitDefaultValue = true)]
         public DateTime Created { get; set; }
         /// <summary>
         /// Readonly field set by the database when times record was last modified
         /// </summary>
         /// <value>Readonly field set by the database when times record was last modified</value>
-        /// <example>2023-08-21T08:23:35Z</example>
+        /*
+        <example>2023-08-21T08:23:35Z</example>
+        */
         [DataMember(Name = "modified", EmitDefaultValue = true)]
         public DateTime? Modified { get; set; }
         /// <summary>
@@ -8490,43 +8741,57 @@ namespace BreCalClient.misc.Model
         /// <summary>
         /// Gets or Sets Id
         /// </summary>
-        /// <example>42</example>
+        /*
+        <example>42</example>
+        */
         [DataMember(Name = "id", EmitDefaultValue = true)]
         public int Id { get; set; }
         /// <summary>
         /// Gets or Sets OldPassword
         /// </summary>
-        /// <example>oldpassword</example>
+        /*
+        <example>oldpassword</example>
+        */
         [DataMember(Name = "old_password", EmitDefaultValue = true)]
         public string OldPassword { get; set; }
         /// <summary>
         /// Gets or Sets NewPassword
         /// </summary>
-        /// <example>newpassword</example>
+        /*
+        <example>newpassword</example>
+        */
         [DataMember(Name = "new_password", EmitDefaultValue = true)]
         public string NewPassword { get; set; }
         /// <summary>
         /// Gets or Sets FirstName
         /// </summary>
-        /// <example>John</example>
+        /*
+        <example>John</example>
+        */
         [DataMember(Name = "first_name", EmitDefaultValue = true)]
         public string FirstName { get; set; }
         /// <summary>
         /// Gets or Sets LastName
         /// </summary>
-        /// <example>Doe</example>
+        /*
+        <example>Doe</example>
+        */
         [DataMember(Name = "last_name", EmitDefaultValue = true)]
         public string LastName { get; set; }
         /// <summary>
         /// Gets or Sets UserPhone
         /// </summary>
-        /// <example>1234567890</example>
+        /*
+        <example>1234567890</example>
+        */
         [DataMember(Name = "user_phone", EmitDefaultValue = true)]
         public string UserPhone { get; set; }
         /// <summary>
         /// Gets or Sets UserEmail
         /// </summary>
-        /// <example>no@where.com</example>
+        /*
+        <example>no@where.com</example>
+        */
         [DataMember(Name = "user_email", EmitDefaultValue = true)]
         public string UserEmail { get; set; }
         /// <summary>
diff --git a/misc/BreCalApi.yaml b/misc/BreCalApi.yaml
index c792698..1a61e0b 100644
--- a/misc/BreCalApi.yaml
+++ b/misc/BreCalApi.yaml
@@ -657,7 +657,7 @@ paths:
       parameters:
         - name: shipcall_id
           in: query
-          required: true
+          required: false
           description: '**Id of ship call**. *Example: 52*. Id given in ship call list'
           schema:
             $ref: '#/components/schemas/shipcallId'
@@ -1545,13 +1545,15 @@ components:
         id:
           type: integer
           example: 42
+          nullable: false      
         shipcall_id:
           type: integer
           example: 5
+          nullable: false
         notification_type:
-          $ref: '#/components/schemas/NotificationType'
+          $ref: '#/components/schemas/NotificationType'          
         message:
-          type: string
+          type: string                    
           example: Entry XY violates rule Z
         created:
           type: string
@@ -1567,8 +1569,8 @@ components:
       example:
         id: 42
         shipcall_id: 5
-        notification_type: email
-        message: Entry XY violates rule Z
+        notification_type: next24h
+        message: Shipcall may be relevant to you in the next 24 hours
         created: '2023-08-21T08:23:35Z'
         modified: '2023-08-21T08:23:35Z'
     notification_list:
@@ -1579,13 +1581,13 @@ components:
       example:
         - id: 42
           shipcall_id: 5
-          notification_type: email
+          notification_type: time_conflict
           message: Entry XY violates rule Z
           created: '2023-08-21T08:23:35Z'
           modified: '2023-08-21T08:23:35Z'
         - id: 43
           shipcall_id: 7
-          notification_type: email
+          notification_type: time_conflict
           message: Entry AB violates rule C
           created: '2023-08-21T08:23:35Z'
           modified: '2023-08-21T08:23:35Z'
@@ -1804,10 +1806,11 @@ components:
       type: string
       description: Type of notification
       enum:
-        - undefined
-        - email
-        - push
-      example: email
+        - assignment
+        - next24h
+        - time_conflict
+        - time_conflict_resolved
+      example: time_conflict
     EvaluationType:
       description: Evaluation of the ship call
       readOnly: true
diff --git a/src/server/BreCal/impl/login.py b/src/server/BreCal/impl/login.py
index 949e04a..c65d630 100644
--- a/src/server/BreCal/impl/login.py
+++ b/src/server/BreCal/impl/login.py
@@ -31,7 +31,11 @@ def GetUser(options):
                         "last_name": data[0].last_name,
                         "user_name": data[0].user_name,
                         "user_phone": data[0].user_phone,
-                        "user_email": data[0].user_email
+                        "user_email": data[0].user_email,
+                        "notify_email": data[0].notify_email,
+                        "notify_whatsapp": data[0].notify_whatsapp,
+                        "notify_signal": data[0].notify_signal,
+                        "notify_popup": data[0].notify_popup
                     }
                     token = jwt_handler.generate_jwt(payload=result, lifetime=120) # generate token valid 60 mins
                     result["token"] = token # add token to user data
diff --git a/src/server/BreCal/impl/user.py b/src/server/BreCal/impl/user.py
index 92dc02d..6229bc8 100644
--- a/src/server/BreCal/impl/user.py
+++ b/src/server/BreCal/impl/user.py
@@ -35,7 +35,7 @@ def PutUser(schemaModel):
         # should this be refactored?
         # Also, what about the 'user_name'?
         # 'participant_id' would also not trigger an update in isolation
-        if "first_name" in schemaModel or "last_name" in schemaModel or "user_phone" in schemaModel or "user_email" in schemaModel:
+        if "first_name" in schemaModel or "last_name" in schemaModel or "user_phone" in schemaModel or "user_email" in schemaModel or "notify_email" in schemaModel or "notify_whatsapp" in schemaModel or "notify_signal" in schemaModel or "notify_popup" in schemaModel:
             # query = SQLQuery.get_user_put(schemaModel)
             query = "UPDATE user SET "
             isNotFirst = False
diff --git a/src/server/BreCal/schemas/model.py b/src/server/BreCal/schemas/model.py
index b8e80c4..280fa30 100644
--- a/src/server/BreCal/schemas/model.py
+++ b/src/server/BreCal/schemas/model.py
@@ -65,18 +65,16 @@ class EvaluationType(IntEnum):
         return cls.undefined
 
 class NotificationType(IntEnum):
+
     """
-    Any user has the attributes
-        'notify_email' -> NotificationType.email
-        'notify_popup' -> NotificationType.push
-        'notify_whatsapp' -> undeclared
-        'notify_signal' -> undeclared
+    This type is not the way the user is informed but the type of the notification, e.g. time conflict, time conflict resolved, etc.
+    It can be understood as an event type
     """
-    undefined = 0
-    email = 1
-    push = 2
-    # whatsapp = 3
-    # signal = 4
+
+    assignment = 0
+    next24h = 1
+    time_conflict = 2
+    time_conflict_resolved = 3
 
     @classmethod
     def _missing_(cls, value):
@@ -489,7 +487,10 @@ class UserSchema(Schema):
     user_email = fields.String(allow_none=True, required=False, validate=[validate.Length(max=64)])
     old_password = fields.String(allow_none=True, required=False, validate=[validate.Length(max=128)])
     new_password = fields.String(allow_none=True, required=False, validate=[validate.Length(min=6, max=128)])
-    # #TODO: the user schema does not (yet) include the 'notify_' fields
+    notify_email = fields.Bool(allow_none=True, required=False)
+    notify_whatsapp = fields.Bool(allow_none=True, required=False)
+    notify_signal = fields.Bool(allow_none=True, required=False)
+    notify_popup = fields.Bool(allow_none=True, required=False)
 
     @validates("user_phone")
     def validate_user_phone(self, value):
@@ -542,10 +543,10 @@ class User:
     user_phone: str
     password_hash: str
     api_key: str
-    notify_email: bool # #TODO_clarify: should we use an IntFlag for multi-assignment?
-    notify_whatsapp: bool # #TODO_clarify: should we use an IntFlag for multi-assignment?
-    notify_signal: bool # #TODO_clarify: should we use an IntFlag for multi-assignment?
-    notify_popup: bool # #TODO_clarify: should we use an IntFlag for multi-assignment?
+    notify_email: bool
+    notify_whatsapp: bool
+    notify_signal: bool
+    notify_popup: bool
     created: datetime
     modified: datetime