diff --git a/src/main/java/com/alterdekim/game/component/game/GameRoom.java b/src/main/java/com/alterdekim/game/component/game/GameRoom.java
index e98319b..b6766f3 100644
--- a/src/main/java/com/alterdekim/game/component/game/GameRoom.java
+++ b/src/main/java/com/alterdekim/game/component/game/GameRoom.java
@@ -37,13 +37,12 @@ public class GameRoom {
     private final ObjectMapper om;
 
     public GameRoom(List<RoomPlayer> players, UserServiceImpl userService) {
-        /*PolymorphicTypeValidator ptv = BasicPolymorphicTypeValidator.builder()
-                .allowIfSubType("com.alterdekim.game.component.game.DialogButtonsList")
-                .allowIfSubType("java.util.ArrayList")
-                .build();*/
+        PolymorphicTypeValidator ptv = BasicPolymorphicTypeValidator.builder()
+                .allowIfBaseType(ActionDialogBody.class)
+                .allowIfBaseType(List.class)
+                .build();
         this.om = new ObjectMapper();
-        //this.om.activateDefaultTyping(ptv, ObjectMapper.DefaultTyping.NON_FINAL);
-        this.om.activateDefaultTyping(new LaissezFaireSubTypeValidator(), ObjectMapper.DefaultTyping.EVERYTHING);
+        this.om.activateDefaultTyping(ptv, ObjectMapper.DefaultTyping.NON_FINAL);
         this.userService = userService;
         this.players = players.stream()
                 .map(p -> new GamePlayer(p.getUserId(), userService.findById(p.getUserId()).getDisplayName(), 0, new Chip(p.getUserId(), 0, 0, "#000000")))