diff --git a/pom.xml b/pom.xml
index d89060a..5fbaddb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,7 @@
         <quarkus.platform.version>3.4.1</quarkus.platform.version>
         <skipITs>true</skipITs>
         <surefire-plugin.version>3.1.2</surefire-plugin.version>
+        <lombok.version>1.18.28</lombok.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -69,6 +70,11 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-resteasy-reactive</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5</artifactId>
@@ -104,6 +110,13 @@
                     <compilerArgs>
                         <arg>-parameters</arg>
                     </compilerArgs>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/main/java/org/acme/CollectEvent.java b/src/main/java/org/acme/CollectEvent.java
deleted file mode 100644
index 471d247..0000000
--- a/src/main/java/org/acme/CollectEvent.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.acme;
-
-import java.io.Serializable;
-
-public interface CollectEvent extends Serializable {
-    Type getType();
-
-    enum Type {
-        CREATION, UPDATE, DELETE;
-    }
-}
diff --git a/src/main/java/org/acme/Suspendable.java b/src/main/java/org/acme/Suspendable.java
new file mode 100644
index 0000000..6c6a6be
--- /dev/null
+++ b/src/main/java/org/acme/Suspendable.java
@@ -0,0 +1,6 @@
+package org.acme;
+
+import java.io.Serializable;
+
+public interface Suspendable extends Serializable {
+}
diff --git a/src/main/java/org/acme/UserCreated.java b/src/main/java/org/acme/UserCreated.java
index bdf375e..a8664d0 100644
--- a/src/main/java/org/acme/UserCreated.java
+++ b/src/main/java/org/acme/UserCreated.java
@@ -3,7 +3,7 @@ package org.acme;
 import java.time.LocalDateTime;
 import java.util.Objects;
 
-public class UserCreated implements CollectEvent {
+public class UserCreated implements Suspendable {
     private String username;
     private LocalDateTime timestamp;
 
@@ -23,11 +23,6 @@ public class UserCreated implements CollectEvent {
         this.timestamp = timestamp;
     }
 
-    @Override
-    public CollectEvent.Type getType() {
-        return Type.CREATION;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/src/main/java/org/acme/UserDeleted.java b/src/main/java/org/acme/UserDeleted.java
index 5d5f392..d4e2097 100644
--- a/src/main/java/org/acme/UserDeleted.java
+++ b/src/main/java/org/acme/UserDeleted.java
@@ -3,7 +3,7 @@ package org.acme;
 import java.time.LocalDateTime;
 import java.util.Objects;
 
-public class UserDeleted implements CollectEvent {
+public class UserDeleted implements Suspendable {
     private long id;
     private LocalDateTime timestamp;
 
@@ -23,11 +23,6 @@ public class UserDeleted implements CollectEvent {
         this.timestamp = timestamp;
     }
 
-    @Override
-    public CollectEvent.Type getType() {
-        return Type.DELETE;
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/src/main/java/org/acme/UserObserver.java b/src/main/java/org/acme/UserObserver.java
index c626898..c6908c8 100644
--- a/src/main/java/org/acme/UserObserver.java
+++ b/src/main/java/org/acme/UserObserver.java
@@ -10,11 +10,11 @@ public class UserObserver {
     private final Logger log = Logger.getLogger(UserObserver.class);
 
     public void onCreation(@Observes(during = TransactionPhase.AFTER_SUCCESS) UserCreated event) {
-        log.info("Arrived event for user " + event.getUsername());
+        log.info("Send event for user " + event);
     }
 
     public void onDelete(@Observes(during = TransactionPhase.AFTER_SUCCESS) UserDeleted event) {
-        log.info("Arrived event for deletion user " + event.getId());
+        log.info("Send event for deletion user " + event);
     }
 
 }
diff --git a/src/main/java/org/acme/UserService.java b/src/main/java/org/acme/UserService.java
index 002eabc..c4a3ea7 100644
--- a/src/main/java/org/acme/UserService.java
+++ b/src/main/java/org/acme/UserService.java
@@ -14,10 +14,10 @@ import java.util.stream.Collectors;
 public class UserService {
     private final Logger log = Logger.getLogger(UserService.class);
 
-    private final Event<CollectEvent> collectEventSender;
+    private final Event<Suspendable> collectEventSender;
 
     @Inject
-    public UserService(Event<CollectEvent> collectEventSender) {
+    public UserService(Event<Suspendable> collectEventSender) {
         this.collectEventSender = collectEventSender;
     }