diff --git a/internal/common/omci/get_test.go b/internal/common/omci/get_test.go
index 60fd5ae..82bbe7a 100644
--- a/internal/common/omci/get_test.go
+++ b/internal/common/omci/get_test.go
@@ -82,55 +82,55 @@
 		want getWant
 	}{
 		{"getOnu2gResponse",
-			getArgs{createOnu2gResponse(57344, 10), 1},
+			getArgs{createOnu2gResponse(false, 57344, 10), 1},
 			getWant{1, map[string]interface{}{"OpticalNetworkUnitManagementAndControlChannelOmccVersion": uint8(180)}},
 		},
 		{"getOnugResponse",
-			getArgs{createOnugResponse(40960, 10, sn), 1},
+			getArgs{createOnugResponse(false, 40960, 10, sn), 1},
 			getWant{1, map[string]interface{}{}},
 		},
 		{"getOnuDataResponse",
-			getArgs{createOnuDataResponse(32768, 10, 129), 2},
+			getArgs{createOnuDataResponse(false, 32768, 10, 129), 2},
 			getWant{2, map[string]interface{}{"MibDataSync": uint8(129)}},
 		},
 		{"getGemPortNetworkCtpPerformanceMonitoringHistoryDataResponse",
-			getArgs{createGemPortNetworkCtpPerformanceMonitoringHistoryData(32768, 10), 2},
+			getArgs{createGemPortNetworkCtpPerformanceMonitoringHistoryData(false, 32768, 10), 2},
 			getWant{2, map[string]interface{}{"ManagedEntityId": uint16(10)}},
 		},
 		{"getEthernetFramePerformanceMonitoringHistoryDataUpstreamResponse",
-			getArgs{createEthernetFramePerformanceMonitoringHistoryDataUpstreamResponse(32768, 10), 2},
+			getArgs{createEthernetFramePerformanceMonitoringHistoryDataUpstreamResponse(false, 32768, 10), 2},
 			getWant{2, map[string]interface{}{"ManagedEntityId": uint16(10)}},
 		},
 		{"getEthernetFramePerformanceMonitoringHistoryDataDownstreamResponse",
-			getArgs{createEthernetFramePerformanceMonitoringHistoryDataDownstreamResponse(32768, 10), 2},
+			getArgs{createEthernetFramePerformanceMonitoringHistoryDataDownstreamResponse(false, 32768, 10), 2},
 			getWant{2, map[string]interface{}{"ManagedEntityId": uint16(10)}},
 		},
 		{"getEthernetPerformanceMonitoringHistoryDataResponse",
-			getArgs{createEthernetPerformanceMonitoringHistoryDataResponse(32768, 10), 2},
+			getArgs{createEthernetPerformanceMonitoringHistoryDataResponse(false, 32768, 10), 2},
 			getWant{2, map[string]interface{}{"ManagedEntityId": uint16(10)}},
 		},
 		{"getSoftwareImageResponse",
-			getArgs{createSoftwareImageResponse(61440, 0, 1, 1, "BBSM_IMG_00000", "BBSM_IMG_00001", "BBSM_IMG_00001"), 2},
+			getArgs{createSoftwareImageResponse(false, 61440, 0, 1, 1, "BBSM_IMG_00000", "BBSM_IMG_00001", "BBSM_IMG_00001"), 2},
 			getWant{2, map[string]interface{}{"IsCommitted": uint8(0), "IsActive": uint8(0)}},
 		},
 		{"getSoftwareImageResponseActiveCommitted",
-			getArgs{createSoftwareImageResponse(61440, 1, 1, 1, "BBSM_IMG_00000", "BBSM_IMG_00001", "BBSM_IMG_00001"), 2},
+			getArgs{createSoftwareImageResponse(false, 61440, 1, 1, 1, "BBSM_IMG_00000", "BBSM_IMG_00001", "BBSM_IMG_00001"), 2},
 			getWant{2, map[string]interface{}{"IsCommitted": uint8(1), "IsActive": uint8(1)}},
 		},
 		{"getSoftwareImageResponseVersion",
-			getArgs{createSoftwareImageResponse(61440, 1, 1, 1, "BBSM_IMG_00000", "BBSM_IMG_00001", "BBSM_IMG_00001"), 2},
+			getArgs{createSoftwareImageResponse(false, 61440, 1, 1, 1, "BBSM_IMG_00000", "BBSM_IMG_00001", "BBSM_IMG_00001"), 2},
 			getWant{2, map[string]interface{}{"Version": ToOctets("BBSM_IMG_00001", 14)}},
 		},
 		{"getSoftwareImageResponseProductCode",
-			getArgs{createSoftwareImageResponse(2048, 1, 1, 1, "BBSM_IMG_00000", "BBSM_IMG_00001", "BBSM_IMG_00001"), 2},
+			getArgs{createSoftwareImageResponse(false, 2048, 1, 1, 1, "BBSM_IMG_00000", "BBSM_IMG_00001", "BBSM_IMG_00001"), 2},
 			getWant{2, map[string]interface{}{"ProductCode": ToOctets("BBSIM-ONU", 25)}},
 		},
 		{"getSoftwareImageResponseActiveImageHash",
-			getArgs{createSoftwareImageResponse(1024, 1, 1, 1, "BBSM_IMG_00000", "BBSM_IMG_00001", "BBSM_IMG_00001"), 2},
+			getArgs{createSoftwareImageResponse(false, 1024, 1, 1, 1, "BBSM_IMG_00000", "BBSM_IMG_00001", "BBSM_IMG_00001"), 2},
 			getWant{2, map[string]interface{}{"ImageHash": ToOctets("BBSM_IMG_00001", 25)}},
 		},
 		{"getEthernetFrameExtendedPMDataResponse",
-			getArgs{createEthernetFrameExtendedPmGetResponse(me.EthernetFrameExtendedPmClassID, 16128, 10), 2},
+			getArgs{createEthernetFrameExtendedPmGetResponse(false, me.EthernetFrameExtendedPmClassID, 16128, 10), 2},
 			getWant{2, map[string]interface{}{"ManagedEntityId": uint16(10),
 				"DropEvents":       uint32(100),
 				"Octets":           uint32(101),
@@ -140,7 +140,7 @@
 				"CrcErroredFrames": uint32(105)}},
 		},
 		{"getEthernetFrameExtendedPM64BitDataResponse",
-			getArgs{createEthernetFrameExtendedPmGetResponse(me.EthernetFrameExtendedPm64BitClassID, 3, 10), 2},
+			getArgs{createEthernetFrameExtendedPmGetResponse(false, me.EthernetFrameExtendedPm64BitClassID, 3, 10), 2},
 			getWant{2, map[string]interface{}{"ManagedEntityId": uint16(10),
 				"Frames512To1023Octets":  uint64(112),
 				"Frames1024To1518Octets": uint64(113)}},
@@ -194,7 +194,7 @@
 		VendorId:       []byte("BBSM"),
 		VendorSpecific: []byte{0, byte(1 % 256), byte(1), byte(1)},
 	}
-	response := createOnugResponse(40960, 1, sn)
+	response := createOnugResponse(false, 40960, 1, sn)
 	data, _ := Serialize(omci.GetResponseType, response, 1)
 
 	omciMsg, omciPkt := omciBytesToMsg(t, data)