From 911e1bfb73dc009eeed9bc5ef49092b1e6ffcccf Mon Sep 17 00:00:00 2001
From: Alessandro Autiero <alautiero@gmail.com>
Date: Tue, 9 Jan 2024 13:00:33 +0100
Subject: [PATCH] Added back message quoting

---
 pom.xml                                       |  26 +++-
 .../java/it/auties/whatsapp/api/Whatsapp.java | 109 +++++++++++++-
 .../model/message/button/ButtonsMessage.java  | 138 +++++++++++++----
 .../button/ButtonsResponseMessage.java        |  60 ++++++--
 .../message/button/InteractiveMessage.java    | 105 ++++++++++---
 .../button/InteractiveResponseMessage.java    |  50 ++++++-
 .../model/message/button/ListMessage.java     |  99 +++++++++---
 .../message/button/ListResponseMessage.java   |  70 +++++++--
 .../model/message/button/TemplateMessage.java |  89 ++++++++---
 .../message/button/TemplateReplyMessage.java  |  59 ++++++--
 .../message/model/ButtonReplyMessage.java     |   2 +-
 .../message/model/ContextualMessage.java      |   3 +-
 .../model/message/model/MediaMessage.java     |   2 +-
 .../model/message/model/MessageContainer.java |   2 +-
 .../payment/PaymentInvoiceMessage.java        |   8 +-
 .../message/payment/PaymentOrderMessage.java  | 141 ++++++++++++++----
 .../model/message/standard/AudioMessage.java  |   8 +-
 .../message/standard/ContactMessage.java      |  50 ++++++-
 .../message/standard/ContactsMessage.java     |  49 +++++-
 .../message/standard/DocumentMessage.java     |   8 +-
 .../message/standard/GroupInviteMessage.java  | 101 ++++++++++---
 .../model/message/standard/ImageMessage.java  |   8 +-
 .../message/standard/LiveLocationMessage.java | 120 ++++++++++++---
 .../message/standard/LocationMessage.java     | 139 +++++++++++++----
 .../message/standard/PollCreationMessage.java |  50 +++----
 .../message/standard/ProductMessage.java      |  79 ++++++++--
 .../standard/RequestPhoneNumberMessage.java   |  30 +++-
 .../message/standard/StickerMessage.java      |   8 +-
 .../model/message/standard/TextMessage.java   |   2 +-
 .../message/standard/VideoOrGifMessage.java   |   8 +-
 .../model/poll/SelectedPollOption.java        |  18 +++
 .../registration/apns/ApnsClient.java         |   2 +-
 .../auties/whatsapp/util/Specification.java   |   2 +-
 33 files changed, 1340 insertions(+), 305 deletions(-)
 create mode 100644 src/main/java/it/auties/whatsapp/model/poll/SelectedPollOption.java

diff --git a/pom.xml b/pom.xml
index d6da3a82..3cb5b412 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.auties00</groupId>
     <artifactId>cobalt</artifactId>
-    <version>0.0.1</version>
+    <version>0.0.2</version>
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Standalone fully-featured Whatsapp Web API for Java and Kotlin</description>
     <url>https://github.com/Auties00/Cobalt</url>
@@ -124,6 +124,30 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>uber-jar</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <configuration>
+                            <descriptorRefs>
+                                <descriptorRef>jar-with-dependencies</descriptorRef>
+                            </descriptorRefs>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>make-assembly</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
     <packaging>jar</packaging>
 
diff --git a/src/main/java/it/auties/whatsapp/api/Whatsapp.java b/src/main/java/it/auties/whatsapp/api/Whatsapp.java
index 1ba62e16..cd7f3fc4 100644
--- a/src/main/java/it/auties/whatsapp/api/Whatsapp.java
+++ b/src/main/java/it/auties/whatsapp/api/Whatsapp.java
@@ -23,10 +23,7 @@
 import it.auties.whatsapp.model.companion.CompanionLinkResult;
 import it.auties.whatsapp.model.contact.Contact;
 import it.auties.whatsapp.model.contact.ContactStatus;
-import it.auties.whatsapp.model.info.ChatMessageInfo;
-import it.auties.whatsapp.model.info.ChatMessageInfoBuilder;
-import it.auties.whatsapp.model.info.MessageInfo;
-import it.auties.whatsapp.model.info.NewsletterMessageInfo;
+import it.auties.whatsapp.model.info.*;
 import it.auties.whatsapp.model.jid.Jid;
 import it.auties.whatsapp.model.jid.JidProvider;
 import it.auties.whatsapp.model.jid.JidServer;
@@ -38,6 +35,7 @@
 import it.auties.whatsapp.model.message.server.ProtocolMessageBuilder;
 import it.auties.whatsapp.model.message.standard.CallMessageBuilder;
 import it.auties.whatsapp.model.message.standard.ReactionMessageBuilder;
+import it.auties.whatsapp.model.message.standard.TextMessage;
 import it.auties.whatsapp.model.newsletter.Newsletter;
 import it.auties.whatsapp.model.newsletter.NewsletterViewerMetadata;
 import it.auties.whatsapp.model.newsletter.NewsletterViewerRole;
@@ -411,6 +409,108 @@ public CompletableFuture<? extends MessageInfo> sendMessage(JidProvider chat, St
         return sendMessage(chat, MessageContainer.of(message));
     }
 
+    /**
+     * Builds and sends a message from a chat and a message
+     *
+     * @param chat    the chat where the message should be sent
+     * @param message the message to send
+     * @return a CompletableFuture
+     */
+    public CompletableFuture<ChatMessageInfo> sendChatMessage(JidProvider chat, String message) {
+        return sendChatMessage(chat, MessageContainer.of(message));
+    }
+
+    /**
+     * Builds and sends a message from a chat and a message
+     *
+     * @param chat    the chat where the message should be sent
+     * @param message the message to send
+     * @return a CompletableFuture
+     */
+    public CompletableFuture<NewsletterMessageInfo> sendsNewsletterMessage(JidProvider chat, String message) {
+        return sendNewsletterMessage(chat, MessageContainer.of(message));
+    }
+
+    /**
+     * Builds and sends a message from a chat and a message
+     *
+     * @param chat          the chat where the message should be sent
+     * @param message       the message to send
+     * @param quotedMessage the message to quote
+     * @return a CompletableFuture
+     */
+    public CompletableFuture<? extends MessageInfo> sendMessage(JidProvider chat, String message, MessageInfo quotedMessage) {
+        return sendMessage(chat, TextMessage.of(message), quotedMessage);
+    }
+
+    /**
+     * Builds and sends a message from a chat and a message
+     *
+     * @param chat          the chat where the message should be sent
+     * @param message       the message to send
+     * @param quotedMessage the message to quote
+     * @return a CompletableFuture
+     */
+    public CompletableFuture<? extends MessageInfo> sendChatMessage(JidProvider chat, String message, MessageInfo quotedMessage) {
+        return sendChatMessage(chat, TextMessage.of(message), quotedMessage);
+    }
+
+    /**
+     * Builds and sends a message from a chat and a message
+     *
+     * @param chat          the chat where the message should be sent
+     * @param message       the message to send
+     * @param quotedMessage the message to quote
+     * @return a CompletableFuture
+     */
+    public CompletableFuture<? extends MessageInfo> sendNewsletterMessage(JidProvider chat, String message, MessageInfo quotedMessage) {
+        return sendNewsletterMessage(chat, TextMessage.of(message), quotedMessage);
+    }
+
+    /**
+     * Builds and sends a message from a chat and a message
+     *
+     * @param chat    the chat where the message should be sent
+     * @param message the message to send
+     * @param quotedMessage the message to quote
+     * @return a CompletableFuture
+     */
+    public CompletableFuture<? extends MessageInfo> sendMessage(JidProvider chat, ContextualMessage<?> message, MessageInfo quotedMessage) {
+        var contextInfo = ContextInfo.of(quotedMessage);
+        message.setContextInfo(contextInfo);
+        return sendMessage(chat, MessageContainer.of(message));
+    }
+
+    /**
+     * Builds and sends a message from a chat and a message
+     *
+     * @param chat    the chat where the message should be sent
+     * @param message the message to send
+     * @param quotedMessage the message to quote
+     * @return a CompletableFuture
+     */
+    public CompletableFuture<ChatMessageInfo> sendChatMessage(JidProvider chat, ContextualMessage<?> message, MessageInfo quotedMessage) {
+        var contextInfo = ContextInfo.of(quotedMessage);
+        message.setContextInfo(contextInfo);
+        return sendChatMessage(chat, MessageContainer.of(message));
+    }
+
+
+    /**
+     * Builds and sends a message from a chat and a message
+     *
+     * @param chat    the chat where the message should be sent
+     * @param message the message to send
+     * @param quotedMessage the message to quote
+     * @return a CompletableFuture
+     */
+    public CompletableFuture<NewsletterMessageInfo> sendNewsletterMessage(JidProvider chat, ContextualMessage<?> message, MessageInfo quotedMessage) {
+        var contextInfo = ContextInfo.of(quotedMessage);
+        message.setContextInfo(contextInfo);
+        return sendNewsletterMessage(chat, MessageContainer.of(message));
+    }
+
+
     /**
      * Builds and sends a message from a chat and a message
      *
@@ -433,7 +533,6 @@ public CompletableFuture<? extends MessageInfo> sendMessage(JidProvider recipien
         return recipient.toJid().server() == JidServer.NEWSLETTER ? sendNewsletterMessage(recipient, message) : sendChatMessage(recipient, message);
     }
 
-
     /**
      * Builds and sends a message from a recipient and a message
      *
diff --git a/src/main/java/it/auties/whatsapp/model/message/button/ButtonsMessage.java b/src/main/java/it/auties/whatsapp/model/message/button/ButtonsMessage.java
index ed0dc311..15a64a09 100644
--- a/src/main/java/it/auties/whatsapp/model/message/button/ButtonsMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/button/ButtonsMessage.java
@@ -22,28 +22,42 @@
  * A model class that represents a message that contains buttons inside
  */
 @ProtobufMessageName("Message.ButtonsMessage")
-public record ButtonsMessage(
-        @ProtobufProperty(index = 1, type = ProtobufType.STRING)
-        Optional<ButtonsMessageHeaderText> headerText,
-        @ProtobufProperty(index = 2, type = ProtobufType.OBJECT)
-        Optional<DocumentMessage> headerDocument,
-        @ProtobufProperty(index = 3, type = ProtobufType.OBJECT)
-        Optional<ImageMessage> headerImage,
-        @ProtobufProperty(index = 4, type = ProtobufType.OBJECT)
-        Optional<VideoOrGifMessage> headerVideo,
-        @ProtobufProperty(index = 5, type = ProtobufType.OBJECT)
-        Optional<LocationMessage> headerLocation,
-        @ProtobufProperty(index = 6, type = ProtobufType.STRING)
-        Optional<String> body,
-        @ProtobufProperty(index = 7, type = ProtobufType.STRING)
-        Optional<String> footer,
-        @ProtobufProperty(index = 8, type = ProtobufType.OBJECT)
-        Optional<ContextInfo> contextInfo,
-        @ProtobufProperty(index = 9, type = ProtobufType.OBJECT)
-        List<Button> buttons,
-        @ProtobufProperty(index = 10, type = ProtobufType.OBJECT)
-        Type headerType
-) implements ButtonMessage, ContextualMessage {
+public final class ButtonsMessage implements ButtonMessage, ContextualMessage<ButtonsMessage> {
+    @ProtobufProperty(index = 1, type = ProtobufType.STRING)
+    private final ButtonsMessageHeaderText headerText;
+    @ProtobufProperty(index = 2, type = ProtobufType.OBJECT)
+    private final DocumentMessage headerDocument;
+    @ProtobufProperty(index = 3, type = ProtobufType.OBJECT)
+    private final ImageMessage headerImage;
+    @ProtobufProperty(index = 4, type = ProtobufType.OBJECT)
+    private final VideoOrGifMessage headerVideo;
+    @ProtobufProperty(index = 5, type = ProtobufType.OBJECT)
+    private final LocationMessage headerLocation;
+    @ProtobufProperty(index = 6, type = ProtobufType.STRING)
+    private final String body;
+    @ProtobufProperty(index = 7, type = ProtobufType.STRING)
+    private final String footer;
+    @ProtobufProperty(index = 8, type = ProtobufType.OBJECT)
+    private ContextInfo contextInfo;
+    @ProtobufProperty(index = 9, type = ProtobufType.OBJECT)
+    private final List<Button> buttons;
+    @ProtobufProperty(index = 10, type = ProtobufType.OBJECT)
+    private final Type headerType;
+
+
+    public ButtonsMessage(ButtonsMessageHeaderText headerText, DocumentMessage headerDocument, ImageMessage headerImage, VideoOrGifMessage headerVideo, LocationMessage headerLocation, String body, String footer, ContextInfo contextInfo, List<Button> buttons, Type headerType) {
+        this.headerText = headerText;
+        this.headerDocument = headerDocument;
+        this.headerImage = headerImage;
+        this.headerVideo = headerVideo;
+        this.headerLocation = headerLocation;
+        this.body = body;
+        this.footer = footer;
+        this.contextInfo = contextInfo;
+        this.buttons = buttons;
+        this.headerType = headerType;
+    }
+
     @ProtobufBuilder(className = "ButtonsMessageSimpleBuilder")
     static ButtonsMessage customBuilder(ButtonsMessageHeader header, String body, String footer, ContextInfo contextInfo, List<Button> buttons) {
         var builder = new ButtonsMessageBuilder()
@@ -84,22 +98,84 @@ public MessageType type() {
      * @return an optional
      */
     public Optional<? extends ButtonsMessageHeader> header() {
-        if (headerText.isPresent()) {
-            return headerText;
+        if (headerText != null) {
+            return Optional.of(headerText);
         }
 
-        if (headerDocument.isPresent()) {
-            return headerDocument;
+        if (headerDocument  != null) {
+            return Optional.of(headerDocument);
         }
 
-        if (headerImage.isPresent()) {
-            return headerImage;
+        if (headerImage != null) {
+            return Optional.of(headerImage);
         }
 
-        if (headerVideo.isPresent()) {
-            return headerVideo;
+        if (headerVideo != null) {
+            return Optional.of(headerVideo);
         }
 
-        return headerLocation;
+        return Optional.ofNullable(headerLocation);
+    }
+    
+    public Optional<ButtonsMessageHeaderText> headerText() {
+        return Optional.ofNullable(headerText);
+    }
+    
+    public Optional<DocumentMessage> headerDocument() {
+        return Optional.ofNullable(headerDocument);
+    }
+    
+    public Optional<ImageMessage> headerImage() {
+        return Optional.ofNullable(headerImage);
+    }
+    
+    public Optional<VideoOrGifMessage> headerVideo() {
+        return Optional.ofNullable(headerVideo);
+    }
+    
+    public Optional<LocationMessage> headerLocation() {
+        return Optional.ofNullable(headerLocation);
+    }
+    
+    public Optional<String> body() {
+        return Optional.ofNullable(body);
+    }
+    
+    public Optional<String> footer() {
+        return Optional.ofNullable(footer);
+    }
+
+    @Override
+    public Optional<ContextInfo> contextInfo() {
+        return Optional.ofNullable(contextInfo);
+    }
+
+    public List<Button> buttons() {
+        return buttons;
+    }
+
+    public Type headerType() {
+        return headerType;
+    }
+
+    @Override
+    public ButtonsMessage setContextInfo(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+        return this;
+    }
+    
+    @Override
+    public String toString() {
+        return "ButtonsMessage[" +
+                "headerText=" + headerText + ", " +
+                "headerDocument=" + headerDocument + ", " +
+                "headerImage=" + headerImage + ", " +
+                "headerVideo=" + headerVideo + ", " +
+                "headerLocation=" + headerLocation + ", " +
+                "body=" + body + ", " +
+                "footer=" + footer + ", " +
+                "contextInfo=" + contextInfo + ", " +
+                "buttons=" + buttons + ", " +
+                "headerType=" + headerType + ']';
     }
 }
\ No newline at end of file
diff --git a/src/main/java/it/auties/whatsapp/model/message/button/ButtonsResponseMessage.java b/src/main/java/it/auties/whatsapp/model/message/button/ButtonsResponseMessage.java
index 1de48a1a..30643ece 100644
--- a/src/main/java/it/auties/whatsapp/model/message/button/ButtonsResponseMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/button/ButtonsResponseMessage.java
@@ -20,16 +20,23 @@
  * {@link ButtonsMessage}
  */
 @ProtobufMessageName("Message.ButtonsResponseMessage")
-public record ButtonsResponseMessage(
-        @ProtobufProperty(index = 1, type = ProtobufType.STRING)
-        String buttonId,
-        @ProtobufProperty(index = 2, type = ProtobufType.STRING)
-        Optional<String> buttonText,
-        @ProtobufProperty(index = 3, type = ProtobufType.OBJECT)
-        Optional<ContextInfo> contextInfo,
-        @ProtobufProperty(index = 4, type = ProtobufType.OBJECT)
-        ResponseType responseType
-) implements ButtonReplyMessage {
+public final class ButtonsResponseMessage implements ButtonReplyMessage<ButtonsResponseMessage> {
+    @ProtobufProperty(index = 1, type = ProtobufType.STRING)
+    private final String buttonId;
+    @ProtobufProperty(index = 2, type = ProtobufType.STRING)
+    private final String buttonText;
+    @ProtobufProperty(index = 3, type = ProtobufType.OBJECT)
+    private ContextInfo contextInfo;
+    @ProtobufProperty(index = 4, type = ProtobufType.OBJECT)
+    private final ResponseType responseType;
+
+    public ButtonsResponseMessage(String buttonId, String buttonText, ContextInfo contextInfo, ResponseType responseType) {
+        this.buttonId = buttonId;
+        this.buttonText = buttonText;
+        this.contextInfo = contextInfo;
+        this.responseType = responseType;
+    }
+
     public static ButtonsResponseMessage of(ChatMessageInfo quoted, Button button) {
         return new ButtonsResponseMessageBuilder()
                 .buttonId(button.id())
@@ -44,6 +51,39 @@ public MessageType type() {
         return MessageType.BUTTONS_RESPONSE;
     }
 
+    public String buttonId() {
+        return buttonId;
+    }
+
+    public Optional<String> buttonText() {
+        return Optional.ofNullable(buttonText);
+    }
+
+    @Override
+    public Optional<ContextInfo> contextInfo() {
+        return Optional.ofNullable(contextInfo);
+    }
+
+    @Override
+    public ButtonsResponseMessage setContextInfo(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+        return this;
+    }
+
+    public ResponseType responseType() {
+        return responseType;
+    }
+
+    @Override
+    public String toString() {
+        return "ButtonsResponseMessage[" +
+                "buttonId=" + buttonId + ", " +
+                "buttonText=" + buttonText + ", " +
+                "contextInfo=" + contextInfo + ", " +
+                "responseType=" + responseType + ']';
+    }
+
+
     public enum ResponseType implements ProtobufEnum {
         UNKNOWN(0),
         SELECTED_DISPLAY_TEXT(1);
diff --git a/src/main/java/it/auties/whatsapp/model/message/button/InteractiveMessage.java b/src/main/java/it/auties/whatsapp/model/message/button/InteractiveMessage.java
index ca72122f..bbdf3f89 100644
--- a/src/main/java/it/auties/whatsapp/model/message/button/InteractiveMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/button/InteractiveMessage.java
@@ -19,22 +19,32 @@
  * how this could be used, contributions are welcomed.
  */
 @ProtobufMessageName("Message.InteractiveMessage")
-public record InteractiveMessage(
-        @ProtobufProperty(index = 1, type = ProtobufType.OBJECT)
-        Optional<InteractiveHeader> header,
-        @ProtobufProperty(index = 2, type = ProtobufType.OBJECT)
-        Optional<InteractiveBody> body,
-        @ProtobufProperty(index = 3, type = ProtobufType.OBJECT)
-        Optional<InteractiveFooter> footer,
-        @ProtobufProperty(index = 4, type = ProtobufType.OBJECT)
-        Optional<InteractiveShop> contentShop,
-        @ProtobufProperty(index = 5, type = ProtobufType.OBJECT)
-        Optional<InteractiveCollection> contentCollection,
-        @ProtobufProperty(index = 6, type = ProtobufType.OBJECT)
-        Optional<InteractiveNativeFlow> contentNativeFlow,
-        @ProtobufProperty(index = 15, type = ProtobufType.OBJECT)
-        Optional<ContextInfo> contextInfo
-) implements ContextualMessage, ButtonMessage, TemplateFormatter {
+public final class InteractiveMessage implements ContextualMessage<InteractiveMessage>, ButtonMessage, TemplateFormatter {
+    @ProtobufProperty(index = 1, type = ProtobufType.OBJECT)
+    private final InteractiveHeader header;
+    @ProtobufProperty(index = 2, type = ProtobufType.OBJECT)
+    private final InteractiveBody body;
+    @ProtobufProperty(index = 3, type = ProtobufType.OBJECT)
+    private final InteractiveFooter footer;
+    @ProtobufProperty(index = 4, type = ProtobufType.OBJECT)
+    private final InteractiveShop contentShop;
+    @ProtobufProperty(index = 5, type = ProtobufType.OBJECT)
+    private final InteractiveCollection contentCollection;
+    @ProtobufProperty(index = 6, type = ProtobufType.OBJECT)
+    private final InteractiveNativeFlow contentNativeFlow;
+    @ProtobufProperty(index = 15, type = ProtobufType.OBJECT)
+    private ContextInfo contextInfo;
+
+    public InteractiveMessage(InteractiveHeader header, InteractiveBody body, InteractiveFooter footer, InteractiveShop contentShop, InteractiveCollection contentCollection, InteractiveNativeFlow contentNativeFlow, ContextInfo contextInfo) {
+        this.header = header;
+        this.body = body;
+        this.footer = footer;
+        this.contentShop = contentShop;
+        this.contentCollection = contentCollection;
+        this.contentNativeFlow = contentNativeFlow;
+        this.contextInfo = contextInfo;
+    }
+
     @ProtobufBuilder(className = "InteractiveMessageSimpleBuilder")
     static InteractiveMessage simpleBuilder(InteractiveHeader header, String body, String footer, InteractiveMessageContent content, ContextInfo contextInfo) {
         var builder = new InteractiveMessageBuilder()
@@ -46,8 +56,7 @@ static InteractiveMessage simpleBuilder(InteractiveHeader header, String body, S
             case InteractiveShop interactiveShop -> builder.contentShop(interactiveShop);
             case InteractiveCollection interactiveCollection -> builder.contentCollection(interactiveCollection);
             case InteractiveNativeFlow interactiveNativeFlow -> builder.contentNativeFlow(interactiveNativeFlow);
-            case null -> {
-            }
+            case null -> {}
         }
         return builder.build();
     }
@@ -69,20 +78,20 @@ public InteractiveMessageContent.Type contentType() {
      * @return a non-null content type
      */
     public Optional<? extends InteractiveMessageContent> content() {
-        if (contentShop.isPresent()) {
-            return contentShop;
+        if (contentShop != null) {
+            return Optional.of(contentShop);
         }
 
-        if (contentCollection.isPresent()) {
-            return contentCollection;
+        if (contentCollection != null) {
+            return Optional.of(contentCollection);
         }
 
-        return contentNativeFlow;
+        return Optional.ofNullable(contentNativeFlow);
     }
 
     @Override
     public Type templateType() {
-        return TemplateFormatter.Type.INTERACTIVE;
+        return Type.INTERACTIVE;
     }
 
     @Override
@@ -94,4 +103,52 @@ public MessageType type() {
     public MessageCategory category() {
         return MessageCategory.STANDARD;
     }
+
+    public Optional<InteractiveHeader> header() {
+        return Optional.ofNullable(header);
+    }
+
+    public Optional<InteractiveBody> body() {
+        return Optional.ofNullable(body);
+    }
+
+    public Optional<InteractiveFooter> footer() {
+        return Optional.ofNullable(footer);
+    }
+
+    public Optional<InteractiveShop> contentShop() {
+        return Optional.ofNullable(contentShop);
+    }
+
+    public Optional<InteractiveCollection> contentCollection() {
+        return Optional.ofNullable(contentCollection);
+    }
+
+    public Optional<InteractiveNativeFlow> contentNativeFlow() {
+        return Optional.ofNullable(contentNativeFlow);
+    }
+
+    @Override
+    public Optional<ContextInfo> contextInfo() {
+        return Optional.ofNullable(contextInfo);
+    }
+
+    @Override
+    public InteractiveMessage setContextInfo(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "InteractiveMessage[" +
+                "header=" + header + ", " +
+                "body=" + body + ", " +
+                "footer=" + footer + ", " +
+                "contentShop=" + contentShop + ", " +
+                "contentCollection=" + contentCollection + ", " +
+                "contentNativeFlow=" + contentNativeFlow + ", " +
+                "contextInfo=" + contextInfo + ']';
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/it/auties/whatsapp/model/message/button/InteractiveResponseMessage.java b/src/main/java/it/auties/whatsapp/model/message/button/InteractiveResponseMessage.java
index 0bb71d65..c77b3a4f 100644
--- a/src/main/java/it/auties/whatsapp/model/message/button/InteractiveResponseMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/button/InteractiveResponseMessage.java
@@ -12,14 +12,20 @@
 import java.util.Optional;
 
 @ProtobufMessageName("Message.InteractiveResponseMessage")
-public record InteractiveResponseMessage(
-        @ProtobufProperty(index = 1, type = ProtobufType.OBJECT)
-        InteractiveBody body,
-        @ProtobufProperty(index = 2, type = ProtobufType.OBJECT)
-        NativeFlowResponseMessage nativeFlowResponseMessage,
-        @ProtobufProperty(index = 15, type = ProtobufType.OBJECT)
-        Optional<ContextInfo> contextInfo
-) implements ContextualMessage {
+public final class InteractiveResponseMessage implements ContextualMessage<InteractiveResponseMessage> {
+    @ProtobufProperty(index = 1, type = ProtobufType.OBJECT)
+    private final InteractiveBody body;
+    @ProtobufProperty(index = 2, type = ProtobufType.OBJECT)
+    private final NativeFlowResponseMessage nativeFlowResponseMessage;
+    @ProtobufProperty(index = 15, type = ProtobufType.OBJECT)
+    private ContextInfo contextInfo;
+
+    public InteractiveResponseMessage(InteractiveBody body, NativeFlowResponseMessage nativeFlowResponseMessage, ContextInfo contextInfo) {
+        this.body = body;
+        this.nativeFlowResponseMessage = nativeFlowResponseMessage;
+        this.contextInfo = contextInfo;
+    }
+
     @Override
     public MessageType type() {
         return MessageType.INTERACTIVE_RESPONSE;
@@ -33,4 +39,32 @@ public MessageCategory category() {
     public InteractiveMessageContent.Type interactiveResponseMessageType() {
         return InteractiveMessageContent.Type.COLLECTION;
     }
+
+    public InteractiveBody body() {
+        return body;
+    }
+
+    public NativeFlowResponseMessage nativeFlowResponseMessage() {
+        return nativeFlowResponseMessage;
+    }
+
+    @Override
+    public Optional<ContextInfo> contextInfo() {
+        return Optional.ofNullable(contextInfo);
+    }
+
+    @Override
+    public InteractiveResponseMessage setContextInfo(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "InteractiveResponseMessage[" +
+                "body=" + body + ", " +
+                "nativeFlowResponseMessage=" + nativeFlowResponseMessage + ", " +
+                "contextInfo=" + contextInfo + ']';
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/it/auties/whatsapp/model/message/button/ListMessage.java b/src/main/java/it/auties/whatsapp/model/message/button/ListMessage.java
index 4ed4b8bf..37650da8 100644
--- a/src/main/java/it/auties/whatsapp/model/message/button/ListMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/button/ListMessage.java
@@ -19,30 +19,93 @@
  * A model class that represents a message that contains a list of buttons or a list of products
  */
 @ProtobufMessageName("Message.ListMessage")
-public record ListMessage(
-        @ProtobufProperty(index = 1, type = ProtobufType.STRING)
-        String title,
-        @ProtobufProperty(index = 2, type = ProtobufType.STRING)
-        Optional<String> description,
-        @ProtobufProperty(index = 3, type = ProtobufType.STRING)
-        String button,
-        @ProtobufProperty(index = 4, type = ProtobufType.OBJECT)
-        Type listType,
-        @ProtobufProperty(index = 5, type = ProtobufType.OBJECT)
-        List<ButtonSection> sections,
-        @ProtobufProperty(index = 6, type = ProtobufType.OBJECT)
-        Optional<ProductListInfo> productListInfo,
-        @ProtobufProperty(index = 7, type = ProtobufType.STRING)
-        Optional<String> footer,
-        @ProtobufProperty(index = 8, type = ProtobufType.OBJECT)
-        Optional<ContextInfo> contextInfo
-) implements ContextualMessage, ButtonMessage {
+public final class ListMessage implements ContextualMessage<ListMessage>, ButtonMessage {
+    @ProtobufProperty(index = 1, type = ProtobufType.STRING)
+    private final String title;
+    @ProtobufProperty(index = 2, type = ProtobufType.STRING)
+    private final String description;
+    @ProtobufProperty(index = 3, type = ProtobufType.STRING)
+    private final String button;
+    @ProtobufProperty(index = 4, type = ProtobufType.OBJECT)
+    private final Type listType;
+    @ProtobufProperty(index = 5, type = ProtobufType.OBJECT)
+    private final List<ButtonSection> sections;
+    @ProtobufProperty(index = 6, type = ProtobufType.OBJECT)
+    private final ProductListInfo productListInfo;
+    @ProtobufProperty(index = 7, type = ProtobufType.STRING)
+    private final String footer;
+    @ProtobufProperty(index = 8, type = ProtobufType.OBJECT)
+    private ContextInfo contextInfo;
+
+    public ListMessage(String title, String description, String button, Type listType, List<ButtonSection> sections, ProductListInfo productListInfo, String footer, ContextInfo contextInfo) {
+        this.title = title;
+        this.description = description;
+        this.button = button;
+        this.listType = listType;
+        this.sections = sections;
+        this.productListInfo = productListInfo;
+        this.footer = footer;
+        this.contextInfo = contextInfo;
+    }
 
     @Override
     public MessageType type() {
         return MessageType.LIST;
     }
 
+    public String title() {
+        return title;
+    }
+
+    public Optional<String> description() {
+        return Optional.ofNullable(description);
+    }
+
+    public String button() {
+        return button;
+    }
+
+    public Type listType() {
+        return listType;
+    }
+
+    public List<ButtonSection> sections() {
+        return sections;
+    }
+
+    public Optional<ProductListInfo> productListInfo() {
+        return Optional.ofNullable(productListInfo);
+    }
+
+    public Optional<String> footer() {
+        return Optional.ofNullable(footer);
+    }
+
+    @Override
+    public Optional<ContextInfo> contextInfo() {
+        return Optional.ofNullable(contextInfo);
+    }
+
+    @Override
+    public ListMessage setContextInfo(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "ListMessage[" +
+                "title=" + title + ", " +
+                "description=" + description + ", " +
+                "button=" + button + ", " +
+                "listType=" + listType + ", " +
+                "sections=" + sections + ", " +
+                "productListInfo=" + productListInfo + ", " +
+                "footer=" + footer + ", " +
+                "contextInfo=" + contextInfo + ']';
+    }
+
+
     /**
      * The constants of this enumerated type describe the various types of {@link ListMessage}
      */
diff --git a/src/main/java/it/auties/whatsapp/model/message/button/ListResponseMessage.java b/src/main/java/it/auties/whatsapp/model/message/button/ListResponseMessage.java
index 7598d6df..e64542f4 100644
--- a/src/main/java/it/auties/whatsapp/model/message/button/ListResponseMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/button/ListResponseMessage.java
@@ -17,23 +17,69 @@
  * {@link ListMessage}
  */
 @ProtobufMessageName("Message.ListResponseMessage")
-public record ListResponseMessage(
-        @ProtobufProperty(index = 1, type = ProtobufType.STRING)
-        String title,
-        @ProtobufProperty(index = 3, type = ProtobufType.OBJECT)
-        SingleSelectReplyButton reply,
-        @ProtobufProperty(index = 4, type = ProtobufType.OBJECT)
-        Optional<ContextInfo> contextInfo,
-        @ProtobufProperty(index = 5, type = ProtobufType.STRING)
-        Optional<String> description,
-        @ProtobufProperty(index = 2, type = ProtobufType.OBJECT)
-        Type listType
-) implements ButtonReplyMessage {
+public final class ListResponseMessage implements ButtonReplyMessage<ListResponseMessage> {
+    @ProtobufProperty(index = 1, type = ProtobufType.STRING)
+    private final String title;
+    @ProtobufProperty(index = 3, type = ProtobufType.OBJECT)
+    private final SingleSelectReplyButton reply;
+    @ProtobufProperty(index = 4, type = ProtobufType.OBJECT)
+    private ContextInfo contextInfo;
+    @ProtobufProperty(index = 5, type = ProtobufType.STRING)
+    private final String description;
+    @ProtobufProperty(index = 2, type = ProtobufType.OBJECT)
+    private final Type listType;
+
+    public ListResponseMessage(String title, SingleSelectReplyButton reply, ContextInfo contextInfo, String description, Type listType) {
+        this.title = title;
+        this.reply = reply;
+        this.contextInfo = contextInfo;
+        this.description = description;
+        this.listType = listType;
+    }
+
     @Override
     public MessageType type() {
         return MessageType.LIST_RESPONSE;
     }
 
+    public String title() {
+        return title;
+    }
+
+    public SingleSelectReplyButton reply() {
+        return reply;
+    }
+
+    @Override
+    public Optional<ContextInfo> contextInfo() {
+        return Optional.ofNullable(contextInfo);
+    }
+
+    @Override
+    public ListResponseMessage setContextInfo(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+        return this;
+    }
+
+    public Optional<String> description() {
+        return Optional.ofNullable(description);
+    }
+
+    public Type listType() {
+        return listType;
+    }
+
+    @Override
+    public String toString() {
+        return "ListResponseMessage[" +
+                "title=" + title + ", " +
+                "reply=" + reply + ", " +
+                "contextInfo=" + contextInfo + ", " +
+                "description=" + description + ", " +
+                "listType=" + listType + ']';
+    }
+
+
     /**
      * The constants of this enumerated type describe the various types of {@link ListMessage}
      */
diff --git a/src/main/java/it/auties/whatsapp/model/message/button/TemplateMessage.java b/src/main/java/it/auties/whatsapp/model/message/button/TemplateMessage.java
index 0c88102e..8baeb334 100644
--- a/src/main/java/it/auties/whatsapp/model/message/button/TemplateMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/button/TemplateMessage.java
@@ -22,20 +22,29 @@
  * buttons to choose from.
  */
 @ProtobufMessageName("Message.TemplateMessage")
-public record TemplateMessage(
-        @ProtobufProperty(index = 9, type = ProtobufType.STRING)
-        String id,
-        @ProtobufProperty(index = 4, type = ProtobufType.OBJECT)
-        HydratedFourRowTemplate content,
-        @ProtobufProperty(index = 1, type = ProtobufType.OBJECT)
-        Optional<HighlyStructuredFourRowTemplate> highlyStructuredFourRowTemplateFormat,
-        @ProtobufProperty(index = 2, type = ProtobufType.OBJECT)
-        Optional<HydratedFourRowTemplate> hydratedFourRowTemplateFormat,
-        @ProtobufProperty(index = 5, type = ProtobufType.OBJECT)
-        Optional<InteractiveMessage> interactiveMessageFormat,
-        @ProtobufProperty(index = 3, type = ProtobufType.OBJECT)
-        Optional<ContextInfo> contextInfo
-) implements ContextualMessage, ButtonMessage {
+public final class TemplateMessage implements ContextualMessage<TemplateMessage>, ButtonMessage {
+    @ProtobufProperty(index = 9, type = ProtobufType.STRING)
+    private final String id;
+    @ProtobufProperty(index = 4, type = ProtobufType.OBJECT)
+    private final HydratedFourRowTemplate content;
+    @ProtobufProperty(index = 1, type = ProtobufType.OBJECT)
+    private final HighlyStructuredFourRowTemplate highlyStructuredFourRowTemplateFormat;
+    @ProtobufProperty(index = 2, type = ProtobufType.OBJECT)
+    private final HydratedFourRowTemplate hydratedFourRowTemplateFormat;
+    @ProtobufProperty(index = 5, type = ProtobufType.OBJECT)
+    private final InteractiveMessage interactiveMessageFormat;
+    @ProtobufProperty(index = 3, type = ProtobufType.OBJECT)
+    private ContextInfo contextInfo;
+
+    public TemplateMessage(String id, HydratedFourRowTemplate content, HighlyStructuredFourRowTemplate highlyStructuredFourRowTemplateFormat, HydratedFourRowTemplate hydratedFourRowTemplateFormat, InteractiveMessage interactiveMessageFormat, ContextInfo contextInfo) {
+        this.id = id;
+        this.content = content;
+        this.highlyStructuredFourRowTemplateFormat = highlyStructuredFourRowTemplateFormat;
+        this.hydratedFourRowTemplateFormat = hydratedFourRowTemplateFormat;
+        this.interactiveMessageFormat = interactiveMessageFormat;
+        this.contextInfo = contextInfo;
+    }
+
     @ProtobufBuilder(className = "TemplateMessageSimpleBuilder")
     static TemplateMessage customBuilder(String id, HydratedFourRowTemplate content, TemplateFormatter format, ContextInfo contextInfo) {
         var builder = new TemplateMessageBuilder()
@@ -70,19 +79,61 @@ public TemplateFormatter.Type formatType() {
      * @return an optional
      */
     public Optional<? extends TemplateFormatter> format() {
-        if (highlyStructuredFourRowTemplateFormat.isPresent()) {
-            return highlyStructuredFourRowTemplateFormat;
+        if (highlyStructuredFourRowTemplateFormat != null) {
+            return Optional.of(highlyStructuredFourRowTemplateFormat);
         }
 
-        if (hydratedFourRowTemplateFormat.isPresent()) {
-            return hydratedFourRowTemplateFormat;
+        if (hydratedFourRowTemplateFormat != null) {
+            return Optional.of(hydratedFourRowTemplateFormat);
         }
 
-        return interactiveMessageFormat;
+        return Optional.ofNullable(interactiveMessageFormat);
     }
 
     @Override
     public MessageType type() {
         return MessageType.TEMPLATE;
     }
+
+    public String id() {
+        return id;
+    }
+
+    public HydratedFourRowTemplate content() {
+        return content;
+    }
+
+    public Optional<HighlyStructuredFourRowTemplate> highlyStructuredFourRowTemplateFormat() {
+        return Optional.ofNullable(highlyStructuredFourRowTemplateFormat);
+    }
+
+    public Optional<HydratedFourRowTemplate> hydratedFourRowTemplateFormat() {
+        return Optional.ofNullable(hydratedFourRowTemplateFormat);
+    }
+
+    public Optional<InteractiveMessage> interactiveMessageFormat() {
+        return Optional.ofNullable(interactiveMessageFormat);
+    }
+
+    @Override
+    public Optional<ContextInfo> contextInfo() {
+        return Optional.ofNullable(contextInfo);
+    }
+
+    @Override
+    public TemplateMessage setContextInfo(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "TemplateMessage[" +
+                "id=" + id + ", " +
+                "content=" + content + ", " +
+                "highlyStructuredFourRowTemplateFormat=" + highlyStructuredFourRowTemplateFormat + ", " +
+                "hydratedFourRowTemplateFormat=" + hydratedFourRowTemplateFormat + ", " +
+                "interactiveMessageFormat=" + interactiveMessageFormat + ", " +
+                "contextInfo=" + contextInfo + ']';
+    }
 }
diff --git a/src/main/java/it/auties/whatsapp/model/message/button/TemplateReplyMessage.java b/src/main/java/it/auties/whatsapp/model/message/button/TemplateReplyMessage.java
index 464dfcd1..ca1450ba 100644
--- a/src/main/java/it/auties/whatsapp/model/message/button/TemplateReplyMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/button/TemplateReplyMessage.java
@@ -16,18 +16,57 @@
  * {@link HighlyStructuredMessage}
  */
 @ProtobufMessageName("Message.TemplateButtonReplyMessage")
-public record TemplateReplyMessage(
-        @ProtobufProperty(index = 1, type = ProtobufType.STRING)
-        String id,
-        @ProtobufProperty(index = 2, type = ProtobufType.STRING)
-        String buttonText,
-        @ProtobufProperty(index = 3, type = ProtobufType.OBJECT)
-        Optional<ContextInfo> contextInfo,
-        @ProtobufProperty(index = 4, type = ProtobufType.UINT32)
-        int index
-) implements ButtonReplyMessage {
+public final class TemplateReplyMessage implements ButtonReplyMessage<TemplateReplyMessage> {
+    @ProtobufProperty(index = 1, type = ProtobufType.STRING)
+    private final String id;
+    @ProtobufProperty(index = 2, type = ProtobufType.STRING)
+    private final String buttonText;
+    @ProtobufProperty(index = 3, type = ProtobufType.OBJECT)
+    private ContextInfo contextInfo;
+    @ProtobufProperty(index = 4, type = ProtobufType.UINT32)
+    private final int index;
+
+    public TemplateReplyMessage(String id, String buttonText, ContextInfo contextInfo, int index) {
+        this.id = id;
+        this.buttonText = buttonText;
+        this.contextInfo = contextInfo;
+        this.index = index;
+    }
+
     @Override
     public MessageType type() {
         return MessageType.TEMPLATE_REPLY;
     }
+
+    public String id() {
+        return id;
+    }
+
+    public String buttonText() {
+        return buttonText;
+    }
+
+    @Override
+    public Optional<ContextInfo> contextInfo() {
+        return Optional.ofNullable(contextInfo);
+    }
+
+    @Override
+    public TemplateReplyMessage setContextInfo(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+        return this;
+    }
+
+    public int index() {
+        return index;
+    }
+
+    @Override
+    public String toString() {
+        return "TemplateReplyMessage[" +
+                "id=" + id + ", " +
+                "buttonText=" + buttonText + ", " +
+                "contextInfo=" + contextInfo + ", " +
+                "index=" + index + ']';
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/it/auties/whatsapp/model/message/model/ButtonReplyMessage.java b/src/main/java/it/auties/whatsapp/model/message/model/ButtonReplyMessage.java
index f8591798..b211847a 100644
--- a/src/main/java/it/auties/whatsapp/model/message/model/ButtonReplyMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/model/ButtonReplyMessage.java
@@ -7,6 +7,6 @@
 /**
  * A model interface that represents a reply to a button message
  */
-public sealed interface ButtonReplyMessage extends ContextualMessage, ButtonMessage permits ListResponseMessage, TemplateReplyMessage, ButtonsResponseMessage {
+public sealed interface ButtonReplyMessage<T extends ButtonReplyMessage<T>> extends ContextualMessage<T>, ButtonMessage permits ListResponseMessage, TemplateReplyMessage, ButtonsResponseMessage {
 
 }
diff --git a/src/main/java/it/auties/whatsapp/model/message/model/ContextualMessage.java b/src/main/java/it/auties/whatsapp/model/message/model/ContextualMessage.java
index ee1ed3f9..42a96538 100644
--- a/src/main/java/it/auties/whatsapp/model/message/model/ContextualMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/model/ContextualMessage.java
@@ -12,9 +12,10 @@
  * that implement this interface must provide an accessor named contextInfo to access said
  * property.
  */
-public sealed interface ContextualMessage extends Message
+public sealed interface ContextualMessage<T extends ContextualMessage<T>> extends Message
         permits ButtonsMessage, InteractiveMessage, InteractiveResponseMessage, ListMessage,
         TemplateMessage, ButtonReplyMessage, MediaMessage, PaymentOrderMessage, ContactMessage, ContactsMessage,
         GroupInviteMessage, LiveLocationMessage, LocationMessage, PollCreationMessage, ProductMessage, RequestPhoneNumberMessage, TextMessage {
     Optional<ContextInfo> contextInfo();
+    T setContextInfo(ContextInfo contextInfo);
 }
diff --git a/src/main/java/it/auties/whatsapp/model/message/model/MediaMessage.java b/src/main/java/it/auties/whatsapp/model/message/model/MediaMessage.java
index 44510540..ec4e308e 100644
--- a/src/main/java/it/auties/whatsapp/model/message/model/MediaMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/model/MediaMessage.java
@@ -15,7 +15,7 @@
  * A media message
  * Read its content using {@link it.auties.whatsapp.api.Whatsapp#downloadMedia(ChatMessageInfo)}
  */
-public sealed interface MediaMessage<T extends MediaMessage<T>> extends ContextualMessage, MutableAttachmentProvider<T> permits ExtendedMediaMessage, PaymentInvoiceMessage, AudioMessage, DocumentMessage, ImageMessage, StickerMessage, VideoOrGifMessage {
+public sealed interface MediaMessage<T extends MediaMessage<T>> extends ContextualMessage<T>, MutableAttachmentProvider<T> permits ExtendedMediaMessage, PaymentInvoiceMessage, AudioMessage, DocumentMessage, ImageMessage, StickerMessage, VideoOrGifMessage {
     /**
      * Returns the timestampSeconds, that is the seconds elapsed since {@link java.time.Instant#EPOCH}, for{@link MediaMessage#mediaKey()}
      *
diff --git a/src/main/java/it/auties/whatsapp/model/message/model/MessageContainer.java b/src/main/java/it/auties/whatsapp/model/message/model/MessageContainer.java
index 55718e5e..2ab80de7 100644
--- a/src/main/java/it/auties/whatsapp/model/message/model/MessageContainer.java
+++ b/src/main/java/it/auties/whatsapp/model/message/model/MessageContainer.java
@@ -583,7 +583,7 @@ public MessageContainer unbox() {
     }
 
     /**
-     * Converts this message to an ephemeral message
+     * Returns a copy of this container with a different device info
      *
      * @return a non-null message container
      */
diff --git a/src/main/java/it/auties/whatsapp/model/message/payment/PaymentInvoiceMessage.java b/src/main/java/it/auties/whatsapp/model/message/payment/PaymentInvoiceMessage.java
index b6d48737..c07166b3 100644
--- a/src/main/java/it/auties/whatsapp/model/message/payment/PaymentInvoiceMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/payment/PaymentInvoiceMessage.java
@@ -49,7 +49,7 @@ public final class PaymentInvoiceMessage implements PaymentMessage, MediaMessage
     private final byte[] thumbnail;
 
     @ProtobufProperty(index = 17, type = ProtobufType.OBJECT)
-    private final ContextInfo contextInfo;
+    private ContextInfo contextInfo;
 
     @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
     public PaymentInvoiceMessage(String note, String token, PaymentAttachmentType paymentAttachmentType, String mimeType, byte[] mediaKey, Long mediaKeyTimestampSeconds, byte[] mediaSha256, byte[] mediaEncryptedSha256, String mediaDirectPath, byte[] thumbnail, ContextInfo contextInfo) {
@@ -192,6 +192,12 @@ public MessageCategory category() {
         return MessageCategory.PAYMENT;
     }
 
+    @Override
+    public PaymentInvoiceMessage setContextInfo(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+        return this;
+    }
+
     /**
      * The constants of this enumerated type describe the various types of attachment that an invoice
      * can wrap
diff --git a/src/main/java/it/auties/whatsapp/model/message/payment/PaymentOrderMessage.java b/src/main/java/it/auties/whatsapp/model/message/payment/PaymentOrderMessage.java
index 0be66369..d1fa8e86 100644
--- a/src/main/java/it/auties/whatsapp/model/message/payment/PaymentOrderMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/payment/PaymentOrderMessage.java
@@ -11,6 +11,7 @@
 import it.auties.whatsapp.model.message.model.MessageType;
 import it.auties.whatsapp.model.message.model.PaymentMessage;
 
+import java.util.Arrays;
 import java.util.Optional;
 
 
@@ -18,37 +19,125 @@
  * A model class that represents a message to pay an order.
  */
 @ProtobufMessageName("Message.PaymentOrderMessage")
-public record PaymentOrderMessage(
-        @ProtobufProperty(index = 1, type = ProtobufType.STRING)
-        String id,
-        @ProtobufProperty(index = 2, type = ProtobufType.BYTES)
-        Optional<byte[]> thumbnail,
-        @ProtobufProperty(index = 3, type = ProtobufType.UINT32)
-        int itemCount,
-        @ProtobufProperty(index = 4, type = ProtobufType.OBJECT)
-        Status status,
-        @ProtobufProperty(index = 5, type = ProtobufType.OBJECT)
-        PaymentOrderSurface surface,
-        @ProtobufProperty(index = 6, type = ProtobufType.STRING)
-        Optional<String> message,
-        @ProtobufProperty(index = 7, type = ProtobufType.STRING)
-        Optional<String> title,
-        @ProtobufProperty(index = 8, type = ProtobufType.STRING)
-        Jid sellerId,
-        @ProtobufProperty(index = 9, type = ProtobufType.STRING)
-        String token,
-        @ProtobufProperty(index = 10, type = ProtobufType.UINT64)
-        long amount,
-        @ProtobufProperty(index = 11, type = ProtobufType.STRING)
-        String currency,
-        @ProtobufProperty(index = 17, type = ProtobufType.OBJECT)
-        Optional<ContextInfo> contextInfo
-) implements ContextualMessage, PaymentMessage {
+public final class PaymentOrderMessage implements ContextualMessage<PaymentOrderMessage>, PaymentMessage {
+    @ProtobufProperty(index = 1, type = ProtobufType.STRING)
+    private final String id;
+    @ProtobufProperty(index = 2, type = ProtobufType.BYTES)
+    private final byte[] thumbnail;
+    @ProtobufProperty(index = 3, type = ProtobufType.UINT32)
+    private final int itemCount;
+    @ProtobufProperty(index = 4, type = ProtobufType.OBJECT)
+    private final Status status;
+    @ProtobufProperty(index = 5, type = ProtobufType.OBJECT)
+    private final PaymentOrderSurface surface;
+    @ProtobufProperty(index = 6, type = ProtobufType.STRING)
+    private final String message;
+    @ProtobufProperty(index = 7, type = ProtobufType.STRING)
+    private final String title;
+    @ProtobufProperty(index = 8, type = ProtobufType.STRING)
+    private final Jid sellerId;
+    @ProtobufProperty(index = 9, type = ProtobufType.STRING)
+    private final String token;
+    @ProtobufProperty(index = 10, type = ProtobufType.UINT64)
+    private final long amount;
+    @ProtobufProperty(index = 11, type = ProtobufType.STRING)
+    private final String currency;
+    @ProtobufProperty(index = 17, type = ProtobufType.OBJECT)
+    private ContextInfo contextInfo;
+
+    public PaymentOrderMessage(String id, byte[] thumbnail, int itemCount, Status status, PaymentOrderSurface surface, String message, String title, Jid sellerId, String token, long amount, String currency, ContextInfo contextInfo) {
+        this.id = id;
+        this.thumbnail = thumbnail;
+        this.itemCount = itemCount;
+        this.status = status;
+        this.surface = surface;
+        this.message = message;
+        this.title = title;
+        this.sellerId = sellerId;
+        this.token = token;
+        this.amount = amount;
+        this.currency = currency;
+        this.contextInfo = contextInfo;
+    }
+
     @Override
     public MessageType type() {
         return MessageType.PAYMENT_ORDER;
     }
 
+    public String id() {
+        return id;
+    }
+
+    public Optional<byte[]> thumbnail() {
+        return Optional.ofNullable(thumbnail);
+    }
+
+    public int itemCount() {
+        return itemCount;
+    }
+
+    public Status status() {
+        return status;
+    }
+
+    public PaymentOrderSurface surface() {
+        return surface;
+    }
+
+    public Optional<String> message() {
+        return Optional.ofNullable(message);
+    }
+
+    public Optional<String> title() {
+        return Optional.ofNullable(title);
+    }
+
+    public Jid sellerId() {
+        return sellerId;
+    }
+
+    public String token() {
+        return token;
+    }
+
+    public long amount() {
+        return amount;
+    }
+
+    public String currency() {
+        return currency;
+    }
+
+    @Override
+    public Optional<ContextInfo> contextInfo() {
+        return Optional.ofNullable(contextInfo);
+    }
+
+    @Override
+    public PaymentOrderMessage setContextInfo(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "PaymentOrderMessage[" +
+                "id=" + id + ", " +
+                "thumbnail=" + Arrays.toString(thumbnail) + ", " +
+                "itemCount=" + itemCount + ", " +
+                "status=" + status + ", " +
+                "surface=" + surface + ", " +
+                "message=" + message + ", " +
+                "title=" + title + ", " +
+                "sellerId=" + sellerId + ", " +
+                "token=" + token + ", " +
+                "amount=" + amount + ", " +
+                "currency=" + currency + ", " +
+                "contextInfo=" + contextInfo + ']';
+    }
+
+
     @ProtobufMessageName("Message.OrderMessage.OrderStatus")
     public enum Status implements ProtobufEnum {
         /**
diff --git a/src/main/java/it/auties/whatsapp/model/message/standard/AudioMessage.java b/src/main/java/it/auties/whatsapp/model/message/standard/AudioMessage.java
index cfcb8e47..e391a092 100644
--- a/src/main/java/it/auties/whatsapp/model/message/standard/AudioMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/standard/AudioMessage.java
@@ -52,7 +52,7 @@ public final class AudioMessage extends ExtendedMediaMessage<AudioMessage> imple
     private Long mediaKeyTimestampSeconds;
 
     @ProtobufProperty(index = 17, type = ProtobufType.OBJECT)
-    private final ContextInfo contextInfo;
+    private ContextInfo contextInfo;
 
     @ProtobufProperty(index = 18, type = ProtobufType.BYTES)
     private final byte[] streamingSidecar;
@@ -215,6 +215,12 @@ public Optional<ContextInfo> contextInfo() {
         return Optional.ofNullable(contextInfo);
     }
 
+    @Override
+    public AudioMessage setContextInfo(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+        return this;
+    }
+
     @Override
     public MediaMessageType mediaType() {
         return MediaMessageType.AUDIO;
diff --git a/src/main/java/it/auties/whatsapp/model/message/standard/ContactMessage.java b/src/main/java/it/auties/whatsapp/model/message/standard/ContactMessage.java
index 7ec0b1f0..aed6433e 100644
--- a/src/main/java/it/auties/whatsapp/model/message/standard/ContactMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/standard/ContactMessage.java
@@ -15,14 +15,20 @@
  * A model class that represents a message holding a contact inside
  */
 @ProtobufMessageName("Message.ContactMessage")
-public record ContactMessage(
-        @ProtobufProperty(index = 1, type = ProtobufType.STRING)
-        String name,
-        @ProtobufProperty(index = 16, type = ProtobufType.STRING)
-        ContactCard vcard,
-        @ProtobufProperty(index = 17, type = ProtobufType.OBJECT)
-        Optional<ContextInfo> contextInfo
-) implements ContextualMessage {
+public final class ContactMessage implements ContextualMessage<ContactMessage> {
+    @ProtobufProperty(index = 1, type = ProtobufType.STRING)
+    private final String name;
+    @ProtobufProperty(index = 16, type = ProtobufType.STRING)
+    private final ContactCard vcard;
+    @ProtobufProperty(index = 17, type = ProtobufType.OBJECT)
+    private ContextInfo contextInfo;
+
+    public ContactMessage(String name, ContactCard vcard, ContextInfo contextInfo) {
+        this.name = name;
+        this.vcard = vcard;
+        this.contextInfo = contextInfo;
+    }
+
     @Override
     public MessageType type() {
         return MessageType.CONTACT;
@@ -32,4 +38,32 @@ public MessageType type() {
     public MessageCategory category() {
         return MessageCategory.STANDARD;
     }
+
+    public String name() {
+        return name;
+    }
+
+    public ContactCard vcard() {
+        return vcard;
+    }
+
+    @Override
+    public Optional<ContextInfo> contextInfo() {
+        return Optional.ofNullable(contextInfo);
+    }
+
+    @Override
+    public ContactMessage setContextInfo(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "ContactMessage[" +
+                "name=" + name + ", " +
+                "vcard=" + vcard + ", " +
+                "contextInfo=" + contextInfo + ']';
+    }
+
 }
\ No newline at end of file
diff --git a/src/main/java/it/auties/whatsapp/model/message/standard/ContactsMessage.java b/src/main/java/it/auties/whatsapp/model/message/standard/ContactsMessage.java
index fc73dd54..e3bb4f73 100644
--- a/src/main/java/it/auties/whatsapp/model/message/standard/ContactsMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/standard/ContactsMessage.java
@@ -15,14 +15,20 @@
  * A model class that represents a message holding a list of contacts inside
  */
 @ProtobufMessageName("Message.ContactsArrayMessage")
-public record ContactsMessage(
-        @ProtobufProperty(index = 1, type = ProtobufType.STRING)
-        String name,
-        @ProtobufProperty(index = 2, type = ProtobufType.OBJECT)
-        List<ContactMessage> contacts,
-        @ProtobufProperty(index = 17, type = ProtobufType.OBJECT)
-        Optional<ContextInfo> contextInfo
-) implements ContextualMessage {
+public final class ContactsMessage implements ContextualMessage<ContactsMessage> {
+    @ProtobufProperty(index = 1, type = ProtobufType.STRING)
+    private final String name;
+    @ProtobufProperty(index = 2, type = ProtobufType.OBJECT)
+    private final List<ContactMessage> contacts;
+    @ProtobufProperty(index = 17, type = ProtobufType.OBJECT)
+    private ContextInfo contextInfo;
+
+
+    public ContactsMessage(String name, List<ContactMessage> contacts, ContextInfo contextInfo) {
+        this.name = name;
+        this.contacts = contacts;
+        this.contextInfo = contextInfo;
+    }
 
     @Override
     public MessageType type() {
@@ -33,4 +39,31 @@ public MessageType type() {
     public MessageCategory category() {
         return MessageCategory.STANDARD;
     }
+
+    public String name() {
+        return name;
+    }
+
+    public List<ContactMessage> contacts() {
+        return contacts;
+    }
+
+    @Override
+    public Optional<ContextInfo> contextInfo() {
+        return Optional.ofNullable(contextInfo);
+    }
+
+    @Override
+    public ContactsMessage setContextInfo(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "ContactsMessage[" +
+                "name=" + name + ", " +
+                "contacts=" + contacts + ", " +
+                "contextInfo=" + contextInfo + ']';
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/it/auties/whatsapp/model/message/standard/DocumentMessage.java b/src/main/java/it/auties/whatsapp/model/message/standard/DocumentMessage.java
index edff64de..e297a159 100644
--- a/src/main/java/it/auties/whatsapp/model/message/standard/DocumentMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/standard/DocumentMessage.java
@@ -80,7 +80,7 @@ public final class DocumentMessage extends ExtendedMediaMessage<DocumentMessage>
     private final byte[] thumbnailEncSha256;
 
     @ProtobufProperty(index = 17, type = ProtobufType.OBJECT)
-    private final ContextInfo contextInfo;
+    private ContextInfo contextInfo;
 
     @ProtobufProperty(index = 18, type = ProtobufType.UINT32)
     private final Integer thumbnailHeight;
@@ -304,4 +304,10 @@ public OptionalInt thumbnailHeight() {
     public OptionalInt thumbnailWidth() {
         return thumbnailWidth == null ? OptionalInt.empty() : OptionalInt.of(thumbnailWidth);
     }
+
+    @Override
+    public DocumentMessage setContextInfo(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+        return this;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/it/auties/whatsapp/model/message/standard/GroupInviteMessage.java b/src/main/java/it/auties/whatsapp/model/message/standard/GroupInviteMessage.java
index 990faa7a..e484e015 100644
--- a/src/main/java/it/auties/whatsapp/model/message/standard/GroupInviteMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/standard/GroupInviteMessage.java
@@ -13,6 +13,7 @@
 import it.auties.whatsapp.util.Clock;
 
 import java.time.ZonedDateTime;
+import java.util.Arrays;
 import java.util.Optional;
 
 
@@ -20,24 +21,35 @@
  * A model class that represents a message holding a whatsapp group invite inside
  */
 @ProtobufMessageName("Message.GroupInviteMessage")
-public record GroupInviteMessage(
-        @ProtobufProperty(index = 1, type = ProtobufType.STRING)
-        Jid group,
-        @ProtobufProperty(index = 2, type = ProtobufType.STRING)
-        String code,
-        @ProtobufProperty(index = 3, type = ProtobufType.UINT64)
-        long expirationSeconds,
-        @ProtobufProperty(index = 4, type = ProtobufType.STRING)
-        String groupName,
-        @ProtobufProperty(index = 5, type = ProtobufType.BYTES)
-        Optional<byte[]> thumbnail,
-        @ProtobufProperty(index = 6, type = ProtobufType.STRING)
-        Optional<String> caption,
-        @ProtobufProperty(index = 7, type = ProtobufType.OBJECT)
-        Optional<ContextInfo> contextInfo,
-        @ProtobufProperty(index = 8, type = ProtobufType.OBJECT)
-        Type groupType
-) implements ContextualMessage {
+public final class GroupInviteMessage implements ContextualMessage<GroupInviteMessage> {
+    @ProtobufProperty(index = 1, type = ProtobufType.STRING)
+    private final Jid group;
+    @ProtobufProperty(index = 2, type = ProtobufType.STRING)
+    private final String code;
+    @ProtobufProperty(index = 3, type = ProtobufType.UINT64)
+    private final long expirationSeconds;
+    @ProtobufProperty(index = 4, type = ProtobufType.STRING)
+    private final String groupName;
+    @ProtobufProperty(index = 5, type = ProtobufType.BYTES)
+    private final byte[] thumbnail;
+    @ProtobufProperty(index = 6, type = ProtobufType.STRING)
+    private final String caption;
+    @ProtobufProperty(index = 7, type = ProtobufType.OBJECT)
+    private ContextInfo contextInfo;
+    @ProtobufProperty(index = 8, type = ProtobufType.OBJECT)
+    private final Type groupType;
+    
+    public GroupInviteMessage(Jid group, String code, long expirationSeconds, String groupName, byte[] thumbnail, String caption, ContextInfo contextInfo, Type groupType) {
+        this.group = group;
+        this.code = code;
+        this.expirationSeconds = expirationSeconds;
+        this.groupName = groupName;
+        this.thumbnail = thumbnail;
+        this.caption = caption;
+        this.contextInfo = contextInfo;
+        this.groupType = groupType;
+    }
+
     @Override
     public MessageType type() {
         return MessageType.GROUP_INVITE;
@@ -52,6 +64,59 @@ public Optional<ZonedDateTime> expiration() {
         return Clock.parseSeconds(expirationSeconds);
     }
 
+    public Jid group() {
+        return group;
+    }
+
+    public String code() {
+        return code;
+    }
+
+    public long expirationSeconds() {
+        return expirationSeconds;
+    }
+
+    public String groupName() {
+        return groupName;
+    }
+
+    public Optional<byte[]> thumbnail() {
+        return Optional.ofNullable(thumbnail);
+    }
+
+    public Optional<String> caption() {
+        return Optional.ofNullable(caption);
+    }
+
+    @Override
+    public Optional<ContextInfo> contextInfo() {
+        return Optional.ofNullable(contextInfo);
+    }
+
+    @Override
+    public GroupInviteMessage setContextInfo(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+        return this;
+    }
+
+    public Type groupType() {
+        return groupType;
+    }
+
+    @Override
+    public String toString() {
+        return "GroupInviteMessage[" +
+                "group=" + group + ", " +
+                "code=" + code + ", " +
+                "expirationSeconds=" + expirationSeconds + ", " +
+                "groupName=" + groupName + ", " +
+                "thumbnail=" + Arrays.toString(thumbnail) + ", " +
+                "caption=" + caption + ", " +
+                "contextInfo=" + contextInfo + ", " +
+                "groupType=" + groupType + ']';
+    }
+
+
     @ProtobufMessageName("Message.GroupInviteMessage.GroupType")
     public enum Type implements ProtobufEnum {
         DEFAULT(0),
diff --git a/src/main/java/it/auties/whatsapp/model/message/standard/ImageMessage.java b/src/main/java/it/auties/whatsapp/model/message/standard/ImageMessage.java
index 74eae65e..c30c13bd 100644
--- a/src/main/java/it/auties/whatsapp/model/message/standard/ImageMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/standard/ImageMessage.java
@@ -72,7 +72,7 @@ public final class ImageMessage extends ExtendedMediaMessage<ImageMessage>
     private final byte[] thumbnail;
 
     @ProtobufProperty(index = 17, type = ProtobufType.OBJECT)
-    private final ContextInfo contextInfo;
+    private ContextInfo contextInfo;
 
     @ProtobufProperty(index = 18, type = ProtobufType.BYTES)
     private final byte[] firstScanSidecar;
@@ -349,4 +349,10 @@ public Optional<byte[]> thumbnailEncSha256() {
     public Optional<String> staticUrl() {
         return Optional.ofNullable(staticUrl);
     }
+
+    @Override
+    public ImageMessage setContextInfo(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+        return this;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/it/auties/whatsapp/model/message/standard/LiveLocationMessage.java b/src/main/java/it/auties/whatsapp/model/message/standard/LiveLocationMessage.java
index d76c84ce..d39dee56 100644
--- a/src/main/java/it/auties/whatsapp/model/message/standard/LiveLocationMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/standard/LiveLocationMessage.java
@@ -8,6 +8,7 @@
 import it.auties.whatsapp.model.message.model.MessageCategory;
 import it.auties.whatsapp.model.message.model.MessageType;
 
+import java.util.Arrays;
 import java.util.Optional;
 
 
@@ -15,28 +16,41 @@
  * A model class that represents a message holding a live location inside
  */
 @ProtobufMessageName("Message.LiveLocationMessage")
-public record LiveLocationMessage(
-        @ProtobufProperty(index = 1, type = ProtobufType.DOUBLE)
-        double latitude,
-        @ProtobufProperty(index = 2, type = ProtobufType.DOUBLE)
-        double longitude,
-        @ProtobufProperty(index = 3, type = ProtobufType.UINT32)
-        int accuracy,
-        @ProtobufProperty(index = 4, type = ProtobufType.FLOAT)
-        float speed,
-        @ProtobufProperty(index = 5, type = ProtobufType.UINT32)
-        int magneticNorthOffset,
-        @ProtobufProperty(index = 6, type = ProtobufType.STRING)
-        Optional<String> caption,
-        @ProtobufProperty(index = 7, type = ProtobufType.UINT64)
-        long sequenceNumber,
-        @ProtobufProperty(index = 8, type = ProtobufType.UINT32)
-        int timeOffset,
-        @ProtobufProperty(index = 16, type = ProtobufType.BYTES)
-        Optional<byte[]> thumbnail,
-        @ProtobufProperty(index = 17, type = ProtobufType.OBJECT)
-        Optional<ContextInfo> contextInfo
-) implements ContextualMessage {
+public final class LiveLocationMessage implements ContextualMessage<LiveLocationMessage> {
+    @ProtobufProperty(index = 1, type = ProtobufType.DOUBLE)
+    private final double latitude;
+    @ProtobufProperty(index = 2, type = ProtobufType.DOUBLE)
+    private final double longitude;
+    @ProtobufProperty(index = 3, type = ProtobufType.UINT32)
+    private final int accuracy;
+    @ProtobufProperty(index = 4, type = ProtobufType.FLOAT)
+    private final float speed;
+    @ProtobufProperty(index = 5, type = ProtobufType.UINT32)
+    private final int magneticNorthOffset;
+    @ProtobufProperty(index = 6, type = ProtobufType.STRING)
+    private final String caption;
+    @ProtobufProperty(index = 7, type = ProtobufType.UINT64)
+    private final long sequenceNumber;
+    @ProtobufProperty(index = 8, type = ProtobufType.UINT32)
+    private final int timeOffset;
+    @ProtobufProperty(index = 16, type = ProtobufType.BYTES)
+    private final byte[] thumbnail;
+    @ProtobufProperty(index = 17, type = ProtobufType.OBJECT)
+    private ContextInfo contextInfo;
+
+    public LiveLocationMessage(double latitude, double longitude, int accuracy, float speed, int magneticNorthOffset, String caption, long sequenceNumber, int timeOffset, byte[] thumbnail, ContextInfo contextInfo) {
+        this.latitude = latitude;
+        this.longitude = longitude;
+        this.accuracy = accuracy;
+        this.speed = speed;
+        this.magneticNorthOffset = magneticNorthOffset;
+        this.caption = caption;
+        this.sequenceNumber = sequenceNumber;
+        this.timeOffset = timeOffset;
+        this.thumbnail = thumbnail;
+        this.contextInfo = contextInfo;
+    }
+
     @Override
     public MessageType type() {
         return MessageType.LIVE_LOCATION;
@@ -46,4 +60,66 @@ public MessageType type() {
     public MessageCategory category() {
         return MessageCategory.STANDARD;
     }
+
+    public double latitude() {
+        return latitude;
+    }
+
+    public double longitude() {
+        return longitude;
+    }
+
+    public int accuracy() {
+        return accuracy;
+    }
+
+    public float speed() {
+        return speed;
+    }
+
+    public int magneticNorthOffset() {
+        return magneticNorthOffset;
+    }
+
+    public Optional<String> caption() {
+        return Optional.ofNullable(caption);
+    }
+
+    public long sequenceNumber() {
+        return sequenceNumber;
+    }
+
+    public int timeOffset() {
+        return timeOffset;
+    }
+
+    public Optional<byte[]> thumbnail() {
+        return Optional.ofNullable(thumbnail);
+    }
+
+    @Override
+    public Optional<ContextInfo> contextInfo() {
+        return Optional.ofNullable(contextInfo);
+    }
+
+    @Override
+    public LiveLocationMessage setContextInfo(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "LiveLocationMessage[" +
+                "latitude=" + latitude + ", " +
+                "longitude=" + longitude + ", " +
+                "accuracy=" + accuracy + ", " +
+                "speed=" + speed + ", " +
+                "magneticNorthOffset=" + magneticNorthOffset + ", " +
+                "caption=" + caption + ", " +
+                "sequenceNumber=" + sequenceNumber + ", " +
+                "timeOffset=" + timeOffset + ", " +
+                "thumbnail=" + Arrays.toString(thumbnail) + ", " +
+                "contextInfo=" + contextInfo + ']';
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/it/auties/whatsapp/model/message/standard/LocationMessage.java b/src/main/java/it/auties/whatsapp/model/message/standard/LocationMessage.java
index ddb2d075..c4bde98e 100644
--- a/src/main/java/it/auties/whatsapp/model/message/standard/LocationMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/standard/LocationMessage.java
@@ -11,6 +11,7 @@
 import it.auties.whatsapp.model.message.model.MessageCategory;
 import it.auties.whatsapp.model.message.model.MessageType;
 
+import java.util.Arrays;
 import java.util.Optional;
 
 
@@ -18,32 +19,46 @@
  * A model class that represents a message holding a location inside
  */
 @ProtobufMessageName("Message.LocationMessage")
-public record LocationMessage(
-        @ProtobufProperty(index = 1, type = ProtobufType.DOUBLE)
-        double latitude,
-        @ProtobufProperty(index = 2, type = ProtobufType.DOUBLE)
-        double longitude,
-        @ProtobufProperty(index = 3, type = ProtobufType.STRING)
-        Optional<String> name,
-        @ProtobufProperty(index = 4, type = ProtobufType.STRING)
-        Optional<String> address,
-        @ProtobufProperty(index = 5, type = ProtobufType.STRING)
-        Optional<String> url,
-        @ProtobufProperty(index = 6, type = ProtobufType.BOOL)
-        boolean live,
-        @ProtobufProperty(index = 7, type = ProtobufType.UINT32)
-        int accuracy,
-        @ProtobufProperty(index = 8, type = ProtobufType.FLOAT)
-        float speed,
-        @ProtobufProperty(index = 9, type = ProtobufType.UINT32)
-        int magneticNorthOffset,
-        @ProtobufProperty(index = 11, type = ProtobufType.STRING)
-        Optional<String> caption,
-        @ProtobufProperty(index = 16, type = ProtobufType.BYTES)
-        Optional<byte[]> thumbnail,
-        @ProtobufProperty(index = 17, type = ProtobufType.OBJECT)
-        Optional<ContextInfo> contextInfo
-) implements ContextualMessage, ButtonsMessageHeader, HighlyStructuredFourRowTemplateTitle, HydratedFourRowTemplateTitle {
+public final class LocationMessage implements ContextualMessage<LocationMessage>, ButtonsMessageHeader, HighlyStructuredFourRowTemplateTitle, HydratedFourRowTemplateTitle {
+    @ProtobufProperty(index = 1, type = ProtobufType.DOUBLE)
+    private final double latitude;
+    @ProtobufProperty(index = 2, type = ProtobufType.DOUBLE)
+    private final double longitude;
+    @ProtobufProperty(index = 3, type = ProtobufType.STRING)
+    private final String name;
+    @ProtobufProperty(index = 4, type = ProtobufType.STRING)
+    private final String address;
+    @ProtobufProperty(index = 5, type = ProtobufType.STRING)
+    private final String url;
+    @ProtobufProperty(index = 6, type = ProtobufType.BOOL)
+    private final boolean live;
+    @ProtobufProperty(index = 7, type = ProtobufType.UINT32)
+    private final int accuracy;
+    @ProtobufProperty(index = 8, type = ProtobufType.FLOAT)
+    private final float speed;
+    @ProtobufProperty(index = 9, type = ProtobufType.UINT32)
+    private final int magneticNorthOffset;
+    @ProtobufProperty(index = 11, type = ProtobufType.STRING)
+    private final String caption;
+    @ProtobufProperty(index = 16, type = ProtobufType.BYTES)
+    private final byte[] thumbnail;
+    @ProtobufProperty(index = 17, type = ProtobufType.OBJECT)
+    private ContextInfo contextInfo;
+
+    public LocationMessage(double latitude, double longitude, String name, String address, String url, boolean live, int accuracy, float speed, int magneticNorthOffset, String caption, byte[] thumbnail, ContextInfo contextInfo) {
+        this.latitude = latitude;
+        this.longitude = longitude;
+        this.name = name;
+        this.address = address;
+        this.url = url;
+        this.live = live;
+        this.accuracy = accuracy;
+        this.speed = speed;
+        this.magneticNorthOffset = magneticNorthOffset;
+        this.caption = caption;
+        this.thumbnail = thumbnail;
+        this.contextInfo = contextInfo;
+    }
 
     @Override
     public MessageType type() {
@@ -69,4 +84,76 @@ public HydratedFourRowTemplateTitle.Type hydratedTitleType() {
     public ButtonsMessageHeader.Type buttonHeaderType() {
         return ButtonsMessageHeader.Type.LOCATION;
     }
+
+    public double latitude() {
+        return latitude;
+    }
+
+    public double longitude() {
+        return longitude;
+    }
+
+    public Optional<String> name() {
+        return Optional.ofNullable(name);
+    }
+
+    public Optional<String> address() {
+        return Optional.ofNullable(address);
+    }
+
+    public Optional<String> url() {
+        return Optional.ofNullable(url);
+    }
+
+    public boolean live() {
+        return live;
+    }
+
+    public int accuracy() {
+        return accuracy;
+    }
+
+    public float speed() {
+        return speed;
+    }
+
+    public int magneticNorthOffset() {
+        return magneticNorthOffset;
+    }
+
+    public Optional<String> caption() {
+        return Optional.ofNullable(caption);
+    }
+
+    public Optional<byte[]> thumbnail() {
+        return Optional.ofNullable(thumbnail);
+    }
+
+    @Override
+    public Optional<ContextInfo> contextInfo() {
+        return Optional.ofNullable(contextInfo);
+    }
+
+    @Override
+    public LocationMessage setContextInfo(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "LocationMessage[" +
+                "latitude=" + latitude + ", " +
+                "longitude=" + longitude + ", " +
+                "name=" + name + ", " +
+                "address=" + address + ", " +
+                "url=" + url + ", " +
+                "live=" + live + ", " +
+                "accuracy=" + accuracy + ", " +
+                "speed=" + speed + ", " +
+                "magneticNorthOffset=" + magneticNorthOffset + ", " +
+                "caption=" + caption + ", " +
+                "thumbnail=" + Arrays.toString(thumbnail) + ", " +
+                "contextInfo=" + contextInfo + ']';
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/it/auties/whatsapp/model/message/standard/PollCreationMessage.java b/src/main/java/it/auties/whatsapp/model/message/standard/PollCreationMessage.java
index a7cb7830..60f37d81 100644
--- a/src/main/java/it/auties/whatsapp/model/message/standard/PollCreationMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/standard/PollCreationMessage.java
@@ -1,6 +1,5 @@
 package it.auties.whatsapp.model.message.standard;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
 import it.auties.protobuf.annotation.ProtobufBuilder;
 import it.auties.protobuf.annotation.ProtobufMessageName;
 import it.auties.protobuf.annotation.ProtobufProperty;
@@ -9,24 +8,23 @@
 import it.auties.whatsapp.crypto.Sha256;
 import it.auties.whatsapp.model.info.ChatMessageInfo;
 import it.auties.whatsapp.model.info.ContextInfo;
-import it.auties.whatsapp.model.jid.Jid;
 import it.auties.whatsapp.model.jid.JidProvider;
 import it.auties.whatsapp.model.message.model.ContextualMessage;
 import it.auties.whatsapp.model.message.model.MessageCategory;
 import it.auties.whatsapp.model.message.model.MessageType;
 import it.auties.whatsapp.model.poll.PollOption;
+import it.auties.whatsapp.model.poll.SelectedPollOption;
 import it.auties.whatsapp.util.KeyHelper;
 import it.auties.whatsapp.util.Validate;
 
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 
 
 /**
  * A model class that represents a message holding a poll inside
  */
 @ProtobufMessageName("Message.PollCreationMessage")
-public final class PollCreationMessage implements ContextualMessage {
+public final class PollCreationMessage implements ContextualMessage<PollCreationMessage> {
     @ProtobufProperty(index = 1, type = ProtobufType.BYTES)
     private byte[] encryptionKey;
 
@@ -40,34 +38,24 @@ public final class PollCreationMessage implements ContextualMessage {
     private final int selectableOptionsCount;
 
     @ProtobufProperty(index = 5, type = ProtobufType.OBJECT)
-    private final ContextInfo contextInfo;
+    private ContextInfo contextInfo;
 
+    @ProtobufProperty(index = 999, type = ProtobufType.MAP, keyType = ProtobufType.STRING, valueType = ProtobufType.OBJECT)
     private final Map<String, PollOption> selectableOptionsMap;
 
-    private final Map<Jid, Collection<PollOption>> selectedOptionsMap;
+    @ProtobufProperty(index = 1000, type = ProtobufType.OBJECT)
+    private final List<SelectedPollOption> selectedOptions;
 
-    @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-    public PollCreationMessage(byte[] encryptionKey, String title, List<PollOption> selectableOptions, int selectableOptionsCount, ContextInfo contextInfo, Map<String, PollOption> selectableOptionsMap, Map<Jid, Collection<PollOption>> selectedOptionsMap) {
+    public PollCreationMessage(byte[] encryptionKey, String title, List<PollOption> selectableOptions, int selectableOptionsCount, ContextInfo contextInfo, Map<String, PollOption> selectableOptionsMap, List<SelectedPollOption> selectedOptions) {
         this.encryptionKey = encryptionKey;
         this.title = title;
         this.selectableOptions = selectableOptions;
         this.selectableOptionsCount = selectableOptionsCount;
         this.contextInfo = contextInfo;
         this.selectableOptionsMap = selectableOptionsMap;
-        this.selectedOptionsMap = selectedOptionsMap;
+        this.selectedOptions = selectedOptions;
     }
 
-    public PollCreationMessage(byte[] encryptionKey, String title, List<PollOption> selectableOptions, int selectableOptionsCount, ContextInfo contextInfo) {
-        this.encryptionKey = encryptionKey;
-        this.title = title;
-        this.selectableOptions = selectableOptions;
-        this.selectableOptionsCount = selectableOptionsCount;
-        this.contextInfo = contextInfo;
-        this.selectedOptionsMap = new ConcurrentHashMap<>();
-        this.selectableOptionsMap = new ConcurrentHashMap<>();
-    }
-
-
     /**
      * Constructs a new builder to create a PollCreationMessage The newsletters can be later sent using
      * {@link Whatsapp#sendMessage(ChatMessageInfo)}
@@ -99,17 +87,17 @@ static PollCreationMessage simpleBuilder(String title, List<PollOption> selectab
      * @param voter the non-null contact that voted in this poll
      * @return a non-null unmodifiable map
      */
-    public Collection<PollOption> getSelectedOptions(JidProvider voter) {
-        var results = selectedOptionsMap.get(voter.toJid());
-        if (results == null) {
-            return List.of();
-        }
-
-        return Collections.unmodifiableCollection(results);
+    public Collection<SelectedPollOption> getSelectedOptions(JidProvider voter) {
+        return selectedOptions.stream()
+                .filter(entry -> Objects.equals(entry.jid(), voter.toJid()))
+                .toList();
     }
 
     public void addSelectedOptions(JidProvider voter, Collection<PollOption> voted) {
-        selectedOptionsMap.put(voter.toJid(), voted);
+        for(var entry : voted) {
+            var selectedPollOption = new SelectedPollOption(voter.toJid(), entry.name());
+            selectedOptions.add(selectedPollOption);
+        }
     }
 
     public void addSelectableOption(String hash, PollOption option) {
@@ -154,4 +142,10 @@ public void setEncryptionKey(byte[] encryptionKey) {
     public Optional<ContextInfo> contextInfo() {
         return Optional.ofNullable(contextInfo);
     }
+
+    @Override
+    public PollCreationMessage setContextInfo(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+        return this;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/it/auties/whatsapp/model/message/standard/ProductMessage.java b/src/main/java/it/auties/whatsapp/model/message/standard/ProductMessage.java
index 50657c7d..707ac6f0 100644
--- a/src/main/java/it/auties/whatsapp/model/message/standard/ProductMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/standard/ProductMessage.java
@@ -18,20 +18,29 @@
  * A model class that represents a message holding a product inside
  */
 @ProtobufMessageName("Message.ProductMessage")
-public record ProductMessage(
-        @ProtobufProperty(index = 1, type = ProtobufType.OBJECT)
-        Product product,
-        @ProtobufProperty(index = 2, type = ProtobufType.STRING)
-        Jid businessOwnerJid,
-        @ProtobufProperty(index = 4, type = ProtobufType.OBJECT)
-        ProductCatalog catalog,
-        @ProtobufProperty(index = 5, type = ProtobufType.STRING)
-        Optional<String> body,
-        @ProtobufProperty(index = 6, type = ProtobufType.STRING)
-        Optional<String> footer,
-        @ProtobufProperty(index = 17, type = ProtobufType.OBJECT)
-        Optional<ContextInfo> contextInfo
-) implements ContextualMessage, ButtonMessage {
+public final class ProductMessage implements ContextualMessage<ProductMessage>, ButtonMessage {
+    @ProtobufProperty(index = 1, type = ProtobufType.OBJECT)
+    private final Product product;
+    @ProtobufProperty(index = 2, type = ProtobufType.STRING)
+    private final Jid businessOwnerJid;
+    @ProtobufProperty(index = 4, type = ProtobufType.OBJECT)
+    private final ProductCatalog catalog;
+    @ProtobufProperty(index = 5, type = ProtobufType.STRING)
+    private final String body;
+    @ProtobufProperty(index = 6, type = ProtobufType.STRING)
+    private final String footer;
+    @ProtobufProperty(index = 17, type = ProtobufType.OBJECT)
+    private ContextInfo contextInfo;
+
+    public ProductMessage(Product product, Jid businessOwnerJid, ProductCatalog catalog, String body, String footer, ContextInfo contextInfo) {
+        this.product = product;
+        this.businessOwnerJid = businessOwnerJid;
+        this.catalog = catalog;
+        this.body = body;
+        this.footer = footer;
+        this.contextInfo = contextInfo;
+    }
+
     @Override
     public MessageType type() {
         return MessageType.PRODUCT;
@@ -41,4 +50,46 @@ public MessageType type() {
     public MessageCategory category() {
         return MessageCategory.STANDARD;
     }
+
+    public Product product() {
+        return product;
+    }
+
+    public Jid businessOwnerJid() {
+        return businessOwnerJid;
+    }
+
+    public ProductCatalog catalog() {
+        return catalog;
+    }
+
+    public Optional<String> body() {
+        return Optional.ofNullable(body);
+    }
+
+    public Optional<String> footer() {
+        return Optional.ofNullable(footer);
+    }
+
+    @Override
+    public Optional<ContextInfo> contextInfo() {
+        return Optional.ofNullable(contextInfo);
+    }
+
+    @Override
+    public ProductMessage setContextInfo(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "ProductMessage[" +
+                "product=" + product + ", " +
+                "businessOwnerJid=" + businessOwnerJid + ", " +
+                "catalog=" + catalog + ", " +
+                "body=" + body + ", " +
+                "footer=" + footer + ", " +
+                "contextInfo=" + contextInfo + ']';
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/it/auties/whatsapp/model/message/standard/RequestPhoneNumberMessage.java b/src/main/java/it/auties/whatsapp/model/message/standard/RequestPhoneNumberMessage.java
index a7135e64..b3c43076 100644
--- a/src/main/java/it/auties/whatsapp/model/message/standard/RequestPhoneNumberMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/standard/RequestPhoneNumberMessage.java
@@ -15,10 +15,14 @@
  * Still needs to be implemented by Whatsapp
  */
 @ProtobufMessageName("Message.RequestPhoneNumberMessage")
-public record RequestPhoneNumberMessage(
-        @ProtobufProperty(index = 1, type = ProtobufType.OBJECT)
-        Optional<ContextInfo> contextInfo
-) implements ContextualMessage {
+public final class RequestPhoneNumberMessage implements ContextualMessage<RequestPhoneNumberMessage> {
+    @ProtobufProperty(index = 1, type = ProtobufType.OBJECT)
+    private ContextInfo contextInfo;
+
+    public RequestPhoneNumberMessage(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+    }
+
     @Override
     public MessageType type() {
         return MessageType.REQUEST_PHONE_NUMBER;
@@ -28,4 +32,22 @@ public MessageType type() {
     public MessageCategory category() {
         return MessageCategory.STANDARD;
     }
+
+    @Override
+    public Optional<ContextInfo> contextInfo() {
+        return Optional.ofNullable(contextInfo);
+    }
+
+    @Override
+    public RequestPhoneNumberMessage setContextInfo(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "RequestPhoneNumberMessage[" +
+                "contextInfo=" + contextInfo + ']';
+    }
+
 }
diff --git a/src/main/java/it/auties/whatsapp/model/message/standard/StickerMessage.java b/src/main/java/it/auties/whatsapp/model/message/standard/StickerMessage.java
index 2357df66..5f7e56f8 100644
--- a/src/main/java/it/auties/whatsapp/model/message/standard/StickerMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/standard/StickerMessage.java
@@ -70,7 +70,7 @@ public final class StickerMessage extends ExtendedMediaMessage<StickerMessage> i
     private final byte[] thumbnail;
 
     @ProtobufProperty(index = 17, type = ProtobufType.OBJECT)
-    private final ContextInfo contextInfo;
+    private ContextInfo contextInfo;
 
     @ProtobufProperty(index = 18, type = ProtobufType.INT64)
     private final Long stickerSentTimestamp;
@@ -238,4 +238,10 @@ public Optional<byte[]> thumbnail() {
     public OptionalLong stickerSentTimestamp() {
         return Clock.parseTimestamp(stickerSentTimestamp);
     }
+
+    @Override
+    public StickerMessage setContextInfo(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+        return this;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/it/auties/whatsapp/model/message/standard/TextMessage.java b/src/main/java/it/auties/whatsapp/model/message/standard/TextMessage.java
index dd418f04..1f27fa4a 100644
--- a/src/main/java/it/auties/whatsapp/model/message/standard/TextMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/standard/TextMessage.java
@@ -21,7 +21,7 @@
  * A model class that represents a message holding text inside
  */
 @ProtobufMessageName("Message.TextMessage")
-public final class TextMessage implements ContextualMessage {
+public final class TextMessage implements ContextualMessage<TextMessage> {
     @ProtobufProperty(index = 1, type = ProtobufType.STRING)
     private String text;
 
diff --git a/src/main/java/it/auties/whatsapp/model/message/standard/VideoOrGifMessage.java b/src/main/java/it/auties/whatsapp/model/message/standard/VideoOrGifMessage.java
index c2b18c4b..5f46d262 100644
--- a/src/main/java/it/auties/whatsapp/model/message/standard/VideoOrGifMessage.java
+++ b/src/main/java/it/auties/whatsapp/model/message/standard/VideoOrGifMessage.java
@@ -77,7 +77,7 @@ public final class VideoOrGifMessage extends ExtendedMediaMessage<VideoOrGifMess
     private final byte[] thumbnail;
 
     @ProtobufProperty(index = 17, type = ProtobufType.OBJECT)
-    private final ContextInfo contextInfo;
+    private ContextInfo contextInfo;
 
     @ProtobufProperty(index = 18, type = ProtobufType.BYTES)
     private final byte[] streamingSidecar;
@@ -340,6 +340,12 @@ public Optional<String> staticUrl() {
         return Optional.ofNullable(staticUrl);
     }
 
+    @Override
+    public VideoOrGifMessage setContextInfo(ContextInfo contextInfo) {
+        this.contextInfo = contextInfo;
+        return this;
+    }
+
     /**
      * The constants of this enumerated type describe the various sources from where a gif can come
      * from
diff --git a/src/main/java/it/auties/whatsapp/model/poll/SelectedPollOption.java b/src/main/java/it/auties/whatsapp/model/poll/SelectedPollOption.java
new file mode 100644
index 00000000..2c602eee
--- /dev/null
+++ b/src/main/java/it/auties/whatsapp/model/poll/SelectedPollOption.java
@@ -0,0 +1,18 @@
+package it.auties.whatsapp.model.poll;
+
+import it.auties.protobuf.annotation.ProtobufProperty;
+import it.auties.protobuf.model.ProtobufMessage;
+import it.auties.protobuf.model.ProtobufType;
+import it.auties.whatsapp.model.jid.Jid;
+
+/**
+ * A model class that represents a selected option in a {@link it.auties.whatsapp.model.message.standard.PollCreationMessage}
+ */
+public record SelectedPollOption(
+        @ProtobufProperty(index = 1, type = ProtobufType.STRING)
+        Jid jid,
+        @ProtobufProperty(index = 2, type = ProtobufType.STRING)
+        String name
+) implements ProtobufMessage {
+
+}
diff --git a/src/main/java/it/auties/whatsapp/registration/apns/ApnsClient.java b/src/main/java/it/auties/whatsapp/registration/apns/ApnsClient.java
index 76578bb9..2dfd8a8b 100644
--- a/src/main/java/it/auties/whatsapp/registration/apns/ApnsClient.java
+++ b/src/main/java/it/auties/whatsapp/registration/apns/ApnsClient.java
@@ -183,7 +183,7 @@ private void createSocketConnection(ApnsBag bag) {
           var sslParameters = SSLProvider.getParameters(sslContext);
           sslParameters.setApplicationProtocols(new String[]{"apns-security-v3"});
           var sslSocketFactory = sslContext.getSocketFactory();
-          var underlyingSocket = new Socket(ProxyAuthenticator.getProxy(proxy));
+          var underlyingSocket = new Socket();
           var endpoint = ThreadLocalRandom.current().nextInt(1, bag.hostCount()) + "-" + bag.hostname();
           underlyingSocket.connect(new InetSocketAddress(endpoint, PORT));
           this.socket = (SSLSocket) sslSocketFactory.createSocket(underlyingSocket, endpoint, PORT, true);
diff --git a/src/main/java/it/auties/whatsapp/util/Specification.java b/src/main/java/it/auties/whatsapp/util/Specification.java
index 9b738978..0415387e 100644
--- a/src/main/java/it/auties/whatsapp/util/Specification.java
+++ b/src/main/java/it/auties/whatsapp/util/Specification.java
@@ -43,7 +43,7 @@ public final static class Whatsapp {
         public static final int THUMBNAIL_WIDTH = 480;
         public static final int THUMBNAIL_HEIGHT = 339;
         public static final URI MOBILE_DOWNLOAD_URL = URI.create("https://www.whatsapp.com/android/current/WhatsApp.apk");
-        public static final URI MOBILE_BUSINESS_DOWNLOAD_URL = URI.create("https://d.apkpure.com/b/APK/com.whatsapp.w4b?version=latest");
+        public static final URI MOBILE_BUSINESS_DOWNLOAD_URL = URI.create("https://d.cdnpure.com/b/APK/com.whatsapp.w4b?version=latest");
         public static final byte[] MOBILE_ANDROID_SALT = Base64.getDecoder().decode("PkTwKSZqUfAUyR0rPQ8hYJ0wNsQQ3dW1+3SCnyTXIfEAxxS75FwkDf47wNv/c8pP3p0GXKR6OOQmhyERwx74fw1RYSU10I4r1gyBVDbRJ40pidjM41G1I1oN");
         public static final byte[] REGISTRATION_PUBLIC_KEY = HexFormat.of().parseHex("8e8c0f74c3ebc5d7a6865c6c3c843856b06121cce8ea774d22fb6f122512302d");
         public static final String MOBILE_IOS_STATIC = "0a1mLfGUIBVrMKF1RdvLI5lkRBvof6vn0fD2QRSM";