diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/RoomStatusEntity.java b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/RoomStatusEntity.java
index 446c602..893af97 100644
--- a/src/main/java/com/hiczp/bilibili/api/live/socket/entity/RoomStatusEntity.java
+++ b/src/main/java/com/hiczp/bilibili/api/live/socket/entity/RoomStatusEntity.java
@@ -1,7 +1,5 @@
 package com.hiczp.bilibili.api.live.socket.entity;
 
-public interface RoomStatusEntity {
-    String getCmd();
-
+public interface RoomStatusEntity extends DataEntity {
     String getRoomId();
 }
diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/event/ActivityEventPackageEvent.java b/src/main/java/com/hiczp/bilibili/api/live/socket/event/ActivityEventPackageEvent.java
index 2d488cf..759d4ee 100644
--- a/src/main/java/com/hiczp/bilibili/api/live/socket/event/ActivityEventPackageEvent.java
+++ b/src/main/java/com/hiczp/bilibili/api/live/socket/event/ActivityEventPackageEvent.java
@@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.socket.event;
 
 import com.hiczp.bilibili.api.live.socket.entity.ActivityEventEntity;
 
-public class ActivityEventPackageEvent extends ReceivePackageEvent<ActivityEventEntity> {
+public class ActivityEventPackageEvent extends ReceiveDataPackageEvent<ActivityEventEntity> {
     public ActivityEventPackageEvent(Object source, ActivityEventEntity entity) {
         super(source, entity);
     }
diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/event/DanMuMsgPackageEvent.java b/src/main/java/com/hiczp/bilibili/api/live/socket/event/DanMuMsgPackageEvent.java
index 4f9104c..c3672a9 100644
--- a/src/main/java/com/hiczp/bilibili/api/live/socket/event/DanMuMsgPackageEvent.java
+++ b/src/main/java/com/hiczp/bilibili/api/live/socket/event/DanMuMsgPackageEvent.java
@@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.socket.event;
 
 import com.hiczp.bilibili.api.live.socket.entity.DanMuMsgEntity;
 
-public class DanMuMsgPackageEvent extends ReceivePackageEvent<DanMuMsgEntity> {
+public class DanMuMsgPackageEvent extends ReceiveDataPackageEvent<DanMuMsgEntity> {
     public DanMuMsgPackageEvent(Object source, DanMuMsgEntity entity) {
         super(source, entity);
     }
diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/event/GuardMsgPackageEvent.java b/src/main/java/com/hiczp/bilibili/api/live/socket/event/GuardMsgPackageEvent.java
index 28994b7..7094e9c 100644
--- a/src/main/java/com/hiczp/bilibili/api/live/socket/event/GuardMsgPackageEvent.java
+++ b/src/main/java/com/hiczp/bilibili/api/live/socket/event/GuardMsgPackageEvent.java
@@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.socket.event;
 
 import com.hiczp.bilibili.api.live.socket.entity.GuardMsgEntity;
 
-public class GuardMsgPackageEvent extends ReceivePackageEvent<GuardMsgEntity> {
+public class GuardMsgPackageEvent extends ReceiveDataPackageEvent<GuardMsgEntity> {
     public GuardMsgPackageEvent(Object source, GuardMsgEntity entity) {
         super(source, entity);
     }
diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/event/LivePackageEvent.java b/src/main/java/com/hiczp/bilibili/api/live/socket/event/LivePackageEvent.java
index 8ef1035..76c1f0b 100644
--- a/src/main/java/com/hiczp/bilibili/api/live/socket/event/LivePackageEvent.java
+++ b/src/main/java/com/hiczp/bilibili/api/live/socket/event/LivePackageEvent.java
@@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.socket.event;
 
 import com.hiczp.bilibili.api.live.socket.entity.LiveEntity;
 
-public class LivePackageEvent extends ReceivePackageEvent<LiveEntity> {
+public class LivePackageEvent extends ReceiveRoomStatusPackageEvent<LiveEntity> {
     public LivePackageEvent(Object source, LiveEntity entity) {
         super(source, entity);
     }
diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/event/PreparingPackageEvent.java b/src/main/java/com/hiczp/bilibili/api/live/socket/event/PreparingPackageEvent.java
index a258158..f960ff9 100644
--- a/src/main/java/com/hiczp/bilibili/api/live/socket/event/PreparingPackageEvent.java
+++ b/src/main/java/com/hiczp/bilibili/api/live/socket/event/PreparingPackageEvent.java
@@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.socket.event;
 
 import com.hiczp.bilibili.api.live.socket.entity.PreparingEntity;
 
-public class PreparingPackageEvent extends ReceivePackageEvent<PreparingEntity> {
+public class PreparingPackageEvent extends ReceiveRoomStatusPackageEvent<PreparingEntity> {
     public PreparingPackageEvent(Object source, PreparingEntity entity) {
         super(source, entity);
     }
diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/event/ReceiveDataPackageEvent.java b/src/main/java/com/hiczp/bilibili/api/live/socket/event/ReceiveDataPackageEvent.java
new file mode 100644
index 0000000..6f6e123
--- /dev/null
+++ b/src/main/java/com/hiczp/bilibili/api/live/socket/event/ReceiveDataPackageEvent.java
@@ -0,0 +1,9 @@
+package com.hiczp.bilibili.api.live.socket.event;
+
+import com.hiczp.bilibili.api.live.socket.entity.DataEntity;
+
+public abstract class ReceiveDataPackageEvent<T extends DataEntity> extends ReceivePackageEvent<T> {
+    public ReceiveDataPackageEvent(Object source, T entity) {
+        super(source, entity);
+    }
+}
diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/event/ReceiveRoomStatusPackageEvent.java b/src/main/java/com/hiczp/bilibili/api/live/socket/event/ReceiveRoomStatusPackageEvent.java
new file mode 100644
index 0000000..f147839
--- /dev/null
+++ b/src/main/java/com/hiczp/bilibili/api/live/socket/event/ReceiveRoomStatusPackageEvent.java
@@ -0,0 +1,9 @@
+package com.hiczp.bilibili.api.live.socket.event;
+
+import com.hiczp.bilibili.api.live.socket.entity.RoomStatusEntity;
+
+public class ReceiveRoomStatusPackageEvent<T extends RoomStatusEntity> extends ReceiveDataPackageEvent<T> {
+    public ReceiveRoomStatusPackageEvent(Object source, T entity) {
+        super(source, entity);
+    }
+}
diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/event/RoomBlockMsgPackageEvent.java b/src/main/java/com/hiczp/bilibili/api/live/socket/event/RoomBlockMsgPackageEvent.java
index fd2494b..8618f80 100644
--- a/src/main/java/com/hiczp/bilibili/api/live/socket/event/RoomBlockMsgPackageEvent.java
+++ b/src/main/java/com/hiczp/bilibili/api/live/socket/event/RoomBlockMsgPackageEvent.java
@@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.socket.event;
 
 import com.hiczp.bilibili.api.live.socket.entity.RoomBlockMsgEntity;
 
-public class RoomBlockMsgPackageEvent extends ReceivePackageEvent<RoomBlockMsgEntity> {
+public class RoomBlockMsgPackageEvent extends ReceiveDataPackageEvent<RoomBlockMsgEntity> {
     public RoomBlockMsgPackageEvent(Object source, RoomBlockMsgEntity entity) {
         super(source, entity);
     }
diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/event/RoomSilentOffPackageEvent.java b/src/main/java/com/hiczp/bilibili/api/live/socket/event/RoomSilentOffPackageEvent.java
index 5dd8924..f7e5167 100644
--- a/src/main/java/com/hiczp/bilibili/api/live/socket/event/RoomSilentOffPackageEvent.java
+++ b/src/main/java/com/hiczp/bilibili/api/live/socket/event/RoomSilentOffPackageEvent.java
@@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.socket.event;
 
 import com.hiczp.bilibili.api.live.socket.entity.RoomSilentOffEntity;
 
-public class RoomSilentOffPackageEvent extends ReceivePackageEvent<RoomSilentOffEntity> {
+public class RoomSilentOffPackageEvent extends ReceiveDataPackageEvent<RoomSilentOffEntity> {
     public RoomSilentOffPackageEvent(Object source, RoomSilentOffEntity entity) {
         super(source, entity);
     }
diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/event/SendGiftPackageEvent.java b/src/main/java/com/hiczp/bilibili/api/live/socket/event/SendGiftPackageEvent.java
index c9303a9..d5f1950 100644
--- a/src/main/java/com/hiczp/bilibili/api/live/socket/event/SendGiftPackageEvent.java
+++ b/src/main/java/com/hiczp/bilibili/api/live/socket/event/SendGiftPackageEvent.java
@@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.socket.event;
 
 import com.hiczp.bilibili.api.live.socket.entity.SendGiftEntity;
 
-public class SendGiftPackageEvent extends ReceivePackageEvent<SendGiftEntity> {
+public class SendGiftPackageEvent extends ReceiveDataPackageEvent<SendGiftEntity> {
     public SendGiftPackageEvent(Object source, SendGiftEntity entity) {
         super(source, entity);
     }
diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/event/SysGiftPackageEvent.java b/src/main/java/com/hiczp/bilibili/api/live/socket/event/SysGiftPackageEvent.java
index 67d661c..e1af383 100644
--- a/src/main/java/com/hiczp/bilibili/api/live/socket/event/SysGiftPackageEvent.java
+++ b/src/main/java/com/hiczp/bilibili/api/live/socket/event/SysGiftPackageEvent.java
@@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.socket.event;
 
 import com.hiczp.bilibili.api.live.socket.entity.SysGiftEntity;
 
-public class SysGiftPackageEvent extends ReceivePackageEvent<SysGiftEntity> {
+public class SysGiftPackageEvent extends ReceiveDataPackageEvent<SysGiftEntity> {
     public SysGiftPackageEvent(Object source, SysGiftEntity entity) {
         super(source, entity);
     }
diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/event/SysMsgPackageEvent.java b/src/main/java/com/hiczp/bilibili/api/live/socket/event/SysMsgPackageEvent.java
index 2868cf6..78b80ee 100644
--- a/src/main/java/com/hiczp/bilibili/api/live/socket/event/SysMsgPackageEvent.java
+++ b/src/main/java/com/hiczp/bilibili/api/live/socket/event/SysMsgPackageEvent.java
@@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.socket.event;
 
 import com.hiczp.bilibili.api.live.socket.entity.SysMsgEntity;
 
-public class SysMsgPackageEvent extends ReceivePackageEvent<SysMsgEntity> {
+public class SysMsgPackageEvent extends ReceiveDataPackageEvent<SysMsgEntity> {
     public SysMsgPackageEvent(Object source, SysMsgEntity entity) {
         super(source, entity);
     }
diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/event/WelcomeGuardPackageEvent.java b/src/main/java/com/hiczp/bilibili/api/live/socket/event/WelcomeGuardPackageEvent.java
index 8ea3f5e..3415885 100644
--- a/src/main/java/com/hiczp/bilibili/api/live/socket/event/WelcomeGuardPackageEvent.java
+++ b/src/main/java/com/hiczp/bilibili/api/live/socket/event/WelcomeGuardPackageEvent.java
@@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.socket.event;
 
 import com.hiczp.bilibili.api.live.socket.entity.WelcomeGuardEntity;
 
-public class WelcomeGuardPackageEvent extends ReceivePackageEvent<WelcomeGuardEntity> {
+public class WelcomeGuardPackageEvent extends ReceiveDataPackageEvent<WelcomeGuardEntity> {
     public WelcomeGuardPackageEvent(Object source, WelcomeGuardEntity entity) {
         super(source, entity);
     }
diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/event/WelcomePackageEvent.java b/src/main/java/com/hiczp/bilibili/api/live/socket/event/WelcomePackageEvent.java
index 2ffdb4c..e16c911 100644
--- a/src/main/java/com/hiczp/bilibili/api/live/socket/event/WelcomePackageEvent.java
+++ b/src/main/java/com/hiczp/bilibili/api/live/socket/event/WelcomePackageEvent.java
@@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.socket.event;
 
 import com.hiczp.bilibili.api.live.socket.entity.WelcomeEntity;
 
-public class WelcomePackageEvent extends ReceivePackageEvent<WelcomeEntity> {
+public class WelcomePackageEvent extends ReceiveDataPackageEvent<WelcomeEntity> {
     public WelcomePackageEvent(Object source, WelcomeEntity entity) {
         super(source, entity);
     }
diff --git a/src/main/java/com/hiczp/bilibili/api/live/socket/event/WishBottlePackageEvent.java b/src/main/java/com/hiczp/bilibili/api/live/socket/event/WishBottlePackageEvent.java
index c1fdeb1..25363dd 100644
--- a/src/main/java/com/hiczp/bilibili/api/live/socket/event/WishBottlePackageEvent.java
+++ b/src/main/java/com/hiczp/bilibili/api/live/socket/event/WishBottlePackageEvent.java
@@ -2,7 +2,7 @@ package com.hiczp.bilibili.api.live.socket.event;
 
 import com.hiczp.bilibili.api.live.socket.entity.WishBottleEntity;
 
-public class WishBottlePackageEvent extends ReceivePackageEvent<WishBottleEntity> {
+public class WishBottlePackageEvent extends ReceiveDataPackageEvent<WishBottleEntity> {
     public WishBottlePackageEvent(Object source, WishBottleEntity entity) {
         super(source, entity);
     }