diff --git a/android/app/src/main/java/com/vernu/sms/models/SMSPayload.java b/android/app/src/main/java/com/vernu/sms/models/SMSPayload.java
index 4e5417a..db98ba1 100644
--- a/android/app/src/main/java/com/vernu/sms/models/SMSPayload.java
+++ b/android/app/src/main/java/com/vernu/sms/models/SMSPayload.java
@@ -1,27 +1,30 @@
 package com.vernu.sms.models;
 
 public class SMSPayload {
+
+    private String[] recipients;
+    private String message;
+
+    // Legacy fields that are no longer used
     private String[] receivers;
     private String smsBody;
 
-    public SMSPayload(String[] receivers, String smsBody) {
-        this.receivers = receivers;
-        this.smsBody = smsBody;
+    public SMSPayload() {
     }
 
-    public String[] getReceivers() {
-        return receivers;
+    public String[] getRecipients() {
+        return recipients;
     }
 
-    public void setReceivers(String[] receivers) {
-        this.receivers = receivers;
+    public void setRecipients(String[] recipients) {
+        this.recipients = recipients;
     }
 
-    public String getSmsBody() {
-        return smsBody;
+    public String getMessage() {
+        return message;
     }
 
-    public void setSmsBody(String smsBody) {
-        this.smsBody = smsBody;
+    public void setMessage(String message) {
+        this.message = message;
     }
 }
diff --git a/android/app/src/main/java/com/vernu/sms/services/FCMService.java b/android/app/src/main/java/com/vernu/sms/services/FCMService.java
index bae9b2c..b113084 100644
--- a/android/app/src/main/java/com/vernu/sms/services/FCMService.java
+++ b/android/app/src/main/java/com/vernu/sms/services/FCMService.java
@@ -9,42 +9,40 @@ import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.Build;
 import android.util.Log;
-
 import androidx.core.app.NotificationCompat;
-
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
 import com.google.gson.Gson;
+import com.vernu.sms.AppConstants;
 import com.vernu.sms.R;
 import com.vernu.sms.activities.MainActivity;
 import com.vernu.sms.helpers.SMSHelper;
 import com.vernu.sms.helpers.SharedPreferenceHelper;
 import com.vernu.sms.models.SMSPayload;
 
-
 public class FCMService extends FirebaseMessagingService {
 
-    private static final String TAG = "MyFirebaseMsgService";
+    private static final String TAG = "FirebaseMessagingService";
     private static final String DEFAULT_NOTIFICATION_CHANNEL_ID = "N1";
 
     @Override
     public void onMessageReceived(RemoteMessage remoteMessage) {
 
-        Log.d("FCM_MESSAGE", remoteMessage.getData().toString());
+        Log.d(TAG, remoteMessage.getData().toString());
 
         Gson gson = new Gson();
         SMSPayload smsPayload = gson.fromJson(remoteMessage.getData().get("smsData"), SMSPayload.class);
 
         // Check if message contains a data payload.
         if (remoteMessage.getData().size() > 0) {
-            int preferedSim = SharedPreferenceHelper.getSharedPreferenceInt(this, "PREFERED_SIM", -1);
-            for (String receiver : smsPayload.getReceivers()) {
+            int preferedSim = SharedPreferenceHelper.getSharedPreferenceInt(this, AppConstants.SHARED_PREFS_PREFERRED_SIM_KEY, -1);
+            for (String receiver : smsPayload.getRecipients()) {
                 if(preferedSim == -1) {
-                    SMSHelper.sendSMS(receiver, smsPayload.getSmsBody());
+                    SMSHelper.sendSMS(receiver, smsPayload.getMessage());
                     continue;
                 }
                 try {
-                    SMSHelper.sendSMSFromSpecificSim(receiver, smsPayload.getSmsBody(), preferedSim);
+                    SMSHelper.sendSMSFromSpecificSim(receiver, smsPayload.getMessage(), preferedSim);
                 } catch(Exception e) {
                     Log.d("SMS_SEND_ERROR", e.getMessage());
                 }