diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/ClientSettings.java b/API/src/main/java/io/github/jwdeveloper/tiktok/ClientSettings.java
index c2a8c02..f4821be 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/ClientSettings.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/ClientSettings.java
@@ -26,6 +26,7 @@ public class ClientSettings {
     /// </summary>
     private boolean retryOnConnectionFailure;
 
+
     /// <summary>
     /// Wait to connect again for selected amount of time
     /// </summary>
@@ -65,5 +66,6 @@ public class ClientSettings {
     /// Parameters used in requests to tiktok api
     /// </summary>
     private Map<String, Object> clientParameters;
+
 }
 
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/EventMeta.java b/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/EventMeta.java
new file mode 100644
index 0000000..71dc01a
--- /dev/null
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/EventMeta.java
@@ -0,0 +1,10 @@
+package io.github.jwdeveloper.tiktok.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EventMeta
+{
+     EventType eventType();
+}
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/EventType.java b/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/EventType.java
new file mode 100644
index 0000000..27c79f1
--- /dev/null
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/EventType.java
@@ -0,0 +1,10 @@
+package io.github.jwdeveloper.tiktok.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+
+public enum EventType
+{
+   Control, Message, Custom
+}
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/Nullable.java b/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/Nullable.java
deleted file mode 100644
index 716cf6b..0000000
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/Nullable.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package io.github.jwdeveloper.tiktok.annotations;
-
-public @interface Nullable {
-}
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/TikTokEventHandler.java b/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/TikTokEventHandler.java
new file mode 100644
index 0000000..a7882c1
--- /dev/null
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/annotations/TikTokEventHandler.java
@@ -0,0 +1,10 @@
+package io.github.jwdeveloper.tiktok.annotations;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface TikTokEventHandler
+{
+
+}
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/TikTokEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/TikTokEvent.java
index c70cc90..1ac8481 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/TikTokEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/TikTokEvent.java
@@ -3,39 +3,11 @@ package io.github.jwdeveloper.tiktok.events;
 import io.github.jwdeveloper.tiktok.messages.*;
 import lombok.Getter;
 
+/*
+  Base class for all events
+ */
 @Getter
-public class TikTokEvent {
-    private long messageId;
-    private long roomId;
-    private long timeStamp;
+public abstract class TikTokEvent
+{
 
-    public TikTokEvent(MessageHeader header) {
-        this(header.getMessageId(),header.getRoomId(), header.getTimeStamp1());
-    }
-
-    public TikTokEvent(GiftMessageHeader header) {
-        this(header.getMessageId(),header.getRoomId(), header.getTimeStamp1());
-    }
-
-    public TikTokEvent(MemberMessageHeader header) {
-        this(header.getMessageId(),header.getRoomId(), header.getTimeStamp1());
-    }
-
-    public TikTokEvent(SocialMessageHeader header) {
-        this(header.getMessageId(),header.getRoomId(), header.getTimeStamp1());
-    }
-
-    public TikTokEvent(LikeMessageHeader header) {
-        this(header.getMessageId(),header.getRoomId(), header.getTimeStamp1());
-    }
-
-    public TikTokEvent(long messageId, long roomId, long timeStamp) {
-        this.messageId = messageId;
-        this.roomId = roomId;
-        this.timeStamp = timeStamp;
-    }
-
-    public TikTokEvent() {
-
-    }
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/TikTokEventBuilder.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/TikTokEventBuilder.java
index 8784fad..3f17981 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/TikTokEventBuilder.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/TikTokEventBuilder.java
@@ -66,7 +66,7 @@ public interface TikTokEventBuilder<T> {
 
     T onError(TikTokEventConsumer<TikTokErrorEvent> event);
 
-    T onUnhandled(TikTokEventConsumer<TikTokUnhandledEvent> event);
+    T onUnhandled(TikTokEventConsumer<TikTokUnhandledWebsocketMessageEvent> event);
 
     T onJoin(TikTokEventConsumer<TikTokJoinEvent> event);
 
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/base/TikTokHeaderEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/base/TikTokHeaderEvent.java
new file mode 100644
index 0000000..c80e9d8
--- /dev/null
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/base/TikTokHeaderEvent.java
@@ -0,0 +1,48 @@
+package io.github.jwdeveloper.tiktok.events.base;
+
+import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.messages.*;
+import lombok.Getter;
+
+@Getter
+public class TikTokHeaderEvent extends TikTokEvent {
+    private final long messageId;
+    private final long roomId;
+    private final long timeStamp;
+
+    public TikTokHeaderEvent(Common header) {
+        this(header.getMsgId(), header.getRoomId(), header.getCreateTime());
+    }
+
+    public TikTokHeaderEvent(MessageHeader header) {
+        this(header.getMessageId(), header.getRoomId(), header.getTimeStamp1());
+    }
+
+    public TikTokHeaderEvent(GiftMessageHeader header) {
+        this(header.getMessageId(), header.getRoomId(), header.getTimeStamp1());
+    }
+
+    public TikTokHeaderEvent(MemberMessageHeader header) {
+        this(header.getMessageId(), header.getRoomId(), header.getTimeStamp1());
+    }
+
+    public TikTokHeaderEvent(SocialMessageHeader header) {
+        this(header.getMessageId(), header.getRoomId(), header.getTimeStamp1());
+    }
+
+    public TikTokHeaderEvent(LikeMessageHeader header) {
+        this(header.getMessageId(), header.getRoomId(), header.getTimeStamp1());
+    }
+
+    public TikTokHeaderEvent(long messageId, long roomId, long timeStamp) {
+        this.messageId = messageId;
+        this.roomId = roomId;
+        this.timeStamp = timeStamp;
+    }
+
+    public TikTokHeaderEvent() {
+        messageId = 0;
+        roomId = 0;
+        timeStamp = 0;
+    }
+}
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/base/TikTokLiveClientEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/base/TikTokLiveClientEvent.java
new file mode 100644
index 0000000..415b380
--- /dev/null
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/base/TikTokLiveClientEvent.java
@@ -0,0 +1,7 @@
+package io.github.jwdeveloper.tiktok.events.base;
+
+import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+
+
+public class TikTokLiveClientEvent extends TikTokEvent {
+}
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/base/TikTokUnhandledEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/base/TikTokUnhandledEvent.java
new file mode 100644
index 0000000..398d712
--- /dev/null
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/base/TikTokUnhandledEvent.java
@@ -0,0 +1,12 @@
+package io.github.jwdeveloper.tiktok.events.base;
+
+import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class TikTokUnhandledEvent<T> extends TikTokEvent
+{
+    private final T data;
+}
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokBarrageMessageEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokBarrageMessageEvent.java
index 3ab5f85..0a27aba 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokBarrageMessageEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokBarrageMessageEvent.java
@@ -1,29 +1,28 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.BarrageData;
 import io.github.jwdeveloper.tiktok.events.objects.Picture;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastBarrageMessage;
-import lombok.Getter;
-
-@Getter
-public class TikTokBarrageMessageEvent extends TikTokEvent {
-    private final Picture picture;
-
-    private final Picture picture2;
-
-    private final Picture picture3;
-
-    private final User user;
-    private final BarrageData barrageData;
+import lombok.Value;
 
+@Value
+@EventMeta(eventType = EventType.Message)
+public class TikTokBarrageMessageEvent extends TikTokHeaderEvent {
+    Picture picture;
+    Picture picture2;
+    Picture picture3;
+    User user;
+    BarrageData barrageData;
     public TikTokBarrageMessageEvent(WebcastBarrageMessage msg) {
         super(msg.getHeader());
 
-        picture = new Picture(msg.getPicture());
-        picture2 = new Picture(msg.getPicture2());
-        picture3 = new Picture(msg.getPicture3());
+        picture = new Picture(msg.getImage());
+        picture2 = new Picture(msg.getImage2());
+        picture3 = new Picture(msg.getImage3());
         user = new User(msg.getUserData().getUser());
         barrageData = new BarrageData(msg.getMessage().getEventType(),
                 msg.getMessage().getLabel(),
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokCaptionEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokCaptionEvent.java
index b67c203..c3a1746 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokCaptionEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokCaptionEvent.java
@@ -1,16 +1,19 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastCaptionMessage;
-import lombok.Getter;
+import lombok.Value;
 
-@Getter
-public class TikTokCaptionEvent extends TikTokEvent {
-    private final Long captionTimeStamp;
+@Value
+@EventMeta(eventType = EventType.Message)
+public class TikTokCaptionEvent extends TikTokHeaderEvent {
+    Long captionTimeStamp;
 
-    private final String iSOLanguage;
+    String iSOLanguage;
 
-    private final String text;
+    String text;
 
     public TikTokCaptionEvent(WebcastCaptionMessage msg) {
         super(msg.getHeader());
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokCommentEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokCommentEvent.java
index cb68495..840d7eb 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokCommentEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokCommentEvent.java
@@ -1,30 +1,30 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
-import io.github.jwdeveloper.tiktok.annotations.Nullable;
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.Picture;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastChatMessage;
 import io.github.jwdeveloper.tiktok.messages.WebcastRoomPinMessage;
 import lombok.Getter;
+import lombok.Value;
 
 import java.util.ArrayList;
 import java.util.List;
 
-@Getter
-public class TikTokCommentEvent extends TikTokEvent
-{
-    @Nullable
-    private User user;
-    private final String text;
-    private final String language;
-    private final List<User> mentionedUsers;
-    private final List<Picture> pictures;
+@Value
+@EventMeta(eventType = EventType.Message)
+public class TikTokCommentEvent extends TikTokHeaderEvent {
+     User user;
+     String text;
+     String language;
+     List<User> mentionedUsers;
+     List<Picture> pictures;
 
     public TikTokCommentEvent(WebcastRoomPinMessage.RoomPinMessageData data) {
         super(data.getDetails().getRoomId(), data.getDetails().getMessageId(), data.getDetails().getServerTime());
-        if (data.hasSender())
-            user = new User(data.getSender());
+        user = User.MapOrEmpty(data.getSender());
         text = data.getComment();
         language = data.getLanguage();
         mentionedUsers = new ArrayList<>();
@@ -33,11 +33,10 @@ public class TikTokCommentEvent extends TikTokEvent
 
     public TikTokCommentEvent(WebcastChatMessage msg) {
         super(msg.getHeader());
-        if (msg.hasSender())
-            user = new User(msg.getSender());
+        user = User.MapOrEmpty(msg.getSender());
         text = msg.getComment();
         language = msg.getLanguage();
         mentionedUsers = msg.getMentionedUsersList().stream().map(User::new).toList();
-        pictures = msg.getImagesList().stream().map(e -> new Picture(e.getPicture())).toList();
+        pictures = msg.getImagesList().stream().map(e -> new Picture(e.getImage())).toList();
     }
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokConnectedEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokConnectedEvent.java
index e9d50d7..0d5ac90 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokConnectedEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokConnectedEvent.java
@@ -1,8 +1,9 @@
 package io.github.jwdeveloper.tiktok.events.messages;
-
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
-
-public class TikTokConnectedEvent extends TikTokEvent
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokLiveClientEvent;
+@EventMeta(eventType = EventType.Control)
+public class TikTokConnectedEvent extends TikTokLiveClientEvent
 {
 
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokDetectMessageEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokDetectMessageEvent.java
index bd7d884..3384874 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokDetectMessageEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokDetectMessageEvent.java
@@ -1,18 +1,22 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastMsgDetectMessage;
 import lombok.Getter;
 
 import java.util.List;
 
 @Getter
-public class TikTokDetectMessageEvent extends TikTokEvent {
-  private final String language;
+@EventMeta(eventType = EventType.Message)
+public class TikTokDetectMessageEvent extends TikTokHeaderEvent {
+   String language;
 
-  private final List<Number> data;
+   List<Number> data;
 
-  private final List<Number> timings;
+   List<Number> timings;
 
   public TikTokDetectMessageEvent(WebcastMsgDetectMessage msg) {
     super(msg.getHeader());;
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokDisconnectedEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokDisconnectedEvent.java
index 525fa31..3f65039 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokDisconnectedEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokDisconnectedEvent.java
@@ -1,6 +1,8 @@
 package io.github.jwdeveloper.tiktok.events.messages;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokLiveClientEvent;
 
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
-
-public class TikTokDisconnectedEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Control)
+public class TikTokDisconnectedEvent extends TikTokLiveClientEvent {
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokEmoteEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokEmoteEvent.java
index 28d2a2a..9738088 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokEmoteEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokEmoteEvent.java
@@ -1,25 +1,23 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
-import io.github.jwdeveloper.tiktok.annotations.Nullable;
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.Picture;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastEmoteChatMessage;
-import lombok.Getter;
+import lombok.Value;
 
-@Getter
-public class TikTokEmoteEvent extends TikTokEvent
-{
-    @Nullable
-    private User user;
-    private final String emoteId;
-    private final Picture picture;
+@Value
+@EventMeta(eventType = EventType.Message)
+public class TikTokEmoteEvent extends TikTokHeaderEvent {
+    User user;
+    String emoteId;
+    Picture picture;
 
     public TikTokEmoteEvent(WebcastEmoteChatMessage msg) {
         super(msg.getHeader());
-        if (msg.hasSender()) {
-            user = new User(msg.getSender());
-        }
+        user = User.MapOrEmpty(msg.getSender());
         emoteId = msg.getDetails().getId();
         picture = new Picture(msg.getDetails().getImage().getUrl());
     }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokEnvelopeEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokEnvelopeEvent.java
index 3b0ae05..8ad5b61 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokEnvelopeEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokEnvelopeEvent.java
@@ -1,14 +1,18 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastEnvelopeMessage;
 import lombok.Getter;
+import lombok.Value;
 
-@Getter
-public class TikTokEnvelopeEvent extends TikTokEvent {
-  private final User user;
-
+@Value
+@EventMeta(eventType = EventType.Message)
+public class TikTokEnvelopeEvent extends TikTokHeaderEvent {
+  User user;
   public TikTokEnvelopeEvent(WebcastEnvelopeMessage msg) {
     super(msg.getHeader());
     user = new User(msg.getUser().getId(), msg.getUser().getUsername());
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokErrorEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokErrorEvent.java
index 20d0731..57bd973 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokErrorEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokErrorEvent.java
@@ -1,12 +1,16 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokLiveClientEvent;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
-public class TikTokErrorEvent extends TikTokEvent
+@EventMeta(eventType = EventType.Control)
+public class TikTokErrorEvent extends TikTokLiveClientEvent
 {
     private final Throwable exception;
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokFollowEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokFollowEvent.java
index f8e8236..75e0533 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokFollowEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokFollowEvent.java
@@ -1,25 +1,22 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
-import io.github.jwdeveloper.tiktok.annotations.Nullable;
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastSocialMessage;
-import lombok.Getter;
+import lombok.Value;
 
-@Getter
-public class TikTokFollowEvent extends TikTokEvent
+@Value
+@EventMeta(eventType = EventType.Custom)
+public class TikTokFollowEvent extends TikTokHeaderEvent
 {
-  @Nullable
-  private User newFollower;
-  private final Long totalFollowers;
+   User newFollower;
+   Long totalFollowers;
 
   public TikTokFollowEvent(WebcastSocialMessage msg) {
     super(msg.getHeader());
-    if(msg.hasSender())
-    {
-      newFollower = new User(msg.getSender());
-    }
+    newFollower = User.MapOrEmpty(msg.getSender());
     totalFollowers = msg.getTotalFollowers();
-
   }
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokGiftBroadcastEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokGiftBroadcastEvent.java
index 976e29c..88873eb 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokGiftBroadcastEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokGiftBroadcastEvent.java
@@ -1,27 +1,32 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.Picture;
 import io.github.jwdeveloper.tiktok.messages.WebcastGiftBroadcastMessage;
 import lombok.Getter;
+import lombok.Value;
 
-@Getter
-public class TikTokGiftBroadcastEvent extends TikTokEvent
+@Value
+@EventMeta(eventType = EventType.Message)
+public class TikTokGiftBroadcastEvent extends TikTokHeaderEvent
 {
-  private final Picture picture;
+    Picture picture;
 
-  private final String shortURL;
+    String shortURL;
 
-  private final String notifyEventType;
+    String notifyEventType;
 
-  private final String notifyLabel;
+    String notifyLabel;
 
-  private final String notifyType;
+    String notifyType;
 
   public TikTokGiftBroadcastEvent(WebcastGiftBroadcastMessage msg)
   {
     super(msg.getHeader());
-    picture = new Picture(msg.getPicture());
+    picture = new Picture(msg.getImage());
     var data = msg.getData();
     shortURL = data.getUri();
     notifyEventType = data.getRoomNotifyMessage().getData().getType();
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokGiftMessageEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokGiftMessageEvent.java
index c07c862..505a475 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokGiftMessageEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokGiftMessageEvent.java
@@ -1,41 +1,33 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
-import io.github.jwdeveloper.tiktok.annotations.Nullable;
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.Gift;
-import io.github.jwdeveloper.tiktok.events.objects.TikTokGift;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastGiftMessage;
-import lombok.Getter;
+import lombok.Value;
 
-@Getter
-public class TikTokGiftMessageEvent extends TikTokEvent {
+@Value
+@EventMeta(eventType = EventType.Message)
+public class TikTokGiftMessageEvent extends TikTokHeaderEvent {
 
-    private final Gift gift;
-
-    @Nullable
-    private User sender;
-
-    private final String purchaseId;
-
-    private final String receipt;
-
-    private final Integer amount;
-
-    private final Boolean streakFinished;
-
-    private final Integer streakIndex;
+      Gift gift;
+      User sender;
+      String purchaseId;
+      String receipt;
+      Long comboCount;
+      Boolean streakFinished;
+      Long streakIndex;
 
     public TikTokGiftMessageEvent(WebcastGiftMessage msg) {
-        super(msg.getHeader());
-        gift = new Gift(msg.getGiftDetails());
-        if (msg.hasSender()) {
-            sender = new User(msg.getSender());
-        }
+        super(msg.getCommon());
+        gift = new Gift(msg.getGift());
+        sender = User.MapOrEmpty(msg.getUser());
         purchaseId = msg.getLogId();
-        receipt = msg.getReceiptJson();
-        amount = msg.getAmount();
-        streakFinished = msg.getRepeatEnd();
+        receipt = msg.getMonitorExtra();
+        comboCount = msg.getComboCount();
+        streakFinished = msg.getRepeatEnd() > 0; //todo check values
         streakIndex = msg.getRepeatCount();
     }
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokGoalUpdateEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokGoalUpdateEvent.java
index c886b0a..6794e7a 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokGoalUpdateEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokGoalUpdateEvent.java
@@ -1,6 +1,9 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.Picture;
 
 import io.github.jwdeveloper.tiktok.events.objects.User;
@@ -10,7 +13,8 @@ import lombok.Getter;
 import java.util.List;
 
 @Getter
-public class TikTokGoalUpdateEvent extends TikTokEvent
+@EventMeta(eventType = EventType.Message)
+public class TikTokGoalUpdateEvent extends TikTokHeaderEvent
 {
   private final Long goalId;
   private final Picture picture;
@@ -20,10 +24,10 @@ public class TikTokGoalUpdateEvent extends TikTokEvent
 
   public TikTokGoalUpdateEvent(WebcastGoalUpdateMessage msg) {
     super(msg.getHeader());
-    picture = new Picture(msg.getPicture());
+    picture = new Picture(msg.getImage());
     goalId = msg.getId();
     eventType = msg.getData().getType();
     label = msg.getUpdateData().getLabel();
-    users = msg.getUpdateData().getUsersList().stream().map(u ->new User(u.getId(),u.getNickname(),new Picture(u.getProfilePicture()))).toList();
+    users = msg.getUpdateData().getUsersList().stream().map(u ->new User(u.getId(),u.getNickname(),new Picture(u.getProfileImage()))).toList();
   }
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokIMDeleteEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokIMDeleteEvent.java
index 6f50cbb..e9cd408 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokIMDeleteEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokIMDeleteEvent.java
@@ -1,11 +1,15 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastImDeleteMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokIMDeleteEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokIMDeleteEvent extends TikTokHeaderEvent {
     private final byte[] data;
 
     public TikTokIMDeleteEvent(WebcastImDeleteMessage msg) {
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokInRoomBannerEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokInRoomBannerEvent.java
index b088ae7..4c2aec0 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokInRoomBannerEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokInRoomBannerEvent.java
@@ -1,12 +1,16 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastInRoomBannerMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokInRoomBannerEvent extends TikTokEvent {
-  private String jSON;
+@EventMeta(eventType = EventType.Message)
+public class TikTokInRoomBannerEvent extends TikTokHeaderEvent {
+  private final String jSON;
 
   public TikTokInRoomBannerEvent(WebcastInRoomBannerMessage msg) {
     super(msg.getHeader());;
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokJoinEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokJoinEvent.java
index 5980ba4..240fa25 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokJoinEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokJoinEvent.java
@@ -1,15 +1,16 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
-import io.github.jwdeveloper.tiktok.annotations.Nullable;
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastMemberMessage;
 import io.github.jwdeveloper.tiktok.messages.WebcastSocialMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokJoinEvent extends TikTokEvent {
-    @Nullable
+@EventMeta(eventType = EventType.Custom)
+public class TikTokJoinEvent extends TikTokHeaderEvent {
     private User user;
 
     private final Long totalViewers;
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLikeEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLikeEvent.java
index 18d473e..5d1d34e 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLikeEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLikeEvent.java
@@ -1,16 +1,17 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
-import io.github.jwdeveloper.tiktok.annotations.Nullable;
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastLikeMessage;
 import io.github.jwdeveloper.tiktok.messages.WebcastSocialMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokLikeEvent extends TikTokEvent
+@EventMeta(eventType = EventType.Custom)
+public class TikTokLikeEvent extends TikTokHeaderEvent
 {
-    @Nullable
     private User sender;
 
     private final Integer count;
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkLayerMessageEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkLayerMessageEvent.java
index 029e502..eee5179 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkLayerMessageEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkLayerMessageEvent.java
@@ -1,12 +1,16 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastLinkLayerMessage;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-public class TikTokLinkLayerMessageEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkLayerMessageEvent extends TikTokHeaderEvent {
     private final Long linkId;
     private final LinkData link1;
     private final LinkData link2;
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMessageEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMessageEvent.java
index 8763aaf..2373b10 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMessageEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMessageEvent.java
@@ -1,7 +1,8 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
-import io.github.jwdeveloper.tiktok.annotations.Nullable;
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastLinkMessage;
 import lombok.Getter;
@@ -9,10 +10,10 @@ import lombok.Getter;
 import java.util.List;
 
 @Getter
-public class TikTokLinkMessageEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkMessageEvent extends TikTokHeaderEvent {
     private final String token;
 
-    @Nullable
     private User user;
 
     private final List<User> otherUsers;
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicArmiesEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicArmiesEvent.java
index bc789c4..4dbf246 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicArmiesEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicArmiesEvent.java
@@ -1,6 +1,9 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.LinkMicArmy;
 import io.github.jwdeveloper.tiktok.events.objects.Picture;
 import io.github.jwdeveloper.tiktok.messages.WebcastLinkMicArmies;
@@ -9,7 +12,8 @@ import lombok.Getter;
 import java.util.List;
 
 @Getter
-public class TikTokLinkMicArmiesEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkMicArmiesEvent extends TikTokHeaderEvent {
     private final Long battleId;
 
     private final Integer battleStatus;
@@ -22,7 +26,7 @@ public class TikTokLinkMicArmiesEvent extends TikTokEvent {
         super(msg.getHeader());
         battleId = msg.getId();
         armies = msg.getBattleItemsList().stream().map(LinkMicArmy::new).toList();
-        picture = new Picture(msg.getPicture());
+        picture = new Picture(msg.getImage());
         battleStatus = msg.getBattleStatus();
     }
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicBattleEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicBattleEvent.java
index 0890c4c..011bdef 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicBattleEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicBattleEvent.java
@@ -1,6 +1,9 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.LinkMicBattleTeam;
 import io.github.jwdeveloper.tiktok.messages.WebcastLinkMicBattle;
 import lombok.Getter;
@@ -8,7 +11,8 @@ import lombok.Getter;
 import java.util.List;
 
 @Getter
-public class TikTokLinkMicBattleEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkMicBattleEvent extends TikTokHeaderEvent {
   private final Long battleId;
   private final List<LinkMicBattleTeam> team1;
   private final List<LinkMicBattleTeam> team2;
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicFanTicketEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicFanTicketEvent.java
index 33a0002..f1273b8 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicFanTicketEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicFanTicketEvent.java
@@ -1,11 +1,15 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastLinkMicFanTicketMethod;
 import lombok.Getter;
 
 @Getter
-public class TikTokLinkMicFanTicketEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkMicFanTicketEvent extends TikTokHeaderEvent {
     private final Long id;
     private final Integer data1;
     private final Integer data2;
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicMethodEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicMethodEvent.java
index 83dc22d..617d909 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicMethodEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicMethodEvent.java
@@ -1,12 +1,16 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.LinkMicMethod;
 import io.github.jwdeveloper.tiktok.messages.WebcastLinkMicMethod;
 import lombok.Getter;
 
 @Getter
-public class TikTokLinkMicMethodEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokLinkMicMethodEvent extends TikTokHeaderEvent {
   private final String jSON;
 
   public TikTokLinkMicMethodEvent(WebcastLinkMicMethod msg) {
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLiveEndedEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLiveEndedEvent.java
index 4471fc7..665c0f8 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLiveEndedEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLiveEndedEvent.java
@@ -1,6 +1,8 @@
 package io.github.jwdeveloper.tiktok.events.messages;
-
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
 
+@EventMeta(eventType = EventType.Custom)
 public class TikTokLiveEndedEvent extends TikTokEvent {
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLivePausedEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLivePausedEvent.java
index 3241cce..b96726c 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLivePausedEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLivePausedEvent.java
@@ -1,6 +1,9 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
 
+@EventMeta(eventType = EventType.Custom)
 public class TikTokLivePausedEvent extends TikTokEvent {
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokPollMessageEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokPollMessageEvent.java
index a8ce5ca..5f76f7b 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokPollMessageEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokPollMessageEvent.java
@@ -1,6 +1,9 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.PollOption;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastPollMessage;
@@ -9,7 +12,8 @@ import lombok.Getter;
 import java.util.List;
 
 @Getter
-public class TikTokPollMessageEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokPollMessageEvent extends TikTokHeaderEvent {
     private final Long id;
 
     private final PollOption option1;
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokQuestionEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokQuestionEvent.java
index 6d97696..c3322b4 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokQuestionEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokQuestionEvent.java
@@ -1,12 +1,16 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastQuestionNewMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokQuestionEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokQuestionEvent extends TikTokHeaderEvent {
     private final Long questionId;
 
     private final String text;
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRankTextEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRankTextEvent.java
index 957a916..bc39336 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRankTextEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRankTextEvent.java
@@ -1,14 +1,18 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastRankTextMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokRankTextEvent extends TikTokEvent {
-  private String eventType;
+@EventMeta(eventType = EventType.Message)
+public class TikTokRankTextEvent extends TikTokHeaderEvent {
+  private final String eventType;
 
-  private String label;
+  private final String label;
 
 
   public TikTokRankTextEvent(WebcastRankTextMessage msg) {
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRankUpdateEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRankUpdateEvent.java
index 36d54bc..7962cf5 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRankUpdateEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRankUpdateEvent.java
@@ -1,12 +1,16 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastHourlyRankMessage;
 import io.github.jwdeveloper.tiktok.messages.WebcastRankUpdateMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokRankUpdateEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokRankUpdateEvent extends TikTokHeaderEvent {
   private final String eventType;
 
   private final String label;
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRoomMessageEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRoomMessageEvent.java
index af978a0..3140cfd 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRoomMessageEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRoomMessageEvent.java
@@ -1,7 +1,8 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
-import io.github.jwdeveloper.tiktok.annotations.Nullable;
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.RoomMessage;
 import io.github.jwdeveloper.tiktok.messages.SystemMessage;
@@ -10,10 +11,9 @@ import io.github.jwdeveloper.tiktok.messages.WebcastRoomMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokRoomMessageEvent extends TikTokEvent {
-    @Nullable
+@EventMeta(eventType = EventType.Message)
+public class TikTokRoomMessageEvent extends TikTokHeaderEvent {
     private User host;
-    @Nullable
     private String hostLanguage;
     private final String message;
 
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRoomPinMessageEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRoomPinMessageEvent.java
index f7ee735..659ab39 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRoomPinMessageEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRoomPinMessageEvent.java
@@ -1,11 +1,15 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastRoomPinMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokRoomPinMessageEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokRoomPinMessageEvent extends TikTokHeaderEvent {
   private final Long pinTimeStamp;
   private final TikTokCommentEvent comment;
 
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRoomViewerDataEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRoomViewerDataEvent.java
index a15d54c..52dcb8b 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRoomViewerDataEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRoomViewerDataEvent.java
@@ -1,6 +1,9 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.TopViewer;
 import io.github.jwdeveloper.tiktok.messages.WebcastRoomUserSeqMessage;
 import lombok.Getter;
@@ -8,7 +11,8 @@ import lombok.Getter;
 import java.util.List;
 
 @Getter
-public class TikTokRoomViewerDataEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokRoomViewerDataEvent extends TikTokHeaderEvent {
   private final Integer viewerCount;
   private final List<TopViewer> topViewers;
 
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokShareEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokShareEvent.java
index 2fe5080..c70192c 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokShareEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokShareEvent.java
@@ -1,31 +1,28 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastSocialMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokShareEvent extends TikTokEvent {
-  private User user;
-
-  private Integer amount;
+@EventMeta(eventType = EventType.Custom)
+public class TikTokShareEvent extends TikTokHeaderEvent {
+  private final User user;
+  private final Integer amount;
 
   public TikTokShareEvent(WebcastSocialMessage msg, Integer amount) {
     super(msg.getHeader());;
-    if(msg.hasSender())
-    {
-      user = new User(msg.getSender());
-    }
+    user = User.MapOrEmpty(msg.getSender());
     this.amount = amount;
   }
 
   public TikTokShareEvent(WebcastSocialMessage msg) {
     super(msg.getHeader());
-    if(msg.hasSender())
-    {
-      user = new User(msg.getSender());
-    }
+    user = User.MapOrEmpty(msg.getSender());
     amount = 1;
   }
 
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokShopMessageEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokShopMessageEvent.java
index 62e383b..aa01872 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokShopMessageEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokShopMessageEvent.java
@@ -1,12 +1,16 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.Picture;
 import io.github.jwdeveloper.tiktok.messages.WebcastOecLiveShoppingMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokShopMessageEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokShopMessageEvent extends TikTokHeaderEvent {
   private final String title;
 
   private final String price;
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokSubNotifyEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokSubNotifyEvent.java
index 298ce1a..ede35a8 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokSubNotifyEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokSubNotifyEvent.java
@@ -1,12 +1,16 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastSubNotifyMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokSubNotifyEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokSubNotifyEvent extends TikTokHeaderEvent {
     private User user;
 
     public TikTokSubNotifyEvent(WebcastSubNotifyMessage msg) {
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokSubscribeEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokSubscribeEvent.java
index 7a3f792..0f5a924 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokSubscribeEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokSubscribeEvent.java
@@ -1,12 +1,16 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.events.objects.User;
 import io.github.jwdeveloper.tiktok.messages.WebcastMemberMessage;
 import lombok.Getter;
 
 @Getter
-public class TikTokSubscribeEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Custom)
+public class TikTokSubscribeEvent extends TikTokHeaderEvent {
   private User newSubscriber;
 
   public TikTokSubscribeEvent(WebcastMemberMessage msg) {
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnauthorizedMemberEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnauthorizedMemberEvent.java
index 8ca9075..5a97696 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnauthorizedMemberEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnauthorizedMemberEvent.java
@@ -1,12 +1,16 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokHeaderEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastUnauthorizedMemberMessage;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-public class TikTokUnauthorizedMemberEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Message)
+public class TikTokUnauthorizedMemberEvent extends TikTokHeaderEvent {
     private final String data;
 
     private final UnauthorizedMemberData event;
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledControlEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledControlEvent.java
index 3704279..390cdfd 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledControlEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledControlEvent.java
@@ -1,13 +1,18 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokUnhandledEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastControlMessage;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-@AllArgsConstructor
-public class TikTokUnhandledControlEvent extends TikTokEvent {
+@EventMeta(eventType = EventType.Custom)
+public class TikTokUnhandledControlEvent extends TikTokUnhandledEvent<WebcastControlMessage> {
 
-    private final WebcastControlMessage message;
+    public TikTokUnhandledControlEvent(WebcastControlMessage data) {
+        super(data);
+    }
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledEvent.java
deleted file mode 100644
index 9045111..0000000
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledEvent.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package io.github.jwdeveloper.tiktok.events.messages;
-
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
-import io.github.jwdeveloper.tiktok.messages.WebcastResponse;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-
-@Getter
-@AllArgsConstructor
-public class TikTokUnhandledEvent extends TikTokEvent
-{
-    private final WebcastResponse.Message message;
-}
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledMemberEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledMemberEvent.java
index 5478d15..ecdd893 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledMemberEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledMemberEvent.java
@@ -1,13 +1,18 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokUnhandledEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastMemberMessage;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-@AllArgsConstructor
-public class TikTokUnhandledMemberEvent extends TikTokEvent
+@EventMeta(eventType = EventType.Message)
+public class TikTokUnhandledMemberEvent extends TikTokUnhandledEvent<WebcastMemberMessage>
 {
-    private final WebcastMemberMessage message;
+    public TikTokUnhandledMemberEvent(WebcastMemberMessage data) {
+        super(data);
+    }
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledSocialEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledSocialEvent.java
index c92b5fb..a400cad 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledSocialEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledSocialEvent.java
@@ -1,13 +1,19 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokUnhandledEvent;
+import io.github.jwdeveloper.tiktok.messages.WebcastMemberMessage;
 import io.github.jwdeveloper.tiktok.messages.WebcastSocialMessage;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
-@AllArgsConstructor
-public class TikTokUnhandledSocialEvent extends TikTokEvent
+@EventMeta(eventType = EventType.Custom)
+public class TikTokUnhandledSocialEvent extends TikTokUnhandledEvent<WebcastSocialMessage>
 {
-    private final WebcastSocialMessage message;
+    public TikTokUnhandledSocialEvent(WebcastSocialMessage data) {
+        super(data);
+    }
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledWebsocketMessageEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledWebsocketMessageEvent.java
new file mode 100644
index 0000000..bdd7e40
--- /dev/null
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledWebsocketMessageEvent.java
@@ -0,0 +1,19 @@
+package io.github.jwdeveloper.tiktok.events.messages;
+
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.base.TikTokUnhandledEvent;
+import io.github.jwdeveloper.tiktok.messages.WebcastResponse;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+@Getter
+@EventMeta(eventType = EventType.Message)
+public class TikTokUnhandledWebsocketMessageEvent extends TikTokUnhandledEvent<WebcastResponse.Message>
+{
+    public TikTokUnhandledWebsocketMessageEvent(WebcastResponse.Message data) {
+        super(data);
+    }
+}
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokWebsocketMessageEvent.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokWebsocketMessageEvent.java
index b77b607..5808ebc 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokWebsocketMessageEvent.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokWebsocketMessageEvent.java
@@ -1,16 +1,20 @@
 package io.github.jwdeveloper.tiktok.events.messages;
 
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
 import io.github.jwdeveloper.tiktok.messages.WebcastResponse;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.Getter;
 
 
 /**
  * Happens when TikTok websocket receive message from server
  */
-@Data
+@Getter
 @AllArgsConstructor
+@EventMeta(eventType = EventType.Custom)
 public class TikTokWebsocketMessageEvent extends TikTokEvent
 {
     private TikTokEvent event;
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Badge.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Badge.java
index f80bb2d..d0c03ec 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Badge.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Badge.java
@@ -1,41 +1,77 @@
 package io.github.jwdeveloper.tiktok.events.objects;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
+import io.github.jwdeveloper.tiktok.messages.BadgeStruct;
+import lombok.Value;
 
+import java.util.ArrayList;
 import java.util.List;
 
-@Getter
+@Value
 public class Badge {
-    private  ComboBadge comboBadges;
-    private final List<TextBadge> textBadges;
-    private final List<ImageBadge> imageBadges;
+    ComboBadge comboBadges;
+    List<TextBadge> textBadges;
+    List<ImageBadge> imageBadges;
 
-    public Badge(io.github.jwdeveloper.tiktok.messages.Badge badge) {
-        textBadges = badge.getTextBadgesList().stream().map(b -> new TextBadge(b.getType(), b.getName())).toList();
-        imageBadges = badge.getImageBadgesList().stream().map(b -> new ImageBadge(b.getDisplayType(), new Picture(b.getImage()))).toList();
-        comboBadges = new ComboBadge(new Picture("badge.getComplexBadge().getImageUrl()"), badge.getComplexBadge().getData());
+    public Badge(ComboBadge comboBadges, List<TextBadge> textBadges, List<ImageBadge> imageBadges) {
+        this.comboBadges = comboBadges;
+        this.textBadges = textBadges;
+        this.imageBadges = imageBadges;
     }
 
-
-    @AllArgsConstructor
-    @Getter
-    public class TextBadge {
-        private final String type;
-        private final String name;
+    public Badge(io.github.jwdeveloper.tiktok.messages.BadgeStruct badge)
+    {
+        comboBadges = ComboBadge.map(badge.getCombine());
+        textBadges = TextBadge.mapAll(badge.getTextList());
+        imageBadges = ImageBadge.mapAll(badge.getImageList());
     }
 
-    @AllArgsConstructor
-    @Getter
-    public class ImageBadge {
-        private final Integer displayType;
-        private final Picture image;
+    @Value
+    public static class TextBadge {
+        EnumValue type;
+        String name;
+
+        public static TextBadge map(BadgeStruct.TextBadge input) {
+            return new TextBadge(EnumValue.Map(input.getDisplayType()),input.getKey());
+        }
+        public static List<TextBadge> mapAll(List<BadgeStruct.TextBadge> list) {
+            return list.stream().map(TextBadge::map).toList();
+        }
     }
 
-    @AllArgsConstructor
-    @Getter
-    public class ComboBadge {
-        private final Picture image;
-        private final String data;
+    @Value
+    public static class ImageBadge {
+        EnumValue displayType;
+        Picture image;
+
+        public static ImageBadge map(BadgeStruct.ImageBadge input) {
+            return new ImageBadge(EnumValue.Map(input.getDisplayType()), Picture.Map(input.getImage()));
+        }
+        public static List<ImageBadge> mapAll(List<BadgeStruct.ImageBadge> list) {
+            return list.stream().map(ImageBadge::map).toList();
+        }
+    }
+
+    @Value
+    public static class ComboBadge {
+        Picture image;
+        String data;
+
+        public static ComboBadge map(BadgeStruct.CombineBadge input) {
+            return new ComboBadge(Picture.Map(input.getIcon()),input.getStr());
+        }
+        public static List<ComboBadge> mapAll(List<BadgeStruct.CombineBadge> list) {
+            return list.stream().map(ComboBadge::map).toList();
+        }
+    }
+
+    public static Badge Empty() {
+        var comboBadge = new ComboBadge(Picture.Empty(), "");
+        var textBadges = new ArrayList<TextBadge>();
+        var imageBadges = new ArrayList<ImageBadge>();
+        return new Badge(comboBadge, textBadges, imageBadges);
+    }
+
+    public static List<Badge> EmptyList() {
+        return new ArrayList<Badge>();
     }
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/BarrageData.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/BarrageData.java
index a32ac3a..449d2d0 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/BarrageData.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/BarrageData.java
@@ -2,14 +2,15 @@ package io.github.jwdeveloper.tiktok.events.objects;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.Value;
 
 import java.util.List;
 
-@Getter
+@Value
 public class BarrageData {
-  private final String eventType;
-  private final String label;
-  private final List<BarrageUser> users;
+  String eventType;
+  String label;
+  List<BarrageUser> users;
 
   public BarrageData(String eventType, String label, List<BarrageUser> users)
   {
@@ -18,12 +19,11 @@ public class BarrageData {
     this.users = users;
   }
 
-  @Getter
-  @AllArgsConstructor
-  public static final class BarrageUser
+  @Value
+  public static class BarrageUser
   {
-      private final User user;
+      User user;
 
-      private final String data;
+      String data;
   }
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/EnumValue.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/EnumValue.java
new file mode 100644
index 0000000..e9ce817
--- /dev/null
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/EnumValue.java
@@ -0,0 +1,15 @@
+package io.github.jwdeveloper.tiktok.events.objects;
+
+import lombok.Value;
+
+@Value
+public class EnumValue
+{
+    public int value;
+    public String name;
+
+    public static EnumValue Map(Enum<?> _enum)
+    {
+        return new EnumValue(_enum.ordinal() ,_enum.name());
+    }
+}
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Gift.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Gift.java
index f1f0bad..e550286 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Gift.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Gift.java
@@ -1,27 +1,22 @@
 package io.github.jwdeveloper.tiktok.events.objects;
 
-import lombok.Getter;
+import lombok.Value;
 
-@Getter
+@Value
 public class Gift {
-    private final Long id;
+    Long id;
+    String name;
+    String description;
+    Integer diamondCost;
+    Integer type;
+    Picture picture;
 
-    private final String name;
-
-    private final String description;
-
-    private final Integer diamondCost;
-
-    private final Integer type;
-
-    private final Picture picture;
-
-    public Gift(io.github.jwdeveloper.tiktok.messages.Gift gift) {
+    public Gift(io.github.jwdeveloper.tiktok.messages.GiftStruct gift) {
         id = gift.getId();
         name = gift.getName();
-        description = gift.getDescription();
-        diamondCost = gift.getCoinCount();
-        type = gift.getGiftType();
+        description = gift.getDescribe();
+        diamondCost = gift.getDiamondCount();
+        type = gift.getType();
         picture = new Picture(gift.getImage());
     }
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/LinkMicArmy.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/LinkMicArmy.java
index c402e06..28ce279 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/LinkMicArmy.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/LinkMicArmy.java
@@ -1,31 +1,28 @@
 package io.github.jwdeveloper.tiktok.events.objects;
 
 import io.github.jwdeveloper.tiktok.messages.LinkMicArmiesItems;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
+import lombok.Value;
 
 import java.util.List;
 
-@Getter
+@Value
 public class LinkMicArmy {
-    private final Long armyId;
-    private final List<Army> armies;
+    Long armyId;
+    List<Army> armies;
 
     public LinkMicArmy(LinkMicArmiesItems army) {
         armyId = army.getHostUserId();
         armies = army.getBattleGroupsList()
                 .stream()
-                .map(x -> new Army(x.getUsersList()
-                        .stream()
-                        .map(User::new).toList(), x.getPoints()))
+                .map(x -> new Army(x.getUsersList().stream().map(User::MapOrEmpty).toList(), x.getPoints()))
+
+
                 .toList();
     }
 
-
-    @Getter
-    @AllArgsConstructor
-    public final class Army {
-        private final List<User> Users;
-        private final Integer Points;
+    @Value
+    public static class Army {
+        List<User> Users;
+        Integer Points;
     }
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/LinkMicBattleTeam.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/LinkMicBattleTeam.java
index f46975a..6432a0f 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/LinkMicBattleTeam.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/LinkMicBattleTeam.java
@@ -3,13 +3,14 @@ package io.github.jwdeveloper.tiktok.events.objects;
 
 import io.github.jwdeveloper.tiktok.messages.WebcastLinkMicBattle;
 import lombok.Getter;
+import lombok.Value;
 
 import java.util.List;
 
-@Getter
+@Value
 public class LinkMicBattleTeam {
-    private final Long teamId;
-    private final List<User> users;
+    Long teamId;
+    List<User> users;
 
     public LinkMicBattleTeam(WebcastLinkMicBattle.LinkMicBattleTeam team) {
         this.teamId = team.getId();
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Picture.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Picture.java
index 1048a6b..f375cad 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Picture.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/Picture.java
@@ -1,19 +1,20 @@
 package io.github.jwdeveloper.tiktok.events.objects;
 
 import lombok.Getter;
+import lombok.Value;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-@Getter
+@Value
 public class Picture {
 
-  public final List<String> urls;
+  List<String> urls;
 
-  public Picture(io.github.jwdeveloper.tiktok.messages.Picture profilePicture) {
-    this.urls = profilePicture.getUrlsList();
+  public Picture(io.github.jwdeveloper.tiktok.messages.Image profilePicture) {
+    this.urls = profilePicture.getUrlListList();
   }
-
   public Picture(List<String> urls) {
     this.urls = urls;
   }
@@ -22,4 +23,29 @@ public class Picture {
   {
     this.urls = Arrays.stream(urls).toList();
   }
+
+  public void downlaod()
+  {
+
+  }
+
+  public void downloadAsync()
+  {
+
+  }
+
+  public static Picture Map(io.github.jwdeveloper.tiktok.messages.Image profilePicture)
+  {
+    return new Picture(profilePicture.getUrlListList());
+  }
+
+  public static Picture Empty()
+  {
+    return new Picture();
+  }
+
+  public static List<Picture> EmptyList()
+  {
+    return new ArrayList<Picture>();
+  }
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/PollOption.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/PollOption.java
index d5b30a7..326328b 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/PollOption.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/PollOption.java
@@ -2,18 +2,17 @@ package io.github.jwdeveloper.tiktok.events.objects;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.Value;
 
 import java.util.List;
 
-@Getter
-@AllArgsConstructor
+@Value
 public class PollOption {
 
     private final User user;
     private final List<Option> options;
 
-    @Getter
-    @AllArgsConstructor
+    @Value
     public static final class Option {
         private final String label;
 
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/TikTokGift.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/TikTokGift.java
index 21fb02d..cc86625 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/TikTokGift.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/TikTokGift.java
@@ -7,19 +7,16 @@ import lombok.Setter;
 @Getter
 public class TikTokGift {
     private final Gift gift;
-    private User sender;
+    private final User sender;
     @Setter
-    private int amount;
-
+    private long amount;
     @Setter
-    private  boolean streakFinished;
+    private boolean streakFinished;
 
     public TikTokGift(WebcastGiftMessage message) {
-        gift = new Gift(message.getGiftDetails());
-        if (message.hasSender()) {
-            sender = new User(message.getSender());
-        }
-        amount = message.getAmount();
-        streakFinished = message.getRepeatEnd();
+        gift = new Gift(message.getGift());
+        sender = User.MapOrEmpty(message.getUser());
+        amount = message.getComboCount();
+        streakFinished = message.getRepeatEnd() > 0;
     }
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/TopViewer.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/TopViewer.java
index 49d5c4c..486935e 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/TopViewer.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/TopViewer.java
@@ -1,22 +1,18 @@
 package io.github.jwdeveloper.tiktok.events.objects;
+import lombok.Value;
 
-import lombok.Getter;
-
-@Getter
+@Value
 public class TopViewer {
-  private Integer rank;
+   Integer rank;
 
-  private User user;
+   User user;
 
-  private Integer coinsGiven;
+   Integer coinsGiven;
 
   public TopViewer(io.github.jwdeveloper.tiktok.messages.TopViewer viewer)
   {
     rank = viewer.getRank();
-    if(viewer.hasUser())
-    {
-      user = new User(viewer.getUser());
-    }
+    user = User.MapOrEmpty(viewer.getUser());
     coinsGiven = viewer.getCoinsGiven();
   }
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/User.java b/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/User.java
index efb62a8..7342d5f 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/User.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/events/objects/User.java
@@ -20,14 +20,14 @@ public class User {
 
     private Picture picture1080;
 
-    private Integer following;
+    private long following;
 
-    private Integer followers;
+    private long followers;
 
-    private Integer followsHost;
-    public List<Picture> additionalPictures;
+    private long followsHost;
+    private List<Picture> additionalPictures;
 
-    public List<Badge> badges;
+    private List<Badge> badges;
 
     public User(Long userId,
                 String uniqueId,
@@ -71,17 +71,39 @@ public class User {
 
     public User(io.github.jwdeveloper.tiktok.messages.User user) {
         assert user != null;
-        userId = user.getUserId();
-        uniqueId = user.getUniqueId();
+        userId = user.getId();
+        uniqueId = user.getSpecialId();
         nickName = user.getNickname();
-        description = user.getDescription();
-        profilePicture = new Picture(user.getProfilePicture());
-        picture720 = new Picture(user.getPicture720());
-        picture1080 = new Picture(user.getPicture1080());
-        following = user.getFollowerData().getFollowing();
-        followers = user.getFollowerData().getFollowers();
-        followsHost = user.getFollowerData().getFollowsHost();
-        badges = user.getBadgesList().stream().map(Badge::new).toList();
+        description = user.getBioDescription();
+        profilePicture = new Picture(user.getAvatarThumb());
+        picture720 = new Picture(user.getAvatarMedium());
+        picture1080 = new Picture(user.getAvatarLarge());
+        following = user.getFollowInfo().getFollowingCount();
+        followers = user.getFollowInfo().getFollowerCount();
+        followsHost = user.getFollowInfo().getFollowStatus();
+        badges = user.getBadgeListList().stream().map(Badge::new).toList();
         additionalPictures = new ArrayList<>();
     }
+
+
+    public static User MapOrEmpty(io.github.jwdeveloper.tiktok.messages.User user)
+    {
+        if(user != null)
+        {
+            return new User(user);
+        }
+        return new User(0L,
+                "",
+                "",
+                "",
+                Picture.Empty(),
+                Picture.Empty(),
+                Picture.Empty(),
+                Picture.EmptyList(),
+                0,
+                0,
+                0,
+                Badge.EmptyList());
+
+    }
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokEventListenerMethodException.java b/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokEventListenerMethodException.java
new file mode 100644
index 0000000..1d3535c
--- /dev/null
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/exceptions/TikTokEventListenerMethodException.java
@@ -0,0 +1,23 @@
+package io.github.jwdeveloper.tiktok.exceptions;
+
+public class TikTokEventListenerMethodException extends TikTokLiveException
+{
+    public TikTokEventListenerMethodException() {
+    }
+
+    public TikTokEventListenerMethodException(String message) {
+        super(message);
+    }
+
+    public TikTokEventListenerMethodException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public TikTokEventListenerMethodException(Throwable cause) {
+        super(cause);
+    }
+
+    public TikTokEventListenerMethodException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/http/TikTokHttpRequest.java b/API/src/main/java/io/github/jwdeveloper/tiktok/http/TikTokHttpRequest.java
index 1dc0fd3..c454de2 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/http/TikTokHttpRequest.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/http/TikTokHttpRequest.java
@@ -1,13 +1,12 @@
 package io.github.jwdeveloper.tiktok.http;
 
-import java.net.http.HttpRequest;
 import java.util.Map;
 
 public interface TikTokHttpRequest {
-    TikTokHttpRequest SetQueries(Map<String, Object> queries);
+    TikTokHttpRequest setQueries(Map<String, Object> queries);
 
     TikTokHttpRequest setHeader(String key, String value);
-    String Get(String url);
+    String get(String url);
 
-    String Post(String url, HttpRequest.BodyPublisher data);
+    String post(String url);
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/listener/ListenersManager.java b/API/src/main/java/io/github/jwdeveloper/tiktok/listener/ListenersManager.java
new file mode 100644
index 0000000..599a494
--- /dev/null
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/listener/ListenersManager.java
@@ -0,0 +1,11 @@
+package io.github.jwdeveloper.tiktok.listener;
+
+import java.util.List;
+
+public interface ListenersManager
+{
+    List<TikTokEventListener> getBindingModels();
+    void addListener(TikTokEventListener listener);
+
+    void removeListener(TikTokEventListener listener);
+}
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/listener/TikTokEventListener.java b/API/src/main/java/io/github/jwdeveloper/tiktok/listener/TikTokEventListener.java
new file mode 100644
index 0000000..1a51822
--- /dev/null
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/listener/TikTokEventListener.java
@@ -0,0 +1,6 @@
+package io.github.jwdeveloper.tiktok.listener;
+
+public interface TikTokEventListener
+{
+
+}
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveClient.java b/API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveClient.java
index 43fb9d9..c48e089 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveClient.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/live/LiveClient.java
@@ -1,11 +1,19 @@
 package io.github.jwdeveloper.tiktok.live;
 
+import io.github.jwdeveloper.tiktok.listener.ListenersManager;
+
 public interface LiveClient {
 
+    // Connects to the live stream.
     void connect();
 
+    // Disconnects the connection.
     void disconnect();
 
+    // Gets the meta information about all gifts.
     GiftManager getGiftManager();
+
+    // Gets the current room info from TikTok API including streamer info, room status and statistics.
     LiveRoomInfo getRoomInfo();
+    ListenersManager getListenersManager();
 }
diff --git a/API/src/main/proto/tiktokSchema.proto b/API/src/main/proto/tiktokSchema.proto
index a63ffe7..8df018e 100644
--- a/API/src/main/proto/tiktokSchema.proto
+++ b/API/src/main/proto/tiktokSchema.proto
@@ -156,104 +156,934 @@ message ValueLabel {
   string label3 = 11;
 }
 
+// @Text
+message Text {
+  string key = 1;
+  string defaultPattern = 2;
+  TextFormat defaultFormat = 3;
+  repeated TextPiece piecesList = 4;
 
-// Badges earned by Users
-message Badge {
-  uint32 data1 = 1;
-  uint32 data2 = 2;
-  uint32 data3 = 3;
-  uint32 data4 = 4;
-  string shortUrl = 10;
-  uint32 data5 = 11;
-  IdData badgeId = 12;
-  /*
-   Typically either 20, 21 or 23 is populated.
-   More than one is not populated at once.
-  */
-  repeated BadgeImage imageBadges = 20; // Seems to hold images (top gifter, sub) with no extra data
-  repeated BadgeText textBadges = 21; // Holds badge info (moderator)
-  BadgeComplex complexBadge = 23; // Seems to hold image badges but with data (Level badge, sub level w/ name, etc)
-
-  message BadgeText {
-    string type = 2;
-    string name = 3;
+  message TextPiece {
+    int32 type = 1;
+    TextFormat format = 2;
+    string stringValue = 11;
+    TextPieceUser userValue = 21;
+    TextPieceGift giftValue = 22;
+    TextPiecePatternRef patternRefValue = 24;
   }
 
-  message BadgeImage {
-    uint32 displayType = 1; // Is an Enum
-    Picture image = 2;
+  message TextFormat {
+    string color = 1;
+    bool bold = 2;
+    bool italic = 3;
+    int32 weight = 4;
+    int32 italicAngle = 5;
+    int32 fontSize = 6;
+    bool useHeighLightColor = 7;
+    bool useRemoteClor = 8;
   }
 
-  message BadgeComplex {
-    uint32 data1 = 1;
-    //string imageUrl = 2; Protocol message had invalid UTF-8
-    string data = 4;
-    DataContainer detail1 = 5;
-    string data2 = 6;
-    BadgeText detail2 = 11;
-    BadgeText detail3 = 12;
-    uint32 data3 = 15;
-    uint32 data4 = 16;
+  message TextPieceGift {
+    int64 giftId = 1;
+   // PatternRef nameRef = 2;
+   // ShowType showType = 3; // Enum
+    int64 colorId = 4;
+  }
+
+  message TextPiecePatternRef {
+    string key = 1;
+    string defaultPattern = 2;
+  }
+
+  message TextPieceUser {
+    User user = 1;
+    bool withColon = 2;
+  }
+
+}
+
+
+// @Image
+message Image {
+  repeated string urlList = 1;
+  string uri = 2;
+  int64 height = 3;
+  int64 width = 4;
+  string avgColor = 5;
+  int32 imageType = 6;
+  string openWebUrl = 7;
+  Content content = 8;
+  bool isAnimated = 9;
+
+
+  // @Content
+  // proto.webcast.data.Image
+  message Content {
+    string name = 1;
+    string fontColor = 2;
+    int64 level = 3;
+  }
+
+}
+
+
+// @Common (header)
+message Common {
+  string method = 1;
+  int64 msgId = 2;
+  int64 roomId = 3;
+  int64 createTime = 4;
+  int32 monitor = 5;
+  bool isShowMsg = 6;
+  string describe = 7;
+  Text displayText = 8;
+  int64 foldType = 9;
+  int64 anchorFoldType = 10;
+  int64 priorityScore = 11;
+  string logId = 12;
+  string msgProcessFilterK = 13;
+  string msgProcessFilterV = 14;
+  string fromIdc = 15;
+  string toIdc = 16;
+  repeated string filterMsgTagsList = 17;
+  LiveMessageSEI sei = 18;
+  LiveMessageID dependRootId = 19;
+  LiveMessageID dependId = 20;
+  int64 anchorPriorityScore = 21;
+  int64 roomMessageHeatLevel = 22;
+  int64 foldTypeForWeb = 23;
+  int64 anchorFoldTypeForWeb = 24;
+  int64 clientSendTime = 25;
+  IMDispatchStrategy dispatchStrategy = 26; // Enum
+
+  message LiveMessageSEI {
+    LiveMessageID uniqueId = 1;
+    int64 timestamp = 2;
+  }
+
+  message LiveMessageID {
+    string primaryId = 1;
+    string messageScene = 2;
+  }
+
+  enum IMDispatchStrategy {
+    IM_DISPATCH_STRATEGY_DEFAULT = 0;
+    IM_DISPATCH_STRATEGY_BYPASS_DISPATCH_QUEUE = 1;
   }
 }
 
-// Details about a Gift
-message Gift {
-  Picture image = 1;
-  string description = 2;
-  int32 data1 = 4;
-  uint64 id = 5; // Gift-Id
-  int32 data2 = 7;
-  int32 data3 = 10;
-  uint32 giftType = 11; // SHOULD BE AN ENUM?
-  uint32 coinCount = 12; // Value of Gift
-  int32 data4 = 13;
-  uint32 data5 = 14;
-  Picture picture = 15; // Additional
-  string name = 16; // Name for Gift
-  Picture coloredImage = 21; // Same as image, but with different color
-  uint32 data7 = 38;
-  uint32 data8 = 42;
-  uint32 data9 = 51;
-  repeated GiftDetails details = 102;
-  GiftMasks masks = 104;
-  uint32 data10 = 105;
-  string data11 = 106;
 
-  message GiftDetails {
-    uint32 data1 = 1;
-    string name = 2;
-    repeated string colors = 3;
-    Picture image = 4;
-    Picture icon = 5;
-    uint32 data2 = 6;
-    uint32 data3 = 7;
+// @Badge
+message BadgeStruct {
+  BadgeDisplayType displayType = 1; // Enum
+  BadgePriorityType priorityType = 2; // Enum
+  BadgeSceneType sceneType = 3; // Enum
+  Position position = 4; // Enum
+  DisplayStatus displayStatus = 5; // Enum
+  int64 greyedByClient = 6;
+  ExhibitionType exhibitionType = 7; // Enum
+  string openweburl = 10;
+  bool display = 11;
+ // PrivilegeLogExtra privilegeLogExtra = 12;
+  repeated ImageBadge image = 20;
+  repeated TextBadge text = 21;
+  StringBadge str = 22;
+  CombineBadge combine = 23;
+
+
+  message CombineBadge {
+    BadgeDisplayType displayType = 1; // Enum
+    Image icon = 2;
+    TextBadge text = 3;
+    string str = 4;
+   // repeated PaddingInfo padding = 5;
+   // FontStyle fontStyle = 6;
+    ProfileCardPanel profileCardPanel = 7;
+    CombineBadgeBackground background = 11;
+    CombineBadgeBackground backgroundDarkMode = 12;
+    bool iconAutoMirrored = 13;
+    bool backgroundAutoMirrored = 14;
+    int32 publicScreenShowStyle = 15;
+    int32 personalCardShowStyle = 16;
+    int32 ranklistOnlineAudienceShowStyle = 17;
+    int32 multiGuestShowStyle = 18;
+  //  repeated PaddingInfo paddingNewFont = 20;
   }
 
-  message GiftMasks {
-    GiftMask mask1 = 3;
-    GiftMask mask2 = 4;
+  message ProfileContent {
+    bool useContent = 1;
+    repeated IconConfig iconList = 2;
+    NumberConfig numberConfig = 3;
+  }
 
-    message GiftMask {
-      uint32 mask = 13; // BitMask (EnumFlags?)
+  message ProjectionConfig {
+    bool useProjection = 1;
+    Image icon = 2;
+  }
+
+  message NumberConfig {
+    int64 number = 1;
+    //FontStyle fontStyle = 2;
+    CombineBadgeBackground background = 3;
+  }
+
+
+  message ProfileCardPanel {
+    bool useNewProfileCardStyle = 1;
+    BadgeTextPosition badgeTextPosition = 2; // Enum
+    ProjectionConfig projectionConfig = 3;
+    ProfileContent profileContent = 4;
+  }
+
+  message CombineBadgeBackground {
+    Image image = 1;
+    string backgroundColorCode = 2;
+    string borderColorCode = 3;
+  }
+
+  message ImageBadge {
+    BadgeDisplayType displayType = 1; // Enum
+    Image image = 2;
+  }
+
+  message TextBadge {
+    BadgeDisplayType displayType = 1; // Enum
+    string key = 2;
+    string defaultPattern = 3;
+    repeated string piecesList = 4;
+  }
+
+  message IconConfig {
+    Image icon = 1;
+    CombineBadgeBackground background = 2;
+  }
+
+
+  message StringBadge {
+    BadgeDisplayType displayType = 1; // Enum
+    string str = 2;
+  }
+
+  enum DataCase {
+    DATA_NOT_SET = 0;
+    IMAGE = 20;
+    TEXT = 21;
+    STR = 22;
+    COMBINE = 23;
+  }
+
+  enum BadgeDisplayType {
+    BADGEDISPLAYTYPE_UNKNOWN = 0;
+    BADGEDISPLAYTYPE_IMAGE = 1;
+    BADGEDISPLAYTYPE_TEXT = 2;
+    BADGEDISPLAYTYPE_STRING = 3;
+    BADGEDISPLAYTYPE_COMBINE = 4;
+  }
+
+  enum BadgePriorityType {
+    BADGEPRIORITYTYPE_UNKNOWN = 0;
+    BADGEPRIORITYTYPE_STRONGRELATION = 10;
+    BADGEPRIORITYTYPE_PLATFORM = 20;
+    BADGEPRIORITYTYPE_RELATION = 30;
+    BADGEPRIORITYTYPE_ACTIVITY = 40;
+    BADGEPRIORITYTYPE_RANKLIST = 50;
+  }
+
+  enum BadgeSceneType {
+    BADGESCENETYPE_UNKNOWN = 0;
+    BADGESCENETYPE_ADMIN = 1;
+    BADGESCENETYPE_FIRSTRECHARGE = 2;
+    BADGESCENETYPE_FRIENDS = 3;
+    BADGESCENETYPE_SUBSCRIBER = 4;
+    BADGESCENETYPE_ACTIVITY = 5;
+    BADGESCENETYPE_RANKLIST = 6;
+    BADGESCENETYPE_NEWSUBSCRIBER = 7;
+    BADGESCENETYPE_USERGRADE = 8;
+    BADGESCENETYPE_STATECONTROLLEDMEDIA = 9;
+    BADGESCENETYPE_FANS = 10;
+    BADGESCENETYPE_LIVEPRO = 11;
+  }
+
+  enum DisplayStatus {
+    DISPLAYSTATUSNORMAL = 0;
+    DISPLAYSTATUSSHADOW = 1;
+  }
+
+  enum ExhibitionType {
+    EXHIBITIONTYPE_DEFAULT = 0;
+    EXHIBITIONTYPE_FOLD = 1;
+    EXHIBITIONTYPE_PUBLICSCREEN = 2;
+  }
+  enum BadgeTextPosition {
+    BADGETEXTPOSITIONUNKNOWN = 0;
+    BADGETEXTPOSITIONRIGHT = 1;
+    BADGETEXTPOSITIONBELOW = 2;
+  }
+
+  enum Position {
+    POSITIONUNKNOWN = 0;
+    POSITIONLEFT = 1;
+    POSITIONRIGHT = 2;
+  }
+
+
+
+}
+
+message  WebcastGiftMessage {
+  Common common = 1;
+  int64 giftId = 2;
+  int64 fanTicketCount = 3;
+  int64 groupCount = 4;
+  int64 repeatCount = 5;
+  int64 comboCount = 6;
+  User user = 7;
+  User toUser = 8;
+  int32 repeatEnd = 9;
+  //TextEffect textEffect = 10;
+  int64 groupId = 11;
+  int64 incomeTaskgifts = 12;
+  int64 roomFanTicketCount = 13;
+  GiftIMPriority priority = 14;
+  GiftStruct gift = 15;
+  string logId = 16;
+  int64 sendType = 17;
+  PublicAreaCommon publicAreaCommon = 18;
+  Text trayDisplayText = 19;
+  int64 bannedDisplayEffects = 20;
+  GiftTrayInfo trayInfo = 21;
+  string monitorExtra = 22;
+  GiftMonitorInfo monitorInfo = 23;
+  int64 colorId = 24;
+  bool isFirstSent = 25;
+  Text displayTextForAnchor = 26;
+  Text displayTextForAudience = 27;
+  string orderId = 28;
+  MsgFilter msgFilter = 30;
+  repeated LynxGiftExtra lynxExtraList = 31;
+  UserIdentity userIdentity = 32;
+ // LinkmicGiftExpressionStrategy linkmicGiftExpressionStrategy = 34; // Enum
+ // FlyingMicResources flyingMicResources = 35;
+  bool disableGiftTracking = 36;
+
+  message GiftIMPriority {
+    repeated int64 queueSizesList = 1;
+    int64 selfQueuePriority = 2;
+    int64 priority = 3;
+  }
+
+  message PublicAreaCommon {
+    Image userLabel = 1;
+    int64 userConsumeInRoom = 2;
+  }
+
+  message GiftTrayInfo {
+    Image trayDynamicImg = 1;
+    bool canMirror = 2;
+  }
+
+  message GiftMonitorInfo {
+    int64 anchorId = 1;
+    int64 profitapiMessageDur = 2;
+    int64 sendGiftProfitApiStartMs = 3;
+    int64 sendGiftProfitCoreStartMs = 4;
+    int64 sendGiftReqStartMs = 5;
+    int64 sendGiftSendMessageSuccessMs = 6;
+    int64 sendProfitapiDur = 7;
+    int64 toUserId = 8;
+    int64 sendGiftStartClientLocalMs = 9;
+    string fromPlatform = 10;
+    string fromVersion = 11;
+  }
+
+  message MsgFilter {
+    bool isGifter = 1;
+    bool isSubscribedToAnchor = 2;
+  }
+
+  message LynxGiftExtra {
+    int64 id = 1;
+    int64 code = 2;
+    int64 type = 3;
+    repeated string paramsList = 4;
+    string extra = 5;
+  }
+
+  message UserIdentity {
+    bool isGiftGiverOfAnchor = 1;
+    bool isSubscriberOfAnchor = 2;
+    bool isMutualFollowingWithAnchor = 3;
+    bool isFollowerOfAnchor = 4;
+    bool isModeratorOfAnchor = 5;
+    bool isAnchor = 6;
+  }
+}
+
+// @Gift
+message GiftStruct {
+  Image image = 1;
+  string describe = 2;
+  int64 duration = 4;
+  int64 id = 5;
+  bool forLinkmic = 7;
+  bool combo = 10;
+  int32 type = 11;
+  int32 diamondCount = 12;
+  bool isDisplayedOnPanel = 13;
+  int64 primaryEffectId = 14;
+  Image giftLabelIcon = 15;
+  string name = 16;
+  Image icon = 21;
+  string goldEffect = 24;
+  Image previewImage = 47;
+  GiftPanelBanner giftPanelBanner = 48;
+  bool isBroadcastGift = 49;
+  bool isEffectBefview = 50;
+  bool isRandomGift = 51;
+  bool isBoxGift = 52;
+  bool canPutInGiftBox = 53;
+ // GiftBoxInfo giftBoxInfo = 54;
+
+
+  // @GiftPanelBanner
+  // proto.webcast.data.GiftStruct
+  message GiftPanelBanner {
+    Text displayText = 1;
+    Image leftIcon = 2;
+    string schemaUrl = 3;
+    repeated string bgColorValuesList = 5;
+    string bannerLynxUrl = 6;
+  }
+
+
+  // @GiftRandomEffectInfo
+  // proto.webcast.data.GiftStruct
+  message GiftRandomEffectInfo {
+    RandomGiftPanelBanner randomGiftPanelBanner = 1;
+    repeated int64 effectIdsList = 2;
+    string hostKey = 3;
+    string audienceKey = 4;
+    RandomGiftBubble randomGiftBubble = 5;
+  }
+
+
+  // @RandomGiftBubble
+  // proto.webcast.data.GiftStruct
+  message RandomGiftBubble {
+    string displayText = 1;
+    Image iconDynamicEffect = 2;
+  }
+
+
+  // @RandomGiftPanelBanner
+  // proto.webcast.data.GiftStruct
+  message RandomGiftPanelBanner {
+    Image bgImage = 1;
+    Image shadingImage = 2;
+    int64 targetNum = 3;
+    int64 collectNum = 4;
+    string displayText = 5;
+    Image leftIcon = 6;
+    string schemaUrl = 7;
+    repeated string bgColorValuesList = 8;
+    int64 round = 9;
+  }
+
+}
+
+
+// @User
+message User {
+  int64 id = 1;
+  string nickname = 3;
+  string bioDescription = 5;
+  Image avatarThumb = 9;
+  Image avatarMedium = 10;
+  Image avatarLarge = 11;
+  bool verified = 12;
+  int32 status = 15;
+  int64 createTime = 16;
+  int64 modifyTime = 17;
+  int32 secret = 18;
+  string shareQrcodeUri = 19;
+  repeated Image badgeImageList = 21;
+  FollowInfo followInfo = 22;
+  PayGrade payGrade = 23;
+  FansClub fansClub = 24;
+  Border border = 25;
+  string specialId = 26;
+  Image avatarBorder = 27;
+  Image medal = 28;
+  repeated Image realTimeIconsList = 29;
+  repeated Image newRealTimeIconsList = 30;
+  int64 topVipNo = 31;
+  UserAttr userAttr = 32;
+  OwnRoom ownRoom = 33;
+  int64 payScore = 34;
+  int64 ticketCount = 35;
+  int64 linkMicStats = 37; // @warning Enum not found, should be LinkMicStats
+  string displayId = 38;
+  bool withCommercePermission = 39;
+  bool withFusionShopEntry = 40;
+  AnchorLevel webcastAnchorLevel = 42;
+  string verifiedContent = 43;
+  AuthorStats authorStats = 44;
+  repeated User topFansList = 45;
+  string secUid = 46;
+  int32 userRole = 47;
+  ActivityInfo activityReward = 49;
+  Image personalCard = 52;
+  AuthenticationInfo authenticationInfo = 53;
+  repeated Image mediaBadgeImageList = 57;
+  repeated int64 commerceWebcastConfigIdsList = 60;
+  repeated Border borderList = 61;
+  ComboBadgeInfo comboBadgeInfo = 62;
+  SubscribeInfo subscribeInfo = 63;
+  repeated BadgeStruct badgeList = 64;
+  repeated int64 mintTypeLabelList = 65;
+  FansClubInfo fansClubInfo = 66;
+  bool allowFindByContacts = 1002;
+  bool allowOthersDownloadVideo = 1003;
+  bool allowOthersDownloadWhenSharingVideo = 1004;
+  bool allowShareShowProfile = 1005;
+  bool allowShowInGossip = 1006;
+  bool allowShowMyAction = 1007;
+  bool allowStrangeComment = 1008;
+  bool allowUnfollowerComment = 1009;
+  bool allowUseLinkmic = 1010;
+  AnchorLevel anchorLevel = 1011;
+  Image avatarJpg = 1012;
+  string bgImgUrl = 1013;
+  int32 blockStatus = 1016;
+  int32 commentRestrict = 1017;
+  string constellation = 1018;
+  int32 disableIchat = 1019;
+  int64 enableIchatImg = 1020;
+  int32 exp = 1021;
+  int64 fanTicketCount = 1022;
+  bool foldStrangerChat = 1023;
+  int64 followStatus = 1024;
+  int32 ichatRestrictType = 1027;
+  string idStr = 1028;
+  bool isFollower = 1029;
+  bool isFollowing = 1030;
+  bool needProfileGuide = 1031;
+  int64 payScores = 1032;
+  bool pushCommentStatus = 1033;
+  bool pushDigg = 1034;
+  bool pushFollow = 1035;
+  bool pushFriendAction = 1036;
+  bool pushIchat = 1037;
+  bool pushStatus = 1038;
+  bool pushVideoPost = 1039;
+  bool pushVideoRecommend = 1040;
+  UserStats stats = 1041;
+  string verifiedReason = 1043;
+  bool withCarManagementPermission = 1044;
+  repeated LiveEventInfo upcomingEventList = 1045;
+  string scmLabel = 1046;
+  EcommerceEntrance ecommerceEntrance = 1047;
+  bool isBlock = 1048;
+
+  message LiveEventInfo {
+    int64 eventId = 1;
+    int64 startTime = 2;
+    int64 duration = 3;
+    string title = 4;
+    string description = 5;
+    bool hasSubscribed = 6;
+    bool isPaidEvent = 7;
+    int64 ticketAmount = 8;
+    int64 payMethod = 9; // @warning Enum not found, should be PayMethod
+
+
+    // @EventPayMethod
+    // webcast.data.LiveEventInfo
+    // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js
+    enum EventPayMethod {
+      EVENTPAYMETHODINVALID = 0;
+      EVENTPAYMETHODCOINS = 1;
+      EVENTPAYMETHODCASH = 2;
     }
+
+
+    // @WalletPackage
+    // proto.webcast.data.LiveEventInfo
+    // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js
+    message WalletPackage {
+      string iapId = 1;
+      string usdPriceShow = 2;
+    }
+
   }
+
+
+  // @ActivityInfo
+  // proto.webcast.data.User 
+  // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+  message ActivityInfo {
+    Image badge = 1;
+    Image storytag = 2;
+  }
+
+
+
+  // @AnchorLevel
+  // proto.webcast.data.User 
+  // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+  message AnchorLevel {
+    int64 level = 1;
+    int64 experience = 2;
+    int64 lowestExperienceThisLevel = 3;
+    int64 highestExperienceThisLevel = 4;
+    int64 taskStartExperience = 5;
+    int64 taskStartTime = 6;
+    int64 taskDecreaseExperience = 7;
+    int64 taskTargetExperience = 8;
+    int64 taskEndTime = 9;
+    Image profileDialogBg = 10;
+    Image profileDialogBgBack = 11;
+    Image stageLevel = 12;
+    Image smallIcon = 13;
+  }
+
+
+  // @AuthenticationInfo
+  // proto.webcast.data.User 
+  // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+  message AuthenticationInfo {
+    string customVerify = 1;
+    string enterpriseVerifyReason = 2;
+    Image authenticationBadge = 3;
+  }
+
+
+  // @AuthorStats
+  // proto.webcast.data.User 
+  // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+  message AuthorStats {
+    int64 videoTotalCount = 1;
+    int64 videoTotalPlayCount = 2;
+    int64 videoTotalShareCount = 3;
+    int64 videoTotalSeriesCount = 4;
+    int64 varietyShowPlayCount = 5;
+    int64 videoTotalFavoriteCount = 6;
+  }
+
+
+  // @Border
+  // proto.webcast.data.User 
+  // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+  message Border {
+    Image icon = 1;
+    int64 level = 2;
+    string source = 3;
+    Image profileDecorationRibbon = 4;
+    string avatarBackgroundColor = 7;
+    string avatarBackgroundBorderColor = 8;
+  }
+
+
+  // @ComboBadgeInfo
+  // proto.webcast.data.User 
+  // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+  message ComboBadgeInfo {
+    Image icon = 1;
+    int64 comboCount = 2;
+  }
+
+
+  // @EcommerceEntrance
+  // proto.webcast.data.User 
+  // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+  message EcommerceEntrance {
+    EntranceType entranceType = 1; // Enum
+    CreatorType creatorType = 2; // Enum
+    string schema = 3;
+    ShopEntranceInfo shopEntranceInfo = 4;
+    ShowcaseEntranceInfo showcaseEntranceInfo = 5;
+
+
+    // @CreatorType
+    // webcast.data.User.EcommerceEntrance 
+    // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+    enum CreatorType {
+      UNDEFINED = 0;
+      OFFICIAL = 1;
+      MARKET = 2;
+      NORMAL = 3;
+    }
+
+
+    // @EntranceType
+    // webcast.data.User.EcommerceEntrance 
+    // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+    enum EntranceType {
+      PROFILE = 0;
+      SHOWCASE = 1;
+      SHOP = 2;
+    }
+
+
+    // @ShopEntranceInfo
+    // proto.webcast.data.User.EcommerceEntrance 
+    // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+    message ShopEntranceInfo {
+      string shopId = 1;
+      string shopName = 2;
+      string shopRating = 3;
+      StoreLabel storeLabel = 4;
+      string formatSoldCount = 5;
+      int64 soldCount = 6;
+      int32 expRatePercentile = 7;
+      string expRateTopDisplay = 8;
+      int32 rateDisplayStyle = 9;
+      bool showRateNotApplicable = 10;
+
+
+      // @StoreLabel
+      // proto.webcast.data.User.EcommerceEntrance.ShopEntranceInfo 
+      // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+      message StoreLabel {
+        StoreOfficialLabel officialLabel = 1;
+        bool isBytemall = 2;
+
+
+        // @StoreBrandLabelType
+        // webcast.data.User.EcommerceEntrance.ShopEntranceInfo.StoreLabel 
+        // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+        enum StoreBrandLabelType {
+          NONE = 0;
+          OFFICIAL = 1;
+          AUTHORIZED = 2;
+          STORE_BRAND_LABEL_TYPE_BLUE_V = 3;
+          STORE_BRAND_LABEL_TYPE_TOP_CHOICE = 4;
+        }
+
+
+        // @StoreOfficialLabel
+        // proto.webcast.data.User.EcommerceEntrance.ShopEntranceInfo.StoreLabel 
+        // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+        message StoreOfficialLabel {
+          ShopLabelImage labelImageLight = 1;
+          ShopLabelImage labelImageDark = 2;
+          int64 labelType = 3; // @warning Enum not found, should be LabelType
+          string labelTypeStr = 4;
+
+
+          // @ShopLabelImage
+          // proto.webcast.data.User.EcommerceEntrance.ShopEntranceInfo.StoreLabel.StoreOfficialLabel 
+          // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+          message ShopLabelImage {
+            int32 height = 1;
+            int32 width = 2;
+            string minetype = 3;
+            string thumbUri = 4;
+            repeated string thumbUriList = 5;
+            string uri = 6;
+            repeated string urlList = 7;
+            string color = 8;
+          }
+
+        }
+
+      }
+
+    }
+
+
+    // @ShowcaseEntranceInfo
+    // proto.webcast.data.User.EcommerceEntrance 
+    // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+    message ShowcaseEntranceInfo {
+      string formatSoldCount = 1;
+      int64 soldCount = 2;
+    }
+
+  }
+
+
+  // @FansClub
+  // proto.webcast.data.User 
+  // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+  message FansClub {
+    FansClubData data = 1;
+
+
+    // @FansClubData
+    // proto.webcast.data.User.FansClub 
+    // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+    message FansClubData {
+      string clubName = 1;
+      int32 level = 2;
+      UserFansClubStatus userFansClubStatus = 3; // Enum
+      repeated int64 availableGiftIdsList = 5;
+      int64 anchorId = 6;
+
+
+      // @BadgeIcon
+      // webcast.data.User.FansClub.FansClubData 
+      // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+      enum BadgeIcon {
+        UNKNOWN = 0;
+        ICON = 1;
+        SMALLICON = 2;
+      }
+
+
+      // @UserFansClubStatus
+      // webcast.data.User.FansClub.FansClubData 
+      // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+      enum UserFansClubStatus {
+        NOTJOINED = 0;
+        ACTIVE = 1;
+        INACTIVE = 2;
+      }
+
+    }
+
+
+    // @PreferntialType
+    // webcast.data.User.FansClub 
+    // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+    enum PreferntialType {
+      PRESONALPROFILE = 0;
+      OTHERROOM = 1;
+    }
+
+  }
+
+
+  // @FansClubInfo
+  // proto.webcast.data.User 
+  // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+  message FansClubInfo {
+    bool isSleeping = 1;
+    int64 fansLevel = 2;
+    int64 fansScore = 3;
+    Image badge = 4;
+    int64 fansCount = 5;
+  }
+
+
+  // @FollowInfo
+  // proto.webcast.data.User 
+  // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+  message FollowInfo {
+    int64 followingCount = 1;
+    int64 followerCount = 2;
+    int64 followStatus = 3;
+    int64 pushStatus = 4;
+  }
+
+
+  // @OwnRoom
+  // proto.webcast.data.User 
+  // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+  message OwnRoom {
+    repeated int64 roomIdsList = 1;
+    repeated string roomIdsStrList = 2;
+  }
+
+
+  // @PayGrade
+  // proto.webcast.data.User 
+  // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+  message PayGrade {
+    Image diamondIcon = 2;
+    string name = 3;
+    Image icon = 4;
+    string nextName = 5;
+    int64 level = 6;
+    Image nextIcon = 7;
+    string gradeDescribe = 13;
+    repeated GradeIcon gradeIconList = 14;
+    int64 screenChatType = 15;
+    Image imIcon = 16;
+    Image imIconWithLevel = 17;
+    Image liveIcon = 18;
+    Image newImIconWithLevel = 19;
+    Image newLiveIcon = 20;
+    int64 upgradeNeedConsume = 21;
+    string nextPrivileges = 22;
+    Image background = 23;
+    Image backgroundBack = 24;
+    int64 score = 25;
+    string gradeBanner = 1001;
+    Image profileDialogBg = 1002;
+    Image profileDialogBgBack = 1003;
+
+
+    // @GradeIcon
+    // proto.webcast.data.User.PayGrade 
+    // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+    message GradeIcon {
+      Image icon = 1;
+      int64 iconDiamond = 2;
+      int64 level = 3;
+      string levelStr = 4;
+    }
+
+  }
+
+
+  // @SubscribeBadge
+  // proto.webcast.data.User 
+  // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+  message SubscribeBadge {
+    Image originImg = 3;
+    Image previewImg = 4;
+  }
+
+
+  // @SubscribeInfo
+  // proto.webcast.data.User 
+  // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+  message SubscribeInfo {
+    bool qualification = 1;
+    bool isSubscribe = 2;
+    SubscribeBadge badge = 3;
+    bool enableSubscription = 4;
+    int64 subscriberCount = 5;
+    bool isInGracePeriod = 6;
+    bool isSubscribedToAnchor = 7;
+    bool userGiftSubAuth = 9;
+    bool anchorGiftSubAuth = 10;
+  }
+
+
+  // @UserAttr
+  // proto.webcast.data.User 
+  // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+  message UserAttr {
+    bool isMuted = 1;
+    bool isAdmin = 2;
+    bool isSuperAdmin = 3;
+    int64 muteDuration = 4;
+  }
+
+
+  // @UserStats
+  // proto.webcast.data.User 
+  // C:\Users\ja\RiderProjects\TikTokProBufferGenerator\Application\output\sources\test.js  
+  message UserStats {
+    int64 id = 1;
+    string idStr = 2;
+    int64 followingCount = 3;
+    int64 followerCount = 4;
+    int64 recordCount = 5;
+    int64 totalDuration = 6;
+    int64 dailyFanTicketCount = 7;
+    int64 dailyIncome = 8;
+    int64 itemCount = 9;
+    int64 favoriteItemCount = 10;
+    int64 diamondConsumedCount = 12;
+    int64 tuwenItemCount = 13;
+  }
+
 }
 
-message GiftDetailsData {
-  uint32 data1 = 1;
-  TikTokColor color = 2;
-  string data2 = 11;
-  UserContainer user = 21;
-  GiftDataDetailed details = 22;
-}
 
-message GiftDataDetailed {
-  uint32 data1 = 1;
-  StringData strings = 2;
-  uint32 data2 = 3;
-  int32 data3 = 4;
-}
 
 // Receipt for sending a Gift. Names are mostly taken from JSON
 message GiftReceipt {
@@ -295,7 +1125,7 @@ message GoalUpdateDetails {
 
   message GoalUpdateGiftData {
     string name = 1;
-    Picture picture = 2;
+    Image Image = 2;
     uint32 data1 = 3;
     uint32 data2 = 4;
   }
@@ -303,7 +1133,7 @@ message GoalUpdateDetails {
 
 message GoalUpdateUser {
   uint64 id = 1;
-  Picture profilePicture = 2;
+  Image profileImage = 2;
   string nickname = 3;
   uint64 timeStamp = 4;
   string idString = 5;
@@ -315,11 +1145,11 @@ message GoalUpdateUser {
     uint32 data1 = 1;
     uint32 data2 = 2;
     uint32 data3 = 3;
-    GoalUserPictureContainer links = 10;
+    GoalUserImageContainer links = 10;
 
-    message GoalUserPictureContainer {
+    message GoalUserImageContainer {
       uint32 data1 = 1;
-      Picture links = 2;
+      Image links = 2;
     }
   }
 }
@@ -374,17 +1204,6 @@ message RankTextMessage {
   repeated MessageDetails details = 4;
 }
 
-// Links to Image-Files on the TikTok CDN
-message Picture {
-  repeated string urls = 1; // Usually has 3 different urls with different sizes/extensions
- // string prefix = 2; // uri not working
-  uint32 data1 = 3;
-  uint32 data2 = 4;
-  string color = 5;
-  uint32 data3 = 6;
-  string additionalUrl = 7;
-  string data4 = 8;
-}
 
 message Ranking {
   string type = 1;
@@ -405,47 +1224,6 @@ message TopViewer {
   uint32 rank = 3; // Index in list
 }
 
-// TikTok-User
-message User {
-  uint64 userId = 1;
-  uint32 data1 = 2;
-  string nickname = 3; // Name set in Profile
-  string description = 5; // User-Description
-  Picture profilePicture = 9; // Avatar
-  Picture picture720 = 10; // 720p
-  Picture picture1080 = 11; // 1080p
-  int32 status = 15;
-  int64 createTime = 16;
-  int64 modifyTime = 17;
-  int32 secret = 18;
-  string shareQrcodeUri = 19;
-  repeated Picture additionalPictures = 21;
-  FollowerData followerData = 22;
-//  string userString1 = 23;
-  UserRanking userRank1 = 25;
- // string userString2 = 32;
-  uint64 data4 = 37;
-  string uniqueId = 38; // @-ID for user
-  string data5 = 46;
-  UserRanking userRank2 = 61;
-  repeated Badge badges = 64;
-  string userIdString = 1028;
-
-  // Data about Follower-Counts
-  message FollowerData {
-    uint32 following = 1; // Amount this user Follows
-    uint32 followers = 2; // Amount following this user
-    uint32 followsHost = 3; // Relative Role of this User to the Host. IS AN ENUM
-  }
-
-  message UserRanking {
-    Picture img1 = 1;
-    string eventType = 3;
-    Picture img2 = 4;
-    IdData id1 = 5;
-    IdData id2 = 6;
-  }
-}
 
 // Is part of WebcastGiftBroadcastMessage. Thus far not seen sent seperately
 message WebcastRoomNotifyMessage {
@@ -462,6 +1240,22 @@ message WebcastRoomNotifyMessage {
     TikTokColor color = 3;
     repeated GiftDetailsData data = 4;
   }
+
+
+  message GiftDetailsData {
+    uint32 data1 = 1;
+    TikTokColor color = 2;
+    string data2 = 11;
+    UserContainer user = 21;
+    GiftDataDetailed details = 22;
+  }
+
+  message GiftDataDetailed {
+    uint32 data1 = 1;
+    StringData strings = 2;
+    uint32 data2 = 3;
+    int32 data3 = 4;
+  }
 }
 
 /**
@@ -505,11 +1299,11 @@ message SystemMessage {
 message WebcastBarrageMessage {
   MessageHeader header = 1;
   uint32 data1 = 3;
-  Picture picture = 4;
+  Image image = 4;
   BarrageMessage message = 5;
   uint32 data3 = 6;
-  Picture picture2 = 7;
-  Picture picture3 = 8;
+  Image image2 = 7;
+  Image image3 = 8;
   BarrageUser userData = 100;
 
   message BarrageMessage {
@@ -566,7 +1360,7 @@ message WebcastChatMessage {
 
   message ChatImage {
     uint64 data1 = 1;
-    Picture picture = 2;
+    Image Image = 2;
   }
 }
 
@@ -618,7 +1412,7 @@ message WebcastEnvelopeMessage {
     uint32 data3 = 6;
     uint64 timestamp1 = 7;
     string id1string = 8;
-    Picture picture = 9;
+    Image Image = 9;
     string timestamp2string = 10;
     string id2string = 11;
     uint32 data4 = 12;
@@ -629,7 +1423,7 @@ message WebcastEnvelopeMessage {
 message WebcastGiftBroadcastMessage {
   GiftMessageHeader header = 1;
   uint64 data1 = 2;
-  Picture picture = 3;
+  Image Image = 3;
   GiftBroadcastData data = 4;
 
   message GiftBroadcastData {
@@ -655,60 +1449,13 @@ message WebcastGiftBroadcastMessage {
   }
 }
 
-// Gift sent by user
-message WebcastGiftMessage {
-  GiftMessageHeader header = 1;
-  uint64 giftId = 2; // Gift-ID
-  int32 data1 = 3;
-  int32 data2 = 4;
-  uint32 repeatCount = 5; // Index of Message in Streak
-  uint32 amount = 6; // Number of Gifts sent (in Streak)
-  User sender = 7; // User who sent the gift
-  User user2 = 8; // Receiver? Found with text "live_gift_send_message_to_anyuser" (Host sent a gift to a viewer?)
-  bool repeatEnd = 9; // Whether this is the final message in the GiftStreak
-  uint64 serverTime = 11;
-  int32 data3 = 13;
-  GiftData1 data4 = 14;
-  Gift giftDetails = 15; // Details for Gift that was sent
-  string logId = 16; // "202301050654360101042172152C002035"
-  int32 data5 = 17;
-  string data6 = 19;
-  string receiptJson = 22; // Same a GiftReceipt
-  GiftReceipt receipt = 23; // Same as JSON, but deserialized
-  int32 data7 = 24;
-  uint32 data8 = 25;
-  GiftDetails1 firstGift1 = 26;
-  GiftDetails1 firstGift2 = 27;
-  GiftDetails2 data9 = 31;
-  DataContainer data10 = 32;
-  uint32 data11 = 34;
-
-  message GiftData1 {
-   // string data1 = 1; not working
-    uint32 data2 = 2;
-    uint32 data3 = 3;
-  }
-
-  message GiftDetails1 {
-    string eventType = 1;
-    string label = 2;
-    TikTokColor color = 3;
-    GiftDetailsData data = 4;
-  }
-
-  message GiftDetails2 {
-    uint32 data1 = 1;
-    uint32 data2 = 3;
-    repeated string data3 = 4;
-  }
-}
 
 message WebcastGoalUpdateMessage {
   MessageHeader header = 1;
   TypeValue data = 2;
   GoalUpdateData updateData = 3;
   uint64 id = 4;
-  Picture picture = 5;
+  Image Image = 5;
   string userId = 6;
   GoalUpdateDetails details = 7;
   uint32 data2 = 9;
@@ -847,7 +1594,7 @@ message WebcastLinkMicArmies {
   uint64 data1 = 8;
   uint64 data2 = 9;
   uint32 data3 = 10;
-  Picture picture = 11;
+  Image Image = 11;
   uint32 data4 = 12;
   uint32 data5 = 13;
 }
@@ -1093,7 +1840,7 @@ message WebcastRankUpdateMessage {
 message WebcastRoomMessage {
   MessageHeader header = 1;
   string data = 2;
-  Picture picture = 5;
+  Image Image = 5;
   string data2 = 6;
 }
 
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokGiftManager.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokGiftManager.java
index c3d8d60..27f8c5b 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokGiftManager.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokGiftManager.java
@@ -23,10 +23,10 @@ public class TikTokGiftManager implements GiftManager {
     }
 
     public TikTokGift updateActiveGift(WebcastGiftMessage giftMessage) {
-        var giftId = new GiftId(giftMessage.getGiftId(), giftMessage.getSender().getUniqueId());
+        var giftId = new GiftId(giftMessage.getGiftId(), giftMessage.getUser().getIdStr());
         if (activeGifts.containsKey(giftId)) {
             var gift = activeGifts.get(giftId);
-            gift.setAmount(giftMessage.getAmount());
+            gift.setAmount(giftMessage.getComboCount());
         } else {
             var newGift = new TikTokGift(giftMessage);
             activeGifts.put(giftId, newGift);
@@ -34,7 +34,8 @@ public class TikTokGiftManager implements GiftManager {
 
         var gift = activeGifts.get(giftId);
 
-        if (giftMessage.getRepeatEnd()) {
+        if (giftMessage.getRepeatEnd() > 0)
+        {
             gift.setStreakFinished(true);
             activeGifts.remove(giftId);
         }
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java
index 90717b3..aac29aa 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClient.java
@@ -4,8 +4,10 @@ import io.github.jwdeveloper.tiktok.events.messages.TikTokDisconnectedEvent;
 import io.github.jwdeveloper.tiktok.events.messages.TikTokErrorEvent;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveOfflineHostException;
-import io.github.jwdeveloper.tiktok.handlers.TikTokEventHandler;
+import io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver;
 import io.github.jwdeveloper.tiktok.http.TikTokApiService;
+import io.github.jwdeveloper.tiktok.listener.ListenersManager;
+import io.github.jwdeveloper.tiktok.listener.TikTokListenersManager;
 import io.github.jwdeveloper.tiktok.live.ConnectionState;
 import io.github.jwdeveloper.tiktok.live.GiftManager;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
@@ -17,25 +19,28 @@ import java.util.logging.Logger;
 public class TikTokLiveClient implements LiveClient {
     private final TikTokRoomInfo liveRoomInfo;
     private final TikTokGiftManager tikTokGiftManager;
-    private final TikTokApiService apiClient;
+    private final TikTokApiService apiService;
     private final TikTokWebSocketClient webSocketClient;
-    private final TikTokEventHandler tikTokEventHandler;
+    private final TikTokEventObserver tikTokEventHandler;
     private final ClientSettings clientSettings;
+    private final TikTokListenersManager listenersManager;
     private final Logger logger;
 
     public TikTokLiveClient(TikTokRoomInfo tikTokLiveMeta,
                             TikTokApiService tikTokApiService,
                             TikTokWebSocketClient webSocketClient,
                             TikTokGiftManager tikTokGiftManager,
-                            TikTokEventHandler tikTokEventHandler,
+                            TikTokEventObserver tikTokEventHandler,
                             ClientSettings clientSettings,
+                            TikTokListenersManager listenersManager,
                             Logger logger) {
         this.liveRoomInfo = tikTokLiveMeta;
         this.tikTokGiftManager = tikTokGiftManager;
-        this.apiClient = tikTokApiService;
+        this.apiService = tikTokApiService;
         this.webSocketClient = webSocketClient;
         this.tikTokEventHandler = tikTokEventHandler;
         this.clientSettings = clientSettings;
+        this.listenersManager = listenersManager;
         this.logger = logger;
     }
 
@@ -71,8 +76,6 @@ public class TikTokLiveClient implements LiveClient {
         setState(ConnectionState.DISCONNECTED);
     }
 
-
-
     public void tryConnect() {
         if (liveRoomInfo.hasConnectionState(ConnectionState.CONNECTED))
             throw new TikTokLiveException("Already connected");
@@ -82,9 +85,9 @@ public class TikTokLiveClient implements LiveClient {
         logger.info("Connecting");
         setState(ConnectionState.CONNECTING);
 
-        var roomId = apiClient.fetchRoomId(liveRoomInfo.getUserName());
+        var roomId = apiService.fetchRoomId(liveRoomInfo.getUserName());
         liveRoomInfo.setRoomId(roomId);
-        var roomData = apiClient.fetchRoomInfo();
+        var roomData = apiService.fetchRoomInfo();
         if (roomData.getStatus() == 0 || roomData.getStatus() == 4) {
             throw new TikTokLiveOfflineHostException("LiveStream for HostID could not be found. Is the Host online?");
         }
@@ -92,10 +95,10 @@ public class TikTokLiveClient implements LiveClient {
         if (clientSettings.isDownloadGiftInfo())
         {
             logger.info("Fetch Gift info");
-            var gifts = apiClient.fetchAvailableGifts();
+            var gifts = apiService.fetchAvailableGifts();
             tikTokGiftManager.loadGifsInfo(gifts);
         }
-        var clientData = apiClient.fetchClientData();
+        var clientData = apiService.fetchClientData();
         webSocketClient.start(clientData, this);
         setState(ConnectionState.CONNECTED);
     }
@@ -104,6 +107,11 @@ public class TikTokLiveClient implements LiveClient {
     public LiveRoomInfo getRoomInfo() {
         return liveRoomInfo;
     }
+    @Override
+    public ListenersManager getListenersManager()
+    {
+        return listenersManager;
+    }
 
     @Override
     public GiftManager getGiftManager() {
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClientBuilder.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClientBuilder.java
index 8b47c81..9ece326 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClientBuilder.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveClientBuilder.java
@@ -5,17 +5,20 @@ import io.github.jwdeveloper.tiktok.events.TikTokEventBuilder;
 import io.github.jwdeveloper.tiktok.events.TikTokEventConsumer;
 import io.github.jwdeveloper.tiktok.events.messages.*;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
-import io.github.jwdeveloper.tiktok.handlers.TikTokEventHandler;
+import io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver;
 import io.github.jwdeveloper.tiktok.handlers.TikTokMessageHandlerRegistration;
 import io.github.jwdeveloper.tiktok.http.TikTokApiService;
 import io.github.jwdeveloper.tiktok.http.TikTokCookieJar;
-import io.github.jwdeveloper.tiktok.http.TikTokHttpApiClient;
+import io.github.jwdeveloper.tiktok.http.TikTokHttpClient;
 import io.github.jwdeveloper.tiktok.http.TikTokHttpRequestFactory;
+import io.github.jwdeveloper.tiktok.listener.TikTokEventListener;
+import io.github.jwdeveloper.tiktok.listener.TikTokListenersManager;
 import io.github.jwdeveloper.tiktok.live.LiveClient;
-import io.github.jwdeveloper.tiktok.utils.CancelationToken;
 import io.github.jwdeveloper.tiktok.websocket.TikTokWebSocketClient;
 
 import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.function.Consumer;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -23,19 +26,26 @@ import java.util.logging.Logger;
 public class TikTokLiveClientBuilder implements TikTokEventBuilder<TikTokLiveClientBuilder> {
     private final ClientSettings clientSettings;
     private final Logger logger;
-    private final TikTokEventHandler tikTokEventHandler;
+    private final TikTokEventObserver tikTokEventHandler;
+    private final List<TikTokEventListener> listeners;
 
     public TikTokLiveClientBuilder(String userName) {
-        this.tikTokEventHandler = new TikTokEventHandler();
+        this.tikTokEventHandler = new TikTokEventObserver();
         this.clientSettings = Constants.DefaultClientSettings();
         this.clientSettings.setHostName(userName);
         this.logger = Logger.getLogger(TikTokLive.class.getName());
+        this.listeners = new ArrayList<>();
     }
 
     public TikTokLiveClientBuilder configure(Consumer<ClientSettings> consumer) {
         consumer.accept(clientSettings);
         return this;
     }
+    public TikTokLiveClientBuilder addListener(TikTokEventListener listener)
+    {
+        listeners.add(listener);
+        return this;
+    }
 
     private void validate() {
 
@@ -71,9 +81,12 @@ public class TikTokLiveClientBuilder implements TikTokEventBuilder<TikTokLiveCli
         var tiktokRoomInfo = new TikTokRoomInfo();
         tiktokRoomInfo.setUserName(clientSettings.getHostName());
 
+
+        var listenerManager = new TikTokListenersManager(listeners, tikTokEventHandler);
+
         var cookieJar = new TikTokCookieJar();
         var requestFactory = new TikTokHttpRequestFactory(cookieJar);
-        var apiClient = new TikTokHttpApiClient(cookieJar, requestFactory);
+        var apiClient = new TikTokHttpClient(cookieJar, requestFactory);
         var apiService = new TikTokApiService(apiClient, logger, clientSettings);
         var giftManager = new TikTokGiftManager();
         var webResponseHandler = new TikTokMessageHandlerRegistration(tikTokEventHandler, clientSettings, logger, giftManager, tiktokRoomInfo);
@@ -83,7 +96,14 @@ public class TikTokLiveClientBuilder implements TikTokEventBuilder<TikTokLiveCli
                 webResponseHandler,
                 tikTokEventHandler);
 
-        return new TikTokLiveClient(tiktokRoomInfo, apiService, webSocketClient, giftManager, tikTokEventHandler, clientSettings, logger);
+        return new TikTokLiveClient(tiktokRoomInfo,
+                apiService,
+                webSocketClient,
+                giftManager,
+                tikTokEventHandler,
+                clientSettings,
+                listenerManager,
+                logger);
     }
 
     public LiveClient buildAndRun() {
@@ -259,8 +279,8 @@ public class TikTokLiveClientBuilder implements TikTokEventBuilder<TikTokLiveCli
         return this;
     }
 
-    public TikTokLiveClientBuilder onUnhandled(TikTokEventConsumer<TikTokUnhandledEvent> event) {
-        tikTokEventHandler.subscribe(TikTokUnhandledEvent.class, event);
+    public TikTokLiveClientBuilder onUnhandled(TikTokEventConsumer<TikTokUnhandledWebsocketMessageEvent> event) {
+        tikTokEventHandler.subscribe(TikTokUnhandledWebsocketMessageEvent.class, event);
         return this;
     }
 
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokEventHandler.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokEventObserver.java
similarity index 53%
rename from Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokEventHandler.java
rename to Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokEventObserver.java
index a7f1a5d..1fd99ec 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokEventHandler.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokEventObserver.java
@@ -5,34 +5,43 @@ import io.github.jwdeveloper.tiktok.events.TikTokEvent;
 import io.github.jwdeveloper.tiktok.events.TikTokEventConsumer;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
-public class TikTokEventHandler {
-    private final Map<String, TikTokEventConsumer> events;
+public class TikTokEventObserver {
+    private final Map<String, Set<TikTokEventConsumer>> events;
 
-    public TikTokEventHandler() {
+    public TikTokEventObserver() {
         events = new HashMap<>();
     }
 
     public void publish(TikTokLiveClient tikTokLiveClient, TikTokEvent tikTokEvent) {
         if (events.containsKey(TikTokEvent.class.getSimpleName())) {
-            var handler = events.get(TikTokEvent.class.getSimpleName());
-            handler.onEvent(tikTokLiveClient, tikTokEvent);
+            var handlers = events.get(TikTokEvent.class.getSimpleName());
+            for(var handle : handlers)
+            {
+                handle.onEvent(tikTokLiveClient, tikTokEvent);
+            }
         }
 
         var name = tikTokEvent.getClass().getSimpleName();
         if (!events.containsKey(name)) {
             return;
         }
-        var handler = events.get(name);
-        handler.onEvent(tikTokLiveClient, tikTokEvent);
+        var handlers = events.get(name);
+        for(var handler : handlers)
+        {
+            handler.onEvent(tikTokLiveClient, tikTokEvent);
+        }
     }
 
-    public <T extends TikTokEvent> void subscribe(Class<?> clazz, TikTokEventConsumer<T> event) {
-        events.put(clazz.getSimpleName(), event);
+    public <T extends TikTokEvent> void subscribe(Class<?> clazz, TikTokEventConsumer<T> event)
+    {
+        events.computeIfAbsent(clazz.getSimpleName(), e -> new HashSet<>()).add(event);
     }
 
-    public <T extends TikTokEvent> void unsubscribe(Class<?> clazz) {
+    public <T extends TikTokEvent> void unsubscribeAll(Class<?> clazz) {
         events.remove(clazz);
     }
 }
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokMessageHandler.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokMessageHandler.java
index 37224c8..6ab3fb6 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokMessageHandler.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokMessageHandler.java
@@ -7,7 +7,7 @@ import io.github.jwdeveloper.tiktok.TikTokLiveClient;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
 import io.github.jwdeveloper.tiktok.events.messages.TikTokErrorEvent;
 import io.github.jwdeveloper.tiktok.events.messages.TikTokWebsocketMessageEvent;
-import io.github.jwdeveloper.tiktok.events.messages.TikTokUnhandledEvent;
+import io.github.jwdeveloper.tiktok.events.messages.TikTokUnhandledWebsocketMessageEvent;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveMessageException;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokMessageMappingException;
 import io.github.jwdeveloper.tiktok.messages.WebcastResponse;
@@ -23,11 +23,11 @@ import java.util.logging.Logger;
 public abstract class TikTokMessageHandler {
 
     private final Map<String, io.github.jwdeveloper.tiktok.handler.TikTokMessageHandler> handlers;
-    private final TikTokEventHandler tikTokEventHandler;
+    private final TikTokEventObserver tikTokEventHandler;
     private final ClientSettings clientSettings;
     protected final Logger logger;
 
-    public TikTokMessageHandler(TikTokEventHandler tikTokEventHandler,ClientSettings clientSettings, Logger logger) {
+    public TikTokMessageHandler(TikTokEventObserver tikTokEventHandler, ClientSettings clientSettings, Logger logger) {
         handlers = new HashMap<>();
         this.tikTokEventHandler = tikTokEventHandler;
         this.clientSettings = clientSettings;
@@ -65,7 +65,7 @@ public abstract class TikTokMessageHandler {
 
     private void handleSingleMessage(TikTokLiveClient client, WebcastResponse.Message message) throws Exception {
         if (!handlers.containsKey(message.getType())) {
-            tikTokEventHandler.publish(client, new TikTokUnhandledEvent(message));
+            tikTokEventHandler.publish(client, new TikTokUnhandledWebsocketMessageEvent(message));
             return;
         }
         var handler = handlers.get(message.getType());
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokMessageHandlerRegistration.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokMessageHandlerRegistration.java
index 1cd7828..fd0dc72 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokMessageHandlerRegistration.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokMessageHandlerRegistration.java
@@ -5,21 +5,18 @@ import io.github.jwdeveloper.tiktok.TikTokGiftManager;
 import io.github.jwdeveloper.tiktok.TikTokRoomInfo;
 import io.github.jwdeveloper.tiktok.events.TikTokEvent;
 import io.github.jwdeveloper.tiktok.events.messages.*;
-import io.github.jwdeveloper.tiktok.events.objects.TikTokGift;
 import io.github.jwdeveloper.tiktok.messages.*;
-import io.github.jwdeveloper.tiktok.models.GiftId;
 import io.github.jwdeveloper.tiktok.models.SocialTypes;
 import lombok.SneakyThrows;
 
 import java.util.logging.Logger;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class TikTokMessageHandlerRegistration extends TikTokMessageHandler {
     private final TikTokGiftManager giftManager;
     private final TikTokRoomInfo roomInfo;
 
-    public TikTokMessageHandlerRegistration(TikTokEventHandler tikTokEventHandler,
+    public TikTokMessageHandlerRegistration(TikTokEventObserver tikTokEventHandler,
                                             ClientSettings clientSettings,
                                             Logger logger,
                                             TikTokGiftManager giftManager,
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/TikTokApiService.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/TikTokApiService.java
index dc278d2..84ed72f 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/TikTokApiService.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/TikTokApiService.java
@@ -2,11 +2,12 @@ package io.github.jwdeveloper.tiktok.http;
 
 import com.google.gson.Gson;
 import io.github.jwdeveloper.tiktok.ClientSettings;
+import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveOfflineHostException;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveRequestException;
 import io.github.jwdeveloper.tiktok.live.LiveRoomMeta;
-import io.github.jwdeveloper.tiktok.models.gifts.TikTokGiftInfo;
 import io.github.jwdeveloper.tiktok.messages.WebcastResponse;
+import io.github.jwdeveloper.tiktok.models.gifts.TikTokGiftInfo;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -15,34 +16,96 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class TikTokApiService {
-    private final TikTokHttpApiClient apiClient;
+    private final TikTokHttpClient tiktokHttpClient;
     private final Logger logger;
     private final ClientSettings clientSettings;
 
-    public TikTokApiService(TikTokHttpApiClient apiClient, Logger logger, ClientSettings clientSettings) {
-        this.apiClient = apiClient;
+    public TikTokApiService(TikTokHttpClient apiClient, Logger logger, ClientSettings clientSettings) {
+        this.tiktokHttpClient = apiClient;
         this.logger = logger;
         this.clientSettings = clientSettings;
     }
 
+    /*
+       if (sessionId) {
+            // Update sessionId
+            this.#options.sessionId = sessionId;
+        }
+
+        if (!this.#options.sessionId) {
+            throw new Error('Missing SessionId. Please provide your current SessionId to use this feature.');
+        }
+
+        try {
+            // Retrieve current room_id if not connected
+            if (!this.#isConnected) {
+                await this.#retrieveRoomId();
+            }
+
+            // Add the session cookie to the CookieJar
+            this.#httpClient.setSessionId(this.#options.sessionId);
+
+            // Submit the chat request
+            let requestParams = { ...this.#clientParams, content: text };
+            let response = await this.#httpClient.postFormDataToWebcastApi('room/chat/', requestParams, null);
+
+            // Success?
+            if (response?.status_code === 0) {
+                return response.data;
+            }
+
+            // Handle errors
+            switch (response?.status_code) {
+                case 20003:
+                    throw new Error('Your SessionId has expired. Please provide a new one.');
+                default:
+                    throw new Error(`TikTok responded with status code ${response?.status_code}: ${response?.data?.message}`);
+            }
+        } catch (err) {
+            throw new Error(`Failed to send chat message. ${err.message}`);
+        }
+     */
+
+    public boolean sendMessage(String message, String sessionId) {
+        if (sessionId.isEmpty()) {
+            throw new TikTokLiveException("Session ID must not be Empty");
+        }
+        var roomId = clientSettings.getClientParameters().get("room_id");
+        if (roomId == null) {
+            throw new TikTokLiveException("Room ID must not be Empty");
+        }
+        logger.info("Sending message to chat");
+        try {
+            var params = new HashMap<String, Object>(clientSettings.getClientParameters());
+            params.put("content", message);
+            params.put("channel", "tiktok_web");
+            params.remove("cursor");
+            tiktokHttpClient.setSessionId(sessionId);
+            tiktokHttpClient.postMessageToChat(params);
+            return true;
+        } catch (Exception e) {
+            throw new TikTokLiveRequestException("Failed to fetch room id from WebCast, see stacktrace for more info.", e);
+        }
+    }
+
     public String fetchRoomId(String userName) {
         logger.info("Fetching room ID");
         String html;
         try {
-            html = apiClient.GetLivestreamPage(userName);
+            html = tiktokHttpClient.getLivestreamPage(userName);
         } catch (Exception e) {
             throw new TikTokLiveRequestException("Failed to fetch room id from WebCast, see stacktrace for more info.", e);
         }
 
-        Pattern firstPattern = Pattern.compile("room_id=([0-9]*)");
-        Matcher firstMatcher = firstPattern.matcher(html);
-        String id = "";
+        var firstPattern = Pattern.compile("room_id=([0-9]*)");
+        var firstMatcher = firstPattern.matcher(html);
+        var id = "";
 
         if (firstMatcher.find()) {
             id = firstMatcher.group(1);
         } else {
-            Pattern secondPattern = Pattern.compile("\"roomId\":\"([0-9]*)\"");
-            Matcher secondMatcher = secondPattern.matcher(html);
+            var secondPattern = Pattern.compile("\"roomId\":\"([0-9]*)\"");
+            var secondMatcher = secondPattern.matcher(html);
 
             if (secondMatcher.find()) {
                 id = secondMatcher.group(1);
@@ -54,7 +117,7 @@ public class TikTokApiService {
         }
 
         clientSettings.getClientParameters().put("room_id", id);
-        logger.info("RoomID -> "+id);
+        logger.info("RoomID -> " + id);
         return id;
     }
 
@@ -62,7 +125,7 @@ public class TikTokApiService {
     public LiveRoomMeta fetchRoomInfo() {
         logger.info("Fetch RoomInfo");
         try {
-            var response = apiClient.GetJObjectFromWebcastAPI("room/info/", clientSettings.getClientParameters());
+            var response = tiktokHttpClient.getJObjectFromWebcastAPI("room/info/", clientSettings.getClientParameters());
             if (!response.has("data")) {
                 return new LiveRoomMeta();
             }
@@ -77,48 +140,42 @@ public class TikTokApiService {
             var info = new LiveRoomMeta();
             info.setStatus(status.getAsInt());
 
-            logger.info("RoomInfo status -> "+info.getStatus());
+            logger.info("RoomInfo status -> " + info.getStatus());
             return info;
         } catch (Exception e) {
             throw new TikTokLiveRequestException("Failed to fetch room info from WebCast, see stacktrace for more info.", e);
         }
     }
 
-    public WebcastResponse  fetchClientData()
-    {
+    public WebcastResponse fetchClientData() {
         logger.info("Fetch ClientData");
         try {
-            var response = apiClient.GetDeserializedMessage("im/fetch/", clientSettings.getClientParameters());
-            clientSettings.getClientParameters().put("cursor",response.getCursor());
+            var response = tiktokHttpClient.getDeserializedMessage("im/fetch/", clientSettings.getClientParameters());
+            clientSettings.getClientParameters().put("cursor", response.getCursor());
             clientSettings.getClientParameters().put("internal_ext", response.getAckIds());
             return response;
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             throw new TikTokLiveRequestException("Failed to fetch client data", e);
         }
     }
 
     public Map<Integer, TikTokGiftInfo> fetchAvailableGifts() {
         try {
-            var response = apiClient.GetJObjectFromWebcastAPI("gift/list/", clientSettings.getClientParameters());
-            if(!response.has("data"))
-            {
+            var response = tiktokHttpClient.getJObjectFromWebcastAPI("gift/list/", clientSettings.getClientParameters());
+            if (!response.has("data")) {
                 return new HashMap<>();
             }
             var dataJson = response.getAsJsonObject("data");
-            if(!dataJson.has("gifts"))
-            {
+            if (!dataJson.has("gifts")) {
                 return new HashMap<>();
             }
             var giftsJsonList = dataJson.get("gifts").getAsJsonArray();
             var gifts = new HashMap<Integer, TikTokGiftInfo>();
             var gson = new Gson();
-            for(var jsonGift : giftsJsonList)
-            {
+            for (var jsonGift : giftsJsonList) {
                 var gift = gson.fromJson(jsonGift, TikTokGiftInfo.class);
-                logger.info("Found Available Gift "+ gift.getName()+ " with ID "+gift.getId());
-                gifts.put(gift.getId(),gift);
+                logger.info("Found Available Gift " + gift.getName() + " with ID " + gift.getId());
+                gifts.put(gift.getId(), gift);
             }
             return gifts;
         } catch (Exception e) {
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/TikTokHttpApiClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/TikTokHttpClient.java
similarity index 70%
rename from Client/src/main/java/io/github/jwdeveloper/tiktok/http/TikTokHttpApiClient.java
rename to Client/src/main/java/io/github/jwdeveloper/tiktok/http/TikTokHttpClient.java
index d777443..e3810aa 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/TikTokHttpApiClient.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/TikTokHttpClient.java
@@ -2,7 +2,6 @@ package io.github.jwdeveloper.tiktok.http;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
-import io.github.jwdeveloper.tiktok.ClientSettings;
 import io.github.jwdeveloper.tiktok.Constants;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveRequestException;
 import io.github.jwdeveloper.tiktok.messages.WebcastResponse;
@@ -15,30 +14,44 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;
 
-public class TikTokHttpApiClient {
+public class TikTokHttpClient {
     private final TikTokHttpRequestFactory requestFactory;
     private final TikTokCookieJar tikTokCookieJar;
 
-    public TikTokHttpApiClient(TikTokCookieJar tikTokCookieJar,  TikTokHttpRequestFactory requestFactory) {
+    public TikTokHttpClient(TikTokCookieJar tikTokCookieJar, TikTokHttpRequestFactory requestFactory) {
         this.requestFactory = requestFactory;
         this.tikTokCookieJar = tikTokCookieJar;
     }
 
-    public String GetLivestreamPage(String userName) {
+    public void setSessionId(String sessionId)
+    {
+        tikTokCookieJar.set("sessionid", sessionId);
+        tikTokCookieJar.set("sessionid_ss", sessionId);
+        tikTokCookieJar.set("sid_tt", sessionId);
+    }
+
+
+    public String getLivestreamPage(String userName) {
 
         var url = Constants.TIKTOK_URL_WEB + "@" + userName + "/live/";
         var get = getRequest(url, null);
         return get;
     }
 
-    public JsonObject GetJObjectFromWebcastAPI(String path, Map<String, Object> parameters) {
+    public String postMessageToChat(Map<String,Object> parameters)
+    {
+        var get = postRequest(Constants.TIKTOK_URL_WEBCAST + "room/chat/", parameters);
+        return get;
+    }
+
+    public JsonObject getJObjectFromWebcastAPI(String path, Map<String, Object> parameters) {
         var get = getRequest(Constants.TIKTOK_URL_WEBCAST + path, parameters);
         var json = JsonParser.parseString(get);
         var jsonObject = json.getAsJsonObject();
         return jsonObject;
     }
 
-    public WebcastResponse GetDeserializedMessage(String path, Map<String, Object> parameters) {
+    public WebcastResponse getDeserializedMessage(String path, Map<String, Object> parameters) {
         var bytes = getSignRequest(Constants.TIKTOK_URL_WEBCAST + path, parameters);
         try {
             return WebcastResponse.parseFrom(bytes);
@@ -49,16 +62,25 @@ public class TikTokHttpApiClient {
         }
     }
 
+    private String postRequest(String url, Map<String, Object> parameters) {
+        if (parameters == null) {
+            parameters = new HashMap<>();
+        }
+        System.out.println("RomMID: "+parameters.get("room_id"));
+        var request = requestFactory.setQueries(parameters);
+        return request.post(url);
+    }
+
     private String getRequest(String url, Map<String, Object> parameters) {
         if (parameters == null) {
             parameters = new HashMap<>();
         }
 
-        var request = requestFactory.SetQueries(parameters);
-        return request.Get(url);
+        var request = requestFactory.setQueries(parameters);
+        return request.get(url);
     }
     private byte[] getSignRequest(String url, Map<String, Object> parameters) {
-        url = GetSignedUrl(url, parameters);
+        url = getSignedUrl(url, parameters);
         try {
             var client = HttpClient.newHttpClient();
             var request = HttpRequest.newBuilder()
@@ -86,7 +108,7 @@ public class TikTokHttpApiClient {
     }
 
 
-    private String GetSignedUrl(String url, Map<String, Object> parameters) {
+    private String getSignedUrl(String url, Map<String, Object> parameters) {
 
         var fullUrl = HttpUtils.parseParameters(url,parameters);
         var singHeaders = new TreeMap<String,Object>();
@@ -94,8 +116,8 @@ public class TikTokHttpApiClient {
         singHeaders.put("uuc", 1);
         singHeaders.put("url", fullUrl);
 
-        var request = requestFactory.SetQueries(singHeaders);
-        var content = request.Get(Constants.TIKTOK_SIGN_API);
+        var request = requestFactory.setQueries(singHeaders);
+        var content = request.get(Constants.TIKTOK_SIGN_API);
 
 
         try {
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/TikTokHttpRequestFactory.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/TikTokHttpRequestFactory.java
index 822690b..9fd54a6 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/http/TikTokHttpRequestFactory.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/http/TikTokHttpRequestFactory.java
@@ -11,12 +11,12 @@ import java.net.URLEncoder;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.net.http.WebSocket;
 import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 
 public class TikTokHttpRequestFactory implements TikTokHttpRequest {
     private final CookieManager cookieManager;
@@ -34,13 +34,8 @@ public class TikTokHttpRequestFactory implements TikTokHttpRequest {
                 .connectTimeout(Duration.ofSeconds(2))
                 .build();
     }
-
-    public WebSocket.Builder openSocket() {
-        return client.newWebSocketBuilder();
-    }
-
     @SneakyThrows
-    public String Get(String url) {
+    public String get(String url) {
         var uri = URI.create(url);
         var request = HttpRequest.newBuilder().GET();
         if (query != null) {
@@ -49,22 +44,35 @@ public class TikTokHttpRequestFactory implements TikTokHttpRequest {
             request.uri(requestUri);
         }
 
-        return GetContent(request.build());
+        return getContent(request.build());
     }
 
     @SneakyThrows
-    public String Post(String url, HttpRequest.BodyPublisher data) {
+    public String post(String url) {
         var uri = URI.create(url);
-        var request = HttpRequest.newBuilder().POST(data);
-        for (var header : defaultHeaders.entrySet()) {
+        var request = HttpRequest.newBuilder().POST(HttpRequest.BodyPublishers.ofString(""));
+        for (var header : defaultHeaders.entrySet())
+        {
+            if(header.getKey().equals("Connection"))
+            {
+                continue;
+            }
             request.setHeader(header.getKey(), header.getValue());
         }
+        request.setHeader("Content-type","application/x-www-form-urlencoded; charset=UTF-8");
+        request.setHeader("Cookie", tikTokCookieJar.parseCookies());
+
+
         if (query != null) {
             var baseUri = uri.toString();
             var requestUri = URI.create(baseUri + "?" + query);
             request.uri(requestUri);
+            System.out.println(requestUri.toString());
         }
-        return GetContent(request.build());
+
+
+
+        return getContent(request.build());
     }
 
     public TikTokHttpRequest setHeader(String key, String value) {
@@ -77,10 +85,11 @@ public class TikTokHttpRequestFactory implements TikTokHttpRequest {
         return this;
     }
 
-    public TikTokHttpRequest SetQueries(Map<String, Object> queries) {
+    public TikTokHttpRequest setQueries(Map<String, Object> queries) {
         if (queries == null)
             return this;
-        query = String.join("&", queries.entrySet().stream().map(x ->
+        var testMap = new TreeMap<String,Object>(queries);
+        query = String.join("&", testMap.entrySet().stream().map(x ->
         {
             var key = x.getKey();
             var value = "";
@@ -95,7 +104,7 @@ public class TikTokHttpRequestFactory implements TikTokHttpRequest {
     }
 
 
-    private String GetContent(HttpRequest request) throws Exception {
+    private String getContent(HttpRequest request) throws Exception {
         var response = client.send(request, HttpResponse.BodyHandlers.ofString());
         if (response.statusCode() == 404) {
             throw new TikTokLiveRequestException("Request responded with 404 NOT_FOUND");
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/listener/ListenerBindingModel.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/listener/ListenerBindingModel.java
new file mode 100644
index 0000000..6147c43
--- /dev/null
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/listener/ListenerBindingModel.java
@@ -0,0 +1,17 @@
+package io.github.jwdeveloper.tiktok.listener;
+
+import io.github.jwdeveloper.tiktok.events.TikTokEventConsumer;
+
+import lombok.Value;
+
+import java.util.List;
+
+
+@Value
+public class ListenerBindingModel
+{
+
+    TikTokEventListener listener;
+
+    List<TikTokEventConsumer<?>> events;
+}
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/listener/TikTokListenersManager.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/listener/TikTokListenersManager.java
new file mode 100644
index 0000000..c8618d8
--- /dev/null
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/listener/TikTokListenersManager.java
@@ -0,0 +1,82 @@
+package io.github.jwdeveloper.tiktok.listener;
+
+
+import io.github.jwdeveloper.tiktok.annotations.TikTokEventHandler;
+import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import io.github.jwdeveloper.tiktok.events.TikTokEventConsumer;
+import io.github.jwdeveloper.tiktok.events.messages.TikTokWebsocketMessageEvent;
+import io.github.jwdeveloper.tiktok.exceptions.TikTokEventListenerMethodException;
+import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
+import io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver;
+import io.github.jwdeveloper.tiktok.live.LiveClient;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class TikTokListenersManager implements ListenersManager {
+    private final TikTokEventObserver eventObserver;
+    private final List<ListenerBindingModel> bindingModels;
+
+    public TikTokListenersManager(List<TikTokEventListener> listeners, TikTokEventObserver tikTokEventHandler) {
+        this.eventObserver = tikTokEventHandler;
+        this.bindingModels = listeners.stream().map(this::bindToEvents).toList();
+    }
+
+
+    @Override
+    public List<TikTokEventListener> getBindingModels() {
+        return bindingModels.stream().map(ListenerBindingModel::getListener).toList();
+    }
+
+    @Override
+    public void addListener(TikTokEventListener listener) {
+        var alreadyExists = bindingModels.stream().filter(e -> e.getListener() == listener).findAny();
+        if (alreadyExists.isPresent()) {
+            throw new TikTokLiveException("Listener " + listener.getClass() + " has already been registered");
+        }
+        var bindingModel = bindToEvents(listener);
+        bindingModels.add(bindingModel);
+    }
+
+    @Override
+    public void removeListener(TikTokEventListener listener) {
+        var optional = bindingModels.stream().filter(e -> e.getListener() == listener).findAny();
+        if (optional.isEmpty()) {
+            return;
+        }
+        bindingModels.remove(optional.get());
+    }
+
+    private ListenerBindingModel bindToEvents(TikTokEventListener listener) {
+
+        var clazz = listener.getClass();
+        var methods = Arrays.stream(clazz.getDeclaredMethods()).filter(m ->
+                m.getParameterCount() == 2 &&
+                        m.isAnnotationPresent(TikTokEventHandler.class) &&
+                        m.getParameterTypes()[0].equals(LiveClient.class)).toList();
+        var eventConsumer = new ArrayList<TikTokEventConsumer<?>>();
+
+
+        for (var method : methods)
+        {
+            var eventClazz = method.getParameterTypes()[1];
+            if(!eventClazz.isAssignableFrom(TikTokEvent.class))
+            {
+                throw new TikTokEventListenerMethodException("Method "+method.getName()+" 2nd parameter must instance of "+TikTokEvent.class.getName());
+            }
+            var tikTokEventConsumer = new TikTokEventConsumer() {
+                @Override
+                public void onEvent(LiveClient liveClient, TikTokEvent event) {
+                    try {
+                        method.invoke(listener, liveClient, event);
+                    } catch (Exception e) {
+                        throw new TikTokEventListenerMethodException(e);
+                    }
+                }
+            };
+            eventObserver.subscribe(eventClazz, tikTokEventConsumer);
+        }
+        return new ListenerBindingModel(listener, eventConsumer);
+    }
+}
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketClient.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketClient.java
index 983c830..8f256ae 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketClient.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketClient.java
@@ -5,16 +5,14 @@ import io.github.jwdeveloper.tiktok.ClientSettings;
 import io.github.jwdeveloper.tiktok.Constants;
 import io.github.jwdeveloper.tiktok.TikTokLiveClient;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
-import io.github.jwdeveloper.tiktok.handlers.TikTokEventHandler;
+import io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver;
 import io.github.jwdeveloper.tiktok.handlers.TikTokMessageHandlerRegistration;
 import io.github.jwdeveloper.tiktok.http.HttpUtils;
 import io.github.jwdeveloper.tiktok.http.TikTokCookieJar;
-import io.github.jwdeveloper.tiktok.http.TikTokHttpRequestFactory;
 import io.github.jwdeveloper.tiktok.messages.WebcastResponse;
 import org.java_websocket.client.WebSocketClient;
 
 import java.net.URI;
-import java.net.http.WebSocket;
 import java.util.HashMap;
 import java.util.TreeMap;
 import java.util.logging.Logger;
@@ -24,7 +22,7 @@ public class TikTokWebSocketClient {
     private final ClientSettings clientSettings;
     private final TikTokCookieJar tikTokCookieJar;
     private final TikTokMessageHandlerRegistration webResponseHandler;
-    private final TikTokEventHandler tikTokEventHandler;
+    private final TikTokEventObserver tikTokEventHandler;
     private WebSocketClient webSocketClient;
     private TikTokLiveClient tikTokLiveClient;
     private TikTokWebSocketPingingTask pingingTask;
@@ -34,7 +32,7 @@ public class TikTokWebSocketClient {
                                  TikTokCookieJar tikTokCookieJar,
                                  ClientSettings clientSettings,
                                  TikTokMessageHandlerRegistration webResponseHandler,
-                                 TikTokEventHandler tikTokEventHandler) {
+                                 TikTokEventObserver tikTokEventHandler) {
         this.logger = logger;
         this.tikTokCookieJar = tikTokCookieJar;
         this.clientSettings = clientSettings;
@@ -97,12 +95,11 @@ public class TikTokWebSocketClient {
                 tikTokLiveClient);
     }
 
-
-
     public void stop()
     {
-        if (isConnected && webSocketClient != null) {
-            webSocketClient.close(1);
+        if (isConnected && webSocketClient != null)
+        {
+            webSocketClient.closeConnection(0,"");
         }
         webSocketClient = null;
         pingingTask = null;
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketListener.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketListener.java
index 846075a..e945807 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketListener.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/websocket/TikTokWebSocketListener.java
@@ -6,7 +6,7 @@ import io.github.jwdeveloper.tiktok.events.messages.TikTokConnectedEvent;
 import io.github.jwdeveloper.tiktok.events.messages.TikTokDisconnectedEvent;
 import io.github.jwdeveloper.tiktok.events.messages.TikTokErrorEvent;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokProtocolBufferException;
-import io.github.jwdeveloper.tiktok.handlers.TikTokEventHandler;
+import io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver;
 import io.github.jwdeveloper.tiktok.handlers.TikTokMessageHandlerRegistration;
 import io.github.jwdeveloper.tiktok.messages.WebcastResponse;
 import io.github.jwdeveloper.tiktok.messages.WebcastWebsocketAck;
@@ -16,7 +16,6 @@ import org.java_websocket.drafts.Draft_6455;
 import org.java_websocket.handshake.ServerHandshake;
 
 import java.net.URI;
-import java.net.http.WebSocket;
 import java.nio.ByteBuffer;
 import java.util.Map;
 import java.util.Optional;
@@ -24,14 +23,14 @@ import java.util.Optional;
 public class TikTokWebSocketListener extends WebSocketClient {
 
     private final TikTokMessageHandlerRegistration webResponseHandler;
-    private final TikTokEventHandler tikTokEventHandler;
+    private final TikTokEventObserver tikTokEventHandler;
     private final TikTokLiveClient tikTokLiveClient;
 
     public TikTokWebSocketListener(URI serverUri,
                                    Map<String, String> httpHeaders,
                                    int connectTimeout,
                                    TikTokMessageHandlerRegistration webResponseHandler,
-                                   TikTokEventHandler tikTokEventHandler,
+                                   TikTokEventObserver tikTokEventHandler,
                                    TikTokLiveClient tikTokLiveClient) {
         super(serverUri, new Draft_6455(), httpHeaders,connectTimeout);
         this.webResponseHandler = webResponseHandler;
@@ -43,7 +42,10 @@ public class TikTokWebSocketListener extends WebSocketClient {
     @Override
     public void onOpen(ServerHandshake serverHandshake) {
         tikTokEventHandler.publish(tikTokLiveClient,new TikTokConnectedEvent());
-        sendPing();
+        if(isNotClosing())
+        {
+            sendPing();
+        }
     }
 
 
@@ -55,7 +57,10 @@ public class TikTokWebSocketListener extends WebSocketClient {
         } catch (Exception e) {
             tikTokEventHandler.publish(tikTokLiveClient, new TikTokErrorEvent(e));
         }
-        sendPing();
+        if(isNotClosing())
+        {
+            sendPing();
+        }
     }
 
     @Override
@@ -66,7 +71,10 @@ public class TikTokWebSocketListener extends WebSocketClient {
     @Override
     public void onError(Exception error) {
         tikTokEventHandler.publish(tikTokLiveClient,new TikTokErrorEvent(error));
-        sendPing();
+        if(isNotClosing())
+        {
+            sendPing();
+        }
     }
 
     private void handleBinary(byte[] buffer) {
@@ -101,6 +109,11 @@ public class TikTokWebSocketListener extends WebSocketClient {
         }
     }
 
+    private boolean isNotClosing()
+    {
+        return !isClosed() && !isClosing();
+    }
+
 
 
     private void sendAckId(long id) {
@@ -109,7 +122,10 @@ public class TikTokWebSocketListener extends WebSocketClient {
                 .setType("ack")
                 .setId(id)
                 .build();
-        send(serverInfo.toByteString().asReadOnlyByteBuffer());
+        if(isNotClosing())
+        {
+            send(serverInfo.toByteString().asReadOnlyByteBuffer());
+        }
     }
 
 
diff --git a/Client/src/test/java/io/github/jwdeveloper/tiktok/WebResponseHandlerTests.java b/Client/src/test/java/io/github/jwdeveloper/tiktok/WebResponseHandlerTests.java
index 04a0a65..16be962 100644
--- a/Client/src/test/java/io/github/jwdeveloper/tiktok/WebResponseHandlerTests.java
+++ b/Client/src/test/java/io/github/jwdeveloper/tiktok/WebResponseHandlerTests.java
@@ -1,7 +1,7 @@
 package io.github.jwdeveloper.tiktok;
 
 import io.github.jwdeveloper.tiktok.common.TikTokBaseTest;
-import io.github.jwdeveloper.tiktok.handlers.TikTokEventHandler;
+import io.github.jwdeveloper.tiktok.handlers.TikTokEventObserver;
 import io.github.jwdeveloper.tiktok.handlers.TikTokMessageHandlerRegistration;
 import org.junit.Before;
 
@@ -14,7 +14,7 @@ public class WebResponseHandlerTests extends TikTokBaseTest {
 
     @Before
     public void before() {
-        var mockEventHandler = mock(TikTokEventHandler.class);
+        var mockEventHandler = mock(TikTokEventObserver.class);
         var mockGiftManager = mock(TikTokGiftManager.class);
         var mockRoomInfo = mock(TikTokRoomInfo.class);
         var mockClientSettings = mock(ClientSettings.class);
diff --git a/README.md b/README.md
index fef40ff..9bb9f3b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
- [![](https://jitpack.io/v/jwdeveloper/TikTok-Live-Java.svg)](https://jitpack.io/#jwdeveloper/TikTok-Live-Java)
+[![](https://jitpack.io/v/jwdeveloper/TikTok-Live-Java.svg)](https://jitpack.io/#jwdeveloper/TikTok-Live-Java)
 
 
 # TikTokLive Java
@@ -7,7 +7,7 @@ A Java library based on [TikTokLive](https://github.com/isaackogan/TikTokLive) a
 Join the support [discord](https://discord.gg/e2XwPNTBBr) and visit the `#java-support` channel for questions, contributions and ideas. Feel free to make pull requests with missing/new features, fixes, etc
 
 Do you prefer other programming languages?
-- **Node** orginal: [TikTok-Live-Connector](https://github.com/isaackogan/TikTok-Live-Connector) by [@zerodytrash](https://github.com/zerodytrash) 
+- **Node** orginal: [TikTok-Live-Connector](https://github.com/isaackogan/TikTok-Live-Connector) by [@zerodytrash](https://github.com/zerodytrash)
 - **Python** rewrite: [TikTokLive](https://github.com/isaackogan/TikTokLive) by [@isaackogan](https://github.com/isaackogan)
 - **Go** rewrite: [GoTikTokLive](https://github.com/Davincible/gotiktoklive) by [@Davincible](https://github.com/Davincible)
 - **C#** rewrite: [TikTokLiveSharp](https://github.com/frankvHoof93/TikTokLiveSharp) by [@frankvHoof93](https://github.com/frankvHoof93)
@@ -23,40 +23,50 @@ Do you prefer other programming languages?
 
 ## Getting started
 
-1. Install the package via Maven 
+1. Install the package via Maven
 
 ```xml
    <repositories>
-        <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
-        </repository>
-    </repositories>
+    <repository>
+        <id>jitpack.io</id>
+        <url>https://jitpack.io</url>
+    </repository>
+</repositories>
 
-   <dependencies>
-         <dependency>
-            <groupId>com.github.jwdeveloper.TikTok-Live-Java</groupId>
-            <artifactId>Client</artifactId>
-            <version>0.0.14-Release</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.10.1</version>
-        </dependency>
-   </dependencies>
+<dependencies>
+<dependency>
+    <groupId>com.github.jwdeveloper.TikTok-Live-Java</groupId>
+    <artifactId>Client</artifactId>
+    <version>0.0.14-Release</version>
+    <scope>compile</scope>
+</dependency>
+<dependency>
+    <groupId>com.google.code.gson</groupId>
+    <artifactId>gson</artifactId>
+    <version>2.10.1</version>
+</dependency>
+</dependencies>
 ```
 
 2. Create your first chat connection
 
 ```java
-  public static void main(String[] args)
-  {
-     // Username of someone who is currently live
-     var tiktokUsername = "jwdevtiktok";
+package io.github.jwdeveloper.tiktok;
+import java.io.IOException;
 
-     TikTokLive.newClient(tiktokUsername)
+public class SimpleExample {
+    public static void main(String[] args) throws IOException {
+
+        // set tiktok username
+        TikTokLive.newClient(Main.TEST_TIKTOK_USER)
+                .configure(clientSettings ->
+                {
+
+                })
+                .onFollow((liveClient, event) ->
+                {
+                    System.out.println("Follow joined -> " + event.getNewFollower().getNickName());
+                })
                 .onConnected((client, event) ->
                 {
                     System.out.println("Connected");
@@ -67,7 +77,7 @@ Do you prefer other programming languages?
                 })
                 .onComment((client, event)  ->
                 {
-                   System.out.println(event.getUser().getUniqueId() + ": " + event.getText());
+                    System.out.println(event.getUser().getUniqueId() + ": " + event.getText());
                 })
                 .onEvent((client, event) ->
                 {
@@ -80,15 +90,22 @@ Do you prefer other programming languages?
                 .buildAndRun();
         System.in.read();
     }
+}
+
 ```
 ## Configuration
 
 ```java
-public class ConfigurationExample
-{
+package io.github.jwdeveloper.tiktok;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.util.logging.Level;
+
+public class ConfigurationExample {
     public static void main(String[] args) throws IOException {
-       var tiktokUsername = "jwdevtiktok";
-       TikTokLive.newClient(tiktokUsername)
+
+        TikTokLive.newClient(Main.TEST_TIKTOK_USER)
                 .configure(clientSettings ->
                 {
                     clientSettings.setHostName(Main.TEST_TIKTOK_USER); // TikTok user name
@@ -103,7 +120,59 @@ public class ConfigurationExample
                     clientSettings.setRetryConnectionTimeout(Duration.ofSeconds(1)); // Timeout before next reconnection
                 })
                 .buildAndRun();
-       System.in.read();
+        System.in.read();
+    }
+}
+
+```
+## Listener Example
+
+```java
+package io.github.jwdeveloper.tiktok;
+
+import io.github.jwdeveloper.tiktok.annotations.TikTokEventHandler;
+import io.github.jwdeveloper.tiktok.events.messages.TikTokCommentEvent;
+import io.github.jwdeveloper.tiktok.events.messages.TikTokErrorEvent;
+import io.github.jwdeveloper.tiktok.events.messages.TikTokGiftMessageEvent;
+import io.github.jwdeveloper.tiktok.listener.TikTokEventListener;
+import io.github.jwdeveloper.tiktok.live.LiveClient;
+
+import java.io.IOException;
+
+public class ListenerExample
+{
+    public static void main(String[] args) throws IOException {
+
+        CustomListener customListener = new CustomListener();
+
+        // set tiktok username
+        TikTokLive.newClient(Main.TEST_TIKTOK_USER)
+                .addListener(customListener)
+                .buildAndRun();
+
+        System.in.read();
+    }
+
+    public static class CustomListener implements TikTokEventListener
+    {
+
+        @TikTokEventHandler
+        public void onError(LiveClient liveClient, TikTokErrorEvent event)
+        {
+            System.out.println(event.getException().getMessage());
+        }
+
+        @TikTokEventHandler
+        public void onCommentMessage(LiveClient liveClient, TikTokCommentEvent event)
+        {
+            System.out.println(event.getText());
+        }
+
+        @TikTokEventHandler
+        public void onGiftMessage(LiveClient liveClient, TikTokGiftMessageEvent event)
+        {
+            System.out.println(event.getGift().getDescription());
+        }
     }
 }
 
@@ -112,31 +181,51 @@ public class ConfigurationExample
 ## Methods
 A `client (LiveClient)` object contains the following methods.
 
-| Method Name | Description |
-| ----------- | ----------- |
-| connect     | Connects to the live stream. |
-| disconnect  | Disconnects the connection. |
-| getGiftManager  |  Gets the meta informations about all gifts. |
-| getRoomInfo | Gets the current room info from TikTok API including streamer info, room status and statistics. |
+{{methods}}
+
+| Method Name         | Description |
+|---------------------| ----------- |
+| connect             | Connects to the live stream. |
+| disconnect          | Disconnects the connection. |
+| getGiftManager      |  Gets the meta informations about all gifts. |
+| getRoomInfo         | Gets the current room info from TikTok API including streamer info, room status and statistics. |
+| getListenersManager | Gets and manage TikTokEventListeners    |
 
 ## Events
 
-A `TikTokLive` object has the following events 
+A `TikTokLive` object has the following events
 
-Events:
+
+**Custom**:
+-  [TikTokHeaderEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokHeaderEvent.java)
 -  [TikTokUnhandledSocialEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledSocialEvent.java)
+-  [TikTokLivePausedEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLivePausedEvent.java)
+-  [TikTokLikeEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLikeEvent.java)
+-  [TikTokWebsocketMessageEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokWebsocketMessageEvent.java)
+-  [TikTokSubscribeEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokSubscribeEvent.java)
+-  [TikTokFollowEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokFollowEvent.java)
+-  [TikTokLiveClientEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLiveClientEvent.java)
+-  [TikTokUnhandledEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledEvent.java)
+-  [TikTokLiveEndedEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLiveEndedEvent.java)
+-  [TikTokJoinEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokJoinEvent.java)
+-  [TikTokShareEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokShareEvent.java)
+-  [TikTokUnhandledControlEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledControlEvent.java)
+
+**Control**:
+-  [TikTokConnectedEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokConnectedEvent.java)
+-  [TikTokErrorEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokErrorEvent.java)
+-  [TikTokDisconnectedEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokDisconnectedEvent.java)
+
+**Message**:
 -  [TikTokLinkMicFanTicketEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicFanTicketEvent.java)
 -  [TikTokEnvelopeEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokEnvelopeEvent.java)
 -  [TikTokShopMessageEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokShopMessageEvent.java)
 -  [TikTokDetectMessageEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokDetectMessageEvent.java)
 -  [TikTokLinkLayerMessageEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkLayerMessageEvent.java)
--  [TikTokConnectedEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokConnectedEvent.java)
 -  [TikTokCaptionEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokCaptionEvent.java)
 -  [TikTokQuestionEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokQuestionEvent.java)
 -  [TikTokRoomPinMessageEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRoomPinMessageEvent.java)
 -  [TikTokRoomMessageEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRoomMessageEvent.java)
--  [TikTokLivePausedEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLivePausedEvent.java)
--  [TikTokLikeEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLikeEvent.java)
 -  [TikTokLinkMessageEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMessageEvent.java)
 -  [TikTokBarrageMessageEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokBarrageMessageEvent.java)
 -  [TikTokGiftMessageEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokGiftMessageEvent.java)
@@ -145,27 +234,18 @@ Events:
 -  [TikTokUnauthorizedMemberEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnauthorizedMemberEvent.java)
 -  [TikTokInRoomBannerEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokInRoomBannerEvent.java)
 -  [TikTokLinkMicMethodEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicMethodEvent.java)
--  [TikTokSubscribeEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokSubscribeEvent.java)
 -  [TikTokPollMessageEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokPollMessageEvent.java)
--  [TikTokFollowEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokFollowEvent.java)
 -  [TikTokRoomViewerDataEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRoomViewerDataEvent.java)
 -  [TikTokGoalUpdateEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokGoalUpdateEvent.java)
 -  [TikTokCommentEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokCommentEvent.java)
 -  [TikTokRankUpdateEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRankUpdateEvent.java)
 -  [TikTokIMDeleteEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokIMDeleteEvent.java)
--  [TikTokLiveEndedEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLiveEndedEvent.java)
--  [TikTokErrorEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokErrorEvent.java)
--  [TikTokUnhandledEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledEvent.java)
--  [TikTokJoinEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokJoinEvent.java)
 -  [TikTokRankTextEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokRankTextEvent.java)
--  [TikTokShareEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokShareEvent.java)
 -  [TikTokUnhandledMemberEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledMemberEvent.java)
 -  [TikTokSubNotifyEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokSubNotifyEvent.java)
 -  [TikTokLinkMicBattleEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokLinkMicBattleEvent.java)
--  [TikTokDisconnectedEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokDisconnectedEvent.java)
 -  [TikTokGiftBroadcastEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokGiftBroadcastEvent.java)
--  [TikTokUnhandledControlEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledControlEvent.java)
--  [TikTokEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokEvent.java)
+-  [TikTokUnhandledWebsocketMessageEvent](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokUnhandledWebsocketMessageEvent.java)
 
 
 <br><br>
diff --git a/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/ListenerExample.java b/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/ListenerExample.java
new file mode 100644
index 0000000..57c5452
--- /dev/null
+++ b/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/ListenerExample.java
@@ -0,0 +1,47 @@
+package io.github.jwdeveloper.tiktok;
+
+import io.github.jwdeveloper.tiktok.annotations.TikTokEventHandler;
+import io.github.jwdeveloper.tiktok.events.messages.TikTokCommentEvent;
+import io.github.jwdeveloper.tiktok.events.messages.TikTokErrorEvent;
+import io.github.jwdeveloper.tiktok.events.messages.TikTokGiftMessageEvent;
+import io.github.jwdeveloper.tiktok.listener.TikTokEventListener;
+import io.github.jwdeveloper.tiktok.live.LiveClient;
+
+import java.io.IOException;
+
+public class ListenerExample
+{
+    public static void main(String[] args) throws IOException {
+
+        CustomListener customListener = new CustomListener();
+
+        // set tiktok username
+        TikTokLive.newClient(Main.TEST_TIKTOK_USER)
+                .addListener(customListener)
+                .buildAndRun();
+
+        System.in.read();
+    }
+
+    public static class CustomListener implements TikTokEventListener
+    {
+
+        @TikTokEventHandler
+        public void onError(LiveClient liveClient, TikTokErrorEvent event)
+        {
+            System.out.println(event.getException().getMessage());
+        }
+
+        @TikTokEventHandler
+        public void onCommentMessage(LiveClient liveClient, TikTokCommentEvent event)
+        {
+            System.out.println(event.getText());
+        }
+
+        @TikTokEventHandler
+        public void onGiftMessage(LiveClient liveClient, TikTokGiftMessageEvent event)
+        {
+            System.out.println(event.getGift().getDescription());
+        }
+    }
+}
diff --git a/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/Main.java b/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/Main.java
index f16c9a7..53f51e5 100644
--- a/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/Main.java
+++ b/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/Main.java
@@ -8,10 +8,11 @@ import java.time.Duration;
 
 public class Main {
 
-    public static String TEST_TIKTOK_USER = "olchik.m1";
+    public static String TEST_TIKTOK_USER = "bangbetmenygy";
 
-    public static void main(String[] args) throws IOException {
-        var client = TikTokLive.newClient(TEST_TIKTOK_USER)
+    public static void main(String[] args) throws IOException, InterruptedException
+    {
+        LiveClient client = TikTokLive.newClient(TEST_TIKTOK_USER)
                 .configure(clientSettings ->
                 {
                     clientSettings.setRetryConnectionTimeout(Duration.ofSeconds(5));
@@ -28,17 +29,15 @@ public class Main {
                 .onLike(Main::onLike)
                 .onGiftMessage(Main::onGiftMessage)
                 .onEmote(Main::onEmote)
+                .onEvent((liveClient, event) ->
+                {
+
+                })
                 .onError((_client, error) ->
                 {
                     error.getException().printStackTrace();
                 })
-                .onEvent((liveClient, event) ->
-                {
-                    var viewers = liveClient.getRoomInfo().getViewersCount();
-                })
                 .buildAndRun();
-
-
         System.in.read();
     }
 
@@ -81,7 +80,7 @@ public class Main {
 
     private static void onGiftMessage(LiveClient tikTokLive, TikTokGiftMessageEvent e)
     {
-        print(e.getSender().getUniqueId(), "sent", e.getAmount(), "x", e.getGift().getName());
+        print(e.getSender().getUniqueId(), "sent", e.getComboCount(), "x", e.getGift().getName());
     }
 
     private static void onEmote(LiveClient tikTokLive, TikTokEmoteEvent e) {
diff --git a/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/SimpleExample.java b/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/SimpleExample.java
index ecc855d..af1deaa 100644
--- a/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/SimpleExample.java
+++ b/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/SimpleExample.java
@@ -1,11 +1,15 @@
 package io.github.jwdeveloper.tiktok;
-
 import java.io.IOException;
 
 public class SimpleExample {
     public static void main(String[] args) throws IOException {
 
+        // set tiktok username
         TikTokLive.newClient(Main.TEST_TIKTOK_USER)
+                .configure(clientSettings ->
+                {
+
+                })
                 .onFollow((liveClient, event) ->
                 {
                     System.out.println("Follow joined -> " + event.getNewFollower().getNickName());
@@ -14,7 +18,6 @@ public class SimpleExample {
                 {
                     System.out.println("Connected");
                 })
-
                 .onJoin((client, event)  ->
                 {
                     System.out.println("User joined -> " + event.getUser().getNickName());
diff --git a/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/Main.java b/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/Main.java
index 330b3c2..35c9300 100644
--- a/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/Main.java
+++ b/Tools-EventsCollector/src/main/java/io/github/jwdeveloper/tiktok/tools/collector/Main.java
@@ -1,6 +1,7 @@
 package io.github.jwdeveloper.tiktok.tools.collector;
 
 import io.github.jwdeveloper.tiktok.TikTokLive;
+import io.github.jwdeveloper.tiktok.events.objects.Badge;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveMessageException;
 import io.github.jwdeveloper.tiktok.tools.collector.db.TikTokDatabase;
 import io.github.jwdeveloper.tiktok.tools.collector.tables.ExceptionInfoModel;
@@ -25,16 +26,19 @@ public class Main {
 
     public static void main(String[] args) throws SQLException {
 
-        ignoredEvents = List.of("TikTokJoinEvent","TikTokLikeEvent");
+
+        ignoredEvents = new ArrayList<>();
+        //ignoredEvents = List.of("TikTokJoinEvent","TikTokLikeEvent");
+
 
         var db = new TikTokDatabase("test");
         db.init();
 
         var users = new ArrayList<String>();
-        users.add("mia_tattoo");
-        users.add("moniczkka");
-        users.add("besin1276");
-
+     //   users.add("mia_tattoo");
+      //  users.add("moniczkka");
+      //  users.add("besin1276");
+        users.add("jackwoln");
         for(var user : users)
         {
             runTikTokLiveInstance(user, db);
diff --git a/Tools-ReadmeGenerator/pom.xml b/Tools-ReadmeGenerator/pom.xml
new file mode 100644
index 0000000..9c0c517
--- /dev/null
+++ b/Tools-ReadmeGenerator/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>TikTokLiveJava</artifactId>
+        <groupId>io.github.jwdeveloper.tiktok</groupId>
+        <version>0.0.14-Release</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>Tools-ReadmeGenerator</artifactId>
+
+    <properties>
+        <maven.compiler.source>16</maven.compiler.source>
+        <maven.compiler.target>16</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.github.jwdeveloper.tiktok</groupId>
+            <artifactId>Tools</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/Tools-ReadmeGenerator/src/main/java/io/github/jwdeveloper/tiktok/EventsListGenerator.java b/Tools-ReadmeGenerator/src/main/java/io/github/jwdeveloper/tiktok/EventsListGenerator.java
new file mode 100644
index 0000000..b13cc00
--- /dev/null
+++ b/Tools-ReadmeGenerator/src/main/java/io/github/jwdeveloper/tiktok/EventsListGenerator.java
@@ -0,0 +1,75 @@
+package io.github.jwdeveloper.tiktok;
+
+import io.github.jwdeveloper.tiktok.annotations.EventMeta;
+import io.github.jwdeveloper.tiktok.annotations.EventType;
+import io.github.jwdeveloper.tiktok.events.TikTokEvent;
+import org.reflections.Reflections;
+
+import java.util.*;
+
+public class EventsListGenerator
+{
+
+
+    //[a](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokBarrageMessageEvent.java)
+    //Message Events:
+    //- [member](#member)
+
+    public static String GetEventsList()
+    {
+        var classes =  getClasses();
+        var builder = new StringBuilder();
+        for(var entry : classes.entrySet())
+        {
+            builder.append(System.lineSeparator());
+            builder.append(" **"+entry.getKey().name()+"**:").append(System.lineSeparator());
+
+            for(var clazz : entry.getValue())
+            {
+                var name = clazz.getSimpleName();
+                var baseUrl ="https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/"+name+".java";
+                builder.append("-  [").append(name).append("](").append(baseUrl).append(")").append(System.lineSeparator());
+            }
+        }
+
+        return builder.toString();
+    }
+
+
+    private static Map<EventType, List<Class<?>>> getClasses()
+    {
+        Reflections reflections = new Reflections("io.github.jwdeveloper.tiktok.events.messages");
+        var classes = reflections.getSubTypesOf(TikTokEvent.class).stream().toList();
+        Map<EventType, List<Class<?>>> classMap = new HashMap<>();
+        // Group classes by EventType
+        for (Class<?> clazz : classes) {
+            EventType eventType = getEventType(clazz);
+            classMap.computeIfAbsent(eventType, k -> new ArrayList<>()).add(clazz);
+        }
+        return classMap;
+    }
+
+    private static EventType getEventType(Class<?> clazz) {
+        EventMeta annotation = clazz.getAnnotation(EventMeta.class);
+        if (annotation != null) {
+            return annotation.eventType();
+        }
+        return EventType.Custom; // Default value if annotation not present
+    }
+    private class EventTypeComparator implements Comparator<Class<?>> {
+        @Override
+        public int compare(Class<?> class1, Class<?> class2) {
+            EventType eventType1 = getEventType(class1);
+            EventType eventType2 = getEventType(class2);
+            return eventType1.compareTo(eventType2);
+        }
+
+        private EventType getEventType(Class<?> clazz) {
+            EventMeta annotation = clazz.getAnnotation(EventMeta.class);
+            if (annotation != null) {
+                return annotation.eventType();
+            }
+            return EventType.Custom;
+        }
+    }
+}
diff --git a/Tools-ReadmeGenerator/src/main/java/io/github/jwdeveloper/tiktok/LiveClientMethodsGenerator.java b/Tools-ReadmeGenerator/src/main/java/io/github/jwdeveloper/tiktok/LiveClientMethodsGenerator.java
new file mode 100644
index 0000000..f1eca1b
--- /dev/null
+++ b/Tools-ReadmeGenerator/src/main/java/io/github/jwdeveloper/tiktok/LiveClientMethodsGenerator.java
@@ -0,0 +1,45 @@
+package io.github.jwdeveloper.tiktok;
+
+import io.github.jwdeveloper.tiktok.utils.FilesUtility;
+
+import java.util.regex.Pattern;
+
+public class LiveClientMethodsGenerator
+{
+
+
+
+    //| Method Name | Description |
+    //| ----------- | ----------- |
+
+
+    public static String generate(String path)
+    {
+
+
+        var sb = new StringBuilder();
+        sb.append("| Method Name | Description |");
+        sb.append(System.lineSeparator());
+        sb.append("| ----------- | ----------- |");
+
+        var content = FilesUtility.loadFileContent(path);
+        var pattern = "// \\s*(.*?)\\n\\s*(\\w+)\\s*\\(.*?\\)";
+
+        // Create a Pattern object
+        var regex = Pattern.compile(pattern);
+
+        // Create a Matcher object
+        var matcher = regex.matcher(content);
+
+        // Find and print method names and comments
+        while (matcher.find()) {
+            String comment = matcher.group(1);
+            String methodName = matcher.group(2);
+            sb.append(System.lineSeparator());
+            sb.append("| ").append(methodName).append(" | ").append(comment).append(" |");
+        }
+        sb.append(System.lineSeparator());
+        return sb.toString();
+    }
+
+}
diff --git a/Tools-ReadmeGenerator/src/main/java/io/github/jwdeveloper/tiktok/Main.java b/Tools-ReadmeGenerator/src/main/java/io/github/jwdeveloper/tiktok/Main.java
new file mode 100644
index 0000000..f9e237b
--- /dev/null
+++ b/Tools-ReadmeGenerator/src/main/java/io/github/jwdeveloper/tiktok/Main.java
@@ -0,0 +1,10 @@
+package io.github.jwdeveloper.tiktok;
+
+
+public class Main {
+    public static void main(String[] args)
+    {
+        var generator = new ReadmeGenerator();
+        generator.generate();
+    }
+}
\ No newline at end of file
diff --git a/Tools-ReadmeGenerator/src/main/java/io/github/jwdeveloper/tiktok/ReadmeGenerator.java b/Tools-ReadmeGenerator/src/main/java/io/github/jwdeveloper/tiktok/ReadmeGenerator.java
new file mode 100644
index 0000000..7216bc5
--- /dev/null
+++ b/Tools-ReadmeGenerator/src/main/java/io/github/jwdeveloper/tiktok/ReadmeGenerator.java
@@ -0,0 +1,66 @@
+package io.github.jwdeveloper.tiktok;
+
+import io.github.jwdeveloper.tiktok.utils.FilesUtility;
+import io.github.jwdeveloper.tiktok.utils.TemplateUtility;
+
+import java.util.HashMap;
+import java.util.regex.Pattern;
+
+public class ReadmeGenerator
+{
+
+    public void generate()
+    {
+        var template = FilesUtility.getFileFromResource(Main.class,"template.md");
+        var variables = new HashMap<String,Object>();
+
+        var pomPath = "C:\\Users\\ja\\IdeaProjects\\TikTokLiveJava\\Tools-ReadmeGenerator\\pom.xml";
+
+        variables.put("version", getCurrentVersion(pomPath));
+
+
+        var exampleCodePath = "C:\\Users\\ja\\IdeaProjects\\TikTokLiveJava\\TestApplication\\src\\main\\java\\io\\github\\jwdeveloper\\tiktok\\SimpleExample.java";
+        variables.put("Code-Example", getCodeExample(exampleCodePath));
+
+
+        var exampleConfigurationPath = "C:\\Users\\ja\\IdeaProjects\\TikTokLiveJava\\TestApplication\\src\\main\\java\\io\\github\\jwdeveloper\\tiktok\\ConfigurationExample.java";
+        variables.put("Configuration-Example", getCodeExample(exampleConfigurationPath));
+
+        variables.put("Events", EventsListGenerator.GetEventsList());
+
+        var listenerExamplePath = "C:\\Users\\ja\\IdeaProjects\\TikTokLiveJava\\TestApplication\\src\\main\\java\\io\\github\\jwdeveloper\\tiktok\\ListenerExample.java";
+        variables.put("Listener-Example", getCodeExample(listenerExamplePath));
+
+       // var liveClientPath = "C:\\Users\\ja\\IdeaProjects\\TikTokLiveJava\\API\\src\\main\\java\\io\\github\\jwdeveloper\\tiktok\\live\\LiveClient.java";
+       // variables.put("methods", LiveClientMethodsGenerator.generate(liveClientPath));
+
+        template = TemplateUtility.generateTemplate(template, variables);
+        var outputPath = "C:\\Users\\ja\\IdeaProjects\\TikTokLiveJava\\Tools-ReadmeGenerator\\src\\main\\resources\\output.md";
+        FilesUtility.saveFile(outputPath, template);
+    }
+
+    public String getCurrentVersion(String path)
+    {
+        var content =  FilesUtility.loadFileContent(path);
+        var pattern = "<version>(.*?)<\\/version>";
+
+        // Create a Pattern object
+        var regex = Pattern.compile(pattern);
+
+        // Create a Matcher object
+        var matcher = regex.matcher(content);
+
+        // Find the first match
+        if (matcher.find()) {
+            // Extract and print the version
+           return matcher.group(1);
+        }
+       return "VERSION NOT FOUND";
+    }
+
+    public String getCodeExample(String path)
+    {
+        return  FilesUtility.loadFileContent(path);
+    }
+
+}
diff --git a/Tools-ReadmeGenerator/src/main/resources/template.md b/Tools-ReadmeGenerator/src/main/resources/template.md
new file mode 100644
index 0000000..19547ea
--- /dev/null
+++ b/Tools-ReadmeGenerator/src/main/resources/template.md
@@ -0,0 +1,89 @@
+[![](https://jitpack.io/v/jwdeveloper/TikTok-Live-Java.svg)](https://jitpack.io/#jwdeveloper/TikTok-Live-Java)
+
+
+# TikTokLive Java
+A Java library based on [TikTokLive](https://github.com/isaackogan/TikTokLive) and [TikTokLiveSharp](https://github.com/sebheron/TikTokLiveSharp). Use it to receive live stream events such as comments and gifts in realtime from [TikTok LIVE](https://www.tiktok.com/live) by connecting to TikTok's internal WebCast push service. The package includes a wrapper that connects to the WebCast service using just the username (`uniqueId`). This allows you to connect to your own live chat as well as the live chat of other streamers. No credentials are required. Besides [Chat Comments](#chat), other events such as [Members Joining](#member), [Gifts](#gift), [Subscriptions](#subscribe), [Viewers](#roomuser), [Follows](#social), [Shares](#social), [Questions](#questionnew), [Likes](#like) and [Battles](#linkmicbattle) can be tracked. You can also send [automatic messages](#send-chat-messages) into the chat by providing your Session ID.
+
+Join the support [discord](https://discord.gg/e2XwPNTBBr) and visit the `#java-support` channel for questions, contributions and ideas. Feel free to make pull requests with missing/new features, fixes, etc
+
+Do you prefer other programming languages?
+- **Node** orginal: [TikTok-Live-Connector](https://github.com/isaackogan/TikTok-Live-Connector) by [@zerodytrash](https://github.com/zerodytrash)
+- **Python** rewrite: [TikTokLive](https://github.com/isaackogan/TikTokLive) by [@isaackogan](https://github.com/isaackogan)
+- **Go** rewrite: [GoTikTokLive](https://github.com/Davincible/gotiktoklive) by [@Davincible](https://github.com/Davincible)
+- **C#** rewrite: [TikTokLiveSharp](https://github.com/frankvHoof93/TikTokLiveSharp) by [@frankvHoof93](https://github.com/frankvHoof93)
+
+**NOTE:** This is not an official API. It's a reverse engineering project.
+
+#### Overview
+- [Getting started](#getting-started)
+- [Configuration](#configuration)
+- [Methods](#methods)
+- [Events](#events)
+- [Contributing](#contributing)
+
+## Getting started
+
+1. Install the package via Maven
+
+```xml
+   <repositories>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+    </repositories>
+
+   <dependencies>
+         <dependency>
+            <groupId>com.github.jwdeveloper.TikTok-Live-Java</groupId>
+            <artifactId>Client</artifactId>
+            <version>{{version}}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.10.1</version>
+        </dependency>
+   </dependencies>
+```
+
+2. Create your first chat connection
+
+```java
+{{Code-Example}}
+```
+## Configuration
+
+```java
+{{Configuration-Example}}
+```
+## Listener Example
+
+```java
+{{Listener-Example}}
+```
+
+## Methods
+A `client (LiveClient)` object contains the following methods.
+
+{{methods}}
+
+| Method Name         | Description |
+|---------------------| ----------- |
+| connect             | Connects to the live stream. |
+| disconnect          | Disconnects the connection. |
+| getGiftManager      |  Gets the meta informations about all gifts. |
+| getRoomInfo         | Gets the current room info from TikTok API including streamer info, room status and statistics. |
+| getListenersManager | Gets and manage TikTokEventListeners    |
+
+## Events
+
+A `TikTokLive` object has the following events
+
+{{Events}}
+
+<br><br>
+
+## Contributing
+Your improvements are welcome! Feel free to open an <a href="https://github.com/jwdeveloper/TikTok-Live-Java/issues">issue</a> or <a href="https://github.com/jwdeveloper/TikTok-Live-Java/pulls">pull request</a>.
diff --git a/Tools/src/main/java/io/github/jwdeveloper/tiktok/GenerateEventsListRun.java b/Tools/src/main/java/io/github/jwdeveloper/tiktok/GenerateEventsListRun.java
deleted file mode 100644
index 3f6e88a..0000000
--- a/Tools/src/main/java/io/github/jwdeveloper/tiktok/GenerateEventsListRun.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package io.github.jwdeveloper.tiktok;
-
-import io.github.jwdeveloper.tiktok.events.TikTokEvent;
-import org.reflections.Reflections;
-
-public class GenerateEventsListRun
-{
-
-
-    //[a](https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/TikTokBarrageMessageEvent.java)
-    //Message Events:
-    //- [member](#member)
-
-    public static void main(String[] args)
-    {
-        Reflections reflections = new Reflections("io.github.jwdeveloper.tiktok.events.messages");
-        var classes = reflections.getSubTypesOf(TikTokEvent.class);
-        classes.add(TikTokEvent.class);
-
-        var builder = new StringBuilder();
-        builder.append("Events:").append(System.lineSeparator());
-        for(var event : classes)
-        {
-            var name = event.getSimpleName();
-            var baseUrl ="https://github.com/jwdeveloper/TikTok-Live-Java/blob/master/API/src/main/java/io/github/jwdeveloper/tiktok/events/messages/"+name+".java";
-            builder.append("-  [").append(name).append("](").append(baseUrl).append(")").append(System.lineSeparator());
-        }
-
-        System.out.println(builder.toString());
-    }
-}
diff --git a/Tools/src/main/java/io/github/jwdeveloper/tiktok/utils/FilesUtility.java b/Tools/src/main/java/io/github/jwdeveloper/tiktok/utils/FilesUtility.java
index f4e169c..e3228d9 100644
--- a/Tools/src/main/java/io/github/jwdeveloper/tiktok/utils/FilesUtility.java
+++ b/Tools/src/main/java/io/github/jwdeveloper/tiktok/utils/FilesUtility.java
@@ -1,5 +1,6 @@
 package io.github.jwdeveloper.tiktok.utils;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -18,7 +19,25 @@ public class FilesUtility
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
-
+    }
+    public static String getFileFromResource(Class clazz, String path)
+    {
+        try {
+            var stream =clazz.getClassLoader().getResourceAsStream(path);
+            var bytes=  stream.readAllBytes();
+            stream.close();
+            return new String(bytes);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+    public static List<Path> getFileContent(String input) {
+        Path path = Paths.get(input);
+        try (Stream<Path> paths = Files.list(path)) {
+            return paths.filter(Files::isRegularFile).toList();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     public static void saveFile(String path, String content)
@@ -34,5 +53,42 @@ public class FilesUtility
         }
     }
 
+    public   static boolean pathExists(String path) {
+        var directory = new File(path);
+        return directory.exists();
+    }
+
+    public static File ensurePath(String path) {
+        var directory = new File(path);
+        if (directory.exists()) {
+            return directory;
+        }
+        directory.mkdirs();
+        return directory;
+    }
+
+    public static void ensureFile(String paths) {
+        var file =   new File(paths);
+        if (!file.exists()) {
+            try {
+                file.createNewFile();
+            } catch (IOException e)
+            {
+               e.printStackTrace();
+            }
+        }
+    }
+
+
+     public static String loadFileContent(String path) {
+        ensureFile(path);
+        Path pathh = Paths.get(path);
+        try {
+            return   new String(Files.readAllBytes(pathh));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
 
 }
diff --git a/Tools/src/main/java/io/github/jwdeveloper/tiktok/utils/TemplateUtility.java b/Tools/src/main/java/io/github/jwdeveloper/tiktok/utils/TemplateUtility.java
new file mode 100644
index 0000000..fb7ab0e
--- /dev/null
+++ b/Tools/src/main/java/io/github/jwdeveloper/tiktok/utils/TemplateUtility.java
@@ -0,0 +1,34 @@
+package io.github.jwdeveloper.tiktok.utils;
+
+import java.util.Map;
+
+public class TemplateUtility
+{
+    public static String generateTemplate(String template, Map<String, Object> values) {
+        for(var entry : values.entrySet())
+        {
+            template = doReplacement(template,entry.getKey(), entry.getValue().toString());
+        }
+        return template;
+    }
+
+    public static String generateTemplate2(String template, Map<String, Object> values) {
+        for(var entry : values.entrySet())
+        {
+            template = doReplacement2(template,entry.getKey(), entry.getValue().toString());
+        }
+        return template;
+    }
+
+    private static String doReplacement(String template, String keyword, String value)
+    {
+        var key = "(\\{\\{)"+keyword+"(}})";
+        return template.replaceAll(key, value);
+    }
+
+    private static String doReplacement2(String template, String keyword, String value)
+    {
+        var key = "(\\$)("+keyword+")(\\$)";
+        return template.replaceAll(key, value);
+    }
+}
diff --git a/pom.xml b/pom.xml
index 2ddc8f2..1df3a24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,6 +14,7 @@
         <module>Tools</module>
         <module>TestApplication</module>
         <module>Tools-EventsCollector</module>
+        <module>Tools-ReadmeGenerator</module>
     </modules>
 
     <properties>