diff --git a/meshtastic/mesh.options b/meshtastic/mesh.options
index c384185..ad8bd71 100644
--- a/meshtastic/mesh.options
+++ b/meshtastic/mesh.options
@@ -55,5 +55,6 @@
 
 *DeviceMetadata.firmware_version max_size:18
 
-*MqttClientProxyMessage.topic type:FT_POINTER
-*MqttClientProxyMessage.data max_size:500
\ No newline at end of file
+*MqttClientProxyMessage.topic max_size:60
+*MqttClientProxyMessage.data max_size:435
+*MqttClientProxyMessage.text max_size:435
\ No newline at end of file
diff --git a/meshtastic/mesh.proto b/meshtastic/mesh.proto
index eb55795..8055028 100644
--- a/meshtastic/mesh.proto
+++ b/meshtastic/mesh.proto
@@ -682,10 +682,26 @@ message Waypoint {
    * The MQTT topic this message will be sent /received on
    */
   string topic = 1;
+
   /*
    * The actual service envelope payload for mqtt delivery
    */
-  bytes data = 2;
+  oneof payload_variant {
+    /*
+     * Bytes
+     */
+    bytes data = 2;
+
+    /*
+     * Text
+     */
+    string text = 3;
+  }
+
+  /*
+   * Whether the message should be retained (or not)
+   */
+  bool retained = 4;
 }
 
 /*
diff --git a/meshtastic/module_config.proto b/meshtastic/module_config.proto
index 5008afb..3f429d9 100644
--- a/meshtastic/module_config.proto
+++ b/meshtastic/module_config.proto
@@ -65,6 +65,11 @@ message ModuleConfig {
      * This is useful if you want to use a single MQTT server for multiple meshtastic networks and separate them via ACLs
      */
     string root = 8;
+
+    /*
+     * If true, we can use the connected phone / client to proxy messages to MQTT instead of a direct connection
+     */
+    bool proxy_to_client_enabled = 9;
   }
 
   /*