diff --git a/nfapi/open-nFAPI/nfapi/src/nfapi_p7.c b/nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
index 7cbf2c41fd4dcbb7b5a09d741b174ab44f9455a3..48ff9d517534f4f2c2809898e2749de5a13a2da5 100644
--- a/nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
+++ b/nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
@@ -332,7 +332,11 @@ static uint8_t pack_dl_tti_pdsch_pdu_rel15_value(void *tlv, uint8_t **ppWritePac
         push8(0, ppWritePackedMsg, end))) { // powerControlOffsetSS
     return 0;
   }
-  // TODO Add CBG Fields
+
+  if (!push8(value->maintenance_parms_v3.ldpcBaseGraph, ppWritePackedMsg, end)
+      || !push32(value->maintenance_parms_v3.tbSizeLbrmBytes, ppWritePackedMsg, end))
+    return 0;
+
   return 1;
 }
 
@@ -4091,7 +4095,11 @@ static uint8_t unpack_dl_tti_pdsch_pdu_rel15_value(void *tlv, uint8_t **ppReadPa
         pull8(ppReadPackedMsg, &powerControlOffsetSS, end))) { // powerControlOffsetSS
     return 0;
   }
-  // TODO Add CBG Fields
+
+  if (!pull8(ppReadPackedMsg, &value->maintenance_parms_v3.ldpcBaseGraph, end)
+      || !pull32(ppReadPackedMsg, &value->maintenance_parms_v3.tbSizeLbrmBytes, end))
+    return 0;
+
   return 1;
 }