diff --git a/src/main/java/org/asamk/signal/json/JsonAdminDelete.java b/src/main/java/org/asamk/signal/json/JsonAdminDelete.java
index aa815456..4f2aa4b5 100644
--- a/src/main/java/org/asamk/signal/json/JsonAdminDelete.java
+++ b/src/main/java/org/asamk/signal/json/JsonAdminDelete.java
@@ -9,9 +9,9 @@ import java.util.UUID;
 @JsonSchema(title = "AdminDelete")
 public record JsonAdminDelete(
         @Deprecated String targetAuthor,
-        @JsonProperty(required = true) String targetAuthorNumber,
-        @JsonProperty(required = true) String targetAuthorUuid,
-        @JsonProperty(required = true) long targetSentTimestamp
+        String targetAuthorNumber,
+        String targetAuthorUuid,
+        long targetSentTimestamp
 ) {
 
     static JsonAdminDelete from(MessageEnvelope.Data.AdminDelete adminDelete) {
diff --git a/src/main/java/org/asamk/signal/json/JsonAttachment.java b/src/main/java/org/asamk/signal/json/JsonAttachment.java
index a7580c6e..a6b9c224 100644
--- a/src/main/java/org/asamk/signal/json/JsonAttachment.java
+++ b/src/main/java/org/asamk/signal/json/JsonAttachment.java
@@ -7,14 +7,14 @@ import org.asamk.signal.manager.api.MessageEnvelope;
 
 @JsonSchema(title = "Attachment")
 record JsonAttachment(
-        @JsonProperty(required = true) String contentType,
-        @JsonProperty(required = true) String filename,
-        @JsonProperty(required = true) String id,
-        @JsonProperty(required = true) Long size,
-        @JsonProperty(required = true) Integer width,
-        @JsonProperty(required = true) Integer height,
-        @JsonProperty(required = true) String caption,
-        @JsonProperty(required = true) Long uploadTimestamp
+        String contentType,
+        String filename,
+        String id,
+        Long size,
+        Integer width,
+        Integer height,
+        String caption,
+        Long uploadTimestamp
 ) {
 
     static JsonAttachment from(MessageEnvelope.Data.Attachment attachment) {
diff --git a/src/main/java/org/asamk/signal/json/JsonAttachmentData.java b/src/main/java/org/asamk/signal/json/JsonAttachmentData.java
index e0ffcc08..cb1ac7e1 100644
--- a/src/main/java/org/asamk/signal/json/JsonAttachmentData.java
+++ b/src/main/java/org/asamk/signal/json/JsonAttachmentData.java
@@ -6,5 +6,5 @@ import io.micronaut.jsonschema.JsonSchema;
 
 @JsonSchema(title = "AttachmentData")
 public record JsonAttachmentData(
-        @JsonProperty(required = true) String data
+        String data
 ) {}
diff --git a/src/main/java/org/asamk/signal/json/JsonCallMessage.java b/src/main/java/org/asamk/signal/json/JsonCallMessage.java
index 6170d1df..2debbfb7 100644
--- a/src/main/java/org/asamk/signal/json/JsonCallMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonCallMessage.java
@@ -27,9 +27,9 @@ record JsonCallMessage(
     }
 
     record Offer(
-            @JsonProperty(required = true) long id,
-            @JsonProperty(required = true) String type,
-            @JsonProperty(required = true) String opaque
+            long id,
+            String type,
+            String opaque
     ) {
 
         public static Offer from(final MessageEnvelope.Call.Offer offer) {
@@ -38,8 +38,8 @@ record JsonCallMessage(
     }
 
     public record Answer(
-            @JsonProperty(required = true) long id,
-            @JsonProperty(required = true) String opaque
+            long id,
+            String opaque
     ) {
 
         public static Answer from(final MessageEnvelope.Call.Answer answer) {
@@ -47,7 +47,7 @@ record JsonCallMessage(
         }
     }
 
-    public record Busy(@JsonProperty(required = true) long id) {
+    public record Busy(long id) {
 
         public static Busy from(final MessageEnvelope.Call.Busy busy) {
             return new Busy(busy.id());
@@ -55,9 +55,9 @@ record JsonCallMessage(
     }
 
     public record Hangup(
-            @JsonProperty(required = true) long id,
-            @JsonProperty(required = true) String type,
-            @JsonProperty(required = true) int deviceId
+            long id,
+            String type,
+            int deviceId
     ) {
 
         public static Hangup from(final MessageEnvelope.Call.Hangup hangup) {
@@ -66,8 +66,8 @@ record JsonCallMessage(
     }
 
     public record IceUpdate(
-            @JsonProperty(required = true) long id,
-            @JsonProperty(required = true) String opaque
+            long id,
+            String opaque
     ) {
 
         public static IceUpdate from(final MessageEnvelope.Call.IceUpdate iceUpdate) {
diff --git a/src/main/java/org/asamk/signal/json/JsonContact.java b/src/main/java/org/asamk/signal/json/JsonContact.java
index 7bc0174f..a401362d 100644
--- a/src/main/java/org/asamk/signal/json/JsonContact.java
+++ b/src/main/java/org/asamk/signal/json/JsonContact.java
@@ -9,43 +9,43 @@ import java.util.List;
 
 @JsonSchema(title = "Contact")
 public record JsonContact(
-        @JsonProperty(required = true) String number,
-        @JsonProperty(required = true) String uuid,
-        @JsonProperty(required = true) String username,
-        @JsonProperty(required = true) String name,
-        @JsonProperty(required = true) String givenName,
-        @JsonProperty(required = true) String familyName,
-        @JsonProperty(required = true) String nickName,
-        @JsonProperty(required = true) String nickGivenName,
-        @JsonProperty(required = true) String nickFamilyName,
-        @JsonProperty(required = true) String note,
-        @JsonProperty(required = true) String color,
-        @JsonProperty(required = true) boolean isArchived,
-        @JsonProperty(required = true) boolean isBlocked,
-        @JsonProperty(required = true) boolean isHidden,
-        @JsonProperty(required = true) int messageExpirationTime,
-        @JsonProperty(required = true) boolean profileSharing,
-        @JsonProperty(required = true) boolean unregistered,
-        @JsonProperty(required = true) JsonProfile profile,
+        String number,
+        String uuid,
+        String username,
+        String name,
+        String givenName,
+        String familyName,
+        String nickName,
+        String nickGivenName,
+        String nickFamilyName,
+        String note,
+        String color,
+        boolean isArchived,
+        boolean isBlocked,
+        boolean isHidden,
+        int messageExpirationTime,
+        boolean profileSharing,
+        boolean unregistered,
+        JsonProfile profile,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonInternal internal
 ) {
 
         @JsonSchema(title = "Profile")
     public record JsonProfile(
-            @JsonProperty(required = true) long lastUpdateTimestamp,
-            @JsonProperty(required = true) String givenName,
-            @JsonProperty(required = true) String familyName,
-            @JsonProperty(required = true) String about,
-            @JsonProperty(required = true) String aboutEmoji,
-            @JsonProperty(required = true) boolean hasAvatar,
-            @JsonProperty(required = true) String mobileCoinAddress
+            long lastUpdateTimestamp,
+            String givenName,
+            String familyName,
+            String about,
+            String aboutEmoji,
+            boolean hasAvatar,
+            String mobileCoinAddress
     ) {}
 
         @JsonSchema(title = "Internal")
     public record JsonInternal(
-            @JsonProperty(required = true) List<String> capabilities,
-            @JsonProperty(required = true) String unidentifiedAccessMode,
-            @JsonProperty(required = true) Boolean sharesPhoneNumber,
-            @JsonProperty(required = true) Boolean discoverableByPhonenumber
+            List<String> capabilities,
+            String unidentifiedAccessMode,
+            Boolean sharesPhoneNumber,
+            Boolean discoverableByPhonenumber
     ) {}
 }
diff --git a/src/main/java/org/asamk/signal/json/JsonContactAddress.java b/src/main/java/org/asamk/signal/json/JsonContactAddress.java
index 8c86c318..acc2d9d6 100644
--- a/src/main/java/org/asamk/signal/json/JsonContactAddress.java
+++ b/src/main/java/org/asamk/signal/json/JsonContactAddress.java
@@ -8,15 +8,15 @@ import org.asamk.signal.util.Util;
 
 @JsonSchema(title = "ContactAddress")
 public record JsonContactAddress(
-        @JsonProperty(required = true) String type,
-        @JsonProperty(required = true) String label,
-        @JsonProperty(required = true) String street,
-        @JsonProperty(required = true) String pobox,
-        @JsonProperty(required = true) String neighborhood,
-        @JsonProperty(required = true) String city,
-        @JsonProperty(required = true) String region,
-        @JsonProperty(required = true) String postcode,
-        @JsonProperty(required = true) String country
+        String type,
+        String label,
+        String street,
+        String pobox,
+        String neighborhood,
+        String city,
+        String region,
+        String postcode,
+        String country
 ) {
 
     static JsonContactAddress from(MessageEnvelope.Data.SharedContact.Address address) {
diff --git a/src/main/java/org/asamk/signal/json/JsonContactAvatar.java b/src/main/java/org/asamk/signal/json/JsonContactAvatar.java
index 56a92c08..9adc6d1d 100644
--- a/src/main/java/org/asamk/signal/json/JsonContactAvatar.java
+++ b/src/main/java/org/asamk/signal/json/JsonContactAvatar.java
@@ -7,8 +7,8 @@ import org.asamk.signal.manager.api.MessageEnvelope;
 
 @JsonSchema(title = "ContactAvatar")
 public record JsonContactAvatar(
-        @JsonProperty(required = true) JsonAttachment attachment,
-        @JsonProperty(required = true) boolean isProfile
+        JsonAttachment attachment,
+        boolean isProfile
 ) {
 
     static JsonContactAvatar from(MessageEnvelope.Data.SharedContact.Avatar avatar) {
diff --git a/src/main/java/org/asamk/signal/json/JsonContactEmail.java b/src/main/java/org/asamk/signal/json/JsonContactEmail.java
index e995f4e5..330e58af 100644
--- a/src/main/java/org/asamk/signal/json/JsonContactEmail.java
+++ b/src/main/java/org/asamk/signal/json/JsonContactEmail.java
@@ -8,9 +8,9 @@ import org.asamk.signal.util.Util;
 
 @JsonSchema(title = "ContactEmail")
 public record JsonContactEmail(
-        @JsonProperty(required = true) String value,
-        @JsonProperty(required = true) String type,
-        @JsonProperty(required = true) String label
+        String value,
+        String type,
+        String label
 ) {
 
     static JsonContactEmail from(MessageEnvelope.Data.SharedContact.Email email) {
diff --git a/src/main/java/org/asamk/signal/json/JsonContactName.java b/src/main/java/org/asamk/signal/json/JsonContactName.java
index 02124807..0cc59c13 100644
--- a/src/main/java/org/asamk/signal/json/JsonContactName.java
+++ b/src/main/java/org/asamk/signal/json/JsonContactName.java
@@ -8,12 +8,12 @@ import org.asamk.signal.util.Util;
 
 @JsonSchema(title = "ContactName")
 public record JsonContactName(
-        @JsonProperty(required = true) String nickname,
-        @JsonProperty(required = true) String given,
-        @JsonProperty(required = true) String family,
-        @JsonProperty(required = true) String prefix,
-        @JsonProperty(required = true) String suffix,
-        @JsonProperty(required = true) String middle
+        String nickname,
+        String given,
+        String family,
+        String prefix,
+        String suffix,
+        String middle
 ) {
 
     static JsonContactName from(MessageEnvelope.Data.SharedContact.Name name) {
diff --git a/src/main/java/org/asamk/signal/json/JsonContactPhone.java b/src/main/java/org/asamk/signal/json/JsonContactPhone.java
index 6f567892..908593e0 100644
--- a/src/main/java/org/asamk/signal/json/JsonContactPhone.java
+++ b/src/main/java/org/asamk/signal/json/JsonContactPhone.java
@@ -8,9 +8,9 @@ import org.asamk.signal.util.Util;
 
 @JsonSchema(title = "ContactPhone")
 public record JsonContactPhone(
-        @JsonProperty(required = true) String value,
-        @JsonProperty(required = true) String type,
-        @JsonProperty(required = true) String label
+        String value,
+        String type,
+        String label
 ) {
 
     static JsonContactPhone from(MessageEnvelope.Data.SharedContact.Phone phone) {
diff --git a/src/main/java/org/asamk/signal/json/JsonDataMessage.java b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
index 4f922089..b796af8d 100644
--- a/src/main/java/org/asamk/signal/json/JsonDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
@@ -12,9 +12,9 @@ import java.util.List;
 
 @JsonSchema(title = "DataMessage")
 record JsonDataMessage(
-        @JsonProperty(required = true) long timestamp,
-        @JsonProperty(required = true) String message,
-        @JsonProperty(required = true) Integer expiresInSeconds,
+        long timestamp,
+        String message,
+        Integer expiresInSeconds,
         @JsonInclude(JsonInclude.Include.NON_NULL) Boolean isExpirationUpdate,
         @JsonInclude(JsonInclude.Include.NON_NULL) Boolean viewOnce,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonReaction reaction,
diff --git a/src/main/java/org/asamk/signal/json/JsonEditMessage.java b/src/main/java/org/asamk/signal/json/JsonEditMessage.java
index 7367a3fa..90efaf33 100644
--- a/src/main/java/org/asamk/signal/json/JsonEditMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonEditMessage.java
@@ -8,8 +8,8 @@ import org.asamk.signal.manager.api.MessageEnvelope;
 
 @JsonSchema(title = "EditMessage")
 record JsonEditMessage(
-        @JsonProperty(required = true) long targetSentTimestamp,
-        @JsonProperty(required = true) JsonDataMessage dataMessage
+        long targetSentTimestamp,
+        JsonDataMessage dataMessage
 ) {
 
     static JsonEditMessage from(MessageEnvelope.Edit editMessage, Manager m) {
diff --git a/src/main/java/org/asamk/signal/json/JsonError.java b/src/main/java/org/asamk/signal/json/JsonError.java
index feb75095..6c21309e 100644
--- a/src/main/java/org/asamk/signal/json/JsonError.java
+++ b/src/main/java/org/asamk/signal/json/JsonError.java
@@ -5,7 +5,7 @@ import io.micronaut.jsonschema.JsonSchema;
 
 
 @JsonSchema(title = "Error")
-public record JsonError(@JsonProperty(required = true) String message, @JsonProperty(required = true) String type) {
+public record JsonError(String message, String type) {
 
     public static JsonError from(Throwable exception) {
         return new JsonError(exception.getMessage(), exception.getClass().getSimpleName());
diff --git a/src/main/java/org/asamk/signal/json/JsonGroupInfo.java b/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
index c3120e9f..99bee2d7 100644
--- a/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
+++ b/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
@@ -8,10 +8,10 @@ import org.asamk.signal.manager.api.MessageEnvelope;
 
 @JsonSchema(title = "GroupInfo")
 record JsonGroupInfo(
-        @JsonProperty(required = true) String groupId,
-        @JsonProperty(required = true) String groupName,
-        @JsonProperty(required = true) int revision,
-        @JsonProperty(required = true) String type
+        String groupId,
+        String groupName,
+        int revision,
+        String type
 ) {
 
     static JsonGroupInfo from(MessageEnvelope.Data.GroupContext groupContext, Manager m) {
diff --git a/src/main/java/org/asamk/signal/json/JsonMention.java b/src/main/java/org/asamk/signal/json/JsonMention.java
index 91320e5d..0884b014 100644
--- a/src/main/java/org/asamk/signal/json/JsonMention.java
+++ b/src/main/java/org/asamk/signal/json/JsonMention.java
@@ -10,10 +10,10 @@ import java.util.UUID;
 @JsonSchema(title = "Mention")
 public record JsonMention(
         @Deprecated String name,
-        @JsonProperty(required = true) String number,
-        @JsonProperty(required = true) String uuid,
-        @JsonProperty(required = true) int start,
-        @JsonProperty(required = true) int length
+        String number,
+        String uuid,
+        int start,
+        int length
 ) {
 
     static JsonMention from(MessageEnvelope.Data.Mention mention) {
diff --git a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
index afdfed91..f3581d1f 100644
--- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
@@ -16,13 +16,13 @@ import java.util.UUID;
 @JsonSchema(title = "MessageEnvelope")
 public record JsonMessageEnvelope(
         @Deprecated String source,
-        @JsonProperty(required = true) String sourceNumber,
-        @JsonProperty(required = true) String sourceUuid,
-        @JsonProperty(required = true) String sourceName,
-        @JsonProperty(required = true) Integer sourceDevice,
-        @JsonProperty(required = true) long timestamp,
-        @JsonProperty(required = true) long serverReceivedTimestamp,
-        @JsonProperty(required = true) long serverDeliveredTimestamp,
+        String sourceNumber,
+        String sourceUuid,
+        String sourceName,
+        Integer sourceDevice,
+        long timestamp,
+        long serverReceivedTimestamp,
+        long serverDeliveredTimestamp,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonDataMessage dataMessage,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonEditMessage editMessage,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonStoryMessage storyMessage,
diff --git a/src/main/java/org/asamk/signal/json/JsonPayment.java b/src/main/java/org/asamk/signal/json/JsonPayment.java
index 685b2e8f..1d3dbf27 100644
--- a/src/main/java/org/asamk/signal/json/JsonPayment.java
+++ b/src/main/java/org/asamk/signal/json/JsonPayment.java
@@ -7,8 +7,8 @@ import org.asamk.signal.manager.api.MessageEnvelope;
 
 @JsonSchema(title = "Payment")
 public record JsonPayment(
-        @JsonProperty(required = true) String note,
-        @JsonProperty(required = true) byte[] receipt
+        String note,
+        byte[] receipt
 ) {
 
     static JsonPayment from(MessageEnvelope.Data.Payment payment) {
diff --git a/src/main/java/org/asamk/signal/json/JsonPinMessage.java b/src/main/java/org/asamk/signal/json/JsonPinMessage.java
index 5559550d..cd1a86dc 100644
--- a/src/main/java/org/asamk/signal/json/JsonPinMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonPinMessage.java
@@ -10,10 +10,10 @@ import java.util.UUID;
 @JsonSchema(title = "PinMessage")
 public record JsonPinMessage(
         @Deprecated String targetAuthor,
-        @JsonProperty(required = true) String targetAuthorNumber,
-        @JsonProperty(required = true) String targetAuthorUuid,
-        @JsonProperty(required = true) long targetSentTimestamp,
-        @JsonProperty(required = true) long pinDurationSeconds
+        String targetAuthorNumber,
+        String targetAuthorUuid,
+        long targetSentTimestamp,
+        long pinDurationSeconds
 ) {
 
     static JsonPinMessage from(MessageEnvelope.Data.PinMessage pinMessage) {
diff --git a/src/main/java/org/asamk/signal/json/JsonPollCreate.java b/src/main/java/org/asamk/signal/json/JsonPollCreate.java
index c4fe927c..bfef255c 100644
--- a/src/main/java/org/asamk/signal/json/JsonPollCreate.java
+++ b/src/main/java/org/asamk/signal/json/JsonPollCreate.java
@@ -9,9 +9,9 @@ import java.util.List;
 
 @JsonSchema(title = "PollCreate")
 public record JsonPollCreate(
-        @JsonProperty(required = true) String question,
-        @JsonProperty(required = true) boolean allowMultiple,
-        @JsonProperty(required = true) List<String> options
+        String question,
+        boolean allowMultiple,
+        List<String> options
 ) {
 
     static JsonPollCreate from(MessageEnvelope.Data.PollCreate pollCreate) {
diff --git a/src/main/java/org/asamk/signal/json/JsonPollTerminate.java b/src/main/java/org/asamk/signal/json/JsonPollTerminate.java
index a2bed429..0e003de2 100644
--- a/src/main/java/org/asamk/signal/json/JsonPollTerminate.java
+++ b/src/main/java/org/asamk/signal/json/JsonPollTerminate.java
@@ -6,7 +6,7 @@ import io.micronaut.jsonschema.JsonSchema;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 @JsonSchema(title = "PollTerminate")
-public record JsonPollTerminate(@JsonProperty(required = true) long targetSentTimestamp) {
+public record JsonPollTerminate(long targetSentTimestamp) {
 
     static JsonPollTerminate from(MessageEnvelope.Data.PollTerminate pollTerminate) {
         final var targetSentTimestamp = pollTerminate.targetSentTimestamp();
diff --git a/src/main/java/org/asamk/signal/json/JsonPollVote.java b/src/main/java/org/asamk/signal/json/JsonPollVote.java
index 9ae8fc07..4a9af3e1 100644
--- a/src/main/java/org/asamk/signal/json/JsonPollVote.java
+++ b/src/main/java/org/asamk/signal/json/JsonPollVote.java
@@ -11,11 +11,11 @@ import java.util.UUID;
 @JsonSchema(title = "PollVote")
 public record JsonPollVote(
         @Deprecated String author,
-        @JsonProperty(required = true) String authorNumber,
-        @JsonProperty(required = true) String authorUuid,
-        @JsonProperty(required = true) long targetSentTimestamp,
-        @JsonProperty(required = true) List<Integer> optionIndexes,
-        @JsonProperty(required = true) int voteCount
+        String authorNumber,
+        String authorUuid,
+        long targetSentTimestamp,
+        List<Integer> optionIndexes,
+        int voteCount
 ) {
 
     static JsonPollVote from(MessageEnvelope.Data.PollVote pollVote) {
diff --git a/src/main/java/org/asamk/signal/json/JsonPreview.java b/src/main/java/org/asamk/signal/json/JsonPreview.java
index 1e471afd..5bcb9290 100644
--- a/src/main/java/org/asamk/signal/json/JsonPreview.java
+++ b/src/main/java/org/asamk/signal/json/JsonPreview.java
@@ -7,10 +7,10 @@ import org.asamk.signal.manager.api.MessageEnvelope;
 
 @JsonSchema(title = "Preview")
 public record JsonPreview(
-        @JsonProperty(required = true) String url,
-        @JsonProperty(required = true) String title,
-        @JsonProperty(required = true) String description,
-        @JsonProperty(required = true) JsonAttachment image
+        String url,
+        String title,
+        String description,
+        JsonAttachment image
 ) {
 
     static JsonPreview from(MessageEnvelope.Data.Preview preview) {
diff --git a/src/main/java/org/asamk/signal/json/JsonQuote.java b/src/main/java/org/asamk/signal/json/JsonQuote.java
index 45213777..b5619ea2 100644
--- a/src/main/java/org/asamk/signal/json/JsonQuote.java
+++ b/src/main/java/org/asamk/signal/json/JsonQuote.java
@@ -11,13 +11,13 @@ import java.util.UUID;
 
 @JsonSchema(title = "Quote")
 public record JsonQuote(
-        @JsonProperty(required = true) long id,
+        long id,
         @Deprecated String author,
-        @JsonProperty(required = true) String authorNumber,
-        @JsonProperty(required = true) String authorUuid,
-        @JsonProperty(required = true) String text,
+        String authorNumber,
+        String authorUuid,
+        String text,
         @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonMention> mentions,
-        @JsonProperty(required = true) List<JsonQuotedAttachment> attachments,
+        List<JsonQuotedAttachment> attachments,
         @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonTextStyle> textStyles
 ) {
 
diff --git a/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java b/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java
index d33dbcf7..6e32e4bc 100644
--- a/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java
+++ b/src/main/java/org/asamk/signal/json/JsonQuotedAttachment.java
@@ -8,8 +8,8 @@ import org.asamk.signal.manager.api.MessageEnvelope;
 
 @JsonSchema(title = "QuotedAttachment")
 public record JsonQuotedAttachment(
-        @JsonProperty(required = true) String contentType,
-        @JsonProperty(required = true) String filename,
+        String contentType,
+        String filename,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonAttachment thumbnail
 ) {
 
diff --git a/src/main/java/org/asamk/signal/json/JsonReaction.java b/src/main/java/org/asamk/signal/json/JsonReaction.java
index d1fb6c18..3d0e63ff 100644
--- a/src/main/java/org/asamk/signal/json/JsonReaction.java
+++ b/src/main/java/org/asamk/signal/json/JsonReaction.java
@@ -9,12 +9,12 @@ import java.util.UUID;
 
 @JsonSchema(title = "Reaction")
 public record JsonReaction(
-        @JsonProperty(required = true) String emoji,
+        String emoji,
         @Deprecated String targetAuthor,
-        @JsonProperty(required = true) String targetAuthorNumber,
-        @JsonProperty(required = true) String targetAuthorUuid,
-        @JsonProperty(required = true) long targetSentTimestamp,
-        @JsonProperty(required = true) boolean isRemove
+        String targetAuthorNumber,
+        String targetAuthorUuid,
+        long targetSentTimestamp,
+        boolean isRemove
 ) {
 
     static JsonReaction from(MessageEnvelope.Data.Reaction reaction) {
diff --git a/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java b/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java
index d019c0d4..5e08c540 100644
--- a/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonReceiptMessage.java
@@ -9,11 +9,11 @@ import java.util.List;
 
 @JsonSchema(title = "ReceiptMessage")
 record JsonReceiptMessage(
-        @JsonProperty(required = true) long when,
-        @JsonProperty(required = true) boolean isDelivery,
-        @JsonProperty(required = true) boolean isRead,
-        @JsonProperty(required = true) boolean isViewed,
-        @JsonProperty(required = true) List<Long> timestamps
+        long when,
+        boolean isDelivery,
+        boolean isRead,
+        boolean isViewed,
+        List<Long> timestamps
 ) {
 
     static JsonReceiptMessage from(MessageEnvelope.Receipt receiptMessage) {
diff --git a/src/main/java/org/asamk/signal/json/JsonRecipientAddress.java b/src/main/java/org/asamk/signal/json/JsonRecipientAddress.java
index 7a5c5e70..0a82d83d 100644
--- a/src/main/java/org/asamk/signal/json/JsonRecipientAddress.java
+++ b/src/main/java/org/asamk/signal/json/JsonRecipientAddress.java
@@ -9,9 +9,9 @@ import java.util.UUID;
 
 @JsonSchema(title = "RecipientAddress")
 public record JsonRecipientAddress(
-        @JsonProperty(required = true) String uuid,
-        @JsonProperty(required = true) String number,
-        @JsonProperty(required = true) String username
+        String uuid,
+        String number,
+        String username
 ) {
 
     public static JsonRecipientAddress from(RecipientAddress address) {
diff --git a/src/main/java/org/asamk/signal/json/JsonRemoteDelete.java b/src/main/java/org/asamk/signal/json/JsonRemoteDelete.java
index f29c961e..bf619f5b 100644
--- a/src/main/java/org/asamk/signal/json/JsonRemoteDelete.java
+++ b/src/main/java/org/asamk/signal/json/JsonRemoteDelete.java
@@ -4,4 +4,4 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import io.micronaut.jsonschema.JsonSchema;
 
 @JsonSchema(title = "RemoteDelete")
-record JsonRemoteDelete(@JsonProperty(required = true) long timestamp) {}
+record JsonRemoteDelete(long timestamp) {}
diff --git a/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java b/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java
index 4ad591cd..0203df52 100644
--- a/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java
+++ b/src/main/java/org/asamk/signal/json/JsonSendMessageResult.java
@@ -9,9 +9,9 @@ import org.asamk.signal.manager.api.SendMessageResult;
 
 @JsonSchema(title = "SendMessageResult")
 public record JsonSendMessageResult(
-        @JsonProperty(required = true) JsonRecipientAddress recipientAddress,
+        JsonRecipientAddress recipientAddress,
         @JsonInclude(JsonInclude.Include.NON_NULL) String groupId,
-        @JsonProperty(required = true) Type type,
+        Type type,
         @JsonInclude(JsonInclude.Include.NON_NULL) String token,
         @JsonInclude(JsonInclude.Include.NON_NULL) Long retryAfterSeconds
 ) {
diff --git a/src/main/java/org/asamk/signal/json/JsonSharedContact.java b/src/main/java/org/asamk/signal/json/JsonSharedContact.java
index 677f38ea..823f6c8a 100644
--- a/src/main/java/org/asamk/signal/json/JsonSharedContact.java
+++ b/src/main/java/org/asamk/signal/json/JsonSharedContact.java
@@ -10,12 +10,12 @@ import java.util.List;
 
 @JsonSchema(title = "SharedContact")
 public record JsonSharedContact(
-        @JsonProperty(required = true) JsonContactName name,
+        JsonContactName name,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonContactAvatar avatar,
         @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonContactPhone> phone,
         @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonContactEmail> email,
         @JsonInclude(JsonInclude.Include.NON_NULL) List<JsonContactAddress> address,
-        @JsonProperty(required = true) String organization
+        String organization
 ) {
 
     static JsonSharedContact from(MessageEnvelope.Data.SharedContact contact) {
diff --git a/src/main/java/org/asamk/signal/json/JsonSticker.java b/src/main/java/org/asamk/signal/json/JsonSticker.java
index 2e800b5e..5ddf834d 100644
--- a/src/main/java/org/asamk/signal/json/JsonSticker.java
+++ b/src/main/java/org/asamk/signal/json/JsonSticker.java
@@ -8,8 +8,8 @@ import org.asamk.signal.util.Hex;
 
 @JsonSchema(title = "Sticker")
 public record JsonSticker(
-        @JsonProperty(required = true) String packId,
-        @JsonProperty(required = true) int stickerId
+        String packId,
+        int stickerId
 ) {
 
     static JsonSticker from(MessageEnvelope.Data.Sticker sticker) {
diff --git a/src/main/java/org/asamk/signal/json/JsonStoryContext.java b/src/main/java/org/asamk/signal/json/JsonStoryContext.java
index 8bd7d972..e3f5c42e 100644
--- a/src/main/java/org/asamk/signal/json/JsonStoryContext.java
+++ b/src/main/java/org/asamk/signal/json/JsonStoryContext.java
@@ -9,9 +9,9 @@ import java.util.UUID;
 
 @JsonSchema(title = "StoryContext")
 record JsonStoryContext(
-        @JsonProperty(required = true) String authorNumber,
-        @JsonProperty(required = true) String authorUuid,
-        @JsonProperty(required = true) long sentTimestamp
+        String authorNumber,
+        String authorUuid,
+        long sentTimestamp
 ) {
 
     static JsonStoryContext from(MessageEnvelope.Data.StoryContext storyContext) {
diff --git a/src/main/java/org/asamk/signal/json/JsonStoryMessage.java b/src/main/java/org/asamk/signal/json/JsonStoryMessage.java
index ec082589..51da1a8b 100644
--- a/src/main/java/org/asamk/signal/json/JsonStoryMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonStoryMessage.java
@@ -12,7 +12,7 @@ import java.util.List;
 
 @JsonSchema(title = "StoryMessage")
 record JsonStoryMessage(
-        @JsonProperty(required = true) boolean allowsReplies,
+        boolean allowsReplies,
         @JsonInclude(JsonInclude.Include.NON_NULL) String groupId,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonAttachment fileAttachment,
         @JsonInclude(JsonInclude.Include.NON_NULL) TextAttachment textAttachment
@@ -26,7 +26,7 @@ record JsonStoryMessage(
     }
 
     public record TextAttachment(
-            @JsonProperty(required = true) String text,
+            String text,
             @JsonInclude(JsonInclude.Include.NON_NULL) String style,
             @JsonInclude(JsonInclude.Include.NON_NULL) String textForegroundColor,
             @JsonInclude(JsonInclude.Include.NON_NULL) String textBackgroundColor,
@@ -46,11 +46,11 @@ record JsonStoryMessage(
         }
 
         public record Gradient(
-                @JsonProperty(required = true) String startColor,
-                @JsonProperty(required = true) String endColor,
-                @JsonProperty(required = true) List<String> colors,
-                @JsonProperty(required = true) List<Float> positions,
-                @JsonProperty(required = true) Integer angle
+                String startColor,
+                String endColor,
+                List<String> colors,
+                List<Float> positions,
+                Integer angle
         ) {
 
             static Gradient from(MessageEnvelope.Story.TextAttachment.Gradient gradient) {
diff --git a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
index f6623a0a..b76d1624 100644
--- a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
@@ -14,10 +14,10 @@ import java.util.UUID;
 @JsonSchema(title = "SyncDataMessage")
 record JsonSyncDataMessage(
         @Deprecated String destination,
-        @JsonProperty(required = true) String destinationNumber,
-        @JsonProperty(required = true) String destinationUuid,
+        String destinationNumber,
+        String destinationUuid,
         @JsonInclude(JsonInclude.Include.NON_NULL) JsonEditMessage editMessage,
-        @JsonProperty(required = true) @JsonUnwrapped JsonDataMessage dataMessage
+        @JsonUnwrapped JsonDataMessage dataMessage
 ) {
 
     static JsonSyncDataMessage from(MessageEnvelope.Sync.Sent transcriptMessage, Manager m) {
diff --git a/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java
index 3aad9e55..be2ba5dd 100644
--- a/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncReadMessage.java
@@ -10,9 +10,9 @@ import java.util.UUID;
 @JsonSchema(title = "SyncReadMessage")
 record JsonSyncReadMessage(
     @Deprecated String sender,
-    @JsonProperty(required = true) String senderNumber,
-    @JsonProperty(required = true) String senderUuid,
-    @JsonProperty(required = true) long timestamp
+    String senderNumber,
+    String senderUuid,
+    long timestamp
 ) {
 
     static JsonSyncReadMessage from(MessageEnvelope.Sync.Read readMessage) {
diff --git a/src/main/java/org/asamk/signal/json/JsonSyncStoryMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncStoryMessage.java
index c8835ee9..1d2f2aeb 100644
--- a/src/main/java/org/asamk/signal/json/JsonSyncStoryMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncStoryMessage.java
@@ -10,9 +10,9 @@ import java.util.UUID;
 
 @JsonSchema(title = "SyncStoryMessage")
 record JsonSyncStoryMessage(
-        @JsonProperty(required = true) String destinationNumber,
-        @JsonProperty(required = true) String destinationUuid,
-        @JsonProperty(required = true) @JsonUnwrapped JsonStoryMessage dataMessage
+        String destinationNumber,
+        String destinationUuid,
+        @JsonUnwrapped JsonStoryMessage dataMessage
 ) {
 
     static JsonSyncStoryMessage from(MessageEnvelope.Sync.Sent transcriptMessage) {
diff --git a/src/main/java/org/asamk/signal/json/JsonTextStyle.java b/src/main/java/org/asamk/signal/json/JsonTextStyle.java
index 780b8418..61083515 100644
--- a/src/main/java/org/asamk/signal/json/JsonTextStyle.java
+++ b/src/main/java/org/asamk/signal/json/JsonTextStyle.java
@@ -7,9 +7,9 @@ import org.asamk.signal.manager.api.TextStyle;
 
 @JsonSchema(title = "TextStyle")
 public record JsonTextStyle(
-        @JsonProperty(required = true) String style,
-        @JsonProperty(required = true) int start,
-        @JsonProperty(required = true) int length
+        String style,
+        int start,
+        int length
 ) {
 
     static JsonTextStyle from(TextStyle textStyle) {
diff --git a/src/main/java/org/asamk/signal/json/JsonTypingMessage.java b/src/main/java/org/asamk/signal/json/JsonTypingMessage.java
index ef371b67..9153f76b 100644
--- a/src/main/java/org/asamk/signal/json/JsonTypingMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonTypingMessage.java
@@ -9,8 +9,8 @@ import org.asamk.signal.manager.api.MessageEnvelope;
 
 @JsonSchema(title = "TypingMessage")
 record JsonTypingMessage(
-    @JsonProperty(required = true) String action,
-    @JsonProperty(required = true) long timestamp,
+    String action,
+    long timestamp,
     @JsonInclude(JsonInclude.Include.NON_NULL) String groupId
 ) {
 
diff --git a/src/main/java/org/asamk/signal/json/JsonUnpinMessage.java b/src/main/java/org/asamk/signal/json/JsonUnpinMessage.java
index dca17847..4d87e591 100644
--- a/src/main/java/org/asamk/signal/json/JsonUnpinMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonUnpinMessage.java
@@ -10,9 +10,9 @@ import java.util.UUID;
 @JsonSchema(title = "UnpinMessage")
 public record JsonUnpinMessage(
         @Deprecated String targetAuthor,
-        @JsonProperty(required = true) String targetAuthorNumber,
-        @JsonProperty(required = true) String targetAuthorUuid,
-        @JsonProperty(required = true) long targetSentTimestamp
+        String targetAuthorNumber,
+        String targetAuthorUuid,
+        long targetSentTimestamp
 ) {
 
     static JsonUnpinMessage from(MessageEnvelope.Data.UnpinMessage unpinMessage) {