diff --git a/meshtastic/deviceonly.proto b/meshtastic/deviceonly.proto
index fb3924e..d0baf68 100644
--- a/meshtastic/deviceonly.proto
+++ b/meshtastic/deviceonly.proto
@@ -11,6 +11,7 @@ option swift_prefix = "";
 import "meshtastic/channel.proto";
 import "meshtastic/localonly.proto";
 import "meshtastic/mesh.proto";
+import "meshtastic/module_config.proto";
 
 /*
  * This message is never sent over the wire, but it is used for serializing DB
diff --git a/meshtastic/mesh.options b/meshtastic/mesh.options
index 4ad510a..ec1f766 100644
--- a/meshtastic/mesh.options
+++ b/meshtastic/mesh.options
@@ -52,8 +52,3 @@
 *Waypoint.description  max_size:100
 
 *NeighborInfo.neighbors max_count:10
-
-*DeviceMetadata.firmware_version max_size:18
-*DeviceMetadata:remote_hardware_pins max_count:4
-
-*RemoteHardwarePin.name         max_size:15
diff --git a/meshtastic/module_config.options b/meshtastic/module_config.options
index bae2bcd..6c38d34 100644
--- a/meshtastic/module_config.options
+++ b/meshtastic/module_config.options
@@ -15,4 +15,5 @@
 *ExternalNotificationConfig.output_buzzer int_size:8
 *ExternalNotificationConfig.nag_timeout int_size:16
 
-*RemoteHardwareConfig:available_pins max_count:4
\ No newline at end of file
+*RemoteHardwareConfig:available_pins max_count:4
+*RemoteHardwarePin.name max_size:15
\ No newline at end of file