diff --git a/meshtastic/deviceonly.options b/meshtastic/deviceonly.options
index fe51ce9..71ceaa0 100644
--- a/meshtastic/deviceonly.options
+++ b/meshtastic/deviceonly.options
@@ -2,7 +2,8 @@
 # https://jpa.kapsi.fi/nanopb/docs/reference.html#proto-file-options
 
 # FIXME pick a higher number someday? or do dynamic alloc in nanopb?
-*DeviceState.node_db max_count:80
+*DeviceState.node_db max_count:40
+*DeviceState.node_db_neighbors max_count: 40
 
 # FIXME - max_count is actually 32 but we save/load this as one long string of preencoded MeshPacket bytes - not a big array in RAM
 *DeviceState.receive_queue max_count:1
diff --git a/meshtastic/deviceonly.proto b/meshtastic/deviceonly.proto
index 3ce9ab3..c54a2b9 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/neighborinfo.proto";
 
 /*
  * This message is never sent over the wire, but it is used for serializing DB
@@ -66,6 +67,12 @@ message DeviceState {
    */
   bool did_gps_reset = 11;
 
+  /*
+   * Sender information used by NeighborInfo Module to get edge info on the mesh.
+   * This is stored in each node's nodeDB so we'll have a SNR per edge when we sniff packets.
+   * This field should disabled (always zeroed) unless user opts in.
+   */
+  repeated Neighbor node_db_neighbors = 12;
 }
 
 /*