diff --git a/api/src/gateway/gateway.service.ts b/api/src/gateway/gateway.service.ts
index 0034b43..8df0d50 100644
--- a/api/src/gateway/gateway.service.ts
+++ b/api/src/gateway/gateway.service.ts
@@ -111,10 +111,8 @@ export class GatewayService {
       smsBatch = await this.smsBatchModel.create({
         device: device._id,
         message,
-        metadata: {
-          recipientCount: recipients.length,
-          recipientPreview: this.getRecipientsPreview(recipients),
-        },
+        recipientCount: recipients.length,
+        recipientPreview: this.getRecipientsPreview(recipients),
       })
     } catch (e) {
       throw new HttpException(
diff --git a/api/src/gateway/schemas/sms-batch.schema.ts b/api/src/gateway/schemas/sms-batch.schema.ts
index 405d064..bc48e89 100644
--- a/api/src/gateway/schemas/sms-batch.schema.ts
+++ b/api/src/gateway/schemas/sms-batch.schema.ts
@@ -14,6 +14,18 @@ export class SMSBatch {
   @Prop({ type: String })
   message: string
 
+  @Prop({ type: Boolean, default: false })
+  encrypted: boolean
+
+  @Prop({ type: String })
+  encryptedMessage: string
+
+  @Prop({ type: Number })
+  recipientCount: number
+
+  @Prop({ type: String })
+  recipientPreview: string
+
   // misc metadata for debugging
   @Prop({ type: Object })
   metadata: Record<string, any>