diff --git a/TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md b/TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md
index 5c706eca23effa53fd5dc6a3ae41a723b331e939..c4065baf9f2a9faaf0f70fd495d9c418f7b34d74 100644
--- a/TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md
+++ b/TS-0023-SDT_based_Information_Model_and_Mapping_for_Vertical_Industries.md
@@ -2008,8 +2008,6 @@ This ModuleClass provides capabilities to provide alarm information of water met
 #### 5.3.1.95 waterMeterReportInfo
 This ModuleClass provides information of measurements of the water meter.
 
-<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
-
 **Table 5.3.1.95-1: DataPoints of waterMeterReportInfo ModuleClass**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
@@ -6100,6 +6098,7 @@ In protocol bindings resource attributes names for data points of module classes
 |cpuUsage |[dmAgent](#582-dmagent) |cpuUe |
 |cr6 |[waterQualityMonitor](#53198-waterqualitymonitor) |cr6 |
 |cu |[waterQualityMonitor](#53198-waterqualitymonitor) |cu |
+|cumulativeFlowDaily |[waterMeterReportInfo](#53195-watermeterreportinfo) |cuFDy |
 |cupsNumber |[brewing](#53116-brewing) |cupNr |
 |currency |[billDeposit](#531108-billdeposit), [cashDispenser](#531111-cashdispenser), [coinDeposit](#531110-coindeposit), [prePaidCardReader](#531107-prepaidcardreader) |curry |
 |current |[energyConsumption](#53132-energyconsumption) |currt |
@@ -6124,6 +6123,7 @@ In protocol bindings resource attributes names for data points of module classes
 |dataModelType |[dmDataModelIO](#584-dmdatamodelio) |daMTe |
 |dataSourceID |[origin](#5394-origin) |daSID |
 |dataType |[origin](#5394-origin) |datTe |
+|dailyUseWaterTime |[waterMeterReportInfo](#53195-watermeterreportinfo) |dUWTe |
 |defaultValue |[numberValue](#53155-numbervalue), [textMessage](#53189-textmessage) |defVe |
 |defrost |[refrigeration](#53171-refrigeration) |defrt |
 |demolitionAlarm |[waterMeterAlarm](#53194-watermeteralarm)|demAm |
@@ -6201,6 +6201,7 @@ In protocol bindings resource attributes names for data points of module classes
 |intensiveReportInterval |[waterMeterSetting](#53196-watermetersetting) |inRIl |
 |intensiveReportStartTime |[waterMeterSetting](#53196-watermetersetting) |iRSTe |
 |intensiveSampleInterval |[waterMeterSetting](#53196-watermetersetting) |inSIl |
+|intervalFlow |[waterMeterReportInfo](#53195-watermeterreportinfo) |intFw |
 |jobModes |[airConJobMode](#5313-airconjobmode), [airPurifierJobMode](#5315-airpurifierjobmode), [clothesWasherDryerJobMode](#53121-clotheswasherdryerjobmode), [clothesWasherJobMode](#53120-clotheswasherjobmode), [cookerHoodJobMode](#53126-cookerhoodjobmode), [dehumidifierJobMode](#53128-dehumidifierjobmode), [dishWasherJobMode](#53129-dishwasherjobmode), [robotCleanerJobMode](#53174-robotcleanerjobmode) [steamClosetJobMode](#53185-steamclosetjobmode),  |jobMs |
 |jobStates |[runState](#53175-runstate) |jobSs |
 |kcal |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |kcal |
@@ -6234,6 +6235,10 @@ In protocol bindings resource attributes names for data points of module classes
 |lowFlowAlarm |[waterMeterAlarm](#53194-watermeteralarm)|loFAm |
 |lowFlowAlarmThreshold |[waterMeterAlarm](#53194-watermeteralarm)|lFATd |
 |lowFlowDuration |[waterMeterAlarm](#53194-watermeteralarm)|loFDn |
+|lowestFlowRate |[waterMeterReportInfo](#53195-watermeterreportinfo) |loFRe |
+|lowestFlowRateTime |[waterMeterReportInfo](#53195-watermeterreportinfo) |lFRTe |
+|lowestReverseFlowRate |[waterMeterReportInfo](#53195-watermeterreportinfo) |lRFRe |
+|lowestReverseFlowRateTime |[waterMeterReportInfo](#53195-watermeterreportinfo) |lRFR0 |
 |lowGasAlarm |[gasMeterAlarm](#53139-gasmeteralarm) |loGAm |
 |lowPressureAlarm |[waterMeterAlarm](#53194-watermeteralarm)|LoPAm |
 |lowPressureAlarmThreshold |[waterMeterAlarm](#53194-watermeteralarm)|lPATd |
@@ -6278,6 +6283,7 @@ In protocol bindings resource attributes names for data points of module classes
 |muteEnabled |[audioVolume](#5318-audiovolume) |mutEd |
 |name |[dmPackage](#588-dmpackage), [dmSoftware](#586-dmsoftware) |name |
 |network |[threeDprinter](#5311-threedprinter) |netwk |
+|negativeCumulativeFlow |[waterMeterReportInfo](#53195-watermeterreportinfo) |neCFw |
 |nh3nh4 |[waterQualityMonitor](#53198-waterqualitymonitor) |nh3n4 |
 |no2 |[airQualitySensor](#5316-airqualitysensor) |no2 |
 |no3n |[waterQualityMonitor](#53198-waterqualitymonitor) |no3n |
@@ -6310,11 +6316,16 @@ In protocol bindings resource attributes names for data points of module classes
 |password |[credentials](#53127-credentials) |pwd |
 |pb |[waterQualityMonitor](#53198-waterqualitymonitor) |pb |
 |pci |[connectivity](#53125-connectivity) |pci |
+|peakFlowRate |[waterMeterReportInfo](#53195-watermeterreportinfo) |peFRe |
+|peakFlowRateTime |[waterMeterReportInfo](#53195-watermeterreportinfo) |pFRTe |
+|peakReverseFlowRate |[waterMeterReportInfo](#53195-watermeterreportinfo) |pRFRe |
+|peakReverseFlowRateTime |[waterMeterReportInfo](#53195-watermeterreportinfo) |pRFR0 |
 |period |[periodicalReportConfig](#53163-periodicalreportconfig) |perid |
 |ph |[waterQualityMonitor](#53198-waterqualitymonitor) |ph |
 |pm1 |[airQualitySensor](#5316-airqualitysensor) | pm1 |
 |pm10 |[airQualitySensor](#5316-airqualitysensor) |pm10 |
 |pm25 |[airQualitySensor](#5316-airqualitysensor) | pm25 |
+|positiveCumulativeFlow |[waterMeterReportInfo](#53195-watermeterreportinfo) |poCFw |
 |positionX |[touchScreen](#531106-touchscreen) | posiX |
 |positionY |[touchScreen](#531106-touchscreen) | posiY |
 |postalAddress |[location](#5392-location) |posAs |
@@ -6359,6 +6370,7 @@ In protocol bindings resource attributes names for data points of module classes
 |reverseFlowAlarmThreshold |[waterMeterAlarm](#53194-watermeteralarm)|rFATd |
 |reverseFlowDuration |[waterMeterAlarm](#53194-watermeteralarm)|reFDn |
 |reverseFlowInterval |[waterMeterSetting](#53196-watermetersetting) |reFIl |
+|reverseIntervalFlow |[waterMeterReportInfo](#53195-watermeterreportinfo) |reIFw |
 |room |[location](#5392-location) |room |
 |roundingEnergyConsumption |[energyConsumption](#53132-energyconsumption) |roECn |
 |roundingEnergyGeneration |[energyGeneration](#53133-energygeneration) |roEGn |
@@ -6468,6 +6480,8 @@ In protocol bindings resource attributes names for data points of module classes
 |washTemp |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |wasTp |
 |water |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |water |
 |waterFlowStrength |[waterFlow](#53193-waterflow) |waFSh |
+|waterIntervalPressure |[waterMeterReportInfo](#53195-watermeterreportinfo) |waIPe |
+|waterIntervalTemperature |[waterMeterReportInfo](#53195-watermeterreportinfo) |waITe |
 |waterPressureInterval |[waterMeterSetting](#53196-watermetersetting) |waPIl |
 |waterTemperatureInterval |[waterMeterSetting](#53196-watermetersetting) |waTIl |
 |waterTemperatureSensorFault |[waterMeterAlarm](#53194-watermeteralarm)|wTSFt |