diff --git a/misc/BreCalApi.cs b/misc/BreCalApi.cs
index 49e523b..78f70c7 100644
--- a/misc/BreCalApi.cs
+++ b/misc/BreCalApi.cs
@@ -1,7 +1,7 @@
 
 //----------------------
 // <auto-generated>
-//     Generated REST API Client Code Generator v1.9.3.0 on 14.01.2024 13:10:51
+//     Generated REST API Client Code Generator v1.9.4.0 on 15.01.2024 15:58:12
 //     Using the tool OpenAPI Generator v7.2.0
 // </auto-generated>
 //----------------------
@@ -52,7 +52,7 @@ using System.Web;
  */
 namespace BreCalClient.misc.Api
 {
-    #pragma warning disable CS8073
+#pragma warning disable CS8073
     /// <summary>
     /// Represents a collection of functions to interact with the API endpoints
     /// </summary>
@@ -4879,7 +4879,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; }
@@ -6162,7 +6162,7 @@ namespace BreCalClient.misc.Model
     /// Ship berth used for a ship call
     /// </summary>
     [DataContract(Name = "berth")]
-    public partial class Berth : IEquatable<Berth>, IValidatableObject
+    public partial class Berth : IValidatableObject
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Berth" /> class.
@@ -6257,104 +6257,6 @@ namespace BreCalClient.misc.Model
             return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented);
         }
         /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as Berth);
-        }
-        /// <summary>
-        /// Returns true if Berth instances are equal
-        /// </summary>
-        /// <param name="input">Instance of Berth to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(Berth input)
-        {
-            if (input == null)
-            {
-                return false;
-            }
-            return 
-                (
-                    this.Id == input.Id ||
-                    this.Id.Equals(input.Id)
-                ) && 
-                (
-                    this.Name == input.Name ||
-                    (this.Name != null &&
-                    this.Name.Equals(input.Name))
-                ) && 
-                (
-                    this.OwnerId == input.OwnerId ||
-                    (this.OwnerId != null &&
-                    this.OwnerId.Equals(input.OwnerId))
-                ) && 
-                (
-                    this.AuthorityId == input.AuthorityId ||
-                    (this.AuthorityId != null &&
-                    this.AuthorityId.Equals(input.AuthorityId))
-                ) && 
-                (
-                    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)
-                );
-        }
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                hashCode = (hashCode * 59) + this.Id.GetHashCode();
-                if (this.Name != null)
-                {
-                    hashCode = (hashCode * 59) + this.Name.GetHashCode();
-                }
-                if (this.OwnerId != null)
-                {
-                    hashCode = (hashCode * 59) + this.OwnerId.GetHashCode();
-                }
-                if (this.AuthorityId != null)
-                {
-                    hashCode = (hashCode * 59) + this.AuthorityId.GetHashCode();
-                }
-                if (this.VarLock != null)
-                {
-                    hashCode = (hashCode * 59) + this.VarLock.GetHashCode();
-                }
-                if (this.Created != null)
-                {
-                    hashCode = (hashCode * 59) + this.Created.GetHashCode();
-                }
-                if (this.Modified != null)
-                {
-                    hashCode = (hashCode * 59) + this.Modified.GetHashCode();
-                }
-                hashCode = (hashCode * 59) + this.Deleted.GetHashCode();
-                return hashCode;
-            }
-        }
-        /// <summary>
         /// To validate all properties of the instance
         /// </summary>
         /// <param name="validationContext">Validation context</param>
@@ -6386,7 +6288,7 @@ namespace BreCalClient.misc.Model
     /// Credentials
     /// </summary>
     [DataContract(Name = "credentials")]
-    public partial class Credentials : IEquatable<Credentials>, IValidatableObject
+    public partial class Credentials : IValidatableObject
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Credentials" /> class.
@@ -6445,58 +6347,6 @@ namespace BreCalClient.misc.Model
             return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented);
         }
         /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as Credentials);
-        }
-        /// <summary>
-        /// Returns true if Credentials instances are equal
-        /// </summary>
-        /// <param name="input">Instance of Credentials to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(Credentials input)
-        {
-            if (input == null)
-            {
-                return false;
-            }
-            return 
-                (
-                    this.Username == input.Username ||
-                    (this.Username != null &&
-                    this.Username.Equals(input.Username))
-                ) && 
-                (
-                    this.Password == input.Password ||
-                    (this.Password != null &&
-                    this.Password.Equals(input.Password))
-                );
-        }
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Username != null)
-                {
-                    hashCode = (hashCode * 59) + this.Username.GetHashCode();
-                }
-                if (this.Password != null)
-                {
-                    hashCode = (hashCode * 59) + this.Password.GetHashCode();
-                }
-                return hashCode;
-            }
-        }
-        /// <summary>
         /// To validate all properties of the instance
         /// </summary>
         /// <param name="validationContext">Validation context</param>
@@ -6523,7 +6373,7 @@ namespace BreCalClient.misc.Model
     /// Error
     /// </summary>
     [DataContract(Name = "Error")]
-    public partial class Error : IEquatable<Error>, IValidatableObject
+    public partial class Error : IValidatableObject
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Error" /> class.
@@ -6570,49 +6420,6 @@ namespace BreCalClient.misc.Model
             return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented);
         }
         /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as Error);
-        }
-        /// <summary>
-        /// Returns true if Error instances are equal
-        /// </summary>
-        /// <param name="input">Instance of Error to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(Error input)
-        {
-            if (input == null)
-            {
-                return false;
-            }
-            return 
-                (
-                    this.Message == input.Message ||
-                    (this.Message != null &&
-                    this.Message.Equals(input.Message))
-                );
-        }
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                if (this.Message != null)
-                {
-                    hashCode = (hashCode * 59) + this.Message.GetHashCode();
-                }
-                return hashCode;
-            }
-        }
-        /// <summary>
         /// To validate all properties of the instance
         /// </summary>
         /// <param name="validationContext">Validation context</param>
@@ -6679,7 +6486,7 @@ namespace BreCalClient.misc.Model
     /// Single history entry with references
     /// </summary>
     [DataContract(Name = "history")]
-    public partial class History : IEquatable<History>, IValidatableObject
+    public partial class History : IValidatableObject
     {
         /// <summary>
         /// Gets or Sets Operation
@@ -6763,83 +6570,6 @@ namespace BreCalClient.misc.Model
             return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented);
         }
         /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as History);
-        }
-        /// <summary>
-        /// Returns true if History instances are equal
-        /// </summary>
-        /// <param name="input">Instance of History to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(History input)
-        {
-            if (input == null)
-            {
-                return false;
-            }
-            return 
-                (
-                    this.Id == input.Id ||
-                    this.Id.Equals(input.Id)
-                ) && 
-                (
-                    this.ParticipantId == input.ParticipantId ||
-                    this.ParticipantId.Equals(input.ParticipantId)
-                ) && 
-                (
-                    this.ShipcallId == input.ShipcallId ||
-                    this.ShipcallId.Equals(input.ShipcallId)
-                ) && 
-                (
-                    this.Timestamp == input.Timestamp ||
-                    (this.Timestamp != null &&
-                    this.Timestamp.Equals(input.Timestamp))
-                ) && 
-                (
-                    this.Eta == input.Eta ||
-                    (this.Eta != null &&
-                    this.Eta.Equals(input.Eta))
-                ) && 
-                (
-                    this.Operation == input.Operation ||
-                    this.Operation.Equals(input.Operation)
-                ) && 
-                (
-                    this.Type == input.Type ||
-                    this.Type.Equals(input.Type)
-                );
-        }
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                hashCode = (hashCode * 59) + this.Id.GetHashCode();
-                hashCode = (hashCode * 59) + this.ParticipantId.GetHashCode();
-                hashCode = (hashCode * 59) + this.ShipcallId.GetHashCode();
-                if (this.Timestamp != null)
-                {
-                    hashCode = (hashCode * 59) + this.Timestamp.GetHashCode();
-                }
-                if (this.Eta != null)
-                {
-                    hashCode = (hashCode * 59) + this.Eta.GetHashCode();
-                }
-                hashCode = (hashCode * 59) + this.Operation.GetHashCode();
-                hashCode = (hashCode * 59) + this.Type.GetHashCode();
-                return hashCode;
-            }
-        }
-        /// <summary>
         /// To validate all properties of the instance
         /// </summary>
         /// <param name="validationContext">Validation context</param>
@@ -6866,7 +6596,7 @@ namespace BreCalClient.misc.Model
     /// A unique identifier for an entity
     /// </summary>
     [DataContract(Name = "Id")]
-    public partial class Id : IEquatable<Id>, IValidatableObject
+    public partial class Id : IValidatableObject
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Id" /> class.
@@ -6902,45 +6632,6 @@ namespace BreCalClient.misc.Model
             return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented);
         }
         /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as Id);
-        }
-        /// <summary>
-        /// Returns true if Id instances are equal
-        /// </summary>
-        /// <param name="input">Instance of Id to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(Id input)
-        {
-            if (input == null)
-            {
-                return false;
-            }
-            return 
-                (
-                    this.VarId == input.VarId ||
-                    this.VarId.Equals(input.VarId)
-                );
-        }
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                hashCode = (hashCode * 59) + this.VarId.GetHashCode();
-                return hashCode;
-            }
-        }
-        /// <summary>
         /// To validate all properties of the instance
         /// </summary>
         /// <param name="validationContext">Validation context</param>
@@ -6967,7 +6658,7 @@ namespace BreCalClient.misc.Model
     /// result structure of a successful login attempt
     /// </summary>
     [DataContract(Name = "login_result")]
-    public partial class LoginResult : IEquatable<LoginResult>, IValidatableObject
+    public partial class LoginResult : IValidatableObject
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="LoginResult" /> class.
@@ -7067,109 +6758,6 @@ namespace BreCalClient.misc.Model
             return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented);
         }
         /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as LoginResult);
-        }
-        /// <summary>
-        /// Returns true if LoginResult instances are equal
-        /// </summary>
-        /// <param name="input">Instance of LoginResult to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(LoginResult input)
-        {
-            if (input == null)
-            {
-                return false;
-            }
-            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.UserEmail == input.UserEmail ||
-                    (this.UserEmail != null &&
-                    this.UserEmail.Equals(input.UserEmail))
-                ) && 
-                (
-                    this.Exp == input.Exp ||
-                    this.Exp.Equals(input.Exp)
-                ) && 
-                (
-                    this.Token == input.Token ||
-                    (this.Token != null &&
-                    this.Token.Equals(input.Token))
-                );
-        }
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                hashCode = (hashCode * 59) + this.Id.GetHashCode();
-                hashCode = (hashCode * 59) + this.ParticipantId.GetHashCode();
-                if (this.FirstName != null)
-                {
-                    hashCode = (hashCode * 59) + this.FirstName.GetHashCode();
-                }
-                if (this.LastName != null)
-                {
-                    hashCode = (hashCode * 59) + this.LastName.GetHashCode();
-                }
-                if (this.UserName != null)
-                {
-                    hashCode = (hashCode * 59) + this.UserName.GetHashCode();
-                }
-                if (this.UserPhone != null)
-                {
-                    hashCode = (hashCode * 59) + this.UserPhone.GetHashCode();
-                }
-                if (this.UserEmail != null)
-                {
-                    hashCode = (hashCode * 59) + this.UserEmail.GetHashCode();
-                }
-                hashCode = (hashCode * 59) + this.Exp.GetHashCode();
-                if (this.Token != null)
-                {
-                    hashCode = (hashCode * 59) + this.Token.GetHashCode();
-                }
-                return hashCode;
-            }
-        }
-        /// <summary>
         /// To validate all properties of the instance
         /// </summary>
         /// <param name="validationContext">Validation context</param>
@@ -7196,7 +6784,7 @@ namespace BreCalClient.misc.Model
     /// a notification created by the engine if a times entry violates a rule
     /// </summary>
     [DataContract(Name = "notification")]
-    public partial class Notification : IEquatable<Notification>, IValidatableObject
+    public partial class Notification : IValidatableObject
     {
         /// <summary>
         /// Gets or Sets NotificationType
@@ -7274,82 +6862,6 @@ namespace BreCalClient.misc.Model
             return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented);
         }
         /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as Notification);
-        }
-        /// <summary>
-        /// Returns true if Notification instances are equal
-        /// </summary>
-        /// <param name="input">Instance of Notification to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(Notification input)
-        {
-            if (input == null)
-            {
-                return false;
-            }
-            return 
-                (
-                    this.Id == input.Id ||
-                    this.Id.Equals(input.Id)
-                ) && 
-                (
-                    this.ShipcallId == input.ShipcallId ||
-                    this.ShipcallId.Equals(input.ShipcallId)
-                ) && 
-                (
-                    this.NotificationType == input.NotificationType ||
-                    this.NotificationType.Equals(input.NotificationType)
-                ) && 
-                (
-                    this.Message == input.Message ||
-                    (this.Message != null &&
-                    this.Message.Equals(input.Message))
-                ) && 
-                (
-                    this.Created == input.Created ||
-                    (this.Created != null &&
-                    this.Created.Equals(input.Created))
-                ) && 
-                (
-                    this.Modified == input.Modified ||
-                    (this.Modified != null &&
-                    this.Modified.Equals(input.Modified))
-                );
-        }
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                hashCode = (hashCode * 59) + this.Id.GetHashCode();
-                hashCode = (hashCode * 59) + this.ShipcallId.GetHashCode();
-                hashCode = (hashCode * 59) + this.NotificationType.GetHashCode();
-                if (this.Message != null)
-                {
-                    hashCode = (hashCode * 59) + this.Message.GetHashCode();
-                }
-                if (this.Created != null)
-                {
-                    hashCode = (hashCode * 59) + this.Created.GetHashCode();
-                }
-                if (this.Modified != null)
-                {
-                    hashCode = (hashCode * 59) + this.Modified.GetHashCode();
-                }
-                return hashCode;
-            }
-        }
-        /// <summary>
         /// To validate all properties of the instance
         /// </summary>
         /// <param name="validationContext">Validation context</param>
@@ -7476,7 +6988,7 @@ namespace BreCalClient.misc.Model
     /// A organisational entity that participates in Bremen Calling
     /// </summary>
     [DataContract(Name = "participant")]
-    public partial class Participant : IEquatable<Participant>, IValidatableObject
+    public partial class Participant : IValidatableObject
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Participant" /> class.
@@ -7587,118 +7099,6 @@ namespace BreCalClient.misc.Model
             return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented);
         }
         /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as Participant);
-        }
-        /// <summary>
-        /// Returns true if Participant instances are equal
-        /// </summary>
-        /// <param name="input">Instance of Participant to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(Participant input)
-        {
-            if (input == null)
-            {
-                return false;
-            }
-            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)
-                );
-        }
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                hashCode = (hashCode * 59) + this.Id.GetHashCode();
-                if (this.Name != null)
-                {
-                    hashCode = (hashCode * 59) + this.Name.GetHashCode();
-                }
-                if (this.Street != null)
-                {
-                    hashCode = (hashCode * 59) + this.Street.GetHashCode();
-                }
-                if (this.PostalCode != null)
-                {
-                    hashCode = (hashCode * 59) + this.PostalCode.GetHashCode();
-                }
-                if (this.City != null)
-                {
-                    hashCode = (hashCode * 59) + this.City.GetHashCode();
-                }
-                hashCode = (hashCode * 59) + this.Type.GetHashCode();
-                if (this.Flags != null)
-                {
-                    hashCode = (hashCode * 59) + this.Flags.GetHashCode();
-                }
-                if (this.Created != null)
-                {
-                    hashCode = (hashCode * 59) + this.Created.GetHashCode();
-                }
-                if (this.Modified != null)
-                {
-                    hashCode = (hashCode * 59) + this.Modified.GetHashCode();
-                }
-                hashCode = (hashCode * 59) + this.Deleted.GetHashCode();
-                return hashCode;
-            }
-        }
-        /// <summary>
         /// To validate all properties of the instance
         /// </summary>
         /// <param name="validationContext">Validation context</param>
@@ -7745,7 +7145,7 @@ namespace BreCalClient.misc.Model
     /// Participant assigned to a shipcall with a given role (type)
     /// </summary>
     [DataContract(Name = "participant_assignment")]
-    public partial class ParticipantAssignment : IEquatable<ParticipantAssignment>, IValidatableObject
+    public partial class ParticipantAssignment : IValidatableObject
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="ParticipantAssignment" /> class.
@@ -7795,50 +7195,6 @@ namespace BreCalClient.misc.Model
             return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented);
         }
         /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as ParticipantAssignment);
-        }
-        /// <summary>
-        /// Returns true if ParticipantAssignment instances are equal
-        /// </summary>
-        /// <param name="input">Instance of ParticipantAssignment to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(ParticipantAssignment input)
-        {
-            if (input == null)
-            {
-                return false;
-            }
-            return 
-                (
-                    this.ParticipantId == input.ParticipantId ||
-                    this.ParticipantId.Equals(input.ParticipantId)
-                ) && 
-                (
-                    this.Type == input.Type ||
-                    this.Type.Equals(input.Type)
-                );
-        }
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                hashCode = (hashCode * 59) + this.ParticipantId.GetHashCode();
-                hashCode = (hashCode * 59) + this.Type.GetHashCode();
-                return hashCode;
-            }
-        }
-        /// <summary>
         /// To validate all properties of the instance
         /// </summary>
         /// <param name="validationContext">Validation context</param>
@@ -7865,7 +7221,7 @@ namespace BreCalClient.misc.Model
     /// a ship
     /// </summary>
     [DataContract(Name = "ship")]
-    public partial class Ship : IEquatable<Ship>, IValidatableObject
+    public partial class Ship : IValidatableObject
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Ship" /> class.
@@ -7883,7 +7239,7 @@ namespace BreCalClient.misc.Model
         /// <param name="created">created.</param>
         /// <param name="modified">modified.</param>
         /// <param name="deleted">deleted (default to false).</param>
-        public Ship(int id = default(int), string name = default(string), int? imo = default(int?), string callsign = default(string), int? participantId = default(int?), float? length = default(float?), float? width = default(float?), bool isTug = false, int? bollardPull = default(int?), int? eni = default(int?), DateTime created = default(DateTime), DateTime? modified = default(DateTime?), bool deleted = false)
+        public Ship(int id = default(int), string name = default(string), int? imo = default(int?), string callsign = default(string), int? participantId = default(int?), double? length = default(double?), double? width = default(double?), bool isTug = false, int? bollardPull = default(int?), int? eni = default(int?), DateTime created = default(DateTime), DateTime? modified = default(DateTime?), bool deleted = false)
         {
             this.Id = id;
             this.Name = name;
@@ -7929,12 +7285,12 @@ namespace BreCalClient.misc.Model
         /// Gets or Sets Length
         /// </summary>
         [DataMember(Name = "length", EmitDefaultValue = true)]
-        public float? Length { get; set; }
+        public double? Length { get; set; }
         /// <summary>
         /// Gets or Sets Width
         /// </summary>
         [DataMember(Name = "width", EmitDefaultValue = true)]
-        public float? Width { get; set; }
+        public double? Width { get; set; }
         /// <summary>
         /// Gets or Sets IsTug
         /// </summary>
@@ -7999,145 +7355,6 @@ namespace BreCalClient.misc.Model
             return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented);
         }
         /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as Ship);
-        }
-        /// <summary>
-        /// Returns true if Ship instances are equal
-        /// </summary>
-        /// <param name="input">Instance of Ship to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(Ship input)
-        {
-            if (input == null)
-            {
-                return false;
-            }
-            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)
-                );
-        }
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                hashCode = (hashCode * 59) + this.Id.GetHashCode();
-                if (this.Name != null)
-                {
-                    hashCode = (hashCode * 59) + this.Name.GetHashCode();
-                }
-                if (this.Imo != null)
-                {
-                    hashCode = (hashCode * 59) + this.Imo.GetHashCode();
-                }
-                if (this.Callsign != null)
-                {
-                    hashCode = (hashCode * 59) + this.Callsign.GetHashCode();
-                }
-                if (this.ParticipantId != null)
-                {
-                    hashCode = (hashCode * 59) + this.ParticipantId.GetHashCode();
-                }
-                if (this.Length != null)
-                {
-                    hashCode = (hashCode * 59) + this.Length.GetHashCode();
-                }
-                if (this.Width != null)
-                {
-                    hashCode = (hashCode * 59) + this.Width.GetHashCode();
-                }
-                hashCode = (hashCode * 59) + this.IsTug.GetHashCode();
-                if (this.BollardPull != null)
-                {
-                    hashCode = (hashCode * 59) + this.BollardPull.GetHashCode();
-                }
-                if (this.Eni != null)
-                {
-                    hashCode = (hashCode * 59) + this.Eni.GetHashCode();
-                }
-                if (this.Created != null)
-                {
-                    hashCode = (hashCode * 59) + this.Created.GetHashCode();
-                }
-                if (this.Modified != null)
-                {
-                    hashCode = (hashCode * 59) + this.Modified.GetHashCode();
-                }
-                hashCode = (hashCode * 59) + this.Deleted.GetHashCode();
-                return hashCode;
-            }
-        }
-        /// <summary>
         /// To validate all properties of the instance
         /// </summary>
         /// <param name="validationContext">Validation context</param>
@@ -8174,7 +7391,7 @@ namespace BreCalClient.misc.Model
     /// Shipcall
     /// </summary>
     [DataContract(Name = "shipcall")]
-    public partial class Shipcall : IEquatable<Shipcall>, IValidatableObject
+    public partial class Shipcall : IValidatableObject
     {
         /// <summary>
         /// Gets or Sets Type
@@ -8222,7 +7439,7 @@ namespace BreCalClient.misc.Model
         /// <param name="participants">participants.</param>
         /// <param name="created">Readonly field set by the database.</param>
         /// <param name="modified">Readonly field set by the database.</param>
-        public Shipcall(int id = default(int), int shipId = default(int), ShipcallType type = default(ShipcallType), 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?), EvaluationType? evaluation = default(EvaluationType?), string evaluationMessage = default(string), List<ParticipantAssignment> participants = default(List<ParticipantAssignment>), DateTime created = default(DateTime), DateTime? modified = default(DateTime?))
+        public Shipcall(int id = default(int), int shipId = default(int), ShipcallType type = default(ShipcallType), 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?), double? draft = default(double?), 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?), EvaluationType? evaluation = default(EvaluationType?), string evaluationMessage = default(string), List<ParticipantAssignment> participants = default(List<ParticipantAssignment>), DateTime created = default(DateTime), DateTime? modified = default(DateTime?))
         {
             this.Id = id;
             this.ShipId = shipId;
@@ -8328,7 +7545,7 @@ namespace BreCalClient.misc.Model
         /// Gets or Sets Draft
         /// </summary>
         [DataMember(Name = "draft", EmitDefaultValue = true)]
-        public float? Draft { get; set; }
+        public double? Draft { get; set; }
         /// <summary>
         /// Gets or Sets TidalWindowFrom
         /// </summary>
@@ -8434,277 +7651,6 @@ namespace BreCalClient.misc.Model
             return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented);
         }
         /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as Shipcall);
-        }
-        /// <summary>
-        /// Returns true if Shipcall instances are equal
-        /// </summary>
-        /// <param name="input">Instance of Shipcall to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(Shipcall input)
-        {
-            if (input == null)
-            {
-                return false;
-            }
-            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.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 &&
-                    this.Modified.Equals(input.Modified))
-                );
-        }
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                hashCode = (hashCode * 59) + this.Id.GetHashCode();
-                hashCode = (hashCode * 59) + this.ShipId.GetHashCode();
-                hashCode = (hashCode * 59) + this.Type.GetHashCode();
-                if (this.Eta != null)
-                {
-                    hashCode = (hashCode * 59) + this.Eta.GetHashCode();
-                }
-                if (this.Voyage != null)
-                {
-                    hashCode = (hashCode * 59) + this.Voyage.GetHashCode();
-                }
-                if (this.Etd != null)
-                {
-                    hashCode = (hashCode * 59) + this.Etd.GetHashCode();
-                }
-                if (this.ArrivalBerthId != null)
-                {
-                    hashCode = (hashCode * 59) + this.ArrivalBerthId.GetHashCode();
-                }
-                if (this.DepartureBerthId != null)
-                {
-                    hashCode = (hashCode * 59) + this.DepartureBerthId.GetHashCode();
-                }
-                if (this.TugRequired != null)
-                {
-                    hashCode = (hashCode * 59) + this.TugRequired.GetHashCode();
-                }
-                if (this.PilotRequired != null)
-                {
-                    hashCode = (hashCode * 59) + this.PilotRequired.GetHashCode();
-                }
-                if (this.Flags != null)
-                {
-                    hashCode = (hashCode * 59) + this.Flags.GetHashCode();
-                }
-                if (this.PierSide != null)
-                {
-                    hashCode = (hashCode * 59) + this.PierSide.GetHashCode();
-                }
-                if (this.Bunkering != null)
-                {
-                    hashCode = (hashCode * 59) + this.Bunkering.GetHashCode();
-                }
-                if (this.ReplenishingTerminal != null)
-                {
-                    hashCode = (hashCode * 59) + this.ReplenishingTerminal.GetHashCode();
-                }
-                if (this.ReplenishingLock != null)
-                {
-                    hashCode = (hashCode * 59) + this.ReplenishingLock.GetHashCode();
-                }
-                if (this.Draft != null)
-                {
-                    hashCode = (hashCode * 59) + this.Draft.GetHashCode();
-                }
-                if (this.TidalWindowFrom != null)
-                {
-                    hashCode = (hashCode * 59) + this.TidalWindowFrom.GetHashCode();
-                }
-                if (this.TidalWindowTo != null)
-                {
-                    hashCode = (hashCode * 59) + this.TidalWindowTo.GetHashCode();
-                }
-                if (this.RainSensitiveCargo != null)
-                {
-                    hashCode = (hashCode * 59) + this.RainSensitiveCargo.GetHashCode();
-                }
-                if (this.RecommendedTugs != null)
-                {
-                    hashCode = (hashCode * 59) + this.RecommendedTugs.GetHashCode();
-                }
-                if (this.Anchored != null)
-                {
-                    hashCode = (hashCode * 59) + this.Anchored.GetHashCode();
-                }
-                if (this.MooredLock != null)
-                {
-                    hashCode = (hashCode * 59) + this.MooredLock.GetHashCode();
-                }
-                if (this.Canceled != null)
-                {
-                    hashCode = (hashCode * 59) + this.Canceled.GetHashCode();
-                }
-                hashCode = (hashCode * 59) + this.Evaluation.GetHashCode();
-                if (this.EvaluationMessage != null)
-                {
-                    hashCode = (hashCode * 59) + this.EvaluationMessage.GetHashCode();
-                }
-                if (this.Participants != null)
-                {
-                    hashCode = (hashCode * 59) + this.Participants.GetHashCode();
-                }
-                if (this.Created != null)
-                {
-                    hashCode = (hashCode * 59) + this.Created.GetHashCode();
-                }
-                if (this.Modified != null)
-                {
-                    hashCode = (hashCode * 59) + this.Modified.GetHashCode();
-                }
-                return hashCode;
-            }
-        }
-        /// <summary>
         /// To validate all properties of the instance
         /// </summary>
         /// <param name="validationContext">Validation context</param>
@@ -8781,7 +7727,7 @@ namespace BreCalClient.misc.Model
     /// the id parameter needs to be missing on POST and to be present on PUT (Update) calls, otherwise a 400 response will be generated
     /// </summary>
     [DataContract(Name = "times")]
-    public partial class Times : IEquatable<Times>, IValidatableObject
+    public partial class Times : IValidatableObject
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="Times" /> class.
@@ -8991,204 +7937,6 @@ namespace BreCalClient.misc.Model
             return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented);
         }
         /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as Times);
-        }
-        /// <summary>
-        /// Returns true if Times instances are equal
-        /// </summary>
-        /// <param name="input">Instance of Times to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(Times input)
-        {
-            if (input == null)
-            {
-                return false;
-            }
-            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.Equals(input.ParticipantType)
-                ) && 
-                (
-                    this.Created == input.Created ||
-                    (this.Created != null &&
-                    this.Created.Equals(input.Created))
-                ) && 
-                (
-                    this.Modified == input.Modified ||
-                    (this.Modified != null &&
-                    this.Modified.Equals(input.Modified))
-                );
-        }
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                hashCode = (hashCode * 59) + this.Id.GetHashCode();
-                if (this.EtaBerth != null)
-                {
-                    hashCode = (hashCode * 59) + this.EtaBerth.GetHashCode();
-                }
-                if (this.EtaBerthFixed != null)
-                {
-                    hashCode = (hashCode * 59) + this.EtaBerthFixed.GetHashCode();
-                }
-                if (this.EtdBerth != null)
-                {
-                    hashCode = (hashCode * 59) + this.EtdBerth.GetHashCode();
-                }
-                if (this.EtdBerthFixed != null)
-                {
-                    hashCode = (hashCode * 59) + this.EtdBerthFixed.GetHashCode();
-                }
-                if (this.LockTime != null)
-                {
-                    hashCode = (hashCode * 59) + this.LockTime.GetHashCode();
-                }
-                if (this.LockTimeFixed != null)
-                {
-                    hashCode = (hashCode * 59) + this.LockTimeFixed.GetHashCode();
-                }
-                if (this.ZoneEntry != null)
-                {
-                    hashCode = (hashCode * 59) + this.ZoneEntry.GetHashCode();
-                }
-                if (this.ZoneEntryFixed != null)
-                {
-                    hashCode = (hashCode * 59) + this.ZoneEntryFixed.GetHashCode();
-                }
-                if (this.OperationsStart != null)
-                {
-                    hashCode = (hashCode * 59) + this.OperationsStart.GetHashCode();
-                }
-                if (this.OperationsEnd != null)
-                {
-                    hashCode = (hashCode * 59) + this.OperationsEnd.GetHashCode();
-                }
-                if (this.Remarks != null)
-                {
-                    hashCode = (hashCode * 59) + this.Remarks.GetHashCode();
-                }
-                hashCode = (hashCode * 59) + this.ShipcallId.GetHashCode();
-                hashCode = (hashCode * 59) + this.ParticipantId.GetHashCode();
-                if (this.BerthId != null)
-                {
-                    hashCode = (hashCode * 59) + this.BerthId.GetHashCode();
-                }
-                if (this.BerthInfo != null)
-                {
-                    hashCode = (hashCode * 59) + this.BerthInfo.GetHashCode();
-                }
-                if (this.PierSide != null)
-                {
-                    hashCode = (hashCode * 59) + this.PierSide.GetHashCode();
-                }
-                hashCode = (hashCode * 59) + this.ParticipantType.GetHashCode();
-                if (this.Created != null)
-                {
-                    hashCode = (hashCode * 59) + this.Created.GetHashCode();
-                }
-                if (this.Modified != null)
-                {
-                    hashCode = (hashCode * 59) + this.Modified.GetHashCode();
-                }
-                return hashCode;
-            }
-        }
-        /// <summary>
         /// To validate all properties of the instance
         /// </summary>
         /// <param name="validationContext">Validation context</param>
@@ -9225,7 +7973,7 @@ namespace BreCalClient.misc.Model
     /// fields that a user may change
     /// </summary>
     [DataContract(Name = "user_details")]
-    public partial class UserDetails : IEquatable<UserDetails>, IValidatableObject
+    public partial class UserDetails : IValidatableObject
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="UserDetails" /> class.
@@ -9309,99 +8057,6 @@ namespace BreCalClient.misc.Model
             return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented);
         }
         /// <summary>
-        /// Returns true if objects are equal
-        /// </summary>
-        /// <param name="input">Object to be compared</param>
-        /// <returns>Boolean</returns>
-        public override bool Equals(object input)
-        {
-            return this.Equals(input as UserDetails);
-        }
-        /// <summary>
-        /// Returns true if UserDetails instances are equal
-        /// </summary>
-        /// <param name="input">Instance of UserDetails to be compared</param>
-        /// <returns>Boolean</returns>
-        public bool Equals(UserDetails input)
-        {
-            if (input == null)
-            {
-                return false;
-            }
-            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 &&
-                    this.UserPhone.Equals(input.UserPhone))
-                ) && 
-                (
-                    this.UserEmail == input.UserEmail ||
-                    (this.UserEmail != null &&
-                    this.UserEmail.Equals(input.UserEmail))
-                );
-        }
-        /// <summary>
-        /// Gets the hash code
-        /// </summary>
-        /// <returns>Hash code</returns>
-        public override int GetHashCode()
-        {
-            unchecked // Overflow is fine, just wrap
-            {
-                int hashCode = 41;
-                hashCode = (hashCode * 59) + this.Id.GetHashCode();
-                if (this.OldPassword != null)
-                {
-                    hashCode = (hashCode * 59) + this.OldPassword.GetHashCode();
-                }
-                if (this.NewPassword != null)
-                {
-                    hashCode = (hashCode * 59) + this.NewPassword.GetHashCode();
-                }
-                if (this.FirstName != null)
-                {
-                    hashCode = (hashCode * 59) + this.FirstName.GetHashCode();
-                }
-                if (this.LastName != null)
-                {
-                    hashCode = (hashCode * 59) + this.LastName.GetHashCode();
-                }
-                if (this.UserPhone != null)
-                {
-                    hashCode = (hashCode * 59) + this.UserPhone.GetHashCode();
-                }
-                if (this.UserEmail != null)
-                {
-                    hashCode = (hashCode * 59) + this.UserEmail.GetHashCode();
-                }
-                return hashCode;
-            }
-        }
-        /// <summary>
         /// To validate all properties of the instance
         /// </summary>
         /// <param name="validationContext">Validation context</param>
diff --git a/misc/BreCalApi.yaml b/misc/BreCalApi.yaml
index 91c27db..9864996 100644
--- a/misc/BreCalApi.yaml
+++ b/misc/BreCalApi.yaml
@@ -531,7 +531,7 @@ components:
           nullable: true
         draft:
           type: number
-          format: float
+          format: double
           nullable: true
         tidal_window_from:
           type: string
@@ -733,11 +733,11 @@ components:
           description: Optional reference to participant (tug role)
         length:
           type: number
-          format: float
+          format: double
           nullable: true
         width:
           type: number
-          format: float
+          format: double
           nullable: true
         is_tug:
           type: boolean
diff --git a/src/BreCalClient/EditShipDialog.xaml b/src/BreCalClient/EditShipDialog.xaml
index 6ffead4..8b5e324 100644
--- a/src/BreCalClient/EditShipDialog.xaml
+++ b/src/BreCalClient/EditShipDialog.xaml
@@ -4,9 +4,11 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:BreCalClient"
+        xmlns:p = "clr-namespace:BreCalClient.Resources"  
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-        mc:Ignorable="d" Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}"
-        Title="Edit ship" Height="250" Width="500" Loaded="buttonOK_Click">
+        mc:Ignorable="d" 
+        Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}"
+        Title="{x:Static p:Resources.textEditShip}" Height="250" Width="500" Loaded="Window_Loaded" ResizeMode="NoResize">
     <Grid x:Name="shipGrid">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width=".3*" />
@@ -24,27 +26,27 @@
         </Grid.RowDefinitions>
         <Label Content="Name" HorizontalAlignment="Right" />
         <TextBox x:Name="textBoxName" Grid.Column="1" Margin="2" VerticalContentAlignment="Center" Text="{Binding Name, Mode=OneWay}" />
-        <Label Content="Participant / Tug company" HorizontalAlignment="Right" Grid.Row="1" />
+        <Label Content="{x:Static p:Resources.textTugCompany}" HorizontalAlignment="Right" Grid.Row="1" />
         <Grid Grid.Row="1" Grid.Column="1">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
                 <ColumnDefinition Width="28" />
             </Grid.ColumnDefinitions>
-            <ComboBox x:Name="comboBoxParticipants" Margin="2" SelectedItem="{Binding Participant, Mode=OneWay}" />
+            <ComboBox x:Name="comboBoxParticipants" Margin="2" DisplayMemberPath="Name" />
             <Button x:Name="buttonResetParticipant" Grid.Column="1" Margin="2" Click="buttonResetParticipant_Click">
                 <Image Source="./Resources/delete2.png"/>
             </Button>
         </Grid>
         <Label Content="IMO" HorizontalAlignment="Right" Grid.Row="2" />
-        <xctk:IntegerUpDown Name="integerUpDownIMO" Grid.Column="1" Grid.Row="2" Value="{Binding IMO, Mode=OneWay}" Margin="2" Minimum="1000000" Maximum="9999999" ShowButtonSpinner="False"/>
-        <Label Content="Callsign" HorizontalAlignment="Right" Grid.Row="3" />
+        <xctk:IntegerUpDown Name="integerUpDownIMO" Grid.Column="1" Grid.Row="2" Value="{Binding Imo, Mode=OneWay}" Margin="2" Minimum="1000000" Maximum="9999999" ShowButtonSpinner="False"/>
+        <Label Content="{x:Static p:Resources.textCallsign}" HorizontalAlignment="Right" Grid.Row="3" />
         <TextBox x:Name="textBoxCallsign" Grid.Column="1"  Grid.Row="3" Margin="2" VerticalContentAlignment="Center" Text="{Binding Callsign, Mode=OneWay}" />
-        <Label Content="Length" HorizontalAlignment="Right" Grid.Row="4" />
+        <Label Content="{x:Static p:Resources.textLength}" HorizontalAlignment="Right" Grid.Row="4" />
         <xctk:DoubleUpDown Name="doubleUpDownLength" Grid.Row="4" Grid.Column="1" Value="{Binding Length, Mode=OneWay}" Margin="2" Minimum="0" />
-        <Label Content="Width" HorizontalAlignment="Right" Grid.Row="5" />
+        <Label Content="{x:Static p:Resources.textWidth}" HorizontalAlignment="Right" Grid.Row="5" />
         <xctk:DoubleUpDown Name="doubleUpDownWidth" Grid.Row="5" Grid.Column="1" Value="{Binding Width, Mode=OneWay}" Margin="2" Minimum="0"/>
         <StackPanel Grid.Column="1" Grid.Row="7" Orientation="Horizontal" FlowDirection="RightToLeft">
-            <Button x:Name="buttonCancel" Width="80" Content="Cancel" Margin="2" Click="buttonCancel_Click" />
+            <Button x:Name="buttonCancel" Width="80" Content="{x:Static p:Resources.textCancel}" Margin="2" Click="buttonCancel_Click" />
             <Button x:Name="buttonOK" Width="80" Content="OK" Margin="2" Click="buttonOK_Click"/>
         </StackPanel>
         
diff --git a/src/BreCalClient/EditShipDialog.xaml.cs b/src/BreCalClient/EditShipDialog.xaml.cs
index f716a61..750f034 100644
--- a/src/BreCalClient/EditShipDialog.xaml.cs
+++ b/src/BreCalClient/EditShipDialog.xaml.cs
@@ -12,10 +12,10 @@ namespace BreCalClient
     {
         public EditShipDialog()
         {
-            
+            InitializeComponent();
         }
 
-        public Ship Ship { get; set; } = new Ship();
+        public Ship Ship { get; set; } = new();
 
         public List<Participant> Participants { get; } = new List<Participant>();
 
@@ -27,32 +27,45 @@ namespace BreCalClient
 
         private void buttonOK_Click(object sender, RoutedEventArgs e)
         {
-            /*
-            this.Ship.Name = this.textBoxName.Text.Trim();
             
-            this.Ship.Participant = this.comboBoxParticipants.SelectedItem as Participant;
-            if (this.Ship.Participant != null)
-                this.Ship.Participant_Id = this.Ship.Participant.Id;
+            this.Ship.Name = this.textBoxName.Text.Trim();
+
+            if (this.comboBoxParticipants.SelectedItem != null)
+            {
+                this.Ship.ParticipantId = ((Participant)this.comboBoxParticipants.SelectedItem).Id;
+                this.Ship.IsTug = true;
+            } 
             else
-                this.Ship.Participant_Id = null;
-            this.Ship.IMO = this.integerUpDownIMO.Value;
+            {
+                this.Ship.IsTug = false;
+            }
+            this.Ship.Imo = this.integerUpDownIMO.Value;
             this.Ship.Callsign = this.textBoxCallsign.Text.Trim();
-            this.Ship.Length = this.doubleUpDownLength.Value;
-            this.Ship.Width = this.doubleUpDownWidth.Value;
+            this.Ship.Length = (float?) this.doubleUpDownLength.Value;
+            this.Ship.Width = (float?) this.doubleUpDownWidth.Value;
             this.DialogResult = true;
             this.Close();
-            */
+            
         }
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             this.DataContext = this.Ship;
-         //   this.comboBoxParticipants.ItemsSource = this.Participants;
+            this.comboBoxParticipants.ItemsSource = this.Participants;            
+
+            if(this.Ship.ParticipantId != null)
+            {
+                foreach(Participant p in this.Participants)
+                {
+                    if(this.Ship.ParticipantId == p.Id)
+                        this.comboBoxParticipants.SelectedItem = p;
+                }
+            }
         }
 
         private void buttonResetParticipant_Click(object sender, RoutedEventArgs e)
         {
-           // this.comboBoxParticipants.SelectedItem = null;
+           this.comboBoxParticipants.SelectedItem = null;
         }
     }
 }
diff --git a/src/BreCalClient/EditShipcallControl.xaml b/src/BreCalClient/EditShipcallControl.xaml
index fb25afc..d54a4d8 100644
--- a/src/BreCalClient/EditShipcallControl.xaml
+++ b/src/BreCalClient/EditShipcallControl.xaml
@@ -74,7 +74,7 @@
             </ComboBox.ContextMenu>
         </ComboBox>
 
-        <Label x:Name="labelBSMDGranted" Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="2" Content="{x:Static p:Resources.textBSMDGranted}" Visibility="Hidden" FontWeight="DemiBold" />
+        <Label x:Name="labelBSMDGranted" Grid.Row="5" Grid.Column="3" Grid.ColumnSpan="1" Content="{x:Static p:Resources.textBSMDGranted}" Visibility="Hidden" FontWeight="DemiBold" />
         <StackPanel Grid.Row="6" Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Width= "80" Margin="2" Content="{x:Static p:Resources.textOK}" x:Name="buttonOK" Click="buttonOK_Click" IsEnabled="False" />
             <Button Width="80" Margin="2" Content="{x:Static p:Resources.textCancel}" x:Name="buttonCancel" Click="buttonCancel_Click"/>
diff --git a/src/BreCalClient/EditShipcallControl.xaml.cs b/src/BreCalClient/EditShipcallControl.xaml.cs
index 8c90cd4..78cbd97 100644
--- a/src/BreCalClient/EditShipcallControl.xaml.cs
+++ b/src/BreCalClient/EditShipcallControl.xaml.cs
@@ -2,6 +2,7 @@
 // Description: Windows dialog to create / edit ship calls
 //
 
+using BreCalClient.misc.Api;
 using BreCalClient.misc.Model;
 using System;
 using System.Windows;
@@ -37,6 +38,8 @@ namespace BreCalClient
             set { this.buttonEditShips.Visibility = value ? Visibility.Visible : Visibility.Hidden; }
         }
 
+        public ShipApi ShipApi { get; set; }
+
         #endregion
 
         #region Event handler
@@ -45,7 +48,7 @@ namespace BreCalClient
         {
             this.comboBoxAgency.ItemsSource = BreCalLists.Participants_Agent;
 
-            this.comboBoxShip.ItemsSource = BreCalLists.Ships;
+            this.comboBoxShip.ItemsSource = BreCalLists.AllShips;
             this.comboBoxCategories.ItemsSource = Enum.GetValues(typeof(ShipcallType));
             this.comboBoxArrivalBerth.ItemsSource = BreCalLists.Berths;
             this.comboBoxDepartureBerth.ItemsSource = BreCalLists.Berths;
@@ -351,9 +354,16 @@ namespace BreCalClient
 
         private void buttonEditShips_Click(object sender, RoutedEventArgs e)
         {
-            ShipListDialog shipListDialog = new ShipListDialog();
-
+            ShipListDialog shipListDialog = new()
+            {
+                ShipApi = this.ShipApi
+            };
+            
             shipListDialog.ShowDialog();
+
+            // reload combobox
+            this.comboBoxShip.ItemsSource = null;
+            this.comboBoxShip.ItemsSource = BreCalLists.AllShips;
         }
 
         #endregion
diff --git a/src/BreCalClient/MainWindow.xaml.cs b/src/BreCalClient/MainWindow.xaml.cs
index 611450f..a548370 100644
--- a/src/BreCalClient/MainWindow.xaml.cs
+++ b/src/BreCalClient/MainWindow.xaml.cs
@@ -209,7 +209,8 @@ namespace BreCalClient
         {
             EditShipcallControl esc = new()
             {
-                ShipEditingEnabled = App.Participant.IsTypeFlagSet(Extensions.ParticipantType.BSMD)
+                ShipEditingEnabled = App.Participant.IsTypeFlagSet(Extensions.ParticipantType.BSMD),
+                ShipApi = _shipApi
             };
             if (model != null)
                 esc.ShipcallModel = model;
@@ -666,6 +667,7 @@ namespace BreCalClient
                 EditShipcallControl esc = new()
                 {
                     ShipcallModel = obj.ShipcallControlModel,
+                    ShipApi = _shipApi,
                     ShipEditingEnabled = App.Participant.IsTypeFlagSet(Extensions.ParticipantType.BSMD)
                 };
 
diff --git a/src/BreCalClient/Resources/Resources.Designer.cs b/src/BreCalClient/Resources/Resources.Designer.cs
index fef84c3..a92f957 100644
--- a/src/BreCalClient/Resources/Resources.Designer.cs
+++ b/src/BreCalClient/Resources/Resources.Designer.cs
@@ -483,6 +483,15 @@ namespace BreCalClient.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Edit ship.
+        /// </summary>
+        public static string textEditShip {
+            get {
+                return ResourceManager.GetString("textEditShip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Edit ship call.
         /// </summary>
diff --git a/src/BreCalClient/Resources/Resources.de.resx b/src/BreCalClient/Resources/Resources.de.resx
index c501fae..9f67bf3 100644
--- a/src/BreCalClient/Resources/Resources.de.resx
+++ b/src/BreCalClient/Resources/Resources.de.resx
@@ -442,6 +442,9 @@
   <data name="textDeleted" xml:space="preserve">
     <value>Gelöscht</value>
   </data>
+  <data name="textEditShip" xml:space="preserve">
+    <value>Schiff bearbeiten</value>
+  </data>
   <data name="textTugCompany" xml:space="preserve">
     <value>Schlepper-Reederei</value>
   </data>
diff --git a/src/BreCalClient/Resources/Resources.resx b/src/BreCalClient/Resources/Resources.resx
index f97e6c3..c00fdc0 100644
--- a/src/BreCalClient/Resources/Resources.resx
+++ b/src/BreCalClient/Resources/Resources.resx
@@ -253,6 +253,9 @@
   <data name="textEdit" xml:space="preserve">
     <value>Edit</value>
   </data>
+  <data name="textEditShip" xml:space="preserve">
+    <value>Edit ship</value>
+  </data>
   <data name="textEditShipcall" xml:space="preserve">
     <value>Edit ship call</value>
   </data>
diff --git a/src/BreCalClient/ShipListDialog.xaml b/src/BreCalClient/ShipListDialog.xaml
index ff2df0f..a8da62b 100644
--- a/src/BreCalClient/ShipListDialog.xaml
+++ b/src/BreCalClient/ShipListDialog.xaml
@@ -6,7 +6,7 @@
         xmlns:p = "clr-namespace:BreCalClient.Resources"
         xmlns:local="clr-namespace:BreCalClient"        
         mc:Ignorable="d" Left="{local:SettingBinding W1Left}" Top="{local:SettingBinding W1Top}"
-        Height="490" Width="800" ResizeMode="CanResize" Icon="Resources/containership.ico">
+        Height="490" Width="800" ResizeMode="CanResize" Icon="Resources/containership.ico" Loaded="Window_Loaded">
         
     <Grid>
         <Grid.RowDefinitions>
@@ -18,22 +18,22 @@
             <local:ENIDataGrid.RowStyle>
                 <Style TargetType="DataGridRow">
                     <Style.Triggers>
-                        <DataTrigger Binding="{Binding Deleted}" Value="1">
+                        <DataTrigger Binding="{Binding Ship.Deleted}" Value="1">
                             <Setter Property="Foreground" Value="DarkGray"/>
                         </DataTrigger>
                     </Style.Triggers>
                 </Style>
             </local:ENIDataGrid.RowStyle>
             <DataGrid.Columns>
-                <DataGridTextColumn Header="Id" Binding="{Binding Path=Id}" IsReadOnly="True"/>
-                <DataGridTextColumn Header="Name" Binding="{Binding Path=Name}" IsReadOnly="True"/>
-                <DataGridCheckBoxColumn Header="{x:Static p:Resources.textTug}" Binding="{Binding Path=IsTug, Mode=OneWay}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="Id" Binding="{Binding Path=Ship.Id}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="Name" Binding="{Binding Path=Ship.Name}" IsReadOnly="True"/>
+                <DataGridCheckBoxColumn Header="{x:Static p:Resources.textTug}" Binding="{Binding Path=Ship.IsTug, Mode=OneWay}" IsReadOnly="True"/>
                 <DataGridTextColumn Header="{x:Static p:Resources.textTugCompany}" Binding="{Binding Path=TugCompany, Mode=OneWay}" IsReadOnly="True"/>
-                <DataGridTextColumn Header="IMO" Binding="{Binding Path=IMO}" IsReadOnly="True"/>
-                <DataGridTextColumn Header="{x:Static p:Resources.textCallsign}" Binding="{Binding Path=Callsign}" IsReadOnly="True"/>
-                <DataGridTextColumn Header="{x:Static p:Resources.textLength}" Binding="{Binding Path=Length}" IsReadOnly="True"/>
-                <DataGridTextColumn Header="{x:Static p:Resources.textWidth}" Binding="{Binding Path=Width}" IsReadOnly="True"/>
-                <DataGridTextColumn Header="{x:Static p:Resources.textDeleted}" Binding="{Binding Path=Deleted, Mode=OneWay}" IsReadOnly="True" />
+                <DataGridTextColumn Header="IMO" Binding="{Binding Path=Ship.Imo}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static p:Resources.textCallsign}" Binding="{Binding Path=Ship.Callsign}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static p:Resources.textLength}" Binding="{Binding Path=Ship.Length}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static p:Resources.textWidth}" Binding="{Binding Path=Ship.Width}" IsReadOnly="True"/>
+                <DataGridTextColumn Header="{x:Static p:Resources.textDeleted}" Binding="{Binding Path=Ship.Deleted, Mode=OneWay}" IsReadOnly="True" />
             </DataGrid.Columns>
         </local:ENIDataGrid>
         <Button Grid.Row="1" x:Name="buttonClose" Content="{x:Static p:Resources.textClose}" HorizontalAlignment="Right" Margin="2" Click="buttonClose_Click"/>
diff --git a/src/BreCalClient/ShipListDialog.xaml.cs b/src/BreCalClient/ShipListDialog.xaml.cs
index d281aa5..d50ef32 100644
--- a/src/BreCalClient/ShipListDialog.xaml.cs
+++ b/src/BreCalClient/ShipListDialog.xaml.cs
@@ -1,16 +1,12 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+// Copyright (c) 2023 schick Informatik
+// Description: Administration screen for ships
+// 
+
+
+using BreCalClient.misc.Api;
+using BreCalClient.misc.Model;
+using System;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace BreCalClient
 {
@@ -24,9 +20,97 @@ namespace BreCalClient
             InitializeComponent();
         }
 
+        #region Properties
+
+        public ShipApi? ShipApi { get; set; }
+
+        #endregion
+
+        #region Event handler
+
         private void buttonClose_Click(object sender, RoutedEventArgs e)
-        {
+        {            
             this.Close();
         }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {            
+            this.dataGridShips.Initialize();
+            this.dataGridShips.ItemsSource = BreCalLists.AllShips;
+
+            this.dataGridShips.CreateRequested += DataGridShips_CreateRequested; ;
+            this.dataGridShips.EditRequested += DataGridShips_EditRequested;
+            this.dataGridShips.DeleteRequested += DataGridShips_DeleteRequested;
+        }
+
+        private async void DataGridShips_DeleteRequested(object obj)
+        {
+            if (obj is ShipModel shipmodel)
+            {
+                if(this.ShipApi != null)
+                    await this.ShipApi.ShipDeleteAsync(shipmodel.Ship.Id);
+                BreCalLists.Ships.Remove(shipmodel); // remove from "selectable" ships
+                shipmodel.Ship.Deleted = true; // set deleted marker on working instance
+            }
+        }
+
+        private async void DataGridShips_EditRequested(object obj)
+        {
+            if (obj is ShipModel shipmodel)
+            {
+                EditShipDialog esd = new()
+                {
+                    Ship = shipmodel.Ship                    
+                };
+                esd.Participants.AddRange(BreCalLists.Participants_Tug);
+                
+                if (esd.ShowDialog() ?? false)
+                {
+                    try
+                    {
+                        if (this.ShipApi != null)
+                        {
+                            Id tmpId = await this.ShipApi.ShipUpdateAsync(shipmodel.Ship);
+                        }
+                        this.dataGridShips.ItemsSource = null;
+                        this.dataGridShips.ItemsSource = BreCalLists.AllShips;
+                    }
+                    catch (Exception ex)
+                    {
+                        MessageBox.Show(ex.Message);
+                    }
+                }
+            }
+        }
+
+        private void DataGridShips_CreateRequested()
+        {
+            ShipModel shipModel = new ShipModel(new Ship());
+            EditShipDialog esd = new()
+            {
+                Ship = shipModel.Ship
+            };
+            esd.Participants.AddRange(BreCalLists.Participants_Tug);
+            
+            if(esd.ShowDialog() ?? false)
+            {
+                try
+                {
+                    this.ShipApi?.ShipsCreateAsync(shipModel.Ship);
+                    this.dataGridShips.ItemsSource = null;
+                    BreCalLists.AllShips.Add(shipModel);
+                    BreCalLists.Ships.Add(shipModel);
+                    this.dataGridShips.ItemsSource = BreCalLists.AllShips;
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(ex.Message);
+                }
+            }
+            
+        }
+
+        #endregion
+
     }
 }
diff --git a/src/BreCalClient/ShipModel.cs b/src/BreCalClient/ShipModel.cs
index 64e5330..4f06e21 100644
--- a/src/BreCalClient/ShipModel.cs
+++ b/src/BreCalClient/ShipModel.cs
@@ -16,6 +16,16 @@ namespace BreCalClient
 
         public Ship Ship { get; private set; }
 
+        public string TugCompany
+        {
+            get { if(this.Ship.ParticipantId.HasValue)
+                {
+                    return BreCalLists.ParticipantLookupDict[this.Ship.ParticipantId.Value].Name;
+                }
+                return "";
+            }
+        }
+
         public override string ToString()
         {
             return String.Format("{0} ({1})", this.Ship.Name, this.Ship.Imo);