diff --git a/snippets/conversation/send/Snippet.java b/snippets/conversation/send/Snippet.java
index 938a324..773b8f8 100644
--- a/snippets/conversation/send/Snippet.java
+++ b/snippets/conversation/send/Snippet.java
@@ -1,14 +1,15 @@
 package conversation;
 
-import com.sinch.sdk.domains.conversation.api.v1.*;
+import com.sinch.sdk.domains.conversation.api.v1.ConversationService;
+import com.sinch.sdk.domains.conversation.api.v1.MessagesService;
 import com.sinch.sdk.domains.conversation.models.v1.*;
+import com.sinch.sdk.domains.conversation.models.v1.messages.*;
 import com.sinch.sdk.domains.conversation.models.v1.messages.request.*;
 import com.sinch.sdk.domains.conversation.models.v1.messages.response.SendMessageResponse;
-import com.sinch.sdk.domains.conversation.models.v1.messages.*;
 import com.sinch.sdk.domains.conversation.models.v1.messages.types.text.*;
+import java.util.*;
 import java.util.Collections;
 import java.util.logging.Logger;
-import java.util.*;
 
 public class Snippet {
 
@@ -21,36 +22,34 @@ static void execute(ConversationService conversationService) {
     String appId = "YOUR_app_id";
     String from = "YOUR_sms_sender";
     String to = "RECIPIENT_number";
-    ChannelRecipientIdentity recipient = 
-        ChannelRecipientIdentity.builder()
-            .setChannel(ConversationChannel.SMS)
-            .setIdentity(to)
-            .build();
-    Collection<ChannelRecipientIdentity> recipients = new HashSet<ChannelRecipientIdentity>();
-    recipients.add(recipient);
+
     String body = "This is a test Conversation message using the Sinch Java SDK.";
     String smsSender = "SMS_SENDER";
 
-    LOGGER.info("Sending SMS Text using Conversation API");
-    SendMessageResponse value =
-        messagesService.sendMessage(
-            SendMessageRequest.builder()
-                .setAppId(appId)
-                .setRecipient(
-                    ChannelRecipientIdentities.builder()
-                        .setRecipientIdentities(recipients)
-                        .build())
-                .setMessage(
-                    AppMessage.builder()
-                        .setBody(
-                            TextMessage.builder()
-                                .setText(body)
-                                .build())
-                        .build())
-                .setChannelProperties(
-                    Collections.singletonMap(smsSender, from))
+    ChannelRecipientIdentities recipients =
+        ChannelRecipientIdentities.of(
+            ChannelRecipientIdentity.builder()
+                .setChannel(ConversationChannel.SMS)
+                .setIdentity(to)
                 .build());
 
+    AppMessage<TextMessage> message =
+        AppMessage.<TextMessage>builder()
+            .setBody(TextMessage.builder().setText(body).build())
+            .build();
+
+    SendMessageRequest<TextMessage> request =
+        SendMessageRequest.<TextMessage>builder()
+            .setAppId(appId)
+            .setRecipient(recipients)
+            .setMessage(message)
+            .setChannelProperties(Collections.singletonMap(smsSender, from))
+            .build();
+
+    LOGGER.info("Sending SMS Text using Conversation API");
+
+    SendMessageResponse value = messagesService.sendMessage(request);
+
     LOGGER.info("Response: " + value);
   }
-}
\ No newline at end of file
+}