diff --git a/misc/BreCalApi.cs b/misc/BreCalApi.cs
index d4a06ed..f33e5df 100644
--- a/misc/BreCalApi.cs
+++ b/misc/BreCalApi.cs
@@ -1,7 +1,7 @@
 
 //----------------------
 // <auto-generated>
-//     Generated REST API Client Code Generator v1.8.4.0 on 04.10.2023 07:39:32
+//     Generated REST API Client Code Generator v1.8.4.0 on 06.10.2023 16:40:06
 //     Using the tool OpenAPI Generator v7.0.0
 // </auto-generated>
 //----------------------
@@ -71,7 +71,7 @@ namespace BreCalClient.misc.Api
         /// Gets a list of all berths registered
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="operationIndex">Index associated with the operation.</param>
@@ -89,7 +89,7 @@ namespace BreCalClient.misc.Api
         /// Returns a JWT session token and user data if successful
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="credentials">Login credentials</param>
@@ -109,7 +109,7 @@ namespace BreCalClient.misc.Api
         /// Gets a list of notifications pursuant to a specified participant and ship call
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="participantId">**Id of participant**. *Example: 2*. Id returned through loading of participant</param>
@@ -129,7 +129,7 @@ namespace BreCalClient.misc.Api
         /// gets a particular participant entry corresponding to user id
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="userId">**Id of user**. *Example: 2*. User id returned by verify call. (optional)</param>
@@ -147,7 +147,7 @@ namespace BreCalClient.misc.Api
         /// Gets a list of ship calls
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="operationIndex">Index associated with the operation.</param>
@@ -165,7 +165,7 @@ namespace BreCalClient.misc.Api
         /// Create a new ship call
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="shipcall">Creates a new ship call. **Do not** provide id parameter.</param>
@@ -184,7 +184,7 @@ namespace BreCalClient.misc.Api
         /// Updates a ship call
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="shipcall">Creates a new ship call. The id parameter is **required**.</param>
@@ -202,7 +202,7 @@ namespace BreCalClient.misc.Api
         /// gets a list of registered shipcalls
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="operationIndex">Index associated with the operation.</param>
@@ -220,7 +220,7 @@ namespace BreCalClient.misc.Api
         /// Delete a times entry for a ship call.
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="id"></param>
@@ -239,7 +239,7 @@ namespace BreCalClient.misc.Api
         /// Get all recorded times for a a ship call
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="shipcallId">**Id**. *Example: 42*. Id of referenced ship call. (optional)</param>
@@ -258,7 +258,7 @@ namespace BreCalClient.misc.Api
         /// Create a new times entry for a ship call
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="times">Times entry that will be added to the ship call. **Do not** provide id parameter.</param>
@@ -277,7 +277,7 @@ namespace BreCalClient.misc.Api
         /// Update a times entry for a ship call
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="times">Times entry that will be added to the ship call. The id parameter is **required**.</param>
@@ -296,7 +296,7 @@ namespace BreCalClient.misc.Api
         /// Update user details (first/last name, phone, password)
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="userDetails">User details</param>
@@ -315,7 +315,7 @@ namespace BreCalClient.misc.Api
         /// Gets a list of all berths registered
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="operationIndex">Index associated with the operation.</param>
@@ -326,7 +326,7 @@ namespace BreCalClient.misc.Api
         /// Gets a list of all berths registered
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="operationIndex">Index associated with the operation.</param>
@@ -337,7 +337,7 @@ namespace BreCalClient.misc.Api
         /// Returns a JWT session token and user data if successful
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="credentials">Login credentials</param>
@@ -349,7 +349,7 @@ namespace BreCalClient.misc.Api
         /// Returns a JWT session token and user data if successful
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="credentials">Login credentials</param>
@@ -361,7 +361,7 @@ namespace BreCalClient.misc.Api
         /// Gets a list of notifications pursuant to a specified participant and ship call
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="participantId">**Id of participant**. *Example: 2*. Id returned through loading of participant</param>
@@ -374,7 +374,7 @@ namespace BreCalClient.misc.Api
         /// Gets a list of notifications pursuant to a specified participant and ship call
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="participantId">**Id of participant**. *Example: 2*. Id returned through loading of participant</param>
@@ -387,7 +387,7 @@ namespace BreCalClient.misc.Api
         /// gets a particular participant entry corresponding to user id
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="userId">**Id of user**. *Example: 2*. User id returned by verify call. (optional)</param>
@@ -399,7 +399,7 @@ namespace BreCalClient.misc.Api
         /// gets a particular participant entry corresponding to user id
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="userId">**Id of user**. *Example: 2*. User id returned by verify call. (optional)</param>
@@ -411,7 +411,7 @@ namespace BreCalClient.misc.Api
         /// Gets a list of ship calls
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="operationIndex">Index associated with the operation.</param>
@@ -422,7 +422,7 @@ namespace BreCalClient.misc.Api
         /// Gets a list of ship calls
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="operationIndex">Index associated with the operation.</param>
@@ -433,7 +433,7 @@ namespace BreCalClient.misc.Api
         /// Create a new ship call
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="shipcall">Creates a new ship call. **Do not** provide id parameter.</param>
@@ -445,7 +445,7 @@ namespace BreCalClient.misc.Api
         /// Create a new ship call
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="shipcall">Creates a new ship call. **Do not** provide id parameter.</param>
@@ -457,7 +457,7 @@ namespace BreCalClient.misc.Api
         /// Updates a ship call
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="shipcall">Creates a new ship call. The id parameter is **required**.</param>
@@ -469,7 +469,7 @@ namespace BreCalClient.misc.Api
         /// Updates a ship call
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="shipcall">Creates a new ship call. The id parameter is **required**.</param>
@@ -481,7 +481,7 @@ namespace BreCalClient.misc.Api
         /// gets a list of registered shipcalls
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="operationIndex">Index associated with the operation.</param>
@@ -492,7 +492,7 @@ namespace BreCalClient.misc.Api
         /// gets a list of registered shipcalls
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="operationIndex">Index associated with the operation.</param>
@@ -503,7 +503,7 @@ namespace BreCalClient.misc.Api
         /// Delete a times entry for a ship call.
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="id"></param>
@@ -515,7 +515,7 @@ namespace BreCalClient.misc.Api
         /// Delete a times entry for a ship call.
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="id"></param>
@@ -527,7 +527,7 @@ namespace BreCalClient.misc.Api
         /// Get all recorded times for a a ship call
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="shipcallId">**Id**. *Example: 42*. Id of referenced ship call. (optional)</param>
@@ -539,7 +539,7 @@ namespace BreCalClient.misc.Api
         /// Get all recorded times for a a ship call
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="shipcallId">**Id**. *Example: 42*. Id of referenced ship call. (optional)</param>
@@ -551,7 +551,7 @@ namespace BreCalClient.misc.Api
         /// Create a new times entry for a ship call
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="times">Times entry that will be added to the ship call. **Do not** provide id parameter.</param>
@@ -563,7 +563,7 @@ namespace BreCalClient.misc.Api
         /// Create a new times entry for a ship call
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="times">Times entry that will be added to the ship call. **Do not** provide id parameter.</param>
@@ -575,7 +575,7 @@ namespace BreCalClient.misc.Api
         /// Update a times entry for a ship call
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="times">Times entry that will be added to the ship call. The id parameter is **required**.</param>
@@ -587,7 +587,7 @@ namespace BreCalClient.misc.Api
         /// Update a times entry for a ship call
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="times">Times entry that will be added to the ship call. The id parameter is **required**.</param>
@@ -599,7 +599,7 @@ namespace BreCalClient.misc.Api
         /// Update user details (first/last name, phone, password)
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="userDetails">User details</param>
@@ -611,7 +611,7 @@ namespace BreCalClient.misc.Api
         /// Update user details (first/last name, phone, password)
         /// </summary>
         /// <remarks>
-        /// 
+        ///
         /// </remarks>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="userDetails">User details</param>
@@ -725,7 +725,7 @@ namespace BreCalClient.misc.Api
             set { _exceptionFactory = value; }
         }
         /// <summary>
-        /// Gets a list of all berths registered 
+        /// Gets a list of all berths registered
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="operationIndex">Index associated with the operation.</param>
@@ -736,7 +736,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse.Data;
         }
         /// <summary>
-        /// Gets a list of all berths registered 
+        /// Gets a list of all berths registered
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="operationIndex">Index associated with the operation.</param>
@@ -780,7 +780,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// Gets a list of all berths registered 
+        /// Gets a list of all berths registered
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="operationIndex">Index associated with the operation.</param>
@@ -792,7 +792,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse.Data;
         }
         /// <summary>
-        /// Gets a list of all berths registered 
+        /// Gets a list of all berths registered
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="operationIndex">Index associated with the operation.</param>
@@ -837,7 +837,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// Returns a JWT session token and user data if successful 
+        /// Returns a JWT session token and user data if successful
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="credentials">Login credentials</param>
@@ -849,7 +849,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse.Data;
         }
         /// <summary>
-        /// Returns a JWT session token and user data if successful 
+        /// Returns a JWT session token and user data if successful
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="credentials">Login credentials</param>
@@ -901,7 +901,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// Returns a JWT session token and user data if successful 
+        /// Returns a JWT session token and user data if successful
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="credentials">Login credentials</param>
@@ -914,7 +914,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse.Data;
         }
         /// <summary>
-        /// Returns a JWT session token and user data if successful 
+        /// Returns a JWT session token and user data if successful
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="credentials">Login credentials</param>
@@ -967,7 +967,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// Gets a list of notifications pursuant to a specified participant and ship call 
+        /// Gets a list of notifications pursuant to a specified participant and ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="participantId">**Id of participant**. *Example: 2*. Id returned through loading of participant</param>
@@ -980,7 +980,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse.Data;
         }
         /// <summary>
-        /// Gets a list of notifications pursuant to a specified participant and ship call 
+        /// Gets a list of notifications pursuant to a specified participant and ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="participantId">**Id of participant**. *Example: 2*. Id returned through loading of participant</param>
@@ -1028,7 +1028,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// Gets a list of notifications pursuant to a specified participant and ship call 
+        /// Gets a list of notifications pursuant to a specified participant and ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="participantId">**Id of participant**. *Example: 2*. Id returned through loading of participant</param>
@@ -1042,7 +1042,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse.Data;
         }
         /// <summary>
-        /// Gets a list of notifications pursuant to a specified participant and ship call 
+        /// Gets a list of notifications pursuant to a specified participant and ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="participantId">**Id of participant**. *Example: 2*. Id returned through loading of participant</param>
@@ -1091,7 +1091,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// gets a particular participant entry corresponding to user id 
+        /// gets a particular participant entry corresponding to user id
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="userId">**Id of user**. *Example: 2*. User id returned by verify call. (optional)</param>
@@ -1103,7 +1103,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse.Data;
         }
         /// <summary>
-        /// gets a particular participant entry corresponding to user id 
+        /// gets a particular participant entry corresponding to user id
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="userId">**Id of user**. *Example: 2*. User id returned by verify call. (optional)</param>
@@ -1152,7 +1152,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// gets a particular participant entry corresponding to user id 
+        /// gets a particular participant entry corresponding to user id
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="userId">**Id of user**. *Example: 2*. User id returned by verify call. (optional)</param>
@@ -1165,7 +1165,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse.Data;
         }
         /// <summary>
-        /// gets a particular participant entry corresponding to user id 
+        /// gets a particular participant entry corresponding to user id
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="userId">**Id of user**. *Example: 2*. User id returned by verify call. (optional)</param>
@@ -1215,7 +1215,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// Gets a list of ship calls 
+        /// Gets a list of ship calls
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="operationIndex">Index associated with the operation.</param>
@@ -1226,7 +1226,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse.Data;
         }
         /// <summary>
-        /// Gets a list of ship calls 
+        /// Gets a list of ship calls
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="operationIndex">Index associated with the operation.</param>
@@ -1270,7 +1270,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// Gets a list of ship calls 
+        /// Gets a list of ship calls
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="operationIndex">Index associated with the operation.</param>
@@ -1282,7 +1282,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse.Data;
         }
         /// <summary>
-        /// Gets a list of ship calls 
+        /// Gets a list of ship calls
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="operationIndex">Index associated with the operation.</param>
@@ -1327,7 +1327,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// Create a new ship call 
+        /// Create a new ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="shipcall">Creates a new ship call. **Do not** provide id parameter.</param>
@@ -1339,7 +1339,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse.Data;
         }
         /// <summary>
-        /// Create a new ship call 
+        /// Create a new ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="shipcall">Creates a new ship call. **Do not** provide id parameter.</param>
@@ -1391,7 +1391,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// Create a new ship call 
+        /// Create a new ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="shipcall">Creates a new ship call. **Do not** provide id parameter.</param>
@@ -1404,7 +1404,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse.Data;
         }
         /// <summary>
-        /// Create a new ship call 
+        /// Create a new ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="shipcall">Creates a new ship call. **Do not** provide id parameter.</param>
@@ -1457,7 +1457,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// Updates a ship call 
+        /// Updates a ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="shipcall">Creates a new ship call. The id parameter is **required**.</param>
@@ -1469,7 +1469,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse.Data;
         }
         /// <summary>
-        /// Updates a ship call 
+        /// Updates a ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="shipcall">Creates a new ship call. The id parameter is **required**.</param>
@@ -1521,7 +1521,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// Updates a ship call 
+        /// Updates a ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="shipcall">Creates a new ship call. The id parameter is **required**.</param>
@@ -1534,7 +1534,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse.Data;
         }
         /// <summary>
-        /// Updates a ship call 
+        /// Updates a ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="shipcall">Creates a new ship call. The id parameter is **required**.</param>
@@ -1587,7 +1587,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// gets a list of registered shipcalls 
+        /// gets a list of registered shipcalls
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="operationIndex">Index associated with the operation.</param>
@@ -1598,7 +1598,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse.Data;
         }
         /// <summary>
-        /// gets a list of registered shipcalls 
+        /// gets a list of registered shipcalls
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="operationIndex">Index associated with the operation.</param>
@@ -1642,7 +1642,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// gets a list of registered shipcalls 
+        /// gets a list of registered shipcalls
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="operationIndex">Index associated with the operation.</param>
@@ -1654,7 +1654,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse.Data;
         }
         /// <summary>
-        /// gets a list of registered shipcalls 
+        /// gets a list of registered shipcalls
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="operationIndex">Index associated with the operation.</param>
@@ -1699,7 +1699,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// Delete a times entry for a ship call. 
+        /// Delete a times entry for a ship call.
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="id"></param>
@@ -1710,7 +1710,7 @@ namespace BreCalClient.misc.Api
             TimesDeleteWithHttpInfo(id);
         }
         /// <summary>
-        /// Delete a times entry for a ship call. 
+        /// Delete a times entry for a ship call.
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="id"></param>
@@ -1756,7 +1756,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// Delete a times entry for a ship call. 
+        /// Delete a times entry for a ship call.
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="id"></param>
@@ -1768,7 +1768,7 @@ namespace BreCalClient.misc.Api
             await TimesDeleteWithHttpInfoAsync(id, operationIndex, cancellationToken).ConfigureAwait(false);
         }
         /// <summary>
-        /// Delete a times entry for a ship call. 
+        /// Delete a times entry for a ship call.
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="id"></param>
@@ -1815,7 +1815,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// Get all recorded times for a a ship call 
+        /// Get all recorded times for a a ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="shipcallId">**Id**. *Example: 42*. Id of referenced ship call. (optional)</param>
@@ -1827,7 +1827,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse.Data;
         }
         /// <summary>
-        /// Get all recorded times for a a ship call 
+        /// Get all recorded times for a a ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="shipcallId">**Id**. *Example: 42*. Id of referenced ship call. (optional)</param>
@@ -1876,7 +1876,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// Get all recorded times for a a ship call 
+        /// Get all recorded times for a a ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="shipcallId">**Id**. *Example: 42*. Id of referenced ship call. (optional)</param>
@@ -1889,7 +1889,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse.Data;
         }
         /// <summary>
-        /// Get all recorded times for a a ship call 
+        /// Get all recorded times for a a ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="shipcallId">**Id**. *Example: 42*. Id of referenced ship call. (optional)</param>
@@ -1939,7 +1939,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// Create a new times entry for a ship call 
+        /// Create a new times entry for a ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="times">Times entry that will be added to the ship call. **Do not** provide id parameter.</param>
@@ -1951,7 +1951,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse.Data;
         }
         /// <summary>
-        /// Create a new times entry for a ship call 
+        /// Create a new times entry for a ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="times">Times entry that will be added to the ship call. **Do not** provide id parameter.</param>
@@ -2003,7 +2003,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// Create a new times entry for a ship call 
+        /// Create a new times entry for a ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="times">Times entry that will be added to the ship call. **Do not** provide id parameter.</param>
@@ -2016,7 +2016,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse.Data;
         }
         /// <summary>
-        /// Create a new times entry for a ship call 
+        /// Create a new times entry for a ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="times">Times entry that will be added to the ship call. **Do not** provide id parameter.</param>
@@ -2069,7 +2069,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// Update a times entry for a ship call 
+        /// Update a times entry for a ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="times">Times entry that will be added to the ship call. The id parameter is **required**.</param>
@@ -2081,7 +2081,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse.Data;
         }
         /// <summary>
-        /// Update a times entry for a ship call 
+        /// Update a times entry for a ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="times">Times entry that will be added to the ship call. The id parameter is **required**.</param>
@@ -2133,7 +2133,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// Update a times entry for a ship call 
+        /// Update a times entry for a ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="times">Times entry that will be added to the ship call. The id parameter is **required**.</param>
@@ -2146,7 +2146,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse.Data;
         }
         /// <summary>
-        /// Update a times entry for a ship call 
+        /// Update a times entry for a ship call
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="times">Times entry that will be added to the ship call. The id parameter is **required**.</param>
@@ -2199,7 +2199,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// Update user details (first/last name, phone, password) 
+        /// Update user details (first/last name, phone, password)
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="userDetails">User details</param>
@@ -2210,7 +2210,7 @@ namespace BreCalClient.misc.Api
             UserPutWithHttpInfo(userDetails);
         }
         /// <summary>
-        /// Update user details (first/last name, phone, password) 
+        /// Update user details (first/last name, phone, password)
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="userDetails">User details</param>
@@ -2262,7 +2262,7 @@ namespace BreCalClient.misc.Api
             return localVarResponse;
         }
         /// <summary>
-        /// Update user details (first/last name, phone, password) 
+        /// Update user details (first/last name, phone, password)
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="userDetails">User details</param>
@@ -2274,7 +2274,7 @@ namespace BreCalClient.misc.Api
             await UserPutWithHttpInfoAsync(userDetails, operationIndex, cancellationToken).ConfigureAwait(false);
         }
         /// <summary>
-        /// Update user details (first/last name, phone, password) 
+        /// Update user details (first/last name, phone, password)
         /// </summary>
         /// <exception cref="BreCalClient.misc.Client.ApiException">Thrown when fails to make API call</exception>
         /// <param name="userDetails">User details</param>
@@ -3623,7 +3623,7 @@ namespace BreCalClient.misc.Client
         /// <summary>
         /// Gets or sets the base path for API access.
         /// </summary>
-        public virtual string BasePath 
+        public virtual string BasePath
         {
             get { return _basePath; }
             set { _basePath = value; }
@@ -3770,7 +3770,7 @@ namespace BreCalClient.misc.Client
         /// <example>
         /// ApiKeyPrefix["Authorization"] = "Bearer";
         /// </example>
-        /// … where ApiKey["Authorization"] would then be used to set the value of your bearer token.
+        /// � where ApiKey["Authorization"] would then be used to set the value of your bearer token.
         ///
         /// <remarks>
         /// OAuth2 workflows should set tokens via AccessToken.
@@ -5009,36 +5009,36 @@ namespace BreCalClient.misc.Model
             {
                 return false;
             }
-            return 
+            return
                 (
                     this.Id == input.Id ||
                     this.Id.Equals(input.Id)
-                ) && 
+                ) &&
                 (
                     this.Name == input.Name ||
                     (this.Name != null &&
                     this.Name.Equals(input.Name))
-                ) && 
+                ) &&
                 (
                     this.ParticipantId == input.ParticipantId ||
                     (this.ParticipantId != null &&
                     this.ParticipantId.Equals(input.ParticipantId))
-                ) && 
+                ) &&
                 (
                     this.VarLock == input.VarLock ||
                     (this.VarLock != null &&
                     this.VarLock.Equals(input.VarLock))
-                ) && 
+                ) &&
                 (
                     this.Created == input.Created ||
                     (this.Created != null &&
                     this.Created.Equals(input.Created))
-                ) && 
+                ) &&
                 (
                     this.Modified == input.Modified ||
                     (this.Modified != null &&
                     this.Modified.Equals(input.Modified))
-                ) && 
+                ) &&
                 (
                     this.Deleted == input.Deleted ||
                     this.Deleted.Equals(input.Deleted)
@@ -5188,12 +5188,12 @@ namespace BreCalClient.misc.Model
             {
                 return false;
             }
-            return 
+            return
                 (
                     this.Username == input.Username ||
                     (this.Username != null &&
                     this.Username.Equals(input.Username))
-                ) && 
+                ) &&
                 (
                     this.Password == input.Password ||
                     (this.Password != null &&
@@ -5313,7 +5313,7 @@ namespace BreCalClient.misc.Model
             {
                 return false;
             }
-            return 
+            return
                 (
                     this.Message == input.Message ||
                     (this.Message != null &&
@@ -5418,7 +5418,7 @@ namespace BreCalClient.misc.Model
             {
                 return false;
             }
-            return 
+            return
                 (
                     this.VarId == input.VarId ||
                     this.VarId.Equals(input.VarId)
@@ -5575,39 +5575,39 @@ namespace BreCalClient.misc.Model
             {
                 return false;
             }
-            return 
+            return
                 (
                     this.Id == input.Id ||
                     this.Id.Equals(input.Id)
-                ) && 
+                ) &&
                 (
                     this.ParticipantId == input.ParticipantId ||
                     this.ParticipantId.Equals(input.ParticipantId)
-                ) && 
+                ) &&
                 (
                     this.FirstName == input.FirstName ||
                     (this.FirstName != null &&
                     this.FirstName.Equals(input.FirstName))
-                ) && 
+                ) &&
                 (
                     this.LastName == input.LastName ||
                     (this.LastName != null &&
                     this.LastName.Equals(input.LastName))
-                ) && 
+                ) &&
                 (
                     this.UserName == input.UserName ||
                     (this.UserName != null &&
                     this.UserName.Equals(input.UserName))
-                ) && 
+                ) &&
                 (
                     this.UserPhone == input.UserPhone ||
                     (this.UserPhone != null &&
                     this.UserPhone.Equals(input.UserPhone))
-                ) && 
+                ) &&
                 (
                     this.Exp == input.Exp ||
                     this.Exp.Equals(input.Exp)
-                ) && 
+                ) &&
                 (
                     this.Token == input.Token ||
                     (this.Token != null &&
@@ -5809,37 +5809,37 @@ namespace BreCalClient.misc.Model
             {
                 return false;
             }
-            return 
+            return
                 (
                     this.Id == input.Id ||
                     this.Id.Equals(input.Id)
-                ) && 
+                ) &&
                 (
                     this.TimesId == input.TimesId ||
                     this.TimesId.Equals(input.TimesId)
-                ) && 
+                ) &&
                 (
                     this.ParticipantId == input.ParticipantId ||
                     this.ParticipantId.Equals(input.ParticipantId)
-                ) && 
+                ) &&
                 (
                     this.NotificationType == input.NotificationType ||
                     this.NotificationType.Equals(input.NotificationType)
-                ) && 
+                ) &&
                 (
                     this.Timestamp == input.Timestamp ||
                     (this.Timestamp != null &&
                     this.Timestamp.Equals(input.Timestamp))
-                ) && 
+                ) &&
                 (
                     this.Acknowledged == input.Acknowledged ||
                     this.Acknowledged.Equals(input.Acknowledged)
-                ) && 
+                ) &&
                 (
                     this.Created == input.Created ||
                     (this.Created != null &&
                     this.Created.Equals(input.Created))
-                ) && 
+                ) &&
                 (
                     this.Modified == input.Modified ||
                     (this.Modified != null &&
@@ -6029,50 +6029,50 @@ namespace BreCalClient.misc.Model
             {
                 return false;
             }
-            return 
+            return
                 (
                     this.Id == input.Id ||
                     this.Id.Equals(input.Id)
-                ) && 
+                ) &&
                 (
                     this.Name == input.Name ||
                     (this.Name != null &&
                     this.Name.Equals(input.Name))
-                ) && 
+                ) &&
                 (
                     this.Street == input.Street ||
                     (this.Street != null &&
                     this.Street.Equals(input.Street))
-                ) && 
+                ) &&
                 (
                     this.PostalCode == input.PostalCode ||
                     (this.PostalCode != null &&
                     this.PostalCode.Equals(input.PostalCode))
-                ) && 
+                ) &&
                 (
                     this.City == input.City ||
                     (this.City != null &&
                     this.City.Equals(input.City))
-                ) && 
+                ) &&
                 (
                     this.Type == input.Type ||
                     this.Type.Equals(input.Type)
-                ) && 
+                ) &&
                 (
                     this.Flags == input.Flags ||
                     (this.Flags != null &&
                     this.Flags.Equals(input.Flags))
-                ) && 
+                ) &&
                 (
                     this.Created == input.Created ||
                     (this.Created != null &&
                     this.Created.Equals(input.Created))
-                ) && 
+                ) &&
                 (
                     this.Modified == input.Modified ||
                     (this.Modified != null &&
                     this.Modified.Equals(input.Modified))
-                ) && 
+                ) &&
                 (
                     this.Deleted == input.Deleted ||
                     this.Deleted.Equals(input.Deleted)
@@ -6319,65 +6319,65 @@ namespace BreCalClient.misc.Model
             {
                 return false;
             }
-            return 
+            return
                 (
                     this.Id == input.Id ||
                     this.Id.Equals(input.Id)
-                ) && 
+                ) &&
                 (
                     this.Name == input.Name ||
                     (this.Name != null &&
                     this.Name.Equals(input.Name))
-                ) && 
+                ) &&
                 (
                     this.Imo == input.Imo ||
                     (this.Imo != null &&
                     this.Imo.Equals(input.Imo))
-                ) && 
+                ) &&
                 (
                     this.Callsign == input.Callsign ||
                     (this.Callsign != null &&
                     this.Callsign.Equals(input.Callsign))
-                ) && 
+                ) &&
                 (
                     this.ParticipantId == input.ParticipantId ||
                     (this.ParticipantId != null &&
                     this.ParticipantId.Equals(input.ParticipantId))
-                ) && 
+                ) &&
                 (
                     this.Length == input.Length ||
                     (this.Length != null &&
                     this.Length.Equals(input.Length))
-                ) && 
+                ) &&
                 (
                     this.Width == input.Width ||
                     (this.Width != null &&
                     this.Width.Equals(input.Width))
-                ) && 
+                ) &&
                 (
                     this.IsTug == input.IsTug ||
                     this.IsTug.Equals(input.IsTug)
-                ) && 
+                ) &&
                 (
                     this.BollardPull == input.BollardPull ||
                     (this.BollardPull != null &&
                     this.BollardPull.Equals(input.BollardPull))
-                ) && 
+                ) &&
                 (
                     this.Eni == input.Eni ||
                     (this.Eni != null &&
                     this.Eni.Equals(input.Eni))
-                ) && 
+                ) &&
                 (
                     this.Created == input.Created ||
                     (this.Created != null &&
                     this.Created.Equals(input.Created))
-                ) && 
+                ) &&
                 (
                     this.Modified == input.Modified ||
                     (this.Modified != null &&
                     this.Modified.Equals(input.Modified))
-                ) && 
+                ) &&
                 (
                     this.Deleted == input.Deleted ||
                     this.Deleted.Equals(input.Deleted)
@@ -6513,11 +6513,16 @@ namespace BreCalClient.misc.Model
         /// <param name="participants">participants.</param>
         /// <param name="created">created.</param>
         /// <param name="modified">modified.</param>
-        public Shipcall(int id = default(int), int shipId = default(int), int type = default(int), DateTime eta = default(DateTime), string voyage = default(string), DateTime? etd = default(DateTime?), int? arrivalBerthId = default(int?), int? departureBerthId = default(int?), bool? tugRequired = default(bool?), bool? pilotRequired = default(bool?), int? flags = default(int?), bool? pierSide = default(bool?), bool? bunkering = default(bool?), bool? replenishingTerminal = default(bool?), bool? replenishingLock = default(bool?), float? draft = default(float?), DateTime? tidalWindowFrom = default(DateTime?), DateTime? tidalWindowTo = default(DateTime?), bool? rainSensitiveCargo = default(bool?), int? recommendedTugs = default(int?), bool? anchored = default(bool?), bool? mooredLock = default(bool?), bool? canceled = default(bool?), int? evaluation = default(int?), string evaluationMessage = default(string), List<int> participants = default(List<int>), DateTime created = default(DateTime), DateTime? modified = default(DateTime?))
+        public Shipcall(int id = default(int), int shipId = default(int), int type = default(int), DateTime? eta = default(DateTime?), string voyage = default(string), DateTime? etd = default(DateTime?), int? arrivalBerthId = default(int?), int? departureBerthId = default(int?), bool? tugRequired = default(bool?), bool? pilotRequired = default(bool?), int? flags = default(int?), bool? pierSide = default(bool?), bool? bunkering = default(bool?), bool? replenishingTerminal = default(bool?), bool? replenishingLock = default(bool?), float? draft = default(float?), DateTime? tidalWindowFrom = default(DateTime?), DateTime? tidalWindowTo = default(DateTime?), bool? rainSensitiveCargo = default(bool?), int? recommendedTugs = default(int?), bool? anchored = default(bool?), bool? mooredLock = default(bool?), bool? canceled = default(bool?), int? evaluation = default(int?), string evaluationMessage = default(string), List<int> participants = default(List<int>), DateTime created = default(DateTime), DateTime? modified = default(DateTime?))
         {
             this.Id = id;
             this.ShipId = shipId;
             this.Type = type;
+            // to ensure "eta" is required (not null)
+            if (eta == null)
+            {
+                throw new ArgumentNullException("eta is a required property for Shipcall and cannot be null");
+            }
             this.Eta = eta;
             this.Voyage = voyage;
             this.Etd = etd;
@@ -6564,7 +6569,7 @@ namespace BreCalClient.misc.Model
         /// Gets or Sets Eta
         /// </summary>
         [DataMember(Name = "eta", IsRequired = true, EmitDefaultValue = true)]
-        public DateTime Eta { get; set; }
+        public DateTime? Eta { get; set; }
         /// <summary>
         /// Gets or Sets Voyage
         /// </summary>
@@ -6753,140 +6758,140 @@ namespace BreCalClient.misc.Model
             {
                 return false;
             }
-            return 
+            return
                 (
                     this.Id == input.Id ||
                     this.Id.Equals(input.Id)
-                ) && 
+                ) &&
                 (
                     this.ShipId == input.ShipId ||
                     this.ShipId.Equals(input.ShipId)
-                ) && 
+                ) &&
                 (
                     this.Type == input.Type ||
                     this.Type.Equals(input.Type)
-                ) && 
+                ) &&
                 (
                     this.Eta == input.Eta ||
                     (this.Eta != null &&
                     this.Eta.Equals(input.Eta))
-                ) && 
+                ) &&
                 (
                     this.Voyage == input.Voyage ||
                     (this.Voyage != null &&
                     this.Voyage.Equals(input.Voyage))
-                ) && 
+                ) &&
                 (
                     this.Etd == input.Etd ||
                     (this.Etd != null &&
                     this.Etd.Equals(input.Etd))
-                ) && 
+                ) &&
                 (
                     this.ArrivalBerthId == input.ArrivalBerthId ||
                     (this.ArrivalBerthId != null &&
                     this.ArrivalBerthId.Equals(input.ArrivalBerthId))
-                ) && 
+                ) &&
                 (
                     this.DepartureBerthId == input.DepartureBerthId ||
                     (this.DepartureBerthId != null &&
                     this.DepartureBerthId.Equals(input.DepartureBerthId))
-                ) && 
+                ) &&
                 (
                     this.TugRequired == input.TugRequired ||
                     (this.TugRequired != null &&
                     this.TugRequired.Equals(input.TugRequired))
-                ) && 
+                ) &&
                 (
                     this.PilotRequired == input.PilotRequired ||
                     (this.PilotRequired != null &&
                     this.PilotRequired.Equals(input.PilotRequired))
-                ) && 
+                ) &&
                 (
                     this.Flags == input.Flags ||
                     (this.Flags != null &&
                     this.Flags.Equals(input.Flags))
-                ) && 
+                ) &&
                 (
                     this.PierSide == input.PierSide ||
                     (this.PierSide != null &&
                     this.PierSide.Equals(input.PierSide))
-                ) && 
+                ) &&
                 (
                     this.Bunkering == input.Bunkering ||
                     (this.Bunkering != null &&
                     this.Bunkering.Equals(input.Bunkering))
-                ) && 
+                ) &&
                 (
                     this.ReplenishingTerminal == input.ReplenishingTerminal ||
                     (this.ReplenishingTerminal != null &&
                     this.ReplenishingTerminal.Equals(input.ReplenishingTerminal))
-                ) && 
+                ) &&
                 (
                     this.ReplenishingLock == input.ReplenishingLock ||
                     (this.ReplenishingLock != null &&
                     this.ReplenishingLock.Equals(input.ReplenishingLock))
-                ) && 
+                ) &&
                 (
                     this.Draft == input.Draft ||
                     (this.Draft != null &&
                     this.Draft.Equals(input.Draft))
-                ) && 
+                ) &&
                 (
                     this.TidalWindowFrom == input.TidalWindowFrom ||
                     (this.TidalWindowFrom != null &&
                     this.TidalWindowFrom.Equals(input.TidalWindowFrom))
-                ) && 
+                ) &&
                 (
                     this.TidalWindowTo == input.TidalWindowTo ||
                     (this.TidalWindowTo != null &&
                     this.TidalWindowTo.Equals(input.TidalWindowTo))
-                ) && 
+                ) &&
                 (
                     this.RainSensitiveCargo == input.RainSensitiveCargo ||
                     (this.RainSensitiveCargo != null &&
                     this.RainSensitiveCargo.Equals(input.RainSensitiveCargo))
-                ) && 
+                ) &&
                 (
                     this.RecommendedTugs == input.RecommendedTugs ||
                     (this.RecommendedTugs != null &&
                     this.RecommendedTugs.Equals(input.RecommendedTugs))
-                ) && 
+                ) &&
                 (
                     this.Anchored == input.Anchored ||
                     (this.Anchored != null &&
                     this.Anchored.Equals(input.Anchored))
-                ) && 
+                ) &&
                 (
                     this.MooredLock == input.MooredLock ||
                     (this.MooredLock != null &&
                     this.MooredLock.Equals(input.MooredLock))
-                ) && 
+                ) &&
                 (
                     this.Canceled == input.Canceled ||
                     (this.Canceled != null &&
                     this.Canceled.Equals(input.Canceled))
-                ) && 
+                ) &&
                 (
                     this.Evaluation == input.Evaluation ||
                     (this.Evaluation != null &&
                     this.Evaluation.Equals(input.Evaluation))
-                ) && 
+                ) &&
                 (
                     this.EvaluationMessage == input.EvaluationMessage ||
                     (this.EvaluationMessage != null &&
                     this.EvaluationMessage.Equals(input.EvaluationMessage))
-                ) && 
+                ) &&
                 (
                     this.Participants == input.Participants ||
                     this.Participants != null &&
                     input.Participants != null &&
                     this.Participants.SequenceEqual(input.Participants)
-                ) && 
+                ) &&
                 (
                     this.Created == input.Created ||
                     (this.Created != null &&
                     this.Created.Equals(input.Created))
-                ) && 
+                ) &&
                 (
                     this.Modified == input.Modified ||
                     (this.Modified != null &&
@@ -7252,99 +7257,99 @@ namespace BreCalClient.misc.Model
             {
                 return false;
             }
-            return 
+            return
                 (
                     this.Id == input.Id ||
                     this.Id.Equals(input.Id)
-                ) && 
+                ) &&
                 (
                     this.EtaBerth == input.EtaBerth ||
                     (this.EtaBerth != null &&
                     this.EtaBerth.Equals(input.EtaBerth))
-                ) && 
+                ) &&
                 (
                     this.EtaBerthFixed == input.EtaBerthFixed ||
                     (this.EtaBerthFixed != null &&
                     this.EtaBerthFixed.Equals(input.EtaBerthFixed))
-                ) && 
+                ) &&
                 (
                     this.EtdBerth == input.EtdBerth ||
                     (this.EtdBerth != null &&
                     this.EtdBerth.Equals(input.EtdBerth))
-                ) && 
+                ) &&
                 (
                     this.EtdBerthFixed == input.EtdBerthFixed ||
                     (this.EtdBerthFixed != null &&
                     this.EtdBerthFixed.Equals(input.EtdBerthFixed))
-                ) && 
+                ) &&
                 (
                     this.LockTime == input.LockTime ||
                     (this.LockTime != null &&
                     this.LockTime.Equals(input.LockTime))
-                ) && 
+                ) &&
                 (
                     this.LockTimeFixed == input.LockTimeFixed ||
                     (this.LockTimeFixed != null &&
                     this.LockTimeFixed.Equals(input.LockTimeFixed))
-                ) && 
+                ) &&
                 (
                     this.ZoneEntry == input.ZoneEntry ||
                     (this.ZoneEntry != null &&
                     this.ZoneEntry.Equals(input.ZoneEntry))
-                ) && 
+                ) &&
                 (
                     this.ZoneEntryFixed == input.ZoneEntryFixed ||
                     (this.ZoneEntryFixed != null &&
                     this.ZoneEntryFixed.Equals(input.ZoneEntryFixed))
-                ) && 
+                ) &&
                 (
                     this.OperationsStart == input.OperationsStart ||
                     (this.OperationsStart != null &&
                     this.OperationsStart.Equals(input.OperationsStart))
-                ) && 
+                ) &&
                 (
                     this.OperationsEnd == input.OperationsEnd ||
                     (this.OperationsEnd != null &&
                     this.OperationsEnd.Equals(input.OperationsEnd))
-                ) && 
+                ) &&
                 (
                     this.Remarks == input.Remarks ||
                     (this.Remarks != null &&
                     this.Remarks.Equals(input.Remarks))
-                ) && 
+                ) &&
                 (
                     this.ShipcallId == input.ShipcallId ||
                     this.ShipcallId.Equals(input.ShipcallId)
-                ) && 
+                ) &&
                 (
                     this.ParticipantId == input.ParticipantId ||
                     this.ParticipantId.Equals(input.ParticipantId)
-                ) && 
+                ) &&
                 (
                     this.BerthId == input.BerthId ||
                     (this.BerthId != null &&
                     this.BerthId.Equals(input.BerthId))
-                ) && 
+                ) &&
                 (
                     this.BerthInfo == input.BerthInfo ||
                     (this.BerthInfo != null &&
                     this.BerthInfo.Equals(input.BerthInfo))
-                ) && 
+                ) &&
                 (
                     this.PierSide == input.PierSide ||
                     (this.PierSide != null &&
                     this.PierSide.Equals(input.PierSide))
-                ) && 
+                ) &&
                 (
                     this.ParticipantType == input.ParticipantType ||
                     (this.ParticipantType != null &&
                     this.ParticipantType.Equals(input.ParticipantType))
-                ) && 
+                ) &&
                 (
                     this.Created == input.Created ||
                     (this.Created != null &&
                     this.Created.Equals(input.Created))
-                ) && 
+                ) &&
                 (
                     this.Modified == input.Modified ||
                     (this.Modified != null &&
@@ -7561,31 +7566,31 @@ namespace BreCalClient.misc.Model
             {
                 return false;
             }
-            return 
+            return
                 (
                     this.Id == input.Id ||
                     this.Id.Equals(input.Id)
-                ) && 
+                ) &&
                 (
                     this.OldPassword == input.OldPassword ||
                     (this.OldPassword != null &&
                     this.OldPassword.Equals(input.OldPassword))
-                ) && 
+                ) &&
                 (
                     this.NewPassword == input.NewPassword ||
                     (this.NewPassword != null &&
                     this.NewPassword.Equals(input.NewPassword))
-                ) && 
+                ) &&
                 (
                     this.FirstName == input.FirstName ||
                     (this.FirstName != null &&
                     this.FirstName.Equals(input.FirstName))
-                ) && 
+                ) &&
                 (
                     this.LastName == input.LastName ||
                     (this.LastName != null &&
                     this.LastName.Equals(input.LastName))
-                ) && 
+                ) &&
                 (
                     this.UserPhone == input.UserPhone ||
                     (this.UserPhone != null &&
diff --git a/misc/BreCalApi.yaml b/misc/BreCalApi.yaml
index 82a42e3..7829b13 100644
--- a/misc/BreCalApi.yaml
+++ b/misc/BreCalApi.yaml
@@ -350,6 +350,7 @@ components:
                 eta:
                     type: string
                     format: date-time
+                    nullable: true
                 voyage:
                     type: string
                     maxLength: 16
diff --git a/src/BreCalClient/EditShipcallControl.xaml.cs b/src/BreCalClient/EditShipcallControl.xaml.cs
index 3c9ef71..69dd9d8 100644
--- a/src/BreCalClient/EditShipcallControl.xaml.cs
+++ b/src/BreCalClient/EditShipcallControl.xaml.cs
@@ -122,15 +122,23 @@ namespace BreCalClient
                         this.datePickerETA.IsEnabled = true;
                         this.datePickerETD.IsEnabled = false;
                         this.datePickerETD.Value = null;
+                        this.comboBoxDepartureBerth.SelectedIndex = -1;
+                        this.comboBoxDepartureBerth.IsEnabled = false;
+                        this.comboBoxArrivalBerth.IsEnabled = true;
                         break;
                     case TypeEnum.Outgoing:
                         this.datePickerETA.IsEnabled = false;
                         this.datePickerETD.IsEnabled = true;
                         this.datePickerETA.Value = null;
+                        this.comboBoxArrivalBerth.SelectedIndex = -1;
+                        this.comboBoxArrivalBerth.IsEnabled = false;
+                        this.comboBoxDepartureBerth.IsEnabled = true;
                         break;
                     case TypeEnum.Shifting:
                         this.datePickerETA.IsEnabled = true;
                         this.datePickerETD.IsEnabled = true;
+                        this.comboBoxArrivalBerth.IsEnabled = true;
+                        this.comboBoxDepartureBerth.IsEnabled = true;
                         break;
                 }
             }
@@ -145,8 +153,8 @@ namespace BreCalClient
             if (this.ShipcallModel.Shipcall != null)
             {
                 this.ShipcallModel.Shipcall.Type = (int)this.comboBoxCategories.SelectedItem;
-                this.ShipcallModel.Shipcall.Eta = this.datePickerETA.Value ?? DateTime.Now;                
-                this.ShipcallModel.Shipcall.Etd = this.datePickerETD.Value ?? DateTime.Now.AddDays(1);
+                this.ShipcallModel.Shipcall.Eta = this.datePickerETA.Value;
+                this.ShipcallModel.Shipcall.Etd = this.datePickerETD.Value;
                 
                 this.ShipcallModel.Shipcall.ShipId = ((Ship)this.comboBoxShip.SelectedItem).Id;
                 this.ShipcallModel.Ship = (Ship)this.comboBoxShip.SelectedItem;
diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index 69ffde7..e6a3d90 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -491,8 +491,8 @@ namespace BreCalClient
                         {                            
                             if (x.Shipcall == null) return 0;
                             if (y.Shipcall == null) return 0;
-                            DateTime xDate = (x.Shipcall.Type == (int) Extensions.TypeEnum.Incoming) ? x.Shipcall.Eta : x.Shipcall.Etd ?? x.Shipcall.Eta;
-                            DateTime yDate = (y.Shipcall.Type == (int) Extensions.TypeEnum.Incoming) ? y.Shipcall.Eta : y.Shipcall.Etd ?? y.Shipcall.Eta;
+                            DateTime xDate = (x.Shipcall.Type == (int) Extensions.TypeEnum.Incoming) ? x.Shipcall.Eta ?? DateTime.Now : x.Shipcall.Etd ?? DateTime.Now;
+                            DateTime yDate = (y.Shipcall.Type == (int) Extensions.TypeEnum.Incoming) ? y.Shipcall.Eta ?? DateTime.Now : y.Shipcall.Etd ?? DateTime.Now;
                             return DateTime.Compare(xDate, yDate);
                         });
                         break;
diff --git a/src/BreCalClient/ShipcallControl.xaml.cs b/src/BreCalClient/ShipcallControl.xaml.cs
index c9839f4..c93b2d9 100644
--- a/src/BreCalClient/ShipcallControl.xaml.cs
+++ b/src/BreCalClient/ShipcallControl.xaml.cs
@@ -151,7 +151,7 @@ namespace BreCalClient
             this.textBlockCallsign.Text = this.ShipcallControlModel?.Ship?.Callsign;
             if ((this.ShipcallControlModel?.Shipcall?.Type == 1) || (this.ShipcallControlModel?.Shipcall?.Type == 3))
             {
-                this.textBlockETA.Text = this.ShipcallControlModel?.Shipcall?.Eta.ToString("dd.MM. HH:mm");
+                this.textBlockETA.Text = this.ShipcallControlModel?.Shipcall?.Eta?.ToString("dd.MM. HH:mm");
             }
             if(this.ShipcallControlModel?.Shipcall?.Type == 2)
             {
diff --git a/src/server/BreCal/schemas/model.py b/src/server/BreCal/schemas/model.py
index 7b056c9..434b92f 100644
--- a/src/server/BreCal/schemas/model.py
+++ b/src/server/BreCal/schemas/model.py
@@ -67,7 +67,7 @@ class ShipcallSchema(Schema):
     id = fields.Int()
     ship_id = fields.Int()
     type = fields.Int()
-    eta = fields.DateTime()
+    eta = fields.DateTime(Required = False, allow_none=True)
     voyage = fields.Str(Required = False, allow_none=True)
     etd = fields.DateTime(Required = False, allow_none=True)
     arrival_berth_id = fields.Int(Required = False, allow_none=True)