diff --git a/internal/pkg/commands/devices.go b/internal/pkg/commands/devices.go
index eb65adb..91b1d59 100644
--- a/internal/pkg/commands/devices.go
+++ b/internal/pkg/commands/devices.go
@@ -136,22 +136,34 @@
 TxDroppedTotal:             {{.TxDroppedTotal}}`
 	DEFAULT_NNI_PORT_STATS_FORMAT = `Nni Port:               {{.NniPort}}
 RxBytes:                {{.RxBytes}}
+RxFrames:               {{.RxFrames}}
+RxUcastFrames:          {{.RxUcastFrames}}
+RxMcastFrames:          {{.RxMcastFrames}}
+RxBcastFrames:          {{.RxBcastFrames}}
+RxErrorFrames:          {{.RxErrorFrames}}
+RxFcsErrorPackets:      {{.RxFcsErrorPackets}}
+RxUndersizePackets:     {{.RxUndersizePackets}}
+RxOversizePackets:      {{.RxOversizePackets}}
+TxBytes:                {{.TxBytes}}
+TxFrames:               {{.TxFrames}}
+TxUcastFrames:          {{.TxUcastFrames}}
+TxMcastFrames:          {{.TxMcastFrames}}
+TxBcastFrames:          {{.TxBcastFrames}}
+TxErrorFrames:          {{.TxErrorFrames}}
+TxUndersizePackets:     {{.TxUndersizePackets}}
+TxOversizePackets:      {{.TxOversizePackets}}
+
+# Deprecated packet counters to be removed in future releases
 RxPackets:              {{.RxPackets}}
 RxUcastPackets:         {{.RxUcastPackets}}
 RxMcastPackets:         {{.RxMcastPackets}}
 RxBcastPackets:         {{.RxBcastPackets}}
 RxErrorPackets:         {{.RxErrorPackets}}
-RxFcsErrorPackets:      {{.RxFcsErrorPackets}}
-RxUndersizePackets:     {{.RxUndersizePackets}}
-RxOversizePackets:      {{.RxOversizePackets}}
-TxBytes:                {{.TxBytes}}
 TxPackets:              {{.TxPackets}}
 TxUcastPackets:         {{.TxUcastPackets}}
 TxMcastPackets:         {{.TxMcastPackets}}
 TxBcastPackets:         {{.TxBcastPackets}}
-TxErrorPackets:         {{.TxErrorPackets}}
-TxUndersizePackets:     {{.TxUndersizePackets}}
-TxOversizePackets:      {{.TxOversizePackets}}`
+TxErrorPackets:         {{.TxErrorPackets}}`
 
 	DEFAULT_ONU_OMCI_TX_RX_STATS_FORMAT = `BaseTxArFrames:        {{.BaseTxArFrames}}
 BaseRxAkFrames:        {{.BaseRxAkFrames}}
@@ -728,8 +740,8 @@
 	GemId                   uint32
 	TransmittedGEMFrames    uint32
 	ReceivedGEMFrames       uint32
-	ReceivedPayloadBytes    uint32
-	TransmittedPayloadBytes uint32
+	ReceivedPayloadBytes    uint64
+	TransmittedPayloadBytes uint64
 	EncryptionKeyErrors     uint32
 }
 
@@ -3104,8 +3116,8 @@
 				GemId:                   gemStatsInfo.GemId,
 				TransmittedGEMFrames:    gemStatsInfo.TransmittedGEMFrames,
 				ReceivedGEMFrames:       gemStatsInfo.ReceivedGEMFrames,
-				ReceivedPayloadBytes:    gemStatsInfo.ReceivedPayloadBytes,
-				TransmittedPayloadBytes: gemStatsInfo.TransmittedPayloadBytes,
+				ReceivedPayloadBytes:    gemStatsInfo.ReceivedPayloadBytes_64,
+				TransmittedPayloadBytes: gemStatsInfo.TransmittedPayloadBytes_64,
 				EncryptionKeyErrors:     gemStatsInfo.EncryptionKeyErrors,
 			})
 		}