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 bf88b71d60d1012443929c0f66db25f424aa49d3..0ceff4dda7dd7c23b510e803887a069467e9e35c 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
@@ -2021,9 +2021,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 |
@@ -2048,7 +2045,6 @@ This ModuleClass provides information of measurements of the water meter.
 
 
 
-
 #### 5.3.1.96 waterMeterSetting
 This ModuleClass provides capabilities to set service parameters for data sampling and reporting. 
 
@@ -6168,6 +6164,7 @@ In protocol bindings resource attributes names for data points of module classes
 |contextTester |[glucometer](#53142-glucometer) |conTr |
 |country |[dmDeviceInfo](#583-dmdeviceinfo) |couny |
 |cpuUsage |[dmAgent](#582-dmagent) |cpuUe |
+|cumulativeFlowDaily |[waterMeterReportInfo](#53195-watermeterreportinfo) |cuFDy |
 |cupsNumber |[brewing](#53116-brewing) |cupNr |
 |current |[energyConsumption](#53132-energyconsumption) |currt |
 |currentAdfState |[autoDocumentFeeder](#5319-autodocumentfeeder) |cuASe |
@@ -6191,6 +6188,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 |
 |description |[faultDetection](#53134-faultdetection), [dmDeviceInfo](#583-dmdeviceinfo), [localization](#5393-localization) |dc |
@@ -6239,6 +6237,7 @@ In protocol bindings resource attributes names for data points of module classes
 |impactStatus |[impactSensor](#53147-impactsensor) |impSs |
 |impedance |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |impee |
 |initialMagnetic |[magneticSensorParameters](#53161-magneticsensorparameters)|iniMc |
+|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 |
@@ -6268,6 +6267,10 @@ In protocol bindings resource attributes names for data points of module classes
 |loudness |[acousticSensor](#5312-acousticsensor) |louds |
 |lowBattery |[battery](#53110-battery) |lowBy |
 |lowCreditAlarm |[gasMeterAlarm](#53139-gasmeteralarm) |loCAm |
+|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 |
 |lqi |[signalStrength](#53178-signalstrength) |lqi |
 |machineStates |[runState](#53175-runstate) |macSs |
@@ -6305,6 +6308,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 |
 |no2 |[airQualitySensor](#5316-airqualitysensor) |no2 |
 |noise |[airQualitySensor](#5316-airqualitysensor) |noise |
 |numberValue |[numberValue](#53155-numbervalue) |numVe |
@@ -6333,10 +6337,15 @@ In protocol bindings resource attributes names for data points of module classes
 |parkingStatus |[parkingStatus](#53162-parkingstatus) |parSs |
 |password |[credentials](#53127-credentials) |pwd |
 |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 |
 |pm1 |[airQualitySensor](#5316-airqualitysensor) | pm1 |
 |pm10 |[airQualitySensor](#5316-airqualitysensor) |pm10 |
 |pm25 |[airQualitySensor](#5316-airqualitysensor) | pm25 |
+|positiveCumulativeFlow |[waterMeterReportInfo](#53195-watermeterreportinfo) |poCFw |
 |postalAddress |[location](#5392-location) |posAs |
 |power |[energyConsumption](#53132-energyconsumption) |power |
 |powerGenerationData |[energyGeneration](#53133-energygeneration) |poGDa |
@@ -6373,6 +6382,7 @@ In protocol bindings resource attributes names for data points of module classes
 |resistance |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |resie |
 |retryInterval |[periodicalReportConfig](#53163-periodicalreportconfig) |retIl |
 |retryTimes |[periodicalReportConfig](#53163-periodicalreportconfig) |retTs |
+|reverseIntervalFlow |[waterMeterReportInfo](#53195-watermeterreportinfo) |reIFw |
 |room |[location](#5392-location) |room |
 |roundingEnergyConsumption |[energyConsumption](#53132-energyconsumption) |roECn |
 |roundingEnergyGeneration |[energyGeneration](#53133-energygeneration) |roEGn |
@@ -6474,6 +6484,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 |
 |weight |[weight](#53199-weight) |weigt |
 |windDirection |[airQualitySensor](#5316-airqualitysensor) |winDn |
 |windSpeed |[airQualitySensor](#5316-airqualitysensor) |winSd |