diff --git a/libai/src/main/java/ai/api/GsonFactory.java b/libai/src/main/java/ai/api/GsonFactory.java
index 1b25979..15105b3 100644
--- a/libai/src/main/java/ai/api/GsonFactory.java
+++ b/libai/src/main/java/ai/api/GsonFactory.java
@@ -29,11 +29,13 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 
 import ai.api.model.ResponseMessage;
 import ai.api.model.ResponseMessage.MessageType;
+import ai.api.model.ResponseMessage.Platform;
 
 import java.lang.reflect.Type;
 import java.text.SimpleDateFormat;
@@ -49,6 +51,8 @@ public class GsonFactory {
   private static final Gson PROTOCOL_GSON = new GsonBuilder()
       .setDateFormat(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US).toPattern())
       .registerTypeAdapter(ResponseMessage.class, new ResponseItemAdapter())
+      .registerTypeAdapter(ResponseMessage.MessageType.class, new ResponseMessageTypeAdapter())
+      .registerTypeAdapter(ResponseMessage.Platform.class, new ResponseMessagePlatformAdapter())
       .registerTypeAdapter(ResponseMessage.ResponseSpeech.class, new ResponseSpeechDeserializer())
       .create();
 
@@ -67,23 +71,64 @@ public Gson getGson() {
   public static GsonFactory getDefaultFactory() {
     return DEFAULT_FACTORY;
   }
+  
+  private static class ResponseMessagePlatformAdapter implements
+    JsonDeserializer<ResponseMessage.Platform>,
+    JsonSerializer<ResponseMessage.Platform> {
 
-  private static class ResponseItemAdapter implements JsonDeserializer<ResponseMessage>,
-      JsonSerializer<ResponseMessage> {
+    @Override
+    public JsonElement serialize(Platform src, Type typeOfT, JsonSerializationContext context) {
+      return context.serialize(src.getName());
+    }
 
     @Override
-    public ResponseMessage deserialize(JsonElement json, Type typeOfT,
-        JsonDeserializationContext context) throws JsonParseException {
+    public Platform deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
+        throws JsonParseException {
+      String name = json.getAsString();
+      if (name == null) {
+        return Platform.DEFAULT;
+      }
+      Platform result = Platform.fromName(name);
+      if (result == null) {
+        throw new JsonParseException(String.format("Unexpected platform name: %s", json));
+      }
+      return result;
+    }
+  }
+  private static class ResponseMessageTypeAdapter implements
+    JsonDeserializer<ResponseMessage.MessageType>,
+    JsonSerializer<ResponseMessage.MessageType> {
 
-      int typeCode = json.getAsJsonObject().get("type").getAsInt();
+    @Override
+    public JsonElement serialize(MessageType src, Type typeOfT, JsonSerializationContext context) {
+      return context.serialize(src.getCode() <= 4 ? src.getCode() : src.getName());
+    }
 
-      for (MessageType type : MessageType.values()) {
-        if (type.getCode() == typeCode) {
-          return context.deserialize(json, type.getType());
-        }
+    @Override
+    public MessageType deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
+        throws JsonParseException {
+      JsonPrimitive jsonValue = json.getAsJsonPrimitive();
+      MessageType result = null;
+      if (jsonValue.isNumber()) {
+        result = MessageType.fromCode(jsonValue.getAsInt());
+      } else {
+        result = MessageType.fromName(jsonValue.getAsString());
+      }
+      if (result == null) {
+        throw new JsonParseException(String.format("Unexpected message type value: %s", jsonValue));
       }
+      return result;
+    }
+  }
+  
+  private static class ResponseItemAdapter implements JsonDeserializer<ResponseMessage>,
+      JsonSerializer<ResponseMessage> {
 
-      throw new JsonParseException(String.format("Unexpected message type value: %d", typeCode));
+    @Override
+    public ResponseMessage deserialize(JsonElement json, Type typeOfT,
+        JsonDeserializationContext context) throws JsonParseException {
+      MessageType messageType = context.deserialize(json.getAsJsonObject().get("type"), MessageType.class);
+      return context.deserialize(json, messageType.getType());
     }
 
     @Override
diff --git a/libai/src/main/java/ai/api/model/GoogleAssistantResponseMessages.java b/libai/src/main/java/ai/api/model/GoogleAssistantResponseMessages.java
new file mode 100644
index 0000000..0d2bb9a
--- /dev/null
+++ b/libai/src/main/java/ai/api/model/GoogleAssistantResponseMessages.java
@@ -0,0 +1,477 @@
+package ai.api.model;
+
+import java.util.List;
+
+public abstract class GoogleAssistantResponseMessages extends ResponseMessage {
+
+  protected GoogleAssistantResponseMessages(MessageType type) {
+    super(type, Platform.GOOGLE);
+  }
+
+  public static class CardImage {
+    private String url;
+
+    /**
+     * @return the URL
+     */
+    public final String getUrl() {
+      return url;
+    }
+
+    /**
+     * @param url the URL to set
+     */
+    public final void setUrl(String url) {
+      this.url = url;
+    }
+  }
+
+  public static class OptionInfo {
+    private String key;
+    private List<String> synonyms;
+
+    /**
+     * @return the key
+     */
+    public final String getKey() {
+      return key;
+    }
+
+    /**
+     * @param key the key to set
+     */
+    public final void setKey(String key) {
+      this.key = key;
+    }
+
+    /**
+     * @return the synonyms
+     */
+    public final List<String> getSynonyms() {
+      return synonyms;
+    }
+
+    /**
+     * @param synonyms the synonyms to set
+     */
+    public final void setSynonyms(List<String> synonyms) {
+      this.synonyms = synonyms;
+    }
+  }
+
+  public static class CardItem {
+    private OptionInfo optionInfo;
+    private String title;
+    private String description;
+    private CardImage image;
+    /**
+     * @return the optionInfo
+     */
+    public final OptionInfo getOptionInfo() {
+      return optionInfo;
+    }
+    /**
+     * @param optionInfo the optionInfo to set
+     */
+    public final void setOptionInfo(OptionInfo optionInfo) {
+      this.optionInfo = optionInfo;
+    }
+    /**
+     * @return the title
+     */
+    public final String getTitle() {
+      return title;
+    }
+    /**
+     * @param title the title to set
+     */
+    public final void setTitle(String title) {
+      this.title = title;
+    }
+    /**
+     * @return the description
+     */
+    public final String getDescription() {
+      return description;
+    }
+    /**
+     * @param description the description to set
+     */
+    public final void setDescription(String description) {
+      this.description = description;
+    }
+    /**
+     * @return the image
+     */
+    public final CardImage getImage() {
+      return image;
+    }
+    /**
+     * @param image the image to set
+     */
+    public final void setImage(CardImage image) {
+      this.image = image;
+    }
+  }
+
+  public static class ResponseChatBubble extends GoogleAssistantResponseMessages {
+
+    private Boolean customizeAudio;
+    private List<Item> items;
+
+    public ResponseChatBubble() {
+      super(MessageType.CHAT_BUBBLE);
+    }
+
+    /**
+     * @return the customizeAudio
+     */
+    public final Boolean getCustomizeAudio() {
+      return customizeAudio;
+    }
+
+    /**
+     * @param customizeAudio the customizeAudio to set
+     */
+    public final void setCustomizeAudio(Boolean customizeAudio) {
+      this.customizeAudio = customizeAudio;
+    }
+
+    /**
+     * @return the items
+     */
+    public final List<Item> getItems() {
+      return items;
+    }
+
+    /**
+     * @param items the items to set
+     */
+    public final void setItems(List<Item> items) {
+      this.items = items;
+    }
+
+    public static class Item {
+      private String textToSpeech;
+      private String ssml;
+      private String displayText;
+
+      /**
+       * @return the textToSpeech
+       */
+      public final String getTextToSpeech() {
+        return textToSpeech;
+      }
+
+      /**
+       * @param textToSpeech the textToSpeech to set
+       */
+      public final void setTextToSpeech(String textToSpeech) {
+        this.textToSpeech = textToSpeech;
+      }
+
+      /**
+       * @return the SSML
+       */
+      public final String getSsml() {
+        return ssml;
+      }
+
+      /**
+       * @param ssml the SSML to set
+       */
+      public final void setSsml(String ssml) {
+        this.ssml = ssml;
+      }
+
+      /**
+       * @return the displayText
+       */
+      public final String getDisplayText() {
+        return displayText;
+      }
+
+      /**
+       * @param displayText the displayText to set
+       */
+      public final void setDisplayText(String displayText) {
+        this.displayText = displayText;
+      }
+    }
+  }
+  
+  public static class ResponseBasicCard extends GoogleAssistantResponseMessages {
+    private String title;
+    private String subtitle;
+    private String formattedText;
+    private CardImage image;
+    private List<Button> buttons;
+
+    public ResponseBasicCard() {
+      super(MessageType.BASIC_CARD);
+    }
+
+    /**
+     * @return the title
+     */
+    public final String getTitle() {
+      return title;
+    }
+
+    /**
+     * @param title the title to set
+     */
+    public final void setTitle(String title) {
+      this.title = title;
+    }
+
+    /**
+     * @return the subtitle
+     */
+    public final String getSubtitle() {
+      return subtitle;
+    }
+
+    /**
+     * @param subtitle the subtitle to set
+     */
+    public final void setSubtitle(String subtitle) {
+      this.subtitle = subtitle;
+    }
+
+    /**
+     * @return the formattedText
+     */
+    public final String getFormattedText() {
+      return formattedText;
+    }
+
+    /**
+     * @param formattedText the formattedText to set
+     */
+    public final void setFormattedText(String formattedText) {
+      this.formattedText = formattedText;
+    }
+
+    /**
+     * @return the image
+     */
+    public final CardImage getImage() {
+      return image;
+    }
+
+    /**
+     * @param image the image to set
+     */
+    public final void setImage(CardImage image) {
+      this.image = image;
+    }
+
+    /**
+     * @return the buttons
+     */
+    public final List<Button> getButtons() {
+      return buttons;
+    }
+
+    /**
+     * @param buttons the buttons to set
+     */
+    public final void setButtons(List<Button> buttons) {
+      this.buttons = buttons;
+    }
+
+    public static class Button {
+      private String title;
+      private OpenUrlAction openUrlAction;
+
+      /**
+       * @return the title
+       */
+      public final String getTitle() {
+        return title;
+      }
+
+      /**
+       * @param title the title to set
+       */
+      public final void setTitle(String title) {
+        this.title = title;
+      }
+
+      /**
+       * @return the openUrlAction
+       */
+      public final OpenUrlAction getOpenUrlAction() {
+        return openUrlAction;
+      }
+
+      /**
+       * @param openUrlAction the openUrlAction to set
+       */
+      public final void setOpenUrlAction(OpenUrlAction openUrlAction) {
+        this.openUrlAction = openUrlAction;
+      }
+    }
+
+    public static class OpenUrlAction {
+      private String url;
+
+      /**
+       * @return the URL
+       */
+      public final String getUrl() {
+        return url;
+      }
+
+      /**
+       * @param url the URL to set
+       */
+      public final void setUrl(String url) {
+        this.url = url;
+      }
+    }
+  }
+
+  public static class ResponseListCard extends GoogleAssistantResponseMessages {
+
+    private String title;
+    private List<CardItem> items;
+
+    public ResponseListCard() {
+      super(MessageType.LIST_CARD);
+    }
+
+    /**
+     * @return the title
+     */
+    public final String getTitle() {
+      return title;
+    }
+
+    /**
+     * @param title the title to set
+     */
+    public final void setTitle(String title) {
+      this.title = title;
+    }
+
+    /**
+     * @return the items
+     */
+    public final List<CardItem> getItems() {
+      return items;
+    }
+
+    /**
+     * @param items the items to set
+     */
+    public final void setItems(List<CardItem> items) {
+      this.items = items;
+    }
+  }
+
+  public static class ResponseSuggestionChips extends GoogleAssistantResponseMessages {
+
+    private List<Suggestion> suggestions;
+
+    public ResponseSuggestionChips() {
+      super(MessageType.SUGGESTION_CHIPS);
+    }
+
+    
+    
+    /**
+     * @return the suggestions
+     */
+    public final List<Suggestion> getSuggestions() {
+      return suggestions;
+    }
+
+    /**
+     * @param suggestions the suggestions to set
+     */
+    public final void setSuggestions(List<Suggestion> suggestions) {
+      this.suggestions = suggestions;
+    }
+
+    public static class Suggestion {
+      private String title;
+
+      /**
+       * @return the title
+       */
+      public final String getTitle() {
+        return title;
+      }
+
+      /**
+       * @param title the title to set
+       */
+      public final void setTitle(String title) {
+        this.title = title;
+      }
+    }
+  }
+
+  public static class ResponseCarouselCard extends GoogleAssistantResponseMessages {
+
+    private List<CardItem> items;
+
+    public ResponseCarouselCard() {
+      super(MessageType.CAROUSEL_CARD);
+    }
+
+    /**
+     * @return the items
+     */
+    public final List<CardItem> getItems() {
+      return items;
+    }
+
+    /**
+     * @param items the items to set
+     */
+    public final void setItems(List<CardItem> items) {
+      this.items = items;
+    }
+  }
+
+  public static class ResponseLinkOutChip extends GoogleAssistantResponseMessages {
+
+    private String destinationName;
+    private String url;
+
+    public ResponseLinkOutChip() {
+      super(MessageType.LINK_OUT_CHIP);
+    }
+
+    /**
+     * @return the destinationName
+     */
+    public final String getDestinationName() {
+      return destinationName;
+    }
+
+    /**
+     * @param destinationName the destinationName to set
+     */
+    public final void setDestinationName(String destinationName) {
+      this.destinationName = destinationName;
+    }
+
+    /**
+     * @return the URL
+     */
+    public final String getUrl() {
+      return url;
+    }
+
+    /**
+     * @param url the URL to set
+     */
+    public final void setUrl(String url) {
+      this.url = url;
+    }
+  }
+}
diff --git a/libai/src/main/java/ai/api/model/ResponseMessage.java b/libai/src/main/java/ai/api/model/ResponseMessage.java
index eeec771..dccef0b 100644
--- a/libai/src/main/java/ai/api/model/ResponseMessage.java
+++ b/libai/src/main/java/ai/api/model/ResponseMessage.java
@@ -23,10 +23,20 @@
 
 import java.lang.reflect.Type;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.Expose;
 
+import ai.api.model.GoogleAssistantResponseMessages.ResponseBasicCard;
+import ai.api.model.GoogleAssistantResponseMessages.ResponseCarouselCard;
+import ai.api.model.GoogleAssistantResponseMessages.ResponseChatBubble;
+import ai.api.model.GoogleAssistantResponseMessages.ResponseLinkOutChip;
+import ai.api.model.GoogleAssistantResponseMessages.ResponseListCard;
+import ai.api.model.GoogleAssistantResponseMessages.ResponseSuggestionChips;
+
 /**
  * Base model class for 
  * <a href="https://docs.api.ai/docs/query#section-message-objects">response message objects</a>.
@@ -34,15 +44,29 @@
 public abstract class ResponseMessage {
 
   @Expose
-  private int type;
-  
+  private final MessageType type;
+
+  @Expose
+  private final Platform platform;
+
   /**
-   * Default constructor initializing message type code 
+   * Constructor initializing message type code 
    * @param type Message type. Cannot be <code>null</code>.
    */
   protected ResponseMessage(MessageType type) {
+    this(type, null);
+  }
+  
+  /**
+   * Constructor initializing message type code and platform
+   * @param type Message type. Cannot be <code>null</code>.
+   * @param platform Platform type. If <code>null</code> then
+   *    default value will be used
+   */
+  protected ResponseMessage(MessageType type, Platform platform) {
     assert type != null;
-    this.type = type.code;
+    this.type = type;
+    this.platform = platform != null ? platform : Platform.DEFAULT;
   }
 
   /**
@@ -50,21 +74,31 @@ protected ResponseMessage(MessageType type) {
    */
   public static enum MessageType {
     /** Text response message object */
-    SPEECH(0, ResponseSpeech.class),
+    SPEECH(0, "message", ResponseSpeech.class),
     /** Card message object */
-    CARD(1, ResponseCard.class),
+    CARD(1, "card", ResponseCard.class),
     /** Quick replies message object */
-    QUICK_REPLY(2, ResponseQuickReply.class),
+    QUICK_REPLY(2, "quick_reply", ResponseQuickReply.class),
     /** Image message object */
-    IMAGE(3, ResponseImage.class),
+    IMAGE(3, "image", ResponseImage.class),
     /** Custom payload message object */
-    PAYLOAD(4, ResponsePayload.class);
-
+    PAYLOAD(4, "custom_payload", ResponsePayload.class),
+    CHAT_BUBBLE(5, "simple_response", ResponseChatBubble.class),
+    BASIC_CARD(6, "basic_card", ResponseBasicCard.class),
+    LIST_CARD(7, "list_card", ResponseListCard.class),
+    SUGGESTION_CHIPS(8, "suggestion_chips", ResponseSuggestionChips.class),
+    CAROUSEL_CARD(9, "carousel_card", ResponseCarouselCard.class),
+    LINK_OUT_CHIP(10, "link_out_chip", ResponseLinkOutChip.class);
+    
     private final int code;
+    private final String name;
     private final Type type;
 
-    private MessageType(int code, Type curClass) {
+    private MessageType(int code, String name, Type curClass) {
+      assert name != null;
+      assert curClass != null;
       this.code = code;
+      this.name = name;
       this.type = curClass;
     }
 
@@ -75,12 +109,74 @@ public int getCode() {
       return this.code;
     }
 
+    /**
+     * @return Type name presentation
+     */
+    public String getName() {
+      return name;
+    }
+
     /**
      * @return Related class {@link Type}
      */
     public Type getType() {
       return type;
     }
+    
+
+    
+    private static Map<Integer,MessageType> typeByCode = new HashMap<>();
+    private static Map<String,MessageType> typeByName = new HashMap<>();
+
+    static {
+      for (MessageType type : values()) {
+        typeByCode.put(type.code, type);
+        typeByName.put(type.name.toLowerCase(), type);
+      }
+    }
+    
+    public static MessageType fromCode(int code) {
+      return typeByCode.get(code);
+    }
+    
+    public static MessageType fromName(String name) {
+      return typeByName.get(name != null ? name.toLowerCase() : null);
+    }
+  }
+
+  public enum Platform {
+    DEFAULT(null),
+    GOOGLE("google"),
+    FACEBOOK("facebook"),
+    SLACK("slack"),
+    TELEGRAM("telegram"),
+    KIK("kik"),
+    VIBER("viber"),
+    SKYPE("skype"),
+    LINE("line");
+
+    private final String name;
+
+    Platform(String name) {
+      this.name = name;
+    }
+    
+    public String getName() {
+      return name;
+    }
+    
+    private static Map<String,Platform> platformByName = new HashMap<>();
+    
+    static {
+      for (Platform platform : values()) {
+        String platformName = platform.getName();
+        platformByName.put(platformName != null ? platformName.toLowerCase() : null, platform);
+      }
+    }
+    
+    public static Platform fromName(String name) {
+      return platformByName.get(name != null ? name.toLowerCase() : null);
+    }
   }
 
   /**
diff --git a/libai/src/test/java/ai/api/model/GoogleAssistantResponseMessagesTest.java b/libai/src/test/java/ai/api/model/GoogleAssistantResponseMessagesTest.java
new file mode 100644
index 0000000..341069c
--- /dev/null
+++ b/libai/src/test/java/ai/api/model/GoogleAssistantResponseMessagesTest.java
@@ -0,0 +1,232 @@
+package ai.api.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
+import com.google.gson.Gson;
+
+import ai.api.GsonFactory;
+import ai.api.model.GoogleAssistantResponseMessages.CardImage;
+import ai.api.model.GoogleAssistantResponseMessages.CardItem;
+import ai.api.model.GoogleAssistantResponseMessages.OptionInfo;
+import ai.api.model.GoogleAssistantResponseMessages.ResponseBasicCard;
+import ai.api.model.GoogleAssistantResponseMessages.ResponseBasicCard.OpenUrlAction;
+import ai.api.model.GoogleAssistantResponseMessages.ResponseCarouselCard;
+import ai.api.model.GoogleAssistantResponseMessages.ResponseChatBubble;
+import ai.api.model.GoogleAssistantResponseMessages.ResponseLinkOutChip;
+import ai.api.model.GoogleAssistantResponseMessages.ResponseListCard;
+import ai.api.model.GoogleAssistantResponseMessages.ResponseSuggestionChips;
+
+public class GoogleAssistantResponseMessagesTest {
+
+  final static Gson gson = GsonFactory.getDefaultFactory().getGson();
+
+  private final String TEST_CHAT_BUBBLE = "{"
+      + "\"customizeAudio\":true,\"items\":"
+      + "[{\"textToSpeech\":\"hello\",\"ssml\":\"ssmlText\",\"displayText\":\"Hello\"}],"
+      + "\"type\":\"simple_response\",\"platform\":\"google\""
+      + "}";
+
+  private final String TEST_BASIC_CARD = "{"
+      + "\"title\":\"titleVal\",\"subtitle\":\"subtitleVal\",\"formattedText\":\"formattedVal\","
+      + "\"image\":{\"url\":\"urlVal\"},"
+      + "\"buttons\":[{\"title\":\"buttonTitle\",\"openUrlAction\":{\"url\":\"openActionUrlVal\"}}],"
+      + "\"type\":\"basic_card\",\"platform\":\"google\""
+      + "}";
+
+  private final String TEST_LIST_CARD = "{"
+      + "\"title\":\"titleVal\","
+      + "\"items\":[{"
+      + "\"optionInfo\":{\"key\":\"keyVal\",\"synonyms\":[\"syn1\"]},"
+      + "\"title\":\"itemTitle\",\"description\":\"itemDescription\","
+      + "\"image\":{\"url\":\"urlVal\"}"
+      + "}],"
+      + "\"type\":\"list_card\",\"platform\":\"google\""
+      + "}";
+
+  private final String TEST_SUGGESTION_CHIP = "{"
+      + "\"suggestions\":[{\"title\":\"titleVal\"}],"
+      + "\"type\":\"suggestion_chips\",\"platform\":\"google\""
+      + "}";
+
+  private final String TEST_CAROUSEL_CARD = "{"
+      + "\"items\":[{"
+      + "\"optionInfo\":{\"key\":\"keyVal\",\"synonyms\":[\"syn1\"]},"
+      + "\"title\":\"itemTitle\",\"description\":\"itemDescription\","
+      + "\"image\":{\"url\":\"urlVal\"}"
+      + "}],"
+      + "\"type\":\"carousel_card\",\"platform\":\"google\""
+      + "}";
+
+  private final String TEST_LINK_OUT_CHIP = "{"
+      + "\"destinationName\":\"destanationVal\",\"url\":\"urlVal\","
+      + "\"type\":\"link_out_chip\",\"platform\":\"google\""
+      + "}";
+
+  @Test
+  public void testResponseChatBubbleDeserialization() {
+    ResponseChatBubble chatBubble = (ResponseChatBubble) gson.fromJson(TEST_CHAT_BUBBLE, ResponseMessage.class);
+    assertTrue(chatBubble.getCustomizeAudio());
+    assertEquals(1, chatBubble.getItems().size());
+    assertEquals("hello", chatBubble.getItems().get(0).getTextToSpeech());
+    assertEquals("ssmlText", chatBubble.getItems().get(0).getSsml());
+    assertEquals("Hello", chatBubble.getItems().get(0).getDisplayText());
+  }
+
+  @Test
+  public void testResponseChatBubbleSerialization() {
+    ResponseChatBubble chatBubble = new ResponseChatBubble();
+    chatBubble.setCustomizeAudio(true);
+    
+    ResponseChatBubble.Item item = new ResponseChatBubble.Item();
+    item.setTextToSpeech("hello");
+    item.setSsml("ssmlText");
+    item.setDisplayText("Hello");
+    
+    chatBubble.setItems(Arrays.asList(item));
+    assertEquals(TEST_CHAT_BUBBLE, gson.toJson(chatBubble));
+  }
+
+  @Test
+  public void testResponseBasicCardDeserialization() {
+    ResponseBasicCard basicCard = (ResponseBasicCard) gson.fromJson(TEST_BASIC_CARD, ResponseMessage.class);
+    assertEquals("titleVal", basicCard.getTitle());
+    assertEquals("subtitleVal", basicCard.getSubtitle());
+    assertEquals("formattedVal", basicCard.getFormattedText());
+    checkImage(basicCard.getImage());
+    assertEquals(1, basicCard.getButtons().size());
+    assertEquals("buttonTitle", basicCard.getButtons().get(0).getTitle());
+    assertEquals("openActionUrlVal", basicCard.getButtons().get(0).getOpenUrlAction().getUrl());
+  }
+
+  @Test
+  public void testResponseBasicCardSerialization() {
+    ResponseBasicCard basicCard = new ResponseBasicCard();
+    basicCard.setTitle("titleVal");
+    basicCard.setSubtitle("subtitleVal");
+    basicCard.setFormattedText("formattedVal");
+    basicCard.setImage(createImage());
+    
+    ResponseBasicCard.Button button = new ResponseBasicCard.Button();
+    button.setTitle("buttonTitle");
+    OpenUrlAction openUrlAction = new OpenUrlAction();
+    openUrlAction.setUrl("openActionUrlVal");
+    button.setOpenUrlAction(openUrlAction);
+    basicCard.setButtons(Arrays.asList(button));
+
+    assertEquals(TEST_BASIC_CARD, gson.toJson(basicCard));
+  }
+
+  @Test
+  public void testResponseListCardDeserialization() {
+    ResponseListCard listCard = (ResponseListCard) gson.fromJson(TEST_LIST_CARD, ResponseMessage.class);
+    assertEquals("titleVal", listCard.getTitle());
+    checkItems(listCard.getItems());
+  }
+
+  @Test
+  public void testResponseListCardSerialization() {
+    ResponseListCard listCard = new ResponseListCard();
+
+    listCard.setTitle("titleVal");
+    listCard.setItems(Arrays.asList(createItem()));
+    checkItems(listCard.getItems());
+
+    assertEquals(TEST_LIST_CARD, gson.toJson(listCard));
+  }
+
+
+  @Test
+  public void testResponseSuggestionChipsDeserialization() {
+    ResponseSuggestionChips suggestionChips = (ResponseSuggestionChips) gson.fromJson(TEST_SUGGESTION_CHIP, ResponseMessage.class);
+
+    assertEquals(1, suggestionChips.getSuggestions().size());
+    assertEquals("titleVal", suggestionChips.getSuggestions().get(0).getTitle());
+  }
+
+  @Test
+  public void testResponseSuggestionChipsSerialization() {
+    ResponseSuggestionChips suggestionChips = new ResponseSuggestionChips();
+    
+    ResponseSuggestionChips.Suggestion suggestion = new ResponseSuggestionChips.Suggestion();
+    suggestion.setTitle("titleVal");
+    suggestionChips.setSuggestions(Arrays.asList(suggestion));
+
+    assertEquals(TEST_SUGGESTION_CHIP, gson.toJson(suggestionChips));
+  }
+
+  @Test
+  public void testResponseCarouselCardDeserialization() {
+    ResponseCarouselCard carouselCard = (ResponseCarouselCard) gson.fromJson(TEST_CAROUSEL_CARD, ResponseMessage.class);
+    checkItems(carouselCard.getItems());
+  }
+
+  @Test
+  public void testResponseCarouselCardSerialization() {
+    ResponseCarouselCard carouselCard = new ResponseCarouselCard();
+    carouselCard.setItems(Arrays.asList(createItem()));
+
+    assertEquals(TEST_CAROUSEL_CARD, gson.toJson(carouselCard));
+  }
+
+  @Test
+  public void testResponseLinkOutChipDeserialization() {
+    ResponseLinkOutChip linkOutChip = (ResponseLinkOutChip) gson.fromJson(TEST_LINK_OUT_CHIP, ResponseMessage.class);
+
+    assertEquals("destanationVal", linkOutChip.getDestinationName());
+    assertEquals("urlVal", linkOutChip.getUrl());
+  }
+
+  @Test
+  public void testResponseLinkOutChipSerialization() {
+    ResponseLinkOutChip linkOutChip = new ResponseLinkOutChip();
+    linkOutChip.setDestinationName("destanationVal");
+    linkOutChip.setUrl("urlVal");
+
+    assertEquals(TEST_LINK_OUT_CHIP, gson.toJson(linkOutChip));
+  }
+
+  private void checkItems(List<CardItem> items) {
+    assertEquals(1, items.size());
+    checkItem(items.get(0));
+  }
+
+  private void checkItem(CardItem item) {
+    assertEquals("itemTitle", item.getTitle());
+    assertEquals("itemDescription", item.getDescription());
+    checkImage(item.getImage());
+    assertEquals("keyVal", item.getOptionInfo().getKey());
+    assertEquals(1, item.getOptionInfo().getSynonyms().size());
+    assertEquals("syn1", item.getOptionInfo().getSynonyms().get(0));
+  }
+  
+  private CardItem createItem() {
+    CardItem result = new CardItem();
+    
+    result.setTitle("itemTitle");
+    result.setDescription("itemDescription");
+    result.setImage(createImage());
+    
+    OptionInfo optionInfo = new OptionInfo();
+    optionInfo.setKey("keyVal");
+    optionInfo.setSynonyms(Arrays.asList("syn1"));
+    result.setOptionInfo(optionInfo);
+    
+    return result;
+  }
+  
+  private void checkImage(CardImage image) {
+    assertEquals("urlVal", image.getUrl());
+  }
+  
+  private CardImage createImage() {
+    CardImage result = new CardImage();
+    result.setUrl("urlVal");
+    return result;
+  }
+}
diff --git a/libai/src/test/java/ai/api/model/ResponseMessageTest.java b/libai/src/test/java/ai/api/model/ResponseMessageTest.java
index afdb268..16eadac 100644
--- a/libai/src/test/java/ai/api/model/ResponseMessageTest.java
+++ b/libai/src/test/java/ai/api/model/ResponseMessageTest.java
@@ -52,7 +52,7 @@ public class ResponseMessageTest {
 
   private static final String TEST_PAYLOAD = "{\"payload\":{\"field1\":11},\"type\":4}";
 
-  private static final String TEST_BAD_TYPE = "{\"field1\":1,\"type\":5}";
+  private static final String TEST_BAD_TYPE = "{\"field1\":1,\"type\":100}";
 
   @Test
   public void testResponseSpeechDeserialization() {