diff --git a/axon/src/main/java/com/baeldung/axon/commands/CreateMessageCommand.java b/axon/src/main/java/com/baeldung/axon/commands/CreateMessageCommand.java
index d0651bf12e..70d2e46480 100644
--- a/axon/src/main/java/com/baeldung/axon/commands/CreateMessageCommand.java
+++ b/axon/src/main/java/com/baeldung/axon/commands/CreateMessageCommand.java
@@ -1,24 +1,42 @@
 package com.baeldung.axon.commands;
 
+import java.util.Objects;
 
-import org.axonframework.commandhandling.TargetAggregateIdentifier;
+import org.axonframework.modelling.command.TargetAggregateIdentifier;
 
 public class CreateMessageCommand {
- 
+
     @TargetAggregateIdentifier
     private final String id;
     private final String text;
- 
+
     public CreateMessageCommand(String id, String text) {
         this.id = id;
         this.text = text;
     }
- 
+
     public String getId() {
         return id;
     }
- 
+
     public String getText() {
         return text;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        CreateMessageCommand that = (CreateMessageCommand) o;
+        return Objects.equals(id, that.id) && Objects.equals(text, that.text);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, text);
+    }
 }
\ No newline at end of file
diff --git a/axon/src/main/java/com/baeldung/axon/commands/MarkReadMessageCommand.java b/axon/src/main/java/com/baeldung/axon/commands/MarkReadMessageCommand.java
index e66582d9ec..f7d911d65b 100644
--- a/axon/src/main/java/com/baeldung/axon/commands/MarkReadMessageCommand.java
+++ b/axon/src/main/java/com/baeldung/axon/commands/MarkReadMessageCommand.java
@@ -1,18 +1,36 @@
 package com.baeldung.axon.commands;
 
+import java.util.Objects;
 
-import org.axonframework.commandhandling.TargetAggregateIdentifier;
+import org.axonframework.modelling.command.TargetAggregateIdentifier;
 
 public class MarkReadMessageCommand {
- 
+
     @TargetAggregateIdentifier
     private final String id;
- 
+
     public MarkReadMessageCommand(String id) {
         this.id = id;
     }
- 
+
     public String getId() {
         return id;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        MarkReadMessageCommand that = (MarkReadMessageCommand) o;
+        return Objects.equals(id, that.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
+    }
 }
\ No newline at end of file
diff --git a/axon/src/main/java/com/baeldung/axon/events/MessageCreatedEvent.java b/axon/src/main/java/com/baeldung/axon/events/MessageCreatedEvent.java
index 3c9aac5ed8..e638a2a94d 100644
--- a/axon/src/main/java/com/baeldung/axon/events/MessageCreatedEvent.java
+++ b/axon/src/main/java/com/baeldung/axon/events/MessageCreatedEvent.java
@@ -1,20 +1,39 @@
 package com.baeldung.axon.events;
 
+import java.util.Objects;
+
 public class MessageCreatedEvent {
- 
+
     private final String id;
     private final String text;
- 
+
     public MessageCreatedEvent(String id, String text) {
         this.id = id;
         this.text = text;
     }
- 
+
     public String getId() {
         return id;
     }
- 
+
     public String getText() {
         return text;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        MessageCreatedEvent that = (MessageCreatedEvent) o;
+        return Objects.equals(id, that.id) && Objects.equals(text, that.text);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, text);
+    }
 }
\ No newline at end of file
diff --git a/axon/src/main/java/com/baeldung/axon/events/MessageReadEvent.java b/axon/src/main/java/com/baeldung/axon/events/MessageReadEvent.java
index 57bfc8e19e..e362599bb3 100644
--- a/axon/src/main/java/com/baeldung/axon/events/MessageReadEvent.java
+++ b/axon/src/main/java/com/baeldung/axon/events/MessageReadEvent.java
@@ -1,14 +1,33 @@
 package com.baeldung.axon.events;
 
+import java.util.Objects;
+
 public class MessageReadEvent {
- 
+
     private final String id;
- 
+
     public MessageReadEvent(String id) {
         this.id = id;
     }
- 
+
     public String getId() {
         return id;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        MessageReadEvent that = (MessageReadEvent) o;
+        return Objects.equals(id, that.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id);
+    }
 }
\ No newline at end of file