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..ac87a449f612810222f367ca87c7133da6056715 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
@@ -1971,13 +1971,9 @@ This ModuleClass provides capabilities for controlling the water strength of a d
 
 
 
-
 #### 5.3.1.94 waterMeterAlarm
 This ModuleClass provides capabilities to provide alarm information of water meter, such as the alarm of low water flow. Once an alarm is fired, a notification should be sent out from the device and no historical alarm is stored locally, therefore no need to associate timestamp with the alarms. 
 
-<mark>Editor note: the following attributes are missing from the short name tables in 6.3</mark>
-
-
 **Table 5.3.1.94-1: DataPoints of waterMeterAlarm ModuleClass**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
@@ -2016,8 +2012,6 @@ This ModuleClass provides capabilities to provide alarm information of water met
 |vibrationSensorFault |xs:boolean |R |true | |Vibration sensor failure. |
 
 
-
-
 #### 5.3.1.95 waterMeterReportInfo
 This ModuleClass provides information of measurements of the water meter.
 
@@ -6139,6 +6133,7 @@ In protocol bindings resource attributes names for data points of module classes
 |bodyLength |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |bodLh |
 |bone |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |bone |
 |brightness |[brightness](#53117-brightness) |brigs |
+|buttonFault |[waterMeterAlarm](#53194-watermeteralarm)|butFt |
 |callerID |[phoneCall](#53164-phonecall) |calID |
 |callState |[phoneCall](#53164-phonecall) |calSe |
 |capacity |[battery](#53110-battery) |capay |
@@ -6156,6 +6151,7 @@ In protocol bindings resource attributes names for data points of module classes
 |colourSaturation |[colourSaturation](#53124-coloursaturation) |colSn |
 |colourTemperature |[slcReportInfo](#53181-slcreportinfo) |colTe |
 |commFreqValue |[connectivity](#53125-connectivity) |coFVe |
+|communicationAlarm |[waterMeterAlarm](#53194-watermeteralarm)|comAm |
 |component |[dmFirmware](#585-dmfirmware) |compt |
 |concentration |[glucometer](#53142-glucometer) |concn |
 |contextCarbohydratesAmount |[glucometer](#53142-glucometer) |coCAt |
@@ -6193,6 +6189,7 @@ In protocol bindings resource attributes names for data points of module classes
 |dataType |[origin](#5394-origin) |datTe |
 |defaultValue |[numberValue](#53155-numbervalue), [textMessage](#53189-textmessage) |defVe |
 |defrost |[refrigeration](#53171-refrigeration) |defrt |
+|demolitionAlarm |[waterMeterAlarm](#53194-watermeteralarm)|demAm |
 |description |[faultDetection](#53134-faultdetection), [dmDeviceInfo](#583-dmdeviceinfo), [localization](#5393-localization) |dc |
 |desiredHumidity |[relativeHumidity](#53172-relativehumidity) |desHy |
 |detectedTime |[overcurrentSensor](#53158-overcurrentsensor), [smokeSensor](#53182-smokesensor) |detTe |
@@ -6229,6 +6226,14 @@ In protocol bindings resource attributes names for data points of module classes
 |heatingLevel |[heatingZone](#53144-heatingzone) |heaLl |
 |height |[height](#53145-height) |heigt |
 |highMagneticAlarm |[magneticSensorParameters](#53161-magneticsensorparameters)|hiMAm |
+|highFlowAlarm |[waterMeterAlarm](#53194-watermeteralarm)|hiFAm |
+|highFlowAlarmThreshold |[waterMeterAlarm](#53194-watermeteralarm)|hFATd |
+|highFlowDuration |[waterMeterAlarm](#53194-watermeteralarm)|hiFDn |
+|highPressureAlarm |[waterMeterAlarm](#53194-watermeteralarm)|hiPAm |
+|highPressureAlarmThreshold |[waterMeterAlarm](#53194-watermeteralarm)|hPATd |
+|highTemperatureAlarm |[waterMeterAlarm](#53194-watermeteralarm)|hiTAm |
+|highTemperatureAlarmThreshold |[waterMeterAlarm](#53194-watermeteralarm)|hTATh |
+|highTemperatureInnerAlarmThreshold |[waterMeterAlarm](#53194-watermeteralarm)|hTIAd |
 |horizontalAccuracy |[geoLocation](#53141-geolocation) |horAy |
 |horizontalDirection |[airFlow](#5314-airflow) |horDn |
 |humidity |[airQualitySensor](#5316-airqualitysensor) |humiy |
@@ -6238,7 +6243,11 @@ In protocol bindings resource attributes names for data points of module classes
 |impactLevel |[impactSensor](#53147-impactsensor) |impLl |
 |impactStatus |[impactSensor](#53147-impactsensor) |impSs |
 |impedance |[bodyCompositionAnalyser](#53114-bodycompositionanalyser) |impee |
+|impulseFault |[waterMeterAlarm](#53194-watermeteralarm)|impFt |
 |initialMagnetic |[magneticSensorParameters](#53161-magneticsensorparameters)|iniMc |
+|innerErrorAlarm |[waterMeterAlarm](#53194-watermeteralarm)|inEAm |
+|innerHighInternalTemperatureAlarm |[waterMeterAlarm](#53194-watermeteralarm)|iHITm |
+|innerTemperatureSensorFault |[waterMeterAlarm](#53194-watermeteralarm)|iTSFt |
 |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,11 +6277,19 @@ 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 |
+|lowFlowAlarm |[waterMeterAlarm](#53194-watermeteralarm)|loFAm |
+|lowFlowAlarmThreshold |[waterMeterAlarm](#53194-watermeteralarm)|lFATd |
+|lowFlowDuration |[waterMeterAlarm](#53194-watermeteralarm)|loFDn |
 |lowGasAlarm |[gasMeterAlarm](#53139-gasmeteralarm) |loGAm |
+|lowPressureAlarm |[waterMeterAlarm](#53194-watermeteralarm)|LoPAm |
+|lowPressureAlarmThreshold |[waterMeterAlarm](#53194-watermeteralarm)|lPATd |
+|lowTemperatureAlarm |[waterMeterAlarm](#53194-watermeteralarm)|loTAm |
+|lowTemperatureAlarmThreshold |[waterMeterAlarm](#53194-watermeteralarm)|LTATd |
 |lqi |[signalStrength](#53178-signalstrength) |lqi |
 |machineStates |[runState](#53175-runstate) |macSs |
 |magneticDisturb |[gasMeterAlarm](#53139-gasmeteralarm) |magDb |
 |magneticSensitivityLevel |[magneticSensorParameters](#53161-magneticsensorparameters)|maSLl |
+|magneticInterference |[waterMeterAlarm](#53194-watermeteralarm)|magIe |
 |manufacturer |[dmDeviceInfo](#583-dmdeviceinfo) |manur |
 |manufacturerDetailsLink |[dmDeviceInfo](#583-dmdeviceinfo) |maDLk |
 |manufacturingDate |[dmDeviceInfo](#583-dmdeviceinfo) |manDe |
@@ -6344,6 +6361,7 @@ In protocol bindings resource attributes names for data points of module classes
 |powerStatus |[dmAgent](#582-dmagent) |powSs |
 |precision |[features](#5391-features) |precn |
 |presentationURL |[dmDeviceInfo](#583-dmdeviceinfo) |prURL |
+|pressureSensorFault |[waterMeterAlarm](#53194-watermeteralarm)|prSFt |
 |previousChannel |[televisionChannel](#53186-televisionchannel) |preCl |
 |preWash |[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption) |preWh |
 |primaryName |[dmFirmware](#585-dmfirmware) |priNe |
@@ -6373,6 +6391,9 @@ 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 |
+|reverseFlowAlarm |[waterMeterAlarm](#53194-watermeteralarm)|reFAm |
+|reverseFlowAlarmThreshold |[waterMeterAlarm](#53194-watermeteralarm)|rFATd |
+|reverseFlowDuration |[waterMeterAlarm](#53194-watermeteralarm)|reFDn |
 |room |[location](#5392-location) |room |
 |roundingEnergyConsumption |[energyConsumption](#53132-energyconsumption) |roECn |
 |roundingEnergyGeneration |[energyGeneration](#53133-energygeneration) |roEGn |
@@ -6412,6 +6433,7 @@ In protocol bindings resource attributes names for data points of module classes
 |step |[numberValue](#53155-numbervalue) |step |
 |stepValue |[audioVolume](#5318-audiovolume), [openLevel](#53156-openlevel), [temperature](#53187-temperature) |steVe |
 |storageAvailable |[dmAgent](#582-dmagent) |stoAe |
+|storageFault |[waterMeterAlarm](#53194-watermeteralarm)|stoFt |
 |storageTotal |[dmAgent](#582-dmagent) |stoTl |
 |strength |[brewing](#53116-brewing) |streh |
 |subModel |[dmDeviceInfo](#583-dmdeviceinfo) |subMl |
@@ -6427,6 +6449,7 @@ In protocol bindings resource attributes names for data points of module classes
 |swVersion |[dmDeviceInfo](#583-dmdeviceinfo) |sweVn |
 |systemTime |[dmAgent](#582-dmagent) |sysTe |
 |systolicPressure |[sphygmomanometer](#53183-sphygmomanometer) |sysPe |
+|tamperAlarm |[waterMeterAlarm](#53194-watermeteralarm)|tamAm |
 |targetAltitude |[geoLocation](#53141-geolocation) |tarAe |
 |targetDuration |[timer](#53190-timer) |tarDn |
 |targetLatitude |[geoLocation](#53141-geolocation) |tarLe |
@@ -6456,6 +6479,7 @@ In protocol bindings resource attributes names for data points of module classes
 |underVoltagePercent |[slcAlarm](#53179-slcalarm) |unVPt |
 |underVoltageThreshold |[slcAlarm](#53179-slcalarm) |unVTd |
 |unit |[temperature](#53187-temperature) |unit |
+|urgencyButtonPush |[waterMeterAlarm](#53194-watermeteralarm)|urBPh |
 |uri |[printQueue](#53167-printqueue) |ur0 |
 |url |[sessionDescription](#53177-sessiondescription), [dmPackage](#588-dmpackage), [dmSoftware](#586-dmsoftware) |url |
 |useGrinder |[grinder](#53143-grinder) |useGr |
@@ -6465,6 +6489,7 @@ In protocol bindings resource attributes names for data points of module classes
 |version |[dmPackage](#588-dmpackage), [dmSoftware](#586-dmsoftware) |versn |
 |verticalAccuracy |[geoLocation](#53141-geolocation) |verAy |
 |verticalDirection |[airFlow](#5314-airflow) |verDn |
+|vibrationSensorFault |[waterMeterAlarm](#53194-watermeteralarm)|viSFt |
 |visceraFat |[bioElectricalImpedanceAnalysis](#53113-bioelectricalimpedanceanalysis) |visFt |
 |voc |[airQualitySensor](#5316-airqualitysensor) |voc |
 |voltage |[battery](#53110-battery) |volte |
@@ -6474,6 +6499,7 @@ 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 |
+|waterTemperatureSensorFault |[waterMeterAlarm](#53194-watermeteralarm)|wTSFt |
 |weight |[weight](#53199-weight) |weigt |
 |windDirection |[airQualitySensor](#5316-airqualitysensor) |winDn |
 |windSpeed |[airQualitySensor](#5316-airqualitysensor) |winSd |