diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/LiveMapper.java b/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/LiveMapper.java
index d77b04b..17793e4 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/LiveMapper.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/LiveMapper.java
@@ -22,7 +22,7 @@
  */
 package io.github.jwdeveloper.tiktok.mappers;
 
-import com.google.protobuf.GeneratedMessageV3;
+import com.google.protobuf.GeneratedMessage;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.mappers.data.MappingAction;
 import io.github.jwdeveloper.tiktok.mappers.data.MappingResult;
@@ -44,13 +44,13 @@ public interface LiveMapper {
      * @param mapperName protocol buffer class type
      * @return
      */
-    TikTokMapperModel forMessage(Class<? extends GeneratedMessageV3> mapperName);
+    TikTokMapperModel forMessage(Class<? extends GeneratedMessage> mapperName);
 
     TikTokMapperModel forMessage(String mapperName, MappingAction<MappingResult> onMapping);
 
-    TikTokMapperModel forMessage(Class<? extends GeneratedMessageV3> mapperName, MappingAction<MappingResult> onMapping);
+    TikTokMapperModel forMessage(Class<? extends GeneratedMessage> mapperName, MappingAction<MappingResult> onMapping);
 
-    TikTokMapperModel forMessage(Class<? extends GeneratedMessageV3> mapperName, Function<byte[], TikTokEvent> onMapping);
+    TikTokMapperModel forMessage(Class<? extends GeneratedMessage> mapperName, Function<byte[], TikTokEvent> onMapping);
 
     TikTokMapperModel forAnyMessage();
 
@@ -58,5 +58,5 @@ public interface LiveMapper {
 
     boolean isRegistered(String mapperName);
 
-    <T extends GeneratedMessageV3> boolean isRegistered(Class<T> mapperName);
+    <T extends GeneratedMessage> boolean isRegistered(Class<T> mapperName);
 }
diff --git a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/LiveMapperHelper.java b/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/LiveMapperHelper.java
index e03a1ac..3ae1531 100644
--- a/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/LiveMapperHelper.java
+++ b/API/src/main/java/io/github/jwdeveloper/tiktok/mappers/LiveMapperHelper.java
@@ -22,7 +22,7 @@
  */
 package io.github.jwdeveloper.tiktok.mappers;
 
-import com.google.protobuf.GeneratedMessageV3;
+import com.google.protobuf.GeneratedMessage;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokMessageMappingException;
 import io.github.jwdeveloper.tiktok.utils.ProtoBufferObject;
 
@@ -34,7 +34,7 @@ public interface LiveMapperHelper {
      * @param <T>          @messageClass must be class that is made by protocol buffer
      * @return object of type @messageClass
      */
-    <T extends GeneratedMessageV3> T bytesToWebcastObject(byte[] bytes, Class<T> messageClass);
+    <T extends GeneratedMessage> T bytesToWebcastObject(byte[] bytes, Class<T> messageClass);
 
     /**
      * @param bytes       protocol buffer data bytes
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapper.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapper.java
index db9ea4b..286d8fe 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapper.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapper.java
@@ -22,7 +22,7 @@
  */
 package io.github.jwdeveloper.tiktok.mappers;
 
-import com.google.protobuf.GeneratedMessageV3;
+import com.google.protobuf.GeneratedMessage;
 import io.github.jwdeveloper.tiktok.data.events.common.TikTokEvent;
 import io.github.jwdeveloper.tiktok.mappers.data.*;
 
@@ -48,7 +48,7 @@ public class TikTokLiveMapper implements LiveMapper {
     }
 
     @Override
-    public TikTokMapperModel forMessage(Class<? extends GeneratedMessageV3> mapperName) {
+    public TikTokMapperModel forMessage(Class<? extends GeneratedMessage> mapperName) {
         return forMessage(mapperName.getSimpleName());
     }
 
@@ -60,14 +60,14 @@ public class TikTokLiveMapper implements LiveMapper {
     }
 
     @Override
-    public TikTokMapperModel forMessage(Class<? extends GeneratedMessageV3> mapperName, MappingAction<MappingResult> onMapping) {
+    public TikTokMapperModel forMessage(Class<? extends GeneratedMessage> mapperName, MappingAction<MappingResult> onMapping) {
         var model = forMessage(mapperName);
         model.onMapping(onMapping);
         return model;
     }
 
     @Override
-    public TikTokMapperModel forMessage(Class<? extends GeneratedMessageV3> mapperName, Function<byte[], TikTokEvent> onMapping) {
+    public TikTokMapperModel forMessage(Class<? extends GeneratedMessage> mapperName, Function<byte[], TikTokEvent> onMapping) {
         return forMessage(mapperName, (inputBytes, messageName, mapperHelper) -> MappingResult.of(inputBytes, onMapping.apply(inputBytes)));
     }
 
@@ -80,7 +80,7 @@ public class TikTokLiveMapper implements LiveMapper {
         return mappers.containsKey(mapperName);
     }
 
-    public <T extends GeneratedMessageV3> boolean isRegistered(Class<T> mapperName) {
+    public <T extends GeneratedMessage> boolean isRegistered(Class<T> mapperName) {
         return mappers.containsKey(mapperName.getSimpleName());
     }
 
diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapperHelper.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapperHelper.java
index 4f5cc5a..b44da3b 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapperHelper.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/mappers/TikTokLiveMapperHelper.java
@@ -22,7 +22,7 @@
  */
 package io.github.jwdeveloper.tiktok.mappers;
 
-import com.google.protobuf.GeneratedMessageV3;
+import com.google.protobuf.GeneratedMessage;
 import io.github.jwdeveloper.tiktok.exceptions.TikTokMessageMappingException;
 import io.github.jwdeveloper.tiktok.utils.JsonUtil;
 import io.github.jwdeveloper.tiktok.utils.ProtoBufferObject;
@@ -39,7 +39,7 @@ public class TikTokLiveMapperHelper implements LiveMapperHelper {
     }
 
     @Override
-    public <T extends GeneratedMessageV3> T bytesToWebcastObject(byte[] bytes, Class<T> messageClass) {
+    public <T extends GeneratedMessage> T bytesToWebcastObject(byte[] bytes, Class<T> messageClass) {
         try {
             var parsingMethod = genericMapper.getParsingMethod(messageClass);
             //NULL is passed, since Parsing method is Static
@@ -55,7 +55,7 @@ public class TikTokLiveMapperHelper implements LiveMapperHelper {
         try {
             var packageName = PACKAGE_PREFIX + messageName;
             var clazz = Class.forName(packageName);
-            return bytesToWebcastObject(bytes, (Class<? extends GeneratedMessageV3>) clazz);
+            return bytesToWebcastObject(bytes, (Class<? extends GeneratedMessage>) clazz);
         } catch (Exception e) {
             throw new TikTokMessageMappingException(messageName, e);
         }