diff --git a/apps/aqhome-nodes/server.c b/apps/aqhome-nodes/server.c
index 2e191e9..884a2e7 100644
--- a/apps/aqhome-nodes/server.c
+++ b/apps/aqhome-nodes/server.c
@@ -909,14 +909,14 @@ void _forwardDataFromSendStatsMsgToBroker(AQH_NODE_SERVER *xo, const AQH_MESSAGE
     devNum=AQH_SendStatsMessage_GetInterface(msg);
 
     if (devNum==0) {
-      _publishInt(xo, uid, "net/packetsOut", 0, NULL, packetsOutInt);
-      _publishInt(xo, uid, "net/collisions", 0, NULL, (int) AQH_SendStatsMessage_GetCollisions(msg));
-      _publishInt(xo, uid, "net/busy",       0, NULL, (int) AQH_SendStatsMessage_GetBusyErrors(msg));
+      _publishInt(xo, uid, "net/packetsOut", AQH_ValueModality_Stats, NULL, packetsOutInt);
+      _publishInt(xo, uid, "net/collisions", AQH_ValueModality_Stats, NULL, (int) AQH_SendStatsMessage_GetCollisions(msg));
+      _publishInt(xo, uid, "net/busy",       AQH_ValueModality_Stats, NULL, (int) AQH_SendStatsMessage_GetBusyErrors(msg));
     }
     else {
-      _publishIntWithIdx(xo, uid, "net/packetsOut", devNum, 0, NULL, packetsOutInt);
-      _publishIntWithIdx(xo, uid, "net/collisions", devNum, 0, NULL, (int) AQH_SendStatsMessage_GetCollisions(msg));
-      _publishIntWithIdx(xo, uid, "net/busy",       devNum, 0, NULL, (int) AQH_SendStatsMessage_GetBusyErrors(msg));
+      _publishIntWithIdx(xo, uid, "net/packetsOut", devNum, AQH_ValueModality_Stats, NULL, packetsOutInt);
+      _publishIntWithIdx(xo, uid, "net/collisions", devNum, AQH_ValueModality_Stats, NULL, (int) AQH_SendStatsMessage_GetCollisions(msg));
+      _publishIntWithIdx(xo, uid, "net/busy",       devNum, AQH_ValueModality_Stats, NULL, (int) AQH_SendStatsMessage_GetBusyErrors(msg));
     }
   }
 }
@@ -931,25 +931,26 @@ void _forwardDataFromRecvStatsMsgToBroker(AQH_NODE_SERVER *xo, const AQH_MESSAGE
   if (packetsInInt) {
     uint32_t uid;
     int devNum;
+    int m=AQH_ValueModality_Stats;
 
     uid=AQH_RecvStatsMessage_GetUid(msg);
     devNum=AQH_RecvStatsMessage_GetInterface(msg);
 
     if (devNum==0) {
-      _publishInt(xo, uid, "net/packetsIn",      0, NULL, packetsInInt);
-      _publishInt(xo, uid, "net/crcErrors",      0, NULL, (int) AQH_RecvStatsMessage_GetCrcErrors(msg));
-      _publishInt(xo, uid, "net/ioErrors",       0, NULL, (int) AQH_RecvStatsMessage_GetIoErrors(msg));
-      _publishInt(xo, uid, "net/nobufferErrors", 0, NULL, (int) AQH_RecvStatsMessage_GetNoBufferErrors(msg));
-      _publishInt(xo, uid, "net/msgSizeErrors",  0, NULL, (int) AQH_RecvStatsMessage_GetMsgSizeErrors(msg));
-      _publishInt(xo, uid, "net/missed",         0, NULL, (int) AQH_RecvStatsMessage_GetMissed(msg));
+      _publishInt(xo, uid, "net/packetsIn",      m, NULL, packetsInInt);
+      _publishInt(xo, uid, "net/crcErrors",      m, NULL, (int) AQH_RecvStatsMessage_GetCrcErrors(msg));
+      _publishInt(xo, uid, "net/ioErrors",       m, NULL, (int) AQH_RecvStatsMessage_GetIoErrors(msg));
+      _publishInt(xo, uid, "net/nobufferErrors", m, NULL, (int) AQH_RecvStatsMessage_GetNoBufferErrors(msg));
+      _publishInt(xo, uid, "net/msgSizeErrors",  m, NULL, (int) AQH_RecvStatsMessage_GetMsgSizeErrors(msg));
+      _publishInt(xo, uid, "net/missed",         m, NULL, (int) AQH_RecvStatsMessage_GetMissed(msg));
     }
     else {
-      _publishIntWithIdx(xo, uid, "net/packetsIn",      devNum, 0, NULL, packetsInInt);
-      _publishIntWithIdx(xo, uid, "net/crcErrors",      devNum, 0, NULL, (int) AQH_RecvStatsMessage_GetCrcErrors(msg));
-      _publishIntWithIdx(xo, uid, "net/ioErrors",       devNum, 0, NULL, (int) AQH_RecvStatsMessage_GetIoErrors(msg));
-      _publishIntWithIdx(xo, uid, "net/nobufferErrors", devNum, 0, NULL, (int) AQH_RecvStatsMessage_GetNoBufferErrors(msg));
-      _publishIntWithIdx(xo, uid, "net/msgSizeErrors",  devNum, 0, NULL, (int) AQH_RecvStatsMessage_GetMsgSizeErrors(msg));
-      _publishIntWithIdx(xo, uid, "net/missed",         devNum, 0, NULL, (int) AQH_RecvStatsMessage_GetMissed(msg));
+      _publishIntWithIdx(xo, uid, "net/packetsIn",      devNum, m, NULL, packetsInInt);
+      _publishIntWithIdx(xo, uid, "net/crcErrors",      devNum, m, NULL, (int) AQH_RecvStatsMessage_GetCrcErrors(msg));
+      _publishIntWithIdx(xo, uid, "net/ioErrors",       devNum, m, NULL, (int) AQH_RecvStatsMessage_GetIoErrors(msg));
+      _publishIntWithIdx(xo, uid, "net/nobufferErrors", devNum, m, NULL, (int) AQH_RecvStatsMessage_GetNoBufferErrors(msg));
+      _publishIntWithIdx(xo, uid, "net/msgSizeErrors",  devNum, m, NULL, (int) AQH_RecvStatsMessage_GetMsgSizeErrors(msg));
+      _publishIntWithIdx(xo, uid, "net/missed",         devNum, m, NULL, (int) AQH_RecvStatsMessage_GetMissed(msg));
     }
   }
 }
@@ -962,8 +963,8 @@ void _forwardDataFromMemStatsMsgToBroker(AQH_NODE_SERVER *xo, const AQH_MESSAGE
 
   uid=AQH_MemStatsMessage_GetUid(msg);
 
-  _publishInt(   xo, uid, "mem/buffersUsed",       0, NULL, AQH_MemStatsMessage_GetBuffersUsed(msg));
-  _publishInt(   xo, uid, "mem/maxBuffersUsed",    0, NULL, AQH_MemStatsMessage_GetMaxBuffersUsed(msg));
+  _publishInt(   xo, uid, "mem/buffersUsed",       AQH_ValueModality_Stats, NULL, AQH_MemStatsMessage_GetBuffersUsed(msg));
+  _publishInt(   xo, uid, "mem/maxBuffersUsed",    AQH_ValueModality_Stats, NULL, AQH_MemStatsMessage_GetMaxBuffersUsed(msg));
 }