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 fa676589330117cecd599140e74f8810418a29c6..ec79a9f06038bd6707e46bdce8d160bef113e67b 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
@@ -2,24 +2,26 @@
 ![](media/logo.png)
 
 
-| | oneM2M Technical Specification |
-|-|-|
-|Document Number |oneM2M- TS-0023-V5.6.0 |
-|Document Name: |SDT based Information Model and Mapping for Vertical Industries |
-|Date: |2024-06-27 |
-|Abstract: |This technical specification includes oneM2M-defined information models for appliances from various vertical industries and the mapping with other information models from external organizations. |
-|Template Version: January 2017 (Do not modify) |Template Version: January 2017 (Do not modify) |
 
-<mark>Editor's note: We need to decide how the Phrase "oneM2M Technical Specification" in the table header above is been formatted. In the original word document this is single line (using col-span)</mark>
++---------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+|**oneM2M** \                                                                                                                                                                                                       |
+|**Technical Specification**                                                                                                                                                                                        |
++:==============+:==================================================================================================================================================================================================+
+|Document Number|TS-0023-V5.6.0                                                                                                                                                                                     |
++---------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+|Document Name: |SDT based Information Model and Mapping for Vertical Industries                                                                                                                                    |
++---------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+|Date:          |2024-06-27                                                                                                                                                                                         |
++---------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+|Abstract:      |This technical specification includes oneM2M-defined information models for appliances from various vertical industries and the mapping with other information models from external organizations. |
++---------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+|Template Version: January 2017 (Do not modify)                                                                                                                                                                     |
++---------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 
 The present document is provided for future development work within oneM2M only. The Partners accept no liability for any use of this specification.
 
 The present document has not been subject to any approval process by the oneM2M Partners Type 1.  Published oneM2M specifications and reports for implementation should be obtained via the oneM2M Partners' Publications Offices.
 
-
-
-
-
 About oneM2M 
 
 The purpose and goal of oneM2M is to develop technical specifications which address the need for a common M2M Service Layer that can be readily embedded within various hardware and software, and relied upon to connect the myriad of devices in the field with M2M application servers worldwide. 
@@ -28,14 +30,13 @@ More information about oneM2M may be found at:  http//www.oneM2M.org
 
 Copyright Notification
 
-(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC).
+(c) 2018, oneM2M Partners Type 1.
 
 All rights reserved.
 
 The copyright extends to reproduction in all media.
 
 
-
 Notice of Disclaimer & Limitation of Liability 
 
 The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. No recommendation as to products or vendors is made or should be implied. 
@@ -49,113 +50,73 @@ NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURA
 
 
 # 1 Scope
+
 The present document describes the oneM2M defined information model for appliances from various vertical industries, including the description of how it is mapped with other information models from external organizations. It also explains the ontology for the Harmonized Information Model.
 
 
 # 2 References
+
 References are either specific (identified by date of publication and/or edition number or version number) or nonspecific. For specific references, only the cited version applies. For non-specific references, the latest version of the reference document (including any amendments) applies.
 
 
 ## 2.1 Normative references
-The following referenced documents are necessary, partially or totally, for the application of the present document. Their use in the context of this TS is specified by the normative statements that are referring back to this clause
-
-
-- <a name="_ref_1">[1]</a>    oneM2M Smart Device Template.  
-  
-  NOTE: Available at https://git.onem2m.org/MAS/SDT
-  
-- <a name="_ref_2">[2]</a>    Java coding rule.
-
-  NOTE: Available at [http://www.oracle.com/technetwork/java/codeconventions-135099.html](http://www.oracle.com/technetwork/java/codeconventions-135099.html).
-
-- <a name="_ref_3">[3]</a>    oneM2M TS-0001: "Functional Architecture".
-
-- <a name="_ref_4">[4]</a>    oneM2M TS-0004: "Service Layer Core Protocol Specification"
-
-- <a name="_ref_5">[5]</a>    oneM2M TS-0005: "Management Enablement (OMA)".
-
-- <a name="_ref_6">[6]</a>    ISO:80000-1: Quantities and unit -- Part 1: General.
 
-  NOTE:  Available at https://www.iso.org/search.html?q=80000-1.
-  
-- <a name="_ref_7">[7]</a>    Open Mobile Alliance(tm): "OMA-ER-Device-WebAPIs-V1-0-20160419-C: "Enabler Release Definition for DWAPI 1.0".
+The following referenced documents are necessary, partially or totally, for the application of the present document. Their use in the context of this TS is specified by the normative statements that are referring back to this clause
 
-  NOTE: Available at  http://www.openmobilealliance.org/release/DWAPI/V1_0-20160419-C/OMA-ERELD-DWAPI_V1_0-20160419-C.pdf
 
-- [8]    void
+- <a name="_ref_1">[1]</a> oneM2M Smart Device Template.
+	> NOTE: Available at https://git.onem2m.org/MAS/SDT
+- <a name="_ref_2">[2]</a> Java coding rule.
+	> NOTE: Available at [http://www.oracle.com/technetwork/java/codeconventions-135099.html](http://www.oracle.com/technetwork/java/codeconventions-135099.html)
+- <a name="_ref_3">[3]</a> oneM2M TS-0001: "Functional Architecture".
+- <a name="_ref_4">[4]</a> oneM2M TS-0004: "Service Layer Core Protocol Specification"
+- <a name="_ref_5">[5]</a> oneM2M TS-0005: "Management Enablement (OMA)".
+- <a name="_ref_6">[6]</a> ISO:80000-1: Quantities and unit -- Part 1: General.
+	> NOTE: Available at [https://www.iso.org/search.html?q=80000-1](https://www.iso.org/search.html?q=80000-1).
+- <a name="_ref_7">[7]</a> Open Mobile Alliance(tm): "OMA-ER-Device-WebAPIs-V1-0-20160419-C: "Enabler Release Definition for DWAPI 1.0".
+	> NOTE: Available at [http://www.openmobilealliance.org/release/DWAPI/V1_0-20160419-C/OMA-ERELD-DWAPI_V1_0-20160419-C.pdf](http://www.openmobilealliance.org/release/DWAPI/V1_0-20160419-C/OMA-ERELD-DWAPI_V1_0-20160419-C.pdf)
+- [8] void
 - [9] void
 - [10] void
 - [11] void
 - [12] void
 - [13] void
-
-- <a name="_ref_14">[14]</a>    W3C Recommendation: "XML Schema Part 2: Datatypes Second Edition", 28 October 2004.
-
-  NOTE:  Available at https://www.w3.org/TR/xmlschema-2/ .
-
-- <a name="_ref_15">[15]</a>    NIST standard FIPS PUB 180-4: "Secure Hash Standard (SHS)".
-
-- <a name="_ref_16">[16]</a>    IETF RFC 4566: "SDP: Session Description Protocol". 
-
-- <a name="_ref_17">[17]</a>    IANA Time Zone Database
-  
-  NOTE: Available at [https://www.iana.org/time-zones](https://www.iana.org/time-zones)  
-
-- <a name="_ref_18">[18]</a>    Void
-
-- <a name="_ref_19">[19]</a>    Open Mobile Alliance(tm): "OMA-ER-GotAPI-V1-1-20151215-C: " Generic Open Terminal API Framework (GotAPI)".
-
-- <a name="_ref_20">[20]</a>    NIST SP 330:2019: "The International System of Units (SI) 2019 Edition"
-  
-  NOTE: Available at [https://www.nist.gov/pml/special-publication-330](https://www.nist.gov/pml/special-publication-330)  
-
-- <a name="_ref_21">[21]</a>    Recommendation ITU-T X.1303 bis: "Common alerting protocol (CAP 1.2)".
-
-  NOTE: Available at [https://www.itu.int/rec/T-REC-X.1303bis-201403-I](https://www.itu.int/rec/T-REC-X.1303bis-201403-I)
-
-- <a name="_ref_22">[22]</a>    ISO/IEC 8859-1:1998, Information technology - 8-bit single-byte coded graphic character sets - Part 1: Latin alphabet No. 1
+- <a name="_ref_14">[14]</a> W3C Recommendation: "XML Schema Part 2: Datatypes Second Edition", 28 October 2004.
+	> NOTE: Available at [https://www.w3.org/TR/xmlschema-2/](https://www.w3.org/TR/xmlschema-2/) .
+- <a name="_ref_15">[15]</a> NIST standard FIPS PUB 180-4: "Secure Hash Standard (SHS)".
+- <a name="_ref_16">[16]</a> IETF RFC 4566: "SDP: Session Description Protocol". 
+- <a name="_ref_17">[17]</a> IANA Time Zone Database
+	> NOTE: Available at [https://www.iana.org/time-zones](https://www.iana.org/time-zones)  
+- <a name="_ref_18">[18]</a> Void
+- <a name="_ref_19">[19]</a> Open Mobile Alliance(tm): "OMA-ER-GotAPI-V1-1-20151215-C: " Generic Open Terminal API Framework (GotAPI)".
+- <a name="_ref_20">[20]</a> NIST SP 330:2019: "The International System of Units (SI) 2019 Edition"
+	> NOTE: Available at [https://www.nist.gov/pml/special-publication-330](https://www.nist.gov/pml/special-publication-330)  
+- <a name="_ref_21">[21]</a> Recommendation ITU-T X.1303 bis: "Common alerting protocol (CAP 1.2)".
+	> NOTE: Available at [https://www.itu.int/rec/T-REC-X.1303bis-201403-I](https://www.itu.int/rec/T-REC-X.1303bis-201403-I)
+- <a name="_ref_22">[22]</a> ISO/IEC 8859-1:1998, Information technology - 8-bit single-byte coded graphic character sets - Part 1: Latin alphabet No. 1
 
 ## 2.2 Informative references
 
 The following referenced documents are not necessary for the application of the present document but they assist the user with regard to a particular subject area.
 
-
-- <a name="_ref_i.1">[i.1]</a>    oneM2M Drafting Rules.
-
-  NOTE: Available at [http://www.onem2m.org/images/files/oneM2M-Drafting-Rules.pdf](http://www.onem2m.org/images/files/oneM2M-Drafting-Rules.pdf).
-
-- <a name="_ref_i.2">[i.2]</a>    oneM2M TR-0017: "Home Domain Abstract Information Model".
-
-- <a name="_ref_i.3">[i.3]</a>    Void.
-
-- <a name="_ref_i.4">[i.4]</a>    IEEE 802.15.4: "IEEE Standard for Local and metropolitan area networks--Part 15.4: Low-Rate Wireless Personal Area Networks (LR-WPANs)".
-
-- <a name="_ref_i.5">[i.5]</a>    oneM2M TS-0012: "Base Ontology".
-
-- <a name="_ref_i.6">[i.6]</a>    [https://en.wikipedia.org/wiki/Multiple_inheritance](https://en.wikipedia.org/wiki/Multiple_inheritance)
-
-- <a name="_ref_i.7">[i.7]</a>    [https://www.me.go.kr/home/web/index.do?menuId=10272&condition.code1=007](https://www.me.go.kr/home/web/index.do?menuId=10272&condition.code1=007)
-
-- <a name="_ref_i.8">[i.8]</a>    OCF DEVICE SPECIFICATION V1.3.0
-
-  NOTE: Available at [https://openconnectivity.org/specs/OCF_Device_Specification_v1.3.0.pdf](https://openconnectivity.org/specs/OCF_Device_Specification_v1.3.0.pdf)  
-
-- <a name="_ref_i.9">[i.9]</a>    Ju-Hun Park, Hui Sik Kim, Sang-A Hong, Sun Young Jang, "A Study on the Definition of Terms for Domestic Train Control System", Korean Society for Railway,  2015.
-
-  Note Available at  http://railway.or.kr/Papers_Conference/201502/pdf/KSR2015A114.pdf
-
-- <a name="_ref_i.10">[i.10]</a>    CTCS-3??????????? (Overall technology plan Train Control System), ???????(Chinese Railway Press), 2008, ISBN: 9787113091590
-
-- <a name="_ref_i.11">[i.11]</a>     DSL Forum TR-069: "CPE WAN Management Protocol".
-
-- <a name="_ref_i.12">[i.12]</a>   DSL Forum TR-181: "Broadband User Services (BUS)".
-
-- <a name="_ref_i.13">[i.13]</a>    oneM2M TR-0035: "Developer guide of device management"
-
-- <a name="_ref_i.14">[i.14]</a>    3GPP TS 22.268: "Public Warning System (PWS) requirements (Release 16)".
-
-- <a name="_ref_i.15">[i.15]</a>    oneM2M TS-0006: "Management enablement (BBF)"
-
+- <a name="_ref_i.1">[i.1]</a> oneM2M Drafting Rules.
+	> NOTE: Available at [http://www.onem2m.org/images/files/oneM2M-Drafting-Rules.pdf](http://www.onem2m.org/images/files/oneM2M-Drafting-Rules.pdf).
+- <a name="_ref_i.2">[i.2]</a> oneM2M TR-0017: "Home Domain Abstract Information Model".
+- <a name="_ref_i.3">[i.3]</a> Void.
+- <a name="_ref_i.4">[i.4]</a> IEEE 802.15.4: "IEEE Standard for Local and metropolitan area networks--Part 15.4: Low-Rate Wireless Personal Area Networks (LR-WPANs)".
+- <a name="_ref_i.5">[i.5]</a> oneM2M TS-0012: "Base Ontology".
+- <a name="_ref_i.6">[i.6]</a> [https://en.wikipedia.org/wiki/Multiple_inheritance](https://en.wikipedia.org/wiki/Multiple_inheritance)
+- <a name="_ref_i.7">[i.7]</a> [https://www.me.go.kr/home/web/index.do?menuId=10272&condition.code1=007](https://www.me.go.kr/home/web/index.do?menuId=10272&condition.code1=007)
+- <a name="_ref_i.8">[i.8]</a> OCF DEVICE SPECIFICATION V1.3.0
+	> NOTE: Available at [https://openconnectivity.org/specs/OCF_Device_Specification_v1.3.0.pdf](https://openconnectivity.org/specs/OCF_Device_Specification_v1.3.0.pdf)  
+- <a name="_ref_i.9">[i.9]</a> Ju-Hun Park, Hui Sik Kim, Sang-A Hong, Sun Young Jang, "A Study on the Definition of Terms for Domestic Train Control System", Korean Society for Railway,  2015.
+	> Note Available at  http://railway.or.kr/Papers_Conference/201502/pdf/KSR2015A114.pdf
+- <a name="_ref_i.10">[i.10]</a> CTCS-3??????????? (Overall technology plan Train Control System), ???????(Chinese Railway Press), 2008, ISBN: 9787113091590
+- <a name="_ref_i.11">[i.11]</a> DSL Forum TR-069: "CPE WAN Management Protocol".
+- <a name="_ref_i.12">[i.12]</a> DSL Forum TR-181: "Broadband User Services (BUS)".
+- <a name="_ref_i.13">[i.13]</a> oneM2M TR-0035: "Developer guide of device management"
+- <a name="_ref_i.14">[i.14]</a> 3GPP TS 22.268: "Public Warning System (PWS) requirements (Release 16)".
+- <a name="_ref_i.15">[i.15]</a> oneM2M TS-0006: "Management enablement (BBF)"
 
 
 # 3 Definition of terms, symbols  and Abbreviations
@@ -165,7 +126,6 @@ The following referenced documents are not necessary for the application of the
 For the purposes of the present document, the following terms and definitions apply:
 
 - Device Class ID: URN to identify the Device model definition.
-
 - ModuleClass ID: URN to identify the ModuleClass model definition.
 
 ## 3.2 Symbols
@@ -176,24 +136,26 @@ Void.
 ## 3.3 Abbreviations
 For the purposes of the present document, the following abbreviations apply:
 
-`ATC          Automatic Train Control`  
-`ATP          Automatic Train Protection`  
-`BTM          Balise Transmission Module`  
-`CTCS-3       Chinese Train Control System-3`  
-`GotAPI       Generic Open Terminal Application Programming Interface`  
-`DWAPI        Device Web Application Programming Interface`  
-`DWAPI-3DP    Device Web Application Programming Interface for 3D printer`  
-`DWAPI-PCH    Device Web Application Programming Interface for Personal Connected Healthcare`
-`HIM          Harmonized Information Model`
 
+- ATC - Automatic Train Control
+- ATP - Automatic Train Protection
+- BTM - Balise Transmission Module
+- CTCS-3 - Chinese Train Control System-3
+- GotAPI - Generic Open Terminal Application Programming Interface
+- DWAPI - Device Web Application Programming Interface
+- DWAPI-3DP - Device Web Application Programming Interface for 3D printer
+- DWAPI-PCH - Device Web Application Programming Interface for Personal Connected Healthcare
+- HIM - Harmonized Information Model
 
 # 4 Conventions
+
 The key words "Shall", "Shall not", "May", "Need not", "Should", "Should not" in the present document are to be interpreted as described in the oneM2M Drafting Rules <a href="#_ref_i.1">[i.1]</a>.
 
 
 # 5 Harmonised Information Model
 
 ## 5.1 Introduction
+
 The present document intends to provide the unified means in the oneM2M system by defining a Harmonized Information Model (HIM) for the devices such as TV, refrigerator, air conditioner, clothes washer, oven, and robot cleaner. For the reasons of interworking with external technologies and efficiency, the principle of the Harmonized Information Model is designed based on HGI SDT 3.0 <a href="#_ref_1">[1]</a>.
 
 The principle of defining the Harmonized Information Model is introduced in clause [5.2 Design Principle of the Harmonised Information Model](#52-design-principle-of-the-harmonised-information-model). Module Classes which oneM2M systems support are explained in clauses [5.3 ModuleClasses](#53-moduleclasses). In the subsequent clauses [5.4 SubDevice models](#54-subdevice-models) and [5.5 Device models](#55-device-models), Sub-Device and Device models are defined.
@@ -217,151 +179,171 @@ Figure 5.2.1-1 depicts the basic structure of SDT 4.0. Further details about SDT
 
 Specifications of new DeviceClass models and ModuleClasses are encouraged to re-use the definitions specified in the present document as much as possible. If re-use is not possible and new DeviceClass and/or ModuleClasses definitions are necessary, it is strongly advised to closely follow the guidelines and definition style from the present document.
 
-
-![SDT 4.0 Basic Elements](media/SDT_4_0_basic_elements.png)
+![Figure 5.2.1-1: Design Structure of the Harmonized Information Model using SDT 4.0](media/SDT_4_0_basic_elements.png)
 
 **Figure 5.2.1-1: Design Structure of the Harmonized Information Model using SDT 4.0**-
 
-
 The R/W column of the ModuleClasses' data point tables in clause [5.3](#53-moduleclasses) reflects the intentions of how a data point in a ModuleClass shall be used semantically. This is a "behavioural contract" between applications or users of the modelled devices on the semantic level. Further, the devices or IPE's (for NoDN) are expected to implement and control the mappings in clause [5.2.2](#522-description-rules-for-module-classes-and-deviceclasses) to implement this "behavioural contract".
 
 
 ### 5.2.2 Description rules for Module Classes and DeviceClasses
-When the Harmonized Information Model is described based on SDT, the following rules shall be applied:
 
+When the Harmonized Information Model is described based on SDT, the following rules shall be applied:
 
 - Rule 1: CamelCase rule:
-
     - When naming each element, lowerCamelCase shall be used as the Java coding rules <a href="#_ref_2">[2]</a>.
     - Element names shall only contain upper and lower case alphanumerical characters in the ranges "a..z", "A..Z" and "0..9" as defined in <a href="#_ref_22">[22]</a>, and the underscore character "_". Element names shall not contain whitespace characters. 
     - The underscore character "_" shall only be used as a separator in element names that contain only uppercase characters.
-
 - Rule 2: Rule for description of Action, DataPoint:
-
     - DataPoint shall be used to represent stateless operations. (e.g. *state* of [binarySwitch](#53112-binaryswitch) for on/off operations).
     - Action shall be used when describing stateful condition, handling unknown internal state conditions (e.g. [upVolume](#5318-audiovolume)/[downVolume](#5318-audiovolume) by increasing/decreasing the audioVolume in steps, handling transactional procedures, or checking integrity using username plus password at the same time).
-
 - Rule 3: Rule for description of DataPoint and Property:
-
     - Non-functional information shall be described as a Property. Functional information shall be described as a DataPoint. (E.g. non-functional information: version, id; functional information: targetTemperature, targetVolume).
-
 - Rule 4: Definition of the Domain:
-
     - The Domains are specified as "org.onem2m.[domain]", where [domain] is one of the domain names defined in [6.4.1](#641-introduction). The name is chosen according to the domain in which the element is defined. 
     - The sub-domains for DeviceClasses, SubDevices, ModuleClasses and Actions shall be specified as "org.onem2m.[domain].device", "org.onem2m.[domain].subdevice", "org.onem2m.[domain].moduleclass", and "org.onem2m.[domain].action" respectively.
-
 - Rule 5: Naming rule for the element:
-
     - the name of each element should be concise and avoid repeating its parent element name; but
     - it may include the name of its parent element for readability. (e.g., lightDimmerUp, lightDimmerDown under lightDimmer);
     - all DeviceClasses, SubDevices, ModuleClasses, and Actions of a domain shall be uniquely named.
-
 - Rule 6: Criteria for marking elements as optional or mandatory:
-
     - An element shall only be defined as mandatory if it is foreseen to be universally mandatory to all implementing technologies.
-
 - Rule 7: Enumeration type:
-
     - When describing the meaning of values for enumeration type elements, they may be described under clause [5.6](#56-enumeration-type-definitions).
     - The enumeration types for the harmonized information model are based on &lt;xs:integer>, and the numeric values are interpreted as specified in clause [5.6](#56-enumeration-type-definitions). 
     - The name of an enumeration type shall start with the prefix "enum". This prefix shall not be used with non-enumeration type names.
     - All enumeration types are defined under the same domain called Horizontal Domain, which does not contain any other entity. They also shall use the same XSD name space identifiers as defined in clause [6.5.1](#651-introduction). Even if an enumeration type is used in multiple module classes from different domains, this enumeration type is defined only once.
-
 - Rule 8: Rule for unit  in documentation :
-
     - SI (International Systems of Units in <a href="#_ref_20">[20]</a>) measurement (e.g. metre, kilogram, second) should be considered as first candidate.
     - Otherwise, it may be kept consistency with implementing technologies such as other SDO's specification.
     - Units of measures shall be given in the form of a shortcut compliant to table 5.2.2-1. 
 
 **Table 5.2.2-1: Shortcuts for units**
 
-|Original name |Short name |Explanation |
-|-|-|-|
-|Ampere |A | |
-|Ampere Hour |Ah | |
-|Bar |bar | |
-|Celsius |°C | |
-|Centimetres |cm | |
-|Cubic metre |m3 | |
-|Cubic metre per hour |m3/h | |
-|Decibel |dB | |
-|Decibel-milliwatts |dBm | |
-|Degrees |deg | |
-|Dots per inch |dpi |dpi is the common unit for spatial dot density |
-|g-force |g-f | |
-|Grams |g | |
-|Hectopascal |hPa | |
-|Hertz |Hz | |
-|Kilocalories |kcal | |
-|Kilocalories per hour |kcal/h | |
-|Kilograms per square metre |kg/m2 | |
-|Kilopascal |kPa | |
-|kilovar |kvar | |
-|Kilowatt |kW | |
-|Megabyte |MB |1 MB = 1 024 x 1 024 bytes |
-|MegaHertz |MHz | |
-|Metre |m | |
-|Metres per second |m/s | |
-|Milligram per cubic metre |mg/m3 | |
-|Microgram per cubic metre |µg/m3 | |
-|Milligram per decilitre |mg/dl | |
-|Milligram per litre |mg/L | |
-|Millimetre |mm | |
-|Millimetre of mercury |mmHg | |
-|Milliseconds |ms | |
-|Milliwatt per cubic centimetre |mW/cm2 | |
-|Minute |min | |
-|Odour unit per cubic metre |OU/m3 | |
-|Ohm |ohm | |
-|Parts per million |ppm | |
-|Percent |pct | |
-|Picofarad |pF | |
-|Pixel |px | |
-|Seconds |s  | |
-|Siemens per metre |S/m | |
-|Volt |V | |
-|Watt |W | |
-|Watt hour |Wh | |
-
-<mark>NOTE: Popular unit in particular industrial domain should be considered  (e.g. cm for human height, calories for energy consumption in healthcare domain). It should be made coherent in the present document, as possible.</mark>
-
-
++-------------------------------+-----------+-----------------------------------------------+
+|Original name                  |Short name |Explanation                                    |
++:==============================+===========+===============================================+
+|Ampere                         |A          |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Bar                            |bar        |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Celsius                        |°C         |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Centimetres                    |cm         |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Cubic metre                    |m3         |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Cubic metre per hour           |m3/h       |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Decibel                        |dB         |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Decibel-milliwatts             |dBm        |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Degrees                        |deg        |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Dots per inch                  |dpi        |dpi is the common unit for spatial dot density |
++-------------------------------+-----------+-----------------------------------------------+
+|g-force                        |g-f        |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Grams                          |g          |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Hectopascal                    |hPa        |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Hertz                          |Hz         |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Kilocalories                   |kcal       |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Kilocalories per hour          |kcal/h     |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Kilograms per square metre     |kg/m2      |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Kilopascal                     |kPa        |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|kilovar                        |kvar       |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Kilowatt                       |kW         |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Megabyte                       |MB         |1 MB = 1 024 x 1 024 bytes                     |
++-------------------------------+-----------+-----------------------------------------------+
+|MegaHertz                      |MHz        |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Metre                          |m          |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Metres per second              |m/s        |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Milligram per cubic metre      |mg/m3      |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Microgram per cubic metre      |µg/m3      |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Milligram per decilitre        |mg/dl      |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Milligram per litre            |mg/L       |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Millimetre                     |mm         |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Millimetre of mercury          |mmHg       |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Milliseconds                   |ms         |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Milliwatt per cubic centimetre |mW/cm2     |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Minute                         |min        |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Odour unit per cubic metre     |OU/m3      |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Ohm                            |ohm        |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Parts per million              |ppm        |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Percent                        |pct        |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Picofarad                      |pF         |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Pixel                          |px         |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Seconds                        |s          |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Siemens per metre              |S/m        |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Volt                           |           |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Watt                           |W          |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+|Watt hour                      |Wh         |                                               |
++-------------------------------+-----------+-----------------------------------------------+
+| NOTE: Popular unit in particular industrial domain should be considered  (e.g. cm for     |
+| human height, calories for energy consumption in healthcare domain). It should be made    |
+| coherent in the present document, as possible.                                            |
++-------------------------------+-----------+-----------------------------------------------+
 
 - Rule 9: Rule for type :
-
     - Measured and/or calculated values should be represented in float (without taking care of resolution of values).
-
-      <mark>NOTE: It should be made coherent in the document, as possible. Unit should not be fixed as a rule but be decided with correspondence to each DeviceClass or ModuleClass.</mark>
-
+		<mark>Editor NOTE: It should be made coherent in the document, as possible. Unit should not be fixed as a rule but be decided with correspondence to each DeviceClass or ModuleClass.</mark>
 - Rule 10: Inheritance of ModuleClasses :
-
     - A ModuleClass may inherit from another existing ModuleClass in order to provide additional functionalities based on the existing ModuleClass. However, inheritance from multiple ModuleClasses is not allowed (due to the "diamond problem" <a href="#_ref_i.6">[i.6]</a>).
     - Inheritance of ModuleClass shall only be used in the case that extending an existing ModuleClass is not appropriate, i.e. the functionality to be added is irrelevant to the original design purpose of the existing ModuleClass (e.g. adding a 'time' DataPoint to a '[binarySwitch](#53112-binaryswitch)' ModuleClass). 
-
 - Rule 11: When to differentiate between current and target Data Points in ModuleClasses:
-
     - Device operations, which are executed when setting data points to specific values, may take some time to reach the desired result. For example, setting a new temperature to a heater does not immediately change the room temperature, but it may take some time for the heater to increase the temperature. Therefore, it is sometimes necessary to distinguish between current and target data points.
     - A ModuleClass shall provide an additional "target" data point when the "current" data point ...
-      - is writeable, and
-      - the functionality that is mapped to the data point is an operation, not a configuration function, and
-      - the operation may take some time to start and/or to complete, or reach the desired result.  
+		- is writeable, and
+		- the functionality that is mapped to the data point is an operation, not a configuration function, and
+		- the operation may take some time to start and/or to complete, or reach the desired result.  
     - When a ModuleClass provides current and target data points then the name for the current data point shall have the prefix "current", and the name for the target data point shall have the prefix "target". Both data points shall have the same suffix, for example "currentTemperature" and "targetTemperature".
-
 - Rule 12: Algorithm to generate short names for DeviceClasses, ModuleClasses, Data Points, Actions:
 
     - Every domain in oneM2M defines their own short names, i.e. there may exist the same short name in more than one domain, but these short names are distinguished by the domain prefix.
     - Previous defined short names of the home domain, e.g. from a previous version of the specification, shall be taken into account. They are assigned to the same original names.
     - The algorithm to generate the short names from the original names works as follows:
-      - The maximum length of a short name for TS-0023 is 5 characters. This length includes the optional appended distinguishing number (see below), but not the suffix for announced resources.
-      - If the length of the original name is equal or less than 5 characters, then store the original name as an intermediate result.
-      - Else, if the length of the original name is greater than 5 characters, then perform the following procedure:
-        - The first and the last character of the original name are stored as first and second character as an intermediate result.
-        - All the upper-case characters of the original name, starting with the first upper-case character, are inserted one by one before the last character of the intermediate result, up to a total length of 5 characters of the intermediate result.
-        - In case the length of the intermediate result after these steps is less than 5 characters, then the intermediate result is filled with characters from the original string until the length of the intermediate result is 5 characters, following this procedure: the second character of the original name is inserted as the second character of the intermediate result while shifting all characters from the intermediate result by one character forward. This is repeated with the third, fourth, etc., character from the original name.
-      - The intermediate result is now compared with all existing short names. If the intermediate result can be found in the list of existing short names, then execute the following steps until the intermediate result cannot be found in the list of previously defined short names:
-        - Replace the last character of the intermediate result with an integer number, starting with 0. If the number becomes a two-digit number, then replace the last two characters of the intermediate result, and so forth.
-        - Repeat the check described above. If the intermediate result is still the same as an existing short name, then the appended integer number is increased by 1, and the check is repeated.
-      - The intermediate result is now stored as a new short name in the list of existing short names.
+		- The maximum length of a short name for TS-0023 is 5 characters. This length includes the optional appended distinguishing number (see below), but not the suffix for announced resources.
+		- If the length of the original name is equal or less than 5 characters, then store the original name as an intermediate result.
+		- Else, if the length of the original name is greater than 5 characters, then perform the following procedure:
+        	- The first and the last character of the original name are stored as first and second character as an intermediate result.
+        	- All the upper-case characters of the original name, starting with the first upper-case character, are inserted one by one before the last character of the intermediate result, up to a total length of 5 characters of the intermediate result.
+        	- In case the length of the intermediate result after these steps is less than 5 characters, then the intermediate result is filled with characters from the original string until the length of the intermediate result is 5 characters, following this procedure: the second character of the original name is inserted as the second character of the intermediate result while shifting all characters from the intermediate result by one character forward. This is repeated with the third, fourth, etc., character from the original name.
+		- The intermediate result is now compared with all existing short names. If the intermediate result can be found in the list of existing short names, then execute the following steps until the intermediate result cannot be found in the list of previously defined short names:
+			- Replace the last character of the intermediate result with an integer number, starting with 0. If the number becomes a two-digit number, then replace the last two characters of the intermediate result, and so forth.
+        	- Repeat the check described above. If the intermediate result is still the same as an existing short name, then the appended integer number is increased by 1, and the check is repeated.
+		- The intermediate result is now stored as a new short name in the list of existing short names.
     - Short names for announced resources are created by taking the regular short name of the entity and appending the characters "Annc" to it. Short names for announced resources therefore have a maximum length of 9 characters.
     - Short names for [FlexContainerInstance] specializations for ModuleClasses, DeviceClasses, SubDeviceClasses, and Actions are created by taking the regular short name of the entity and appending the characters "Inst" to it. Short names for these resources therefore have a maximum length of 9 characters.
 
@@ -380,21 +362,15 @@ Table 5.2.2-2 provides some examples for short names that have been created by t
 |impactSensorAnnc |impSrAnnc |
 
 
-
-
 - Rule 13: Rule for R/W column:
-
     - The value used in this column defines the interface as it applies to the user of this module. The entity that this module represents (device AE or IPE AE) can read or write to any or all of the data points as needed in order to implement the defined interface to the user.  &lt;accessControlPolicy> resources shall be defined to enforce access control to the data points of the module defined such that R in the R/W column has RETRIEVE accessControlOperations and  RW in the R/W column has RETRIEVE and UPDATE accessControlOperations.
-
 - Rule 14: Rule for Optional and Multiplicity:
-
     - The value used in the "Optional" column of ModuleClass definitions is mapped to the "optional" element attribute for SDT DataPoint elements.
     - The value used in the "Multiplicity" column of DeviceClass and SubDevice definitions is mapped to "minOccurs" and "maxOccurs" element attribute for SDT DeviceClass elements as follows:
-      - 1 : minOccurs = 1, maxOccurs = 1
-      - 0..1 : minOccurs = 0, maxOccurs = 1
-      - 0..N : minOccurs = 0, maxOccurs = unbound
-      - 1..N : minOccurs = 1, maxOccurs = unbound
-
+    	- 1 : minOccurs = 1, maxOccurs = 1
+		- 0..1 : minOccurs = 0, maxOccurs = 1
+		- 0..N : minOccurs = 0, maxOccurs = unbound
+		- 1..N : minOccurs = 1, maxOccurs = unbound
 
 
 ## 5.3 ModuleClasses
@@ -412,9 +388,6 @@ This ModuleClass provides capabilities for a 3D printer.
 |none |start3Dprint |none |true |Start 3D printing. |
 |none |stop3Dprint |none |true |Stop 3D printing. |
 
-
-
-
 **Table 5.3.1.1-2: DataPoints of threeDprinter ModuleClass**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
@@ -426,12 +399,9 @@ This ModuleClass provides capabilities for a 3D printer.
 |network |xs:boolean |R |false | |This value indicates the Wide Area Network (WAN) connectivity of the 3D printer, such as Internet or GSM.<br />"False" indicates that the printer does not have network connectivity to a WAN. "True" indicates that the printer has WAN network connectivity. |
 |memorySize |xs:float |R |false |MB |This value represents the total memory size of the printer. The unit of measure is Megabyte (MB). |
 
-
-
-
 #### 5.3.1.2 acousticSensor
-This ModuleClass provides capabilities for an acoustic sensor. 
 
+This ModuleClass provides capabilities for an acoustic sensor. 
 
 **Table 5.3.1.2-1: DataPoints of acousticSensor ModuleClass**
 
@@ -441,11 +411,9 @@ This ModuleClass provides capabilities for an acoustic sensor.
 |acousticStatus |xs:integer |R |true |pct |The acousticStatus is expressed in percent, whereas a value of 0 means "no sound" and a value of 100 means "most noisy". |
 
 
-
-
 #### 5.3.1.3 airConJobMode
-This ModuleClasses provides capabilities to control and monitor the job modes of an air conditioner.
 
+This ModuleClasses provides capabilities to control and monitor the job modes of an air conditioner.
 
 **Table 5.3.1.3-1: DataPoints of airConJobMode ModuleClass**
 
@@ -456,11 +424,9 @@ This ModuleClasses provides capabilities to control and monitor the job modes of
 |jobModes |list of [hd:enumAirConJobMode](#563-hdenumairconjobmode) |R |false | |List of possible job states the device supports (see clause [5.6.3](#563-hdenumairconjobmode)).  |
 
 
-
-
 #### 5.3.1.4 airFlow
-This ModuleClass provides capabilities for controlling the air flow of a device.
 
+This ModuleClass provides capabilities for controlling the air flow of a device.
 
 **Table 5.3.1.4-1: DataPoints of airFlow ModuleClass**
 
@@ -476,9 +442,8 @@ This ModuleClass provides capabilities for controlling the air flow of a device.
 |automode |xs:Boolean |RW |true | |Status of the automode feature. "True" indicates that the speed is set by the device, "False" indicates that the device is not controlling the speed. |
 
 
-
-
 #### 5.3.1.5 airPurifierJobMode
+
 This ModuleClasses provides capabilities to control and monitor the job modes of an airPurifier.
 
 **Table 5.3.1.5-1: DataPoints of airPurifierJobMode ModuleClass**
@@ -490,11 +455,9 @@ This ModuleClasses provides capabilities to control and monitor the job modes of
 |jobModes |list of [hd:enumAirPurifierJobMode](#564-hdenumairpurifierjobmode) |R |false | |List of possible job states the device supports (see clause [5.6.4](#564-hdenumairpurifierjobmode)). |
 
 
-
-
 #### 5.3.1.6 airQualitySensor
-This ModuleClass provides capabilities for a monitoring sensor that measures the air quality.
 
+This ModuleClass provides capabilities for a monitoring sensor that measures the air quality.
 
 **Table 5.3.1.6-1: DataPoints of airQualitySense ModuleClass**
 
@@ -521,10 +484,9 @@ This ModuleClass provides capabilities for a monitoring sensor that measures the
 |windSpeed |xs:float |R |true |m/s |The wind speed |
 
 
-
 #### 5.3.1.7 alarmSpeaker
-This ModuleClass provides the capabilities to initiate and monitor an alarm.
 
+This ModuleClass provides the capabilities to initiate and monitor an alarm.
 
 **Table 5.3.1.7-1: DataPoints of alarmSpeaker ModuleClass**
 
@@ -535,11 +497,9 @@ This ModuleClass provides the capabilities to initiate and monitor an alarm.
 |alarmStatus |xs:boolean |R |false | |"True" indicates the alarm start while "False" indicates the alarm stop. |
 
 
-
-
 #### 5.3.1.8 audioVolume
-This ModuleClass provides capabilities to control and monitor volume
 
+This ModuleClass provides capabilities to control and monitor volume
 
 **Table 5.3.1.8-1: Actions of audioVolume**
 
@@ -550,8 +510,6 @@ This ModuleClass provides capabilities to control and monitor volume
 |none |muteAudioVolume |none |true |Save the current audio volume and set the volume to 0. |
 
 
-
-
 **Table 5.3.1.8-2: DataPoints of audioVolume**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
@@ -563,11 +521,9 @@ This ModuleClass provides capabilities to control and monitor volume
 |saveAudioVolume |xs:integer |RW |true |pct |Save the current audio volume for the muteAudioVolume |
 
 
-
-
 #### 5.3.1.9 autoDocumentFeeder
-This ModuleClasses provides capabilities to monitor the state of autoDocumentFeeder (ADF). ADF is a feature which takes several pages and feeds the paper one page at a time into a scanner or printer, allowing the user to scan, print or fax, multiple-page documents without having to manually replace each page.
 
+This ModuleClasses provides capabilities to monitor the state of autoDocumentFeeder (ADF). ADF is a feature which takes several pages and feeds the paper one page at a time into a scanner or printer, allowing the user to scan, print or fax, multiple-page documents without having to manually replace each page.
 
 **Table 5.3.1.9-1: DataPoints of autoDocumentFeeder ModuleClass**
 
@@ -577,11 +533,9 @@ This ModuleClasses provides capabilities to monitor the state of autoDocumentFee
 |adfStates |list of [hd:enumAdfState](#562-hdenumadfstate) |R |false | |List of possible ADF states that are supported by the device (see clause [5.6.2](#562-hdenumadfstate)). |
 
 
-
-
 #### 5.3.1.10 battery
-This ModuleClass provides capabilities to indicate the detection of low battery and gives an alarm if the triggering criterion is met. The level data point in the ModuleClass represents the current battery charge level.
 
+This ModuleClass provides capabilities to indicate the detection of low battery and gives an alarm if the triggering criterion is met. The level data point in the ModuleClass represents the current battery charge level.
 
 **Table 5.3.1.10-1: DataPoints of battery ModuleClass**
 
@@ -602,9 +556,8 @@ This ModuleClass provides capabilities to indicate the detection of low battery
 |batteryShape |[hd:enumBatteryShape](#5651-hdenumbatteryshape) |R |true | |The size of the battery such as "AAA". |
 
 
-
-
 #### 5.3.1.11 binaryObject
+
 This ModuleClass describes the handling of a binary object (blob). 
 
 **Table 5.3.1.11-1: DataPoints of binaryObject ModuleClass**
@@ -617,11 +570,9 @@ This ModuleClass describes the handling of a binary object (blob).
 |hash |xs:string |RW |true | |The hash code of the blob. If present, it is used to check the decoded content of the "object" data point for integrity. The algorithm used for generating the hash value is SHA-2 <a href="#_ref_15">[15]</a>. The data point contains the hash as a hex encoded value. |
 
 
-
-
 #### 5.3.1.12 binarySwitch
-This ModuleClass provides capabilities to control and monitor the state of power.
 
+This ModuleClass provides capabilities to control and monitor the state of power.
 
 **Table 5.3.1.12-1: Actions of binarySwitch ModuleClass**
 
@@ -630,8 +581,6 @@ This ModuleClass provides capabilities to control and monitor the state of power
 |none |toggle |none |true |Toggle the switch. |
 
 
-
-
 **Table 5.3.1.12-2: DataPoints of binarySwitch ModuleClass**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
@@ -639,11 +588,9 @@ This ModuleClass provides capabilities to control and monitor the state of power
 |state |xs:boolean |RW |false | |The current status of the binarySwitch. "True" indicates turned-on, and "False" indicates turned-off. |
 
 
-
-
 #### 5.3.1.13 bioElectricalImpedanceAnalysis
-This ModuleClass provides the analysis of human body tissue based on impedance measurement.
 
+This ModuleClass provides the analysis of human body tissue based on impedance measurement.
 
 **Table 5.3.1.13-1: DataPoints of bioElectricalImpedanceAnalysis ModuleClass**
 
@@ -659,6 +606,7 @@ This ModuleClass provides the analysis of human body tissue based on impedance m
 
 
 #### 5.3.1.14 bodyCompositionAnalyser
+
 This ModuleClass provides the capability to report the measurement of body composition analyser characteristics.
 
 **Table 5.3.1.14-1: DataPoints of body composition analyser ModuleClass**
@@ -679,6 +627,7 @@ This ModuleClass provides the capability to report the measurement of body compo
 
 
 #### 5.3.1.15 boiler
+
 This ModuleClass provides capabilities to control the status of the boiling functionality for water heaters.
 
 
@@ -689,11 +638,9 @@ This ModuleClass provides capabilities to control the status of the boiling func
 |status |xs:boolean |RW |false | |The status of boiling. "True" indicates boiling, "False" indicates not boiling. |
 
 
-
-
 #### 5.3.1.16 brewing
-This ModuleClass provides capabilities to control and monitor a brewing process. It is intended to be part of devices that prepare hot drinks such as a coffee or a tea.
 
+This ModuleClass provides capabilities to control and monitor a brewing process. It is intended to be part of devices that prepare hot drinks such as a coffee or a tea.
 
 **Table 5.3.1.16-1: DataPoints of brewing ModuleClass**
 
@@ -703,11 +650,9 @@ This ModuleClass provides capabilities to control and monitor a brewing process.
 |strength |[hd:enumTasteStrength](#5633-hdenumtastestrength) |RW |true | |The current strength of the drink taste (see clause [5.6.33](#5633-hdenumtastestrength)). A higher value indicates a stronger taste. |
 
 
-
-
 #### 5.3.1.17 brightness
-This ModuleClass provides capabilities to control and monitor the brightness of a light for example from a lamp. Brightness is scaled as a percentage. A lamp or a monitor can be adjusted to a level of light between very dim (0 % is the minimum brightness) and very bright (100 % is the maximum brightness).
 
+This ModuleClass provides capabilities to control and monitor the brightness of a light for example from a lamp. Brightness is scaled as a percentage. A lamp or a monitor can be adjusted to a level of light between very dim (0 % is the minimum brightness) and very bright (100 % is the maximum brightness).
 
 **Table 5.3.1.17-1: DataPoints of brightness ModuleClass**
 
@@ -716,11 +661,9 @@ This ModuleClass provides capabilities to control and monitor the brightness of
 |brightness |xs:integer |RW |false |pct |The status of brightness level. |
 
 
-
-
 #### 5.3.1.18 clock
-This ModuleClass provides capabilities to control and monitor time and date information.
 
+This ModuleClass provides capabilities to control and monitor time and date information.
 
 **Table 5.3.1.18-1: DataPoints of clock ModuleClass**
 
@@ -731,9 +674,8 @@ This ModuleClass provides capabilities to control and monitor time and date info
 |currentTimeZone |xs:string |RW |true | |Name of current time zone according to the IANA Timezone data format (TZ) <a href="#_ref_17">[17]</a>,  for example, "America/New York".  |
 
 
-
-
 #### 5.3.1.19 clothesDryerJobMode
+
 This ModuleClasses provides capabilities to control and monitor the job modes of a clothes dryer.
 
 **Table 5.3.1.19-1: DataPoints of clothesDryerJobMode ModuleClass**
@@ -745,11 +687,9 @@ This ModuleClasses provides capabilities to control and monitor the job modes of
 |jobModes |list of [hd:enumClothesDryerJobMode](#567-hdenumclothesdryerjobmode) |R |false | |List of possible job states the device supports. |
 
 
-
-
 #### 5.3.1.20 clothesWasherJobMode
-This ModuleClasses provides capabilities to control and monitor the job mode of a washer.
 
+This ModuleClasses provides capabilities to control and monitor the job mode of a washer.
 
 **Table 5.3.1.20-1: DataPoints of clothesWasherJobMode ModuleClass**
 
@@ -760,14 +700,12 @@ This ModuleClasses provides capabilities to control and monitor the job mode of
 |jobModes |list of [hd:enumClothesWasherJobMode](#569-hdenumclotheswasherjobmode) |R |false | |List of possible job states that the device supports (see clause [5.6.9](#569-hdenumclotheswasherjobmode)). |
 
 
-
-
 #### 5.3.1.21 clothesWasherDryerJobMode
+
 This ModuleClasses provides capabilities to control and monitor the job modes of clothesWasherDryer.
 
 Table 5.3.1.21-1: DataPoints of clothesWasherDryerJobMode ModuleClass
 
-
 |Name |Type |R/W |Optional |Unit |Documentation |
 |-|-|-|-|-|-|
 |currentJobMode |[hd:enumClothesWasherDryerJobMode](#568-hdenumclotheswasherdryerjobmode) |RW |false | |Currently active job (see clause [5.6.8](#568-hdenumclotheswasherdryerjobmode)). |
@@ -775,11 +713,9 @@ Table 5.3.1.21-1: DataPoints of clothesWasherDryerJobMode ModuleClass
 |jobModes |list of [hd:enumClothesWasherDryerJobMode](#568-hdenumclotheswasherdryerjobmode) |R |false | |List of possible job states the device supports (see clause [5.6.8](#568-hdenumclotheswasherdryerjobmode)). |
 
 
-
-
 #### 5.3.1.22 clothesWasherJobModeOption
-This ModuleClasses provides capabilities to control and monitor the washing job mode options of a washer.
 
+This ModuleClasses provides capabilities to control and monitor the washing job mode options of a washer.
 
 **Table 5.3.1.22-1: DataPoints of clothesWasherJobModeOption ModuleClass**
 
@@ -795,11 +731,9 @@ This ModuleClasses provides capabilities to control and monitor the washing job
 |extraRinse |xs:boolean |RW |true | |This data point indicates extra rinse. "True" indicates enabled, "False" indicates disabled. |
 
 
-
-
 #### 5.3.1.23 colour
-This ModuleClass provides the capabilities to set the value of the Red, Green, and Blue colour channels for a colour device.
 
+This ModuleClass provides the capabilities to set the value of the Red, Green, and Blue colour channels for a colour device.
 
 **Table 5.3.1.23-1: DataPoints of colour ModuleClass**
 
@@ -810,11 +744,9 @@ This ModuleClass provides the capabilities to set the value of the Red, Green, a
 |blue |xs:integer |RW |false | |The value of the Blue colour channel of RGB. The range is [0,255]. |
 
 
-
-
 #### 5.3.1.24 colourSaturation
-This ModuleClass provides capabilities to control and monitor a colour saturation value.
 
+This ModuleClass provides capabilities to control and monitor a colour saturation value.
 
 **Table 5.3.1.24-1: DataPoints of colourSaturation ModuleClass**
 
@@ -823,9 +755,8 @@ This ModuleClass provides capabilities to control and monitor a colour saturatio
 |colourSaturation |xs:integer |RW |false |pct |The status of colour saturation level. "colourSaturation" has a range of [0,100]. A "colourSaturation" value of 0 means that a device displays or produces black and white images. A "colourSaturation" value of 50 means that a  device displays or produces normal colour images. A "colourSaturation" value of 100 means that a device displays or produces very colourful images. |
 
 
-
-
 #### 5.3.1.25 connectivity
+
 This ModuleClass provides capabilities to monitor network connectivity. 
 
 **Table 5.3.1.25-1: DataPoints of connectivity ModuleClass**
@@ -848,11 +779,9 @@ This ModuleClass provides capabilities to monitor network connectivity.
 |minimumCommunicationLatency |xs:integer |R |true |s |The minimum time delay between the last communication attempt. |
 
 
-
-
 #### 5.3.1.26 cookerHoodJobMode
-This ModuleClasses provides capabilities to control and monitor the job modes of a cookerHood.
 
+This ModuleClasses provides capabilities to control and monitor the job modes of a cookerHood.
 
 **Table 5.3.1.26-1: DataPoints of cookerHoodJobMode ModuleClass**
 
@@ -863,11 +792,9 @@ This ModuleClasses provides capabilities to control and monitor the job modes of
 |jobModes |list of [hd:enumCookerHoodJobMode](#5610-hdenumcookerhoodjobmode) |R |false | |List of possible job states the device supports (see clause [5.6.10](#5610-hdenumcookerhoodjobmode)). |
 
 
-
-
 #### 5.3.1.27 credentials
-This ModuleClass provides the capability to manage user credentials which allows a user to authenticate on an appliance or a server that is associated with the appliance. The authentication depends on a user login and password, or on a token. An example appliance which may include this ModuleClass is a camera. 
 
+This ModuleClass provides the capability to manage user credentials which allows a user to authenticate on an appliance or a server that is associated with the appliance. The authentication depends on a user login and password, or on a token. An example appliance which may include this ModuleClass is a camera. 
 
 **Table 5.3.1.27-1: DataPoints of credentials ModuleClass**
 
@@ -878,9 +805,8 @@ This ModuleClass provides the capability to manage user credentials which allows
 |token |xs:string |W |true | |An authentication token, for example an OAuth token. |
 
 
-
-
 #### 5.3.1.28 dehumidifierJobMode
+
 This ModuleClasses provides capabilities to control and monitor the job modes of a dehumidifier device.
 
 
@@ -893,11 +819,9 @@ This ModuleClasses provides capabilities to control and monitor the job modes of
 |jobModes |list of [hd:enumDehumidifierJobMode](#5611-hdenumdehumidifierjobmode) |R |false | |List of possible job states the device supports.  |
 
 
-
-
 #### 5.3.1.29 dishWasherJobMode
-This ModuleClasses provides capabilities to control and monitor the job modes of a dishWasher.
 
+This ModuleClasses provides capabilities to control and monitor the job modes of a dishWasher.
 
 **Table 5.3.1.29-1: DataPoints: DataPoints of dishWasherJobMode ModuleClass**
 
@@ -908,11 +832,9 @@ This ModuleClasses provides capabilities to control and monitor the job modes of
 |jobModes |list of [hd:enumDishWasherJobMode](#5612-hdenumdishwasherjobmode) |R |false | |List of possible job states the device supports (see clause [5.6.12](#5612-hdenumdishwasherjobmode)). |
 
 
-
-
 #### 5.3.1.30 doorStatus
-This ModuleClass provides the status of a door. It is intended to be part of a device such as a refrigerator and an oven that might have multiple doors. 
 
+This ModuleClass provides the status of a door. It is intended to be part of a device such as a refrigerator and an oven that might have multiple doors. 
 
 **Table 5.3.1.30-1: DataPoints of doorStatus ModuleClass**
 
@@ -923,11 +845,9 @@ This ModuleClass provides the status of a door. It is intended to be part of a d
 |openAlarm |xs:boolean |RW |true | |The state of the door open alarm. "True" indicates that the open alarm is active. "False" indicates that the open alarm is not active. |
 
 
-
-
 #### 5.3.1.31 electricVehicleConnector
-This ModuleClass provides information about charging/discharging devices for electric vehicles.
 
+This ModuleClass provides information about charging/discharging devices for electric vehicles.
 
 **Table 5.3.1.31-1: DataPoints of electricVehicleConnector ModuleClass**
 
@@ -938,11 +858,9 @@ This ModuleClass provides information about charging/discharging devices for ele
 |dischargingCapacity |xs:integer |R |true |Ah |Rated discharging capacity. |
 
 
-
-
 #### 5.3.1.32 energyConsumption
-This ModuleClass describes the measured energy consumed by the device since power up. One particular use case for the energyConsumption ModuleClass is a smart meter.
 
+This ModuleClass describes the measured energy consumed by the device since power up. One particular use case for the energyConsumption ModuleClass is a smart meter.
 
 **Table 5.3.1.32-1: DataPoints of energyConsumption ModuleClass**
 
@@ -959,11 +877,9 @@ This ModuleClass describes the measured energy consumed by the device since powe
 |measuringScope |xs:string |RW |true | |The measuring scope of the meter, for example the whole house, a room, or a device. |
 
 
-
-
 #### 5.3.1.33 energyGeneration
-This ModuleClass provides information about generation data on electric generator devices such as a photo voltaic power system, fuel cells, or microgeneration.
 
+This ModuleClass provides information about generation data on electric generator devices such as a photo voltaic power system, fuel cells, or microgeneration.
 
 **Table 5.3.1.33-1: DataPoints of energyGenerationModuleClass**
 
@@ -976,9 +892,8 @@ This ModuleClass provides information about generation data on electric generato
 |generationSource |xs:string |RW |false | |The type of generating source. |
 
 
-
-
 #### 5.3.1.34 faultDetection
+
 This ModuleClass provides information about whether a fault has occurred in a device.
 
 **Table 5.3.1.34-1: DataPoints of faultDetection ModuleClass**
@@ -990,11 +905,9 @@ This ModuleClass provides information about whether a fault has occurred in a de
 |description |xs:string |R |true | |The message representation of the fault. |
 
 
-
-
 #### 5.3.1.35 filterInfo
-This ModuleClass is for monitoring filter information of a device.
 
+This ModuleClass is for monitoring filter information of a device.
 
 **Table 5.3.1.35-1: DataPoints of filterInfo ModuleClass**
 
@@ -1005,11 +918,9 @@ This ModuleClass is for monitoring filter information of a device.
 |filterLifetime |xs:integer |R |true |pct |Percentage lifetime remaining for the water filter. |
 
 
-
-
 #### 5.3.1.36 foaming
-This ModuleClass provides capabilities to control and monitor desired parameters of foam e.g. for foaming milk. It is initially intended to be part of a device that prepare drinks with milk (for example a coffee machine or hot chocolate machine).
 
+This ModuleClass provides capabilities to control and monitor desired parameters of foam e.g. for foaming milk. It is initially intended to be part of a device that prepare drinks with milk (for example a coffee machine or hot chocolate machine).
 
 **Table 5.3.1.36-1: DataPoints of foaming ModuleClass**
 
@@ -1018,9 +929,8 @@ This ModuleClass provides capabilities to control and monitor desired parameters
 |foamingStrength |[hd:enumFoamStrength](#5616-hdenumfoamstrength) |RW |false | |The current strength of foamed milk. A higher value indicates more foamed milk (see clause [5.6.16](#5616-hdenumfoamstrength)). |
 
 
-
-
 #### 5.3.1.37 galleryMode
+
 This ModuleClass provides information about the mode of display. The galleryMode includes the display orientation, display interval and display order.  
 
 **Table 5.3.1.37-1: DataPoints of galleryMode ModuleClass**
@@ -1033,6 +943,7 @@ This ModuleClass provides information about the mode of display. The galleryMode
 
 
 #### 5.3.1.38 gasChargingControl
+
 This ModuleClass provides capabilities to recharge the gas meter. 
 
 **Table 5.3.1.38-1: DataPoints of gasChargingControl ModuleClass**
@@ -1047,8 +958,8 @@ This ModuleClass provides capabilities to recharge the gas meter.
 
 
 #### 5.3.1.39 gasMeterAlarm
-This ModuleClass provides capabilities to set service parameters of a gas meter. 
 
+This ModuleClass provides capabilities to set service parameters of a gas meter. 
 
 **Table 5.3.1.39-1: DataPoints of gasMeterAlarm ModuleClass**
 
@@ -1064,6 +975,7 @@ This ModuleClass provides capabilities to set service parameters of a gas meter.
 
 
 #### 5.3.1.40 gasMeterReportInfo
+
 This ModuleClass provides information of measurements of a gas meter.
 
 **Table 5.3.1.40-1: DataPoints of gasMeterReportInfo ModuleClass**
@@ -1075,8 +987,8 @@ This ModuleClass provides information of measurements of a gas meter.
 
 
 #### 5.3.1.41 geoLocation
-This ModuleClass provides the capability to get or set geo-location information.
 
+This ModuleClass provides the capability to get or set geo-location information.
 
 **Table 5.3.1.41-1: DataPoints of geoLocation ModuleClass**
 
@@ -1093,12 +1005,10 @@ This ModuleClass provides the capability to get or set geo-location information.
 |targetLongitude |xs:float |RW |true |deg |The optional target longitude part of a geo-location. This can be used to move a device to a new location. |
 |targetAltitude |xs:float |RW |true |m |The optional target altitude part of a geo-location. This can be used to move a device to a new altitude. |
 
-?    
-
 
 #### 5.3.1.42 glucometer
-This ModuleClass provides the capability to report the measurement of glucose characteristics. 
 
+This ModuleClass provides the capability to report the measurement of glucose characteristics. 
 
 **Table 5.3.1.42-1: DataPoints of glucometer ModuleClass**
 
@@ -1116,11 +1026,9 @@ This ModuleClass provides the capability to report the measurement of glucose ch
 |contextHealth |xs:string |R |true | |The severity of symptoms (for example "minor"). |
 
 
-
-
 #### 5.3.1.43 grinder
-This ModuleClass is for controlling a grinder, for example in a coffee machine. 
 
+This ModuleClass is for controlling a grinder, for example in a coffee machine. 
 
 **Table 5.3.1.43-1: DataPoints of grinder ModuleClass**
 
@@ -1131,11 +1039,9 @@ This ModuleClass is for controlling a grinder, for example in a coffee machine.
 |grainsRemaining |[hd:enumGrainsLevel](#5620-hdenumgrainslevel) |R |true | |The level of remaining grains in a machine having a grinder, for example for remaining coffee beans in the coffee machine grinder (see clause [5.6.20](#5620-hdenumgrainslevel)). |
 
 
-
-
 #### 5.3.1.44 heatingZone
-This ModuleClass provides the capabilities to monitor the status of the heating zone, for example for a cooktop.
 
+This ModuleClass provides the capabilities to monitor the status of the heating zone, for example for a cooktop.
 
 **Table 5.3.1.44-1: DataPoints of heatingZone ModuleClass**
 
@@ -1145,11 +1051,9 @@ This ModuleClass provides the capabilities to monitor the status of the heating
 |maxHeatingLevel |xs:integer |R |false | |The maximum value allowed for the heating level of the zone. |
 
 
-
-
 #### 5.3.1.45 height
-This ModuleClass provides the capability to report the measurement of height.
 
+This ModuleClass provides the capability to report the measurement of height.
 
 **Table 5.3.1.45-1: DataPoints of height ModuleClass**
 
@@ -1158,11 +1062,9 @@ This ModuleClass provides the capability to report the measurement of height.
 |height |xs:float |R |false |cm |The height measurement. |
 
 
-
-
 #### 5.3.1.46 hotWaterSupply
-This ModuleClass provides information about the status of supplying hot water into tanks or bath tubs.
 
+This ModuleClass provides information about the status of supplying hot water into tanks or bath tubs.
 
 **Table 5.3.1.46-1: DataPoints of hotWaterSupply ModuleClass**
 
@@ -1171,11 +1073,9 @@ This ModuleClass provides information about the status of supplying hot water in
 |bath |xs:boolean |RW |true | |The status of whether a bath tub is filled. |
 
 
-
-
 #### 5.3.1.47 impactSensor
-This ModuleClass describes the capabilities on an impact sensor. The impact is a high force or shock over a short time period and the impactSensor detects this.
 
+This ModuleClass describes the capabilities on an impact sensor. The impact is a high force or shock over a short time period and the impactSensor detects this.
 
 **Table 5.3.1.47-1: DataPoints of impactSensor ModuleClass**
 
@@ -1187,11 +1087,9 @@ This ModuleClass describes the capabilities on an impact sensor. The impact is a
 |impactDirectionVertical |xs:float |R |true | |The "impactDirection" indicates the vertical direction where the impact comes from. The value is 0 to 360 degrees. 0 is the front of the sensor and with upward increment. |
 
 
-
-
 #### 5.3.1.48 keepWarm
-This module allows to control the 'keep warm' feature in devices like coffee machines, kettles etc. It allows to keep water warm for a desired time. This ModuleClass inherits from [binarySwitch](#53112-binaryswitch) (see clause [5.3.1.12](#53112-binaryswitch)) to store setting for the 'keep warm' feature. If the "state" data point in a keepWarmSwitch is "True" then the 'keep warm' function will be performed just after boiling (or heating) process is finished (otherwise this function will not be applied).
 
+This module allows to control the 'keep warm' feature in devices like coffee machines, kettles etc. It allows to keep water warm for a desired time. This ModuleClass inherits from [binarySwitch](#53112-binaryswitch) (see clause [5.3.1.12](#53112-binaryswitch)) to store setting for the 'keep warm' feature. If the "state" data point in a keepWarmSwitch is "True" then the 'keep warm' function will be performed just after boiling (or heating) process is finished (otherwise this function will not be applied).
 
 **Table 5.3.1.48-1: DataPoints of keepWarm ModuleClass**
 
@@ -1201,11 +1099,9 @@ This module allows to control the 'keep warm' feature in devices like coffee mac
 |targetTemperature |xs:float |RW |true |C |Content temperature. |
 
 
-
-
 #### 5.3.1.49 keypad
-This ModuleClass provides the capability to perform a user defined service through the key-in number. For example, a user can define key 1 as "perform a take-out from a restaurant with combo meal 1". The IoT service provider or user can define the services. 
 
+This ModuleClass provides the capability to perform a user defined service through the key-in number. For example, a user can define key 1 as "perform a take-out from a restaurant with combo meal 1". The IoT service provider or user can define the services. 
 
 **Table 5.3.1.49-1: DataPoints of keypad ModuleClass**
 
@@ -1214,11 +1110,9 @@ This ModuleClass provides the capability to perform a user defined service throu
 |keyNumber |xs:integer |R |false | |The number of the pressed key. |
 
 
-
-
 #### 5.3.1.50 liquidLevel
-This ModuleClass provides the desired level of water (or other liquid)  for an appliance, for example the desired level of milk for a cup of coffee from a coffee machine. 
 
+This ModuleClass provides the desired level of water (or other liquid)  for an appliance, for example the desired level of milk for a cup of coffee from a coffee machine. 
 
 **Table 5.3.1.50-1: DataPoints of liquidLevel ModuleClass**
 
@@ -1227,11 +1121,9 @@ This ModuleClass provides the desired level of water (or other liquid)  for an a
 |liquidLevel |[hd:enumLiquidLevel](#5624-hdenumliquidlevel) |RW |false | |The desired level of water or other liquid, for example the desired level of milk in a cup of coffee (see clause [5.6.24](#5624-hdenumliquidlevel)). |
 
 
-
-
 #### 5.3.1.51 liquidRemaining
-This ModuleClass provides the status of water level (or other liquid) for an appliance, for example the level of remaining milk in a coffee machine.
 
+This ModuleClass provides the status of water level (or other liquid) for an appliance, for example the level of remaining milk in a coffee machine.
 
 **Table 5.3.1.51-1: DataPoints of liquidRemaining ModuleClass**
 
@@ -1240,11 +1132,9 @@ This ModuleClass provides the status of water level (or other liquid) for an app
 |liquidRemaining |[hd:enumLiquidLevel](#5624-hdenumliquidlevel) |R |false | |The remaining level of water or other liquid in an appliance (see clause [5.6.24](#5624-hdenumliquidlevel)). |
 
 
-
-
 #### 5.3.1.52 lock
-This ModuleClass provides the function to lock and unlock an object. 
 
+This ModuleClass provides the function to lock and unlock an object. 
 
 **Table 5.3.1.52-1: DataPoints of lock ModuleClass**
 
@@ -1253,11 +1143,9 @@ This ModuleClass provides the function to lock and unlock an object.
 |lock |xs:boolean |RW |false | |"True" indicates the object is locked, while "False" indicates the object is not locked. |
 
 
-
-
 #### 5.3.1.53 mediaSelect
-This ModuleClass provides capabilities to control and monitor media input and output of device such as TV or SetTopBox.
 
+This ModuleClass provides capabilities to control and monitor media input and output of device such as TV or SetTopBox.
 
 **Table 5.3.1.53-1: DataPoints of mediaSelect ModuleClass**
 
@@ -1270,11 +1158,9 @@ This ModuleClass provides capabilities to control and monitor media input and ou
 |mediaType |[hd:enumSupportedMediaSources](#5632-hdenumsupportedmediasources) |R |false | |Specifies the type of the media (see clause [5.6.32](#5632-hdenumsupportedmediasources)). |
 
 
-
-
 #### 5.3.1.54 motionSensor
-This ModuleClass provides the capabilities to indicate the occurrence of motion and raising of an alarm if the triggering criterion is met. 
 
+This ModuleClass provides the capabilities to indicate the occurrence of motion and raising of an alarm if the triggering criterion is met. 
 
 **Table 5.3.1.54-1: DataPoints of motionSensor ModuleClass**
 
@@ -1285,11 +1171,9 @@ This ModuleClass provides the capabilities to indicate the occurrence of motion
 |sensitivity |xs:integer |RW |true | |The level of the detection accuracy of the motion sensor. This data point can be used to control the number of the report. |
 
 
-
-
 #### 5.3.1.55 numberValue
-This ModuleClass provides the capabilities to represent a number. It also has capabilities for controlled increment and decrement a counter. It can be used to present a number-related functionality in a technology where there is only a weak semantic specification of that functionality. 
 
+This ModuleClass provides the capabilities to represent a number. It also has capabilities for controlled increment and decrement a counter. It can be used to present a number-related functionality in a technology where there is only a weak semantic specification of that functionality. 
 
 **Table 5.3.1.55-1: Actions of numberValue ModuleClass**
 
@@ -1300,8 +1184,6 @@ This ModuleClass provides the capabilities to represent a number. It also has ca
 |none |resetNumberValue |none |true |Reset the "numberValue" to its "defaultValue". |
 
 
-
-
 **Table 5.3.1.55-2: DataPoints of numberValue ModuleClass**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
@@ -1314,10 +1196,9 @@ This ModuleClass provides the capabilities to represent a number. It also has ca
 
 
 
-
 #### 5.3.1.56 openLevel
-This ModuleClass provides the capabilities to control and monitor the open status of an entity, for example a curtain.
 
+This ModuleClass provides the capabilities to control and monitor the open status of an entity, for example a curtain.
 
 **Table 5.3.1.56-1: Actions of openLevel ModuleClass**
 
@@ -1327,8 +1208,6 @@ This ModuleClass provides the capabilities to control and monitor the open statu
 |none |close |None |true |Decrease the open level by the amount of the "stepValue" down to the "minLevel". |
 
 
-
-
 **Table 5.3.1.56-2: DataPoints of openLevel ModuleClass**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
@@ -1339,11 +1218,9 @@ This ModuleClass provides the capabilities to control and monitor the open statu
 |maxLevel |xs:integer |RW |true | |The maximum value allowed for the "openLevel" status. The default value is 100, which means fully opened. |
 
 
-
-
 #### 5.3.1.57 operationMode
-This ModuleClasses provides capabilities to control or monitor the operation mode of appliances.
 
+This ModuleClasses provides capabilities to control or monitor the operation mode of appliances.
 
 **Table 5.3.1.57-1: DataPoints of operationMode ModuleClass**
 
@@ -1352,9 +1229,8 @@ This ModuleClasses provides capabilities to control or monitor the operation mod
 |startPause |xs:boolean |RW |false | |A value of "True" triggers or starts an operation, and "False" pauses the operation. |
 
 
-
-
 #### 5.3.1.58 overcurrentSensor
+
 This ModuleClass provides capabilities for an over-current sensor. 
 
 **Table 5.3.1.58-1: DataPoints of overcurrentSensor ModuleClass**
@@ -1366,11 +1242,9 @@ This ModuleClass provides capabilities for an over-current sensor.
 |duration |xs:float |R |true |ms |The duration of the detected over-current. |
 
 
-
-
 #### 5.3.1.59 oximeter
-This ModuleClass provides the capability to report the measurement of blood oxygen characteristics. 
 
+This ModuleClass provides the capability to report the measurement of blood oxygen characteristics. 
 
 **Table 5.3.1.59-1: DataPoints of oximeter ModuleClass**
 
@@ -1379,11 +1253,9 @@ This ModuleClass provides the capability to report the measurement of blood oxyg
 |oxygenSaturation |xs:integer |R |false |pct |The measurement of oxygen saturation by Oximeter.  |
 
 
-
-
 #### 5.3.1.60 ozoneMeter
-This ModuleClass provides capabilities for an ozone meter. The "ozoneValue..." attributes are optional, but one of them SHALL be provided.
 
+This ModuleClass provides capabilities for an ozone meter. The "ozoneValue..." attributes are optional, but one of them SHALL be provided.
 
 **Table 5.3.1.60-1: DataPoints of ozoneMeter ModuleClass**
 
@@ -1395,11 +1267,9 @@ This ModuleClass provides capabilities for an ozone meter. The "ozoneValue..." a
 |maxValue |xs:float |R |true | |The maximum value shows the measurement range of the ozone meter (for example maxValue=5 means the range is 0 to 5 ppm). This attribute is only used that the ozone meter provides "ppm" value. |
 
 
-
-
 #### 5.3.1.61 magneticSensorParameters
-This ModuleClass provides capabilities to set service parameters for parking detectors. 
 
+This ModuleClass provides capabilities to set service parameters for parking detectors. 
 
 **Table 5.3.1.61-1: DataPoints of magneticSensorParameters ModuleClass**
 
@@ -1412,6 +1282,7 @@ This ModuleClass provides capabilities to set service parameters for parking det
 
 
 #### 5.3.1.62 parkingStatus
+
 This ModuleClass provides the status of the parking detector.
 
 **Table 5.3.1.62-1: DataPoints of parkingStatus ModuleClass**
@@ -1422,6 +1293,7 @@ This ModuleClass provides the status of the parking detector.
 
 
 #### 5.3.1.63 periodicalReportConfig
+
 This ModuleClass provides capabilities to set parameters of periodic report.
 
 **Table 5.3.1.63-1: DataPoints of periodicalReportConfig ModuleClass**
@@ -1434,10 +1306,9 @@ This ModuleClass provides capabilities to set parameters of periodic report.
 |retryInterval |xs:integer |RW |true |s |The minimum time interval between each message transmission retry. |
 
 
-
 #### 5.3.1.64 phoneCall
-This ModuleClass provides the capability get or set the caller and recipient IDs as well as to initiate and terminate a call.
 
+This ModuleClass provides the capability get or set the caller and recipient IDs as well as to initiate and terminate a call.
 
 **Table 5.3.1.64-1: Actions of phoneCall ModuleClass**
 
@@ -1448,8 +1319,6 @@ This ModuleClass provides the capability get or set the caller and recipient IDs
 |none |hangup |none |true |Hangup an established call. |
 
 
-
-
 **Table 5.3.1.64-2: DataPoints of phoneCall ModuleClass**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
@@ -1459,11 +1328,9 @@ This ModuleClass provides the capability get or set the caller and recipient IDs
 |callState |[hd:enumCallState](#566-hdenumcallstate) |R |true | |This data point represents the current state of an associated phone device regarding calls. |
 
 
-
-
 #### 5.3.1.65 playerControl
-This ModuleClass provides capabilities to control and monitor the operational modes of a media player functionality.
 
+This ModuleClass provides capabilities to control and monitor the operational modes of a media player functionality.
 
 **Table 5.3.1.65-1: Actions of playerControl ModuleClass**
 
@@ -1473,8 +1340,6 @@ This ModuleClass provides capabilities to control and monitor the operational mo
 |none |previousTrack |none |true |Go back to a previous chapter, section or similar marker in the media. |
 
 
-
-
 **Table 5.3.1.65-2: DataPoints of playerControl ModuleClass**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
@@ -1485,12 +1350,9 @@ This ModuleClass provides capabilities to control and monitor the operational mo
 |speedFactor |xs:float |RW |true | |The optional factor of speeding up or slowing down playback, rewind or fast forward. |
 
 
-
-
 #### 5.3.1.66 powerSave
 This ModuleClass provides capabilities to enable the power saving mode of a device and monitor the current status.
 
-
 **Table 5.3.1.66-1: DataPoints of powerSave ModuleClass**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
@@ -1498,11 +1360,9 @@ This ModuleClass provides capabilities to enable the power saving mode of a devi
 |powerSaveEnabled |xs:boolean |RW |false | |The current status of the power saving mode. "True" indicates enabled, and "False" indicates not enabled. |
 
 
-
-
 #### 5.3.1.67 printQueue
-This ModuleClass provides the capabilities for monitoring printing list information. 
 
+This ModuleClass provides the capabilities for monitoring printing list information. 
 
 **Table 5.3.1.67-1: DataPoints of printQueue ModuleClass**
 
@@ -1512,9 +1372,8 @@ This ModuleClass provides the capabilities for monitoring printing list informat
 |printingState |list of [hd:enumJobState](#5623-hdenumjobstate) |R |false | |The printingState is indicating the status of the printing file. <br><mark>Editor Note: Better mapping explanation needed. This doesn't seem to be the same as the usual list of enums used in other ModuleClasses</mark> |
 
 
-
-
 #### 5.3.1.68 pulsemeter
+
 This ModuleClass provides the capability to report the measurement of pulse characteristics. 
 
 **Table 5.3.1.68-1: DataPoints of pulsemeter ModuleClass**
@@ -1527,11 +1386,9 @@ This ModuleClass provides the capability to report the measurement of pulse char
 |modality |xs:string |R |true | |The modality of a particular SpO2 measurement. |
 
 
-
-
 #### 5.3.1.69 pushButton
-This ModuleClass provides the capability to indicate the operation of a push button style switch. A typical application can be an SOS button.
 
+This ModuleClass provides the capability to indicate the operation of a push button style switch. A typical application can be an SOS button.
 
 **Table 5.3.1.69-1: DataPoints of pushButton ModuleClass**
 
@@ -1540,11 +1397,9 @@ This ModuleClass provides the capability to indicate the operation of a push but
 |pushed |xs:boolean |R |false | |This data point indicates the press of the button. |
 
 
-
-
 #### 5.3.1.70 recorder
-This ModuleClass provides the capability to record video/audio for a defined duration.
 
+This ModuleClass provides the capability to record video/audio for a defined duration.
 
 **Table 5.3.1.70-1: DataPoints of recorder ModuleClass**
 
@@ -1553,11 +1408,9 @@ This ModuleClass provides the capability to record video/audio for a defined dur
 |duration |xs:integer |RW |false |s |The duration for video/audio recording. Set to trigger the recorder.  |
 
 
-
-
 #### 5.3.1.71 refrigeration
-This ModuleClass provides capabilities for a refrigeration function.
 
+This ModuleClass provides capabilities for a refrigeration function.
 
 **Table 5.3.1.71-1: DataPoints of refrigeration ModuleClass**
 
@@ -1570,11 +1423,9 @@ This ModuleClass provides capabilities for a refrigeration function.
 |degerm |xs:boolean |RW |true | |Controls the degerm cycle. "True" indicates active, "False" indicates inactive. |
 
 
-
-
 #### 5.3.1.72 relativeHumidity
-This ModuleClass provides the capability for a device to report the humidity based on a specified rule that is vendor dependent.
 
+This ModuleClass provides the capability for a device to report the humidity based on a specified rule that is vendor dependent.
 
 **Table 5.3.1.72-1: DataPoints of relativeHumidity ModuleClass**
 
@@ -1584,11 +1435,9 @@ This ModuleClass provides the capability for a device to report the humidity bas
 |desiredHumidity |xs:float |RW |true |pct |Desired value for humidity. This data point indicates the desired humidity. |
 
 
-
-
 #### 5.3.1.73 remoteControlEnable
-This ModuleClasses provides capabilities to monitor the remote controllability of the appliance. 
 
+This ModuleClasses provides capabilities to monitor the remote controllability of the appliance. 
 
 **Table 5.3.1.73-1: DataPoints of remoteControlEnable ModuleClass**
 
@@ -1597,11 +1446,9 @@ This ModuleClasses provides capabilities to monitor the remote controllability o
 |remoteControlEnabled |xs:boolean |R |false | |This data point enables or disables remote controllability and is set by a user locally. "True" indicates  enabled remote access, and "False" indicates disabled remote access. |
 
 
-
-
 #### 5.3.1.74 robotCleanerJobMode
-This ModuleClasses provides capabilities to control and monitor the job modes of a robotCleaner.
 
+This ModuleClasses provides capabilities to control and monitor the job modes of a robotCleaner.
 
 **Table 5.3.1.74-1: DataPoints of robotCleanerJobMode ModuleClass**
 
@@ -1612,11 +1459,9 @@ This ModuleClasses provides capabilities to control and monitor the job modes of
 |jobModes |list of [hd:enumRobotCleanerJobMode](#5628-hdenumrobotcleanerjobmode) |R |false | |List of possible job states the device supports (see clause [5.6.28](#5628-hdenumrobotcleanerjobmode)). |
 
 
-
-
 #### 5.3.1.75 runState
-This ModuleClasses provides capabilities to control and the monitor machine state of appliances.
 
+This ModuleClasses provides capabilities to control and the monitor machine state of appliances.
 
 **Table 5.3.1.75-1: DataPoints of runState ModuleClass**
 
@@ -1629,11 +1474,9 @@ This ModuleClasses provides capabilities to control and the monitor machine stat
 |progressPercentage |xs:float |R |true |pct |The indication of current job progress in percentage. |
 
 
-
-
 #### 5.3.1.76 securityMode
-This ModuleClasses provides capabilities to control and monitor a security mode.
 
+This ModuleClasses provides capabilities to control and monitor a security mode.
 
 **Table 5.3.1.76-1: DataPoints of securityMode ModuleClass**
 
@@ -1643,11 +1486,9 @@ This ModuleClasses provides capabilities to control and monitor a security mode.
 |securityModes |list of [hd:enumSecurityMode](#5629-hdenumsecuritymode) |R |false | |List of possible security modes the device supports (see clause [5.6.29](#5629-hdenumsecuritymode)). |
 
 
-
-
 #### 5.3.1.77 sessionDescription
-This ModuleClass provides the capabilities for a sessionDescription containing a URL at which the specified media can be accessed and the definition of media using SDP.
 
+This ModuleClass provides the capabilities for a sessionDescription containing a URL at which the specified media can be accessed and the definition of media using SDP.
 
 **Table 5.3.1.77-1: DataPoints of mediaType ModuleClass**
 
@@ -1657,11 +1498,9 @@ This ModuleClass provides the capabilities for a sessionDescription containing a
 |sdp |xs:string |R |true | |Media description using SDP. One or more comma separated multiple SDP lines (SDP media or attribute line) can be included using SDP description syntax as defined in the SDP specification in IETF RFC4566 <a href="#_ref_16">[16]</a>. |
 
 
-
-
 #### 5.3.1.78 signalStrength
-This ModuleClass provides the capability to monitor the strength of the signal.
 
+This ModuleClass provides the capability to monitor the strength of the signal.
 
 **Table 5.3.1.78-1: DataPoints of signalStrength ModuleClass**
 
@@ -1670,10 +1509,11 @@ This ModuleClass provides the capability to monitor the strength of the signal.
 |lqi |xs:integer |R |false |pct |The current value of link quality indicator, which reflects the scaling of rssi by dividing the received signal strength over reference signal strength. The common unit for lqi is percentage [0,100]. For the detailed definition, see IEEE 802.15.4 <a href="#_ref_i.4">[i.4]</a>, clause 6.7.8. |
 |rssi |xs:float |R |true | |The current value of received signal strength indicator, which reflects the raw signal level. |
 
-NOTE: Need further study for this module class.
+<mark>Editor Note: Need further study for this module class.</mark>
 
 
 #### 5.3.1.79 slcAlarm
+
 This ModuleClass provides capabilities to provide alarm information of street light controller. 
 
 **Table 5.3.1.79-1: DataPoints of slcAlarm ModuleClass**
@@ -1698,6 +1538,7 @@ This ModuleClass provides capabilities to provide alarm information of street li
 
 
 #### 5.3.1.80 slcParameterSetting
+
 This ModuleClass provides capabilities to set service parameters. 
 
 **Table 5.3.1.80-1: DataPoints of slcParameterSetting ModuleClass**
@@ -1712,6 +1553,7 @@ This ModuleClass provides capabilities to set service parameters.
 
 
 #### 5.3.1.81 slcReportInfo
+
 This ModuleClass provides information of status of the street light controller.
 
 **Table 5.3.1.81-1: DataPoints of slcReportInfo ModuleClass**
@@ -1734,8 +1576,8 @@ This ModuleClass provides information of status of the street light controller.
 
 
 #### 5.3.1.82 smokeSensor
-This ModuleClass provides the capabilities to indicate the detection of smoke and raising an alarm if the triggering criterion is met. 
 
+This ModuleClass provides the capabilities to indicate the detection of smoke and raising an alarm if the triggering criterion is met. 
 
 **Table 5.3.1.82-1:: Actions of smokeSensor ModuleClass**
 
@@ -1745,8 +1587,6 @@ This ModuleClass provides the capabilities to indicate the detection of smoke an
 |none |test |none |true |Testing the alarm |
 
 
-
-
 **Table 5.3.1.82-2: DataPoints of smokeSensor ModuleClass**
 
 |Name |Type |R-W |Optional |Unit |Documentation |
@@ -1761,11 +1601,9 @@ This ModuleClass provides the capabilities to indicate the detection of smoke an
 |powerOn |xs:boolean |R |true | |"True" indicates the smoke sensor is powered on. "False" is invalid. |
 
 
-
-
 #### 5.3.1.83 sphygmomanometer
-This ModuleClass provides the capability to report the measurement of blood pressure characteristics. 
 
+This ModuleClass provides the capability to report the measurement of blood pressure characteristics. 
 
 **Table 5.3.1.83-1: DataPoints of sphygmomanometer ModuleClass**
 
@@ -1776,11 +1614,9 @@ This ModuleClass provides the capability to report the measurement of blood pres
 |meanPressure |xs:float |R |false |mmHg |The measurement of mean arterial pressure by sphygmomanometer.  |
 
 
-
-
 #### 5.3.1.84 spinLevel
-This ModuleClass provides capabilities to control and monitor the level of spin. It is intended to be part of devices which use spinning function such as a washing machine and a dryer.
 
+This ModuleClass provides capabilities to control and monitor the level of spin. It is intended to be part of devices which use spinning function such as a washing machine and a dryer.
 
 **Table 5.3.1.84-1: DataPoints of spinLevel ModuleClass**
 
@@ -1789,11 +1625,9 @@ This ModuleClass provides capabilities to control and monitor the level of spin.
 |spinLevelStrength |[hd:enumSpinLevelStrength](#5630-hdenumspinlevelstrength) |RW |false | |The value of spin-dry level (see clause [5.6.30](#5630-hdenumspinlevelstrength)). A higher value indicates a higher spin level. |
 
 
-
-
 #### 5.3.1.85 steamClosetJobMode
-This ModuleClasses provides capabilities to control and monitor the job modes of steamCloset.
 
+This ModuleClasses provides capabilities to control and monitor the job modes of steamCloset.
 
 **Table 5.3.1.85-1: DataPoints of steamClosetJobMode ModuleClass**
 
@@ -1804,11 +1638,9 @@ This ModuleClasses provides capabilities to control and monitor the job modes of
 |jobModes |list of [hd:enumSteamClosetJobMode](#5631-hdenumsteamclosetjobmode) |R |false | |List of possible job states the device supports (see clause [5.6.31](#5631-hdenumsteamclosetjobmode)). |
 
 
-
-
 #### 5.3.1.86 televisionChannel
-This ModuleClass provides capabilities to set and get channels of a device that has a channel list.
 
+This ModuleClass provides capabilities to set and get channels of a device that has a channel list.
 
 **Table 5.3.1.86-1: Actions of televisionChannel ModuleClass**
 
@@ -1817,9 +1649,6 @@ This ModuleClass provides capabilities to set and get channels of a device that
 |none |upChannel |None |true |Change the current channel to the next channel in the stored list of available channels. If the current channel is the last one in the list, the new set channel may be the first one in the list. |
 |none |downChannel |None |true |Change the current channel to the previous channel in the stored list of available channels. If the current channel is the first one in the list, the new set channel may be the last one in the list. |
 
-
-
-
 **Table 5.3.1.86-2: DataPoints of televisionChannel ModuleClass**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
@@ -1830,11 +1659,9 @@ This ModuleClass provides capabilities to set and get channels of a device that
 |channelName |xs:string |R |true | |Current human-friendly channel name in string, for example 'CNN'. |
 
 
-
-
 #### 5.3.1.87 temperature
-This ModuleClass provides capabilities to represent the current temperature and target temperature of devices such as an air conditioner, refrigerator, oven, etc.
 
+This ModuleClass provides capabilities to represent the current temperature and target temperature of devices such as an air conditioner, refrigerator, oven, etc.
 
 **Table 5.3.1.87-1: DataPoints of temperature ModuleClass**
 
@@ -1849,6 +1676,7 @@ This ModuleClass provides capabilities to represent the current temperature and
 
 
 #### 5.3.1.88 temperatureAlarm
+
 This ModuleClass provides the capabilities to indicate the detection of abnormal temperatures and raises an alarm if the triggering criterion is met. 
 
 **Table 5.3.1.88-1: DataPoints of temperatureAlarm ModuleClass**
@@ -1865,8 +1693,8 @@ This ModuleClass provides the capabilities to indicate the detection of abnormal
 
 
 #### 5.3.1.89 textMessage
-This ModuleClass provides capabilities to set and get a text message.
 
+This ModuleClass provides capabilities to set and get a text message.
 
 **Table 5.3.1.89-1: Actions of textMessage ModuleClass**
 
@@ -1874,9 +1702,6 @@ This ModuleClass provides capabilities to set and get a text message.
 |-|-|-|-|-|
 |none |resetTextMessage |none |true |Reset  the receiver of the message to the "defaultValue". |
 
-
-
-
 **Table 5.3.1.89-2: DataPoints of textMessage ModuleClass**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
@@ -1889,11 +1714,9 @@ This ModuleClass provides capabilities to set and get a text message.
 |defaultValue |xs:string |RW |true | |The optional default value for "textMessage". The default is an empty string. |
 
 
-
-
 #### 5.3.1.90 timer
-This ModuleClass provides capabilities to monitor and control the times when the appliance executes its operations, that means when it starts, when it ends etc.
 
+This ModuleClass provides capabilities to monitor and control the times when the appliance executes its operations, that means when it starts, when it ends etc.
 
 **Table 5.3.1.90-1: Actions of timer ModuleClass**
 
@@ -1902,9 +1725,6 @@ This ModuleClass provides capabilities to monitor and control the times when the
 |none |activateClockTimer |None |true |Activate current clock timer. |
 |none |deactivateClockTimer |None |true |Deactivate current clock timer. |
 
-
-
-
 **Table 5.3.1.90-2: DataPoints of timer ModuleClass**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
@@ -1919,11 +1739,9 @@ This ModuleClass provides capabilities to monitor and control the times when the
 |absoluteStopTime |m2m:timestamp |RW |true | |An absolute time to specify the stop time. |
 
 
-
-
 #### 5.3.1.91 turbo
-This ModuleClass provides capabilities to enable turbo mode and monitor the current status of the turbo function. It is intended to be part of devices which use turbo function such as an air conditioner, a washing machine, etc.
 
+This ModuleClass provides capabilities to enable turbo mode and monitor the current status of the turbo function. It is intended to be part of devices which use turbo function such as an air conditioner, a washing machine, etc.
 
 **Table 5.3.1.91-1: DataPoints of turbo ModuleClass**
 
@@ -1932,11 +1750,9 @@ This ModuleClass provides capabilities to enable turbo mode and monitor the curr
 |turboEnabled |xs:boolean |RW |false | |The current status of the turbo mode. "True" indicates enabled, and "False" indicates not enabled. |
 
 
-
-
 #### 5.3.1.92 uvSensor
-This ModuleClass describes the capabilities of an ultraviolet sensor. 
 
+This ModuleClass describes the capabilities of an ultraviolet sensor. 
 
 **Table 5.3.1.92-1: DataPoints of uvSensor ModuleClass**
 
@@ -1946,11 +1762,9 @@ This ModuleClass describes the capabilities of an ultraviolet sensor.
 |uvStatus |[hd:enumUvStatus](#5635-hdenumuvstatus) |R |true | |The "uvStatus" indicates the level of the UV radiation status (see clause [5.6.35](#5635-hdenumuvstatus)).  |
 
 
-
-
 #### 5.3.1.93 waterFlow
-This ModuleClass provides capabilities for controlling the water strength of a device.
 
+This ModuleClass provides capabilities for controlling the water strength of a device.
 
 **Table 5.3.1.93-1: DataPoints of waterFlow ModuleClass**
 
@@ -1958,8 +1772,6 @@ This ModuleClass provides capabilities for controlling the water strength of a d
 |-|-|-|-|-|-|
 |waterLevelStrength |[hd:enumWaterFlowStrength](#5637-hdenumwaterflowstrength) |RW |false | |The desired level of water flow (see clause [5.6.37](#5637-hdenumwaterflowstrength)). A higher value indicates higher water flow. |
 
-
-
 #### 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. 
 
@@ -2002,6 +1814,7 @@ 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.
 
 **Table 5.3.1.95-1: DataPoints of waterMeterReportInfo ModuleClass**
@@ -2028,8 +1841,8 @@ 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. 
 
+This ModuleClass provides capabilities to set service parameters for data sampling and reporting. 
 
 **Table 5.3.1.96-1: DataPoints of waterMeterSetting ModuleClass**
 
@@ -2045,8 +1858,8 @@ This ModuleClass provides capabilities to set service parameters for data sampli
 
 
 #### 5.3.1.97 waterSensor
-This ModuleClass provides the capabilities to indicate whether or not water has been sensed, and raising an alarm if the triggering criterion is met. 
 
+This ModuleClass provides the capabilities to indicate whether or not water has been sensed, and raising an alarm if the triggering criterion is met. 
 
 **Table 5.3.1.97-1: DataPoints of waterSensor ModuleClass**
 
@@ -2054,9 +1867,8 @@ This ModuleClass provides the capabilities to indicate whether or not water has
 |-|-|-|-|-|-|
 |alarm |xs:boolean |R |false | |The detection of water.<br />The alarm is indicated as follows:<br />"True" indicates that water has been detected, "False" indicates a normal status, that means that water is not detected. |
 
-
-
 #### 5.3.1.98 waterQualityMonitor
+
 This ModuleClass provides the information of water quality detection.
 
 **Table 5.3.1.98-1: DataPoints of waterQualityMonitor ModuleClass**
@@ -2094,10 +1906,9 @@ This ModuleClass provides the information of water quality detection.
 |zn |xs:float |R |true |mg/L |Zinc (Zn) |
 
 
-
 #### 5.3.1.99 weight
-This ModuleClass provides the capability to report the measurement of weight.
 
+This ModuleClass provides the capability to report the measurement of weight.
 
 **Table 5.3.1.99-1: DataPoints of weight ModuleClass**
 
@@ -2108,6 +1919,7 @@ This ModuleClass provides the capability to report the measurement of weight.
 
 
 #### 5.3.1.100 anemometer
+
 This ModuleClass provides the capabilities to indicate the measure of the wind speed.
 
 **Table 5.3.1.100-1: DataPoints of anemometer ModuleClass**
@@ -2139,7 +1951,6 @@ This ModuleClass provides the capabilities to measure the height of fallen rain.
 |-|-|-|-|-|
 |none |resetGauge |none |false |Empty the water container. Set the height value to 0. |
 
-
 **Table 5.3.1.102-2: DataPoints of rainGauge ModuleClass**
 
 |Name |Type |R/W |Optional |Unit |Documentation |
@@ -2148,6 +1959,7 @@ This ModuleClass provides the capabilities to measure the height of fallen rain.
 
 
 #### 5.3.1.103 infraredSensor
+
 This ModuleClass provides the capabilities to indicate whether or not an object has been sensed.
 
 **Table 5.3.1.103-1: DataPoints of infraredSensor ModuleClass**
@@ -2170,6 +1982,7 @@ This ModuleClass provides capabilities to control the status of the disposing fu
 
 
 #### 5.3.1.105 waterFilterType
+
 This ModuleClass indicates the type of the water purifier.
 
 **Table 5.3.1.105-1: DataPoints of waterFilterType ModuleClass**
@@ -2191,6 +2004,7 @@ This ModuleClass provides the capability to get selections of a user from the pr
 
 
 #### 5.3.1.107 prePaidCardReader
+
 The Pre-paid card reader ModuleClass provides functions to read NFC card and indicates its information.
 **Table 5.3.1.107-1: DataPoints of prePaidCardReader ModuleClass**
 
@@ -2202,8 +2016,8 @@ The Pre-paid card reader ModuleClass provides functions to read NFC card and ind
 |currency |xs:string |R |true | |The currency is depended on the country which the card is used.<br />For example, the unit could be "Dollar" or "$" in US, "Euro" in EU and "Won" in Korea. |
 
 
-
 #### 5.3.1.108 billDeposit
+
 This ModuleClass provides the capability to deposit bills, indicates the balance of the deposited bills and detects fakes.
 
 **Table 5.3.1.108-1: DataPoints of billDeposit ModuleClass**
@@ -2218,6 +2032,7 @@ This ModuleClass provides the capability to deposit bills, indicates the balance
 
 
 #### 5.3.1.109 billWithdrawal
+
 This ModuleClass provides the capability to withdraw bills which are deposited by the [billDeposit](#531108-billdeposit) ModuleClass.
 
 **Table 5.3.1.109-1: DataPoints of billWithdrawal ModuleClass**
@@ -2230,6 +2045,7 @@ This ModuleClass provides the capability to withdraw bills which are deposited b
 
 
 #### 5.3.1.110 coinDeposit
+
 This ModuleClass provides the capability to deposit coins, indicates the balance of the deposited coins and detects fakes.
 
 **Table 5.3.1.110-1: DataPoints of coinDeposit ModuleClass**
@@ -2243,8 +2059,8 @@ This ModuleClass provides the capability to deposit coins, indicates the balance
 |fakeStatus |xs:boolean |R |false | |This data point indicates that the deposited coins are fake. |
 
 
-
 #### 5.3.1.111 cashDispenser
+
 This ModuleClass provides the capability to withdraw designated amount of cash or returns all the deposited bills and coins by the [billDeposit](#531108-billdeposit) ModuleClass and [coinDeposit](#531110-coindeposit) ModuleClass.
 
 **Table 5.3.1.111-1: DataPoints of cashDispenser ModuleClass**
@@ -2258,6 +2074,7 @@ This ModuleClass provides the capability to withdraw designated amount of cash o
 
 
 #### 5.3.1.112 cardScanner
+
 This ModuleClass provides the capability to scan an image of a card, gets the card information from the image and provides the information.
 
 **Table 5.3.1.112-1: DataPoints of cardScanner ModuleClass**
@@ -2268,8 +2085,8 @@ This ModuleClass provides the capability to scan an image of a card, gets the ca
 |cardInfo |xs:string |R |false | |The card information is a string value.  |
 
 
-
 #### 5.3.1.113 headingSensor
+
 This ModuleClass provides the capabilities to indicate the heading (e.g. status of get-in and get-out) of a pedestrian or a vehicle which crossing a control point (e.g. entrance and gate).
 
 **Table 5.3.1.113-1: DataPoints of headingSensor ModuleClass**
@@ -2281,6 +2098,7 @@ This ModuleClass provides the capabilities to indicate the heading (e.g. status
 
 
 #### 5.3.1.114 signalPanel
+
 This ModuleClass displays a signal (e.g. direction arrow) to indicate a gate is permitted to get-in or get-out on a panel.
 
 **Table 5.3.1.114-1: DataPoints of signalPanel ModuleClass**
@@ -2291,6 +2109,7 @@ This ModuleClass displays a signal (e.g. direction arrow) to indicate a gate is
 
 
 #### 5.3.1.115 crossingBarrier
+
 An active barrier is used to block a pedestrian or vehicle from a control point (e.g. entrance and gate).
 
 **Table 5.3.1.115-1: DataPoints of crossingBarrier ModuleClass**
@@ -2303,6 +2122,7 @@ An active barrier is used to block a pedestrian or vehicle from a control point
 
 
 #### 5.3.1.116 threeDDisplay
+
 This ModuleClass provides capabilities to give the information of a 3D display.
 
 **Table 5.3.1.116-1: DataPoints of threeDDisplay ModuleClass**
@@ -2317,6 +2137,7 @@ This ModuleClass provides capabilities to give the information of a 3D display.
 
 
 #### 5.3.1.117 threeDScanner
+
 This ModuleClass provides the capability to scanning 3D object for the user.
 
 **Table 5.3.1.117-1: DataPoints of threeDScanner ModuleClass**
@@ -2331,6 +2152,7 @@ This ModuleClass provides the capability to scanning 3D object for the user.
 
 
 #### 5.3.1.118 blender
+
 This ModuleClass is for controlling a blender, for example in a juicer. 
 
 **Table 5.3.1.118-1: DataPoints of blender ModuleClass**
@@ -2342,6 +2164,7 @@ This ModuleClass is for controlling a blender, for example in a juicer.
 
 
 #### 5.3.1.119 shoesWasherJobMode
+
 This ModuleClasses provides capabilities to control and monitor the job modes of a shoesWasher.
 
 **Table 5.3.1.119-1: DataPoints: DataPoints of shoesWasherJobMode ModuleClass**
@@ -2355,23 +2178,28 @@ This ModuleClasses provides capabilities to control and monitor the job modes of
 
 ### 5.3.2 City Domain
 
-<mark>For further studies.</mark>
+None.
+
 
 ### 5.3.3 Health Domain
 
-<mark>For further studies.</mark>
+None.
+
 
 ### 5.3.4 Home Domain
 
-<mark>For further studies.</mark>
+None.
+
 
 ### 5.3.5 Industry Domain
 
-<mark>For further studies.</mark>
+None.
+
 
 ### 5.3.6 Vehicular Domain
 
-<mark>For further studies.</mark>
+None.
+
 
 ### 5.3.7 Agriculture Domain
 
@@ -2390,6 +2218,7 @@ This ModuleClass provides capabilities to measure activity data in terms of step
 ### 5.3.8 Railway Domain
 
 #### 5.3.8.1 baliseTransmissionModule
+
 A balise is an electronic beacon or transponder placed between the rails of a railway as part of an Automatic Train Protection (ATP) system.
 
 The Balise Transmission Module(BTM) ModuleClasses provides capabilities to indicate and to get balise information.
@@ -2405,8 +2234,8 @@ The Balise Transmission Module(BTM) ModuleClasses provides capabilities to indic
 ### 5.3.9 Metadata Domain
 
 #### 5.3.9.1 features
-This ModuleClass provides metadata information on the parent device.
 
+This ModuleClass provides metadata information on the parent device.
 
 **Table 5.3.9.1-1: DataPoints of features ModuleClass**
 
@@ -2420,8 +2249,8 @@ This ModuleClass provides metadata information on the parent device.
 
 
 #### 5.3.9.2 location
-This ModuleClass provides information on the location of the parent device.
 
+This ModuleClass provides information on the location of the parent device.
 
 **Table 5.3.9.2-1: DataPoints of location ModuleClass**
 
@@ -2434,6 +2263,7 @@ This ModuleClass provides information on the location of the parent device.
 
 
 #### 5.3.9.3 localization
+
 This ModuleClass provides capabilities for localizing friendly names.
 
 **Table 5.3.9.3-1: DataPoints of localization ModuleClass**
@@ -2447,8 +2277,8 @@ This ModuleClass provides capabilities for localizing friendly names.
 
 
 #### 5.3.9.4 origin
-This ModuleClass provides information on the origin of the parent device data.
 
+This ModuleClass provides information on the origin of the parent device data.
 
 **Table 5.3.9.4-1: DataPoints of origin ModuleClass**
 
@@ -2459,11 +2289,10 @@ This ModuleClass provides information on the origin of the parent device data.
 |dataSourceID |xs:string |R |true | |ID of the data source that created the original data |
 
 
-
-
 ### 5.3.10 Public Safety Domain
 
 #### 5.3.10.1 disseminator
+
 This ModuleClass provides the capability of creating oneM2M based information from CAP based information received from oneM2M SP Gateway (ASN) and of controlling the change of received public warning messages such as updating oneM2M based information and cancelling the dissemination of oneM2M based information.
 
 **Table 5.3.10.1-1: Actions of disseminator ModuleClass**
@@ -2498,6 +2327,7 @@ This ModuleClass provides the capability of creating oneM2M based information fr
 
 
 #### 5.3.10.2 emergencyHandler
+
 This ModuleClass provides the capability of triggering things to change into an emergency mode and of enabling things to identify whether an event described in oneM2M based information that is received from Public Warning Center (MN) is relevant to things. If any change happens in received warning messages such as updating oneM2M based information and cancelling the dissemination of oneM2M based information of previously received public warning messages, this ModuleClass updates oneM2M based information corresponding to those received public warning messages to control behaviour of things.
 
 **Table 5.3.10.2-1: DataPoints of emergencyHandler ModuleClass**
@@ -2524,17 +2354,20 @@ This ModuleClass provides the capability of triggering things to change into an
 
 
 #### 5.3.10.3 settings
+
 This ModuleClass provides the capability of selecting the option that allows things to decide to take action as receiving oneM2M based information of public warning messages.
 
 <mark>Editor note: For discussion: this MC has the wrong name.</mark>
 
 **Table 5.3.10.3-1: DataPoints of settings ModuleClass**
 
-|Name |Type |R/W |Optional |Unit |Documentation |
-|-|-|-|-|-|-|
-|optoutStatus |xs:boolean |RW |false | |This specifies the opt-out state for the device. The value of this DataPoint specifies opt-out state. True means that this device does not want to response when a warning has been triggered. |
-
-  NOTE: Opt-out refers to 3GPP TS 22.268 <a href="#_ref_i.14">[i.14]</a> Public Warning System (PWS) requirements specification.
++-------------+-----------+-----+---------+-----+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+|Name         |Type       |R/W  |Optional |Unit |Documentation                                                                                                                                                                                  |
++:============+:==========+:====+:========+:====+:==============================================================================================================================================================================================+
+|optoutStatus |xs:boolean |RW   |false    |     |This specifies the opt-out state for the device. The value of this DataPoint specifies opt-out state. True means that this device does not want to response when a warning has been triggered. |
++-------------+-----------+-----+---------+-----+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| NOTE: Opt-out refers to 3GPP TS 22.268 [\[i.14\]](#_ref_i.14) Public Warning System (PWS) requirements specification.                                                                                                                         |
++-------------+-----------+-----+---------+-----+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 
 
 ## 5.4 SubDevice models
@@ -2543,11 +2376,9 @@ This ModuleClass provides the capability of selecting the option that allows thi
 
 #### 5.4.1.1 Void
 
-
-
 #### 5.4.1.2 subDevicePowerOutlet
-A powerOutlet is a subDevice that specifies the attachment device for [deviceSmartPlug](#55111-devicesmartplug).
 
+A powerOutlet is a subDevice that specifies the attachment device for [deviceSmartPlug](#55111-devicesmartplug).
 
 **Table 5.4.1.2-1: Modules of subDevicePowerOutlet model**
 
@@ -2559,16 +2390,16 @@ A powerOutlet is a subDevice that specifies the attachment device for [deviceSma
 |dimmingLevel |[numberValue](#53155-numbervalue) |0..1 |See clause [5.3.1.55](#53155-numbervalue).<br />This provides the capability to change the energy. |
 
 
-
 ### 5.4.2 City Domain
 
-<mark>For further studies.</mark>
+None.
+
 
 ### 5.4.3 Health Domain
 
 #### 5.4.3.1 subDeviceCuff
-A cuff is a subDevice that expresses the attachment device for measuring blood pressure.
 
+A cuff is a subDevice that expresses the attachment device for measuring blood pressure.
 
 **Table 5.4.3.1-1: Modules of subDeviceCuff model**
 
@@ -2579,26 +2410,25 @@ A cuff is a subDevice that expresses the attachment device for measuring blood p
 |pulsemeter |[pulsemeter](#53168-pulsemeter) |1 |See clause [5.3.1.68](#53168-pulsemeter). |
 
 
-
 ### 5.4.4 Home Domain
 
-<mark>For further studies.</mark>
+None
 
 ### 5.4.5 Industry Domain
 
-<mark>For further studies.</mark>
+None.
 
 ### 5.4.6 Vehicular Domain
 
-<mark>For further studies.</mark>
+None.
 
 ## 5.5 Device models
 
 ### 5.5.1 Common Domain
 
 #### 5.5.1.1 device3DPrinter
-A 3D printer is a smart home appliance to provide 3D printing capabilities.
 
+A 3D printer is a smart home appliance to provide 3D printing capabilities.
 
 **Table 5.5.1.1-1: Modules of device3DPrinter Device model**
 
@@ -2613,6 +2443,7 @@ A 3D printer is a smart home appliance to provide 3D printing capabilities.
 
 
 #### 5.5.1.2 deviceAirQualityMonitor
+
 An air quality monitor is an environmental monitoring device used to monitor the air quality.
 
 **Table 5.5.1.2-1: Modules of deviceAirQualityMonitor Device model**
@@ -2626,6 +2457,7 @@ An air quality monitor is an environmental monitoring device used to monitor the
 
 
 #### 5.5.1.3 deviceAudioReceiver
+
 An audio receiver is a device that receives audio signals from a number of sources, processing them to drive speakers.
 
 **Table 5.5.3.1-1: Modules of deviceAudioReceiver model**
@@ -2639,6 +2471,7 @@ An audio receiver is a device that receives audio signals from a number of sourc
 
 
 #### 5.5.1.4 deviceCamera
+
 A camera is an optical instrument for recording or capturing images, which may be stored locally or transmitted to another locations.
 
 **Table 5.5.1.4-1: Modules of deviceCamera Device model**
@@ -2651,6 +2484,7 @@ A camera is an optical instrument for recording or capturing images, which may b
 
 
 #### 5.5.1.5 deviceDoor
+
 A door is a device that is used to open and close a door.
 
 **Table 5.5.1.5-1: Modules of deviceDoor model**
@@ -2663,6 +2497,7 @@ A door is a device that is used to open and close a door.
 
 
 #### 5.5.1.6 deviceDoorLock
+
 A door lock is a device that can be used to lock, for example, a door.
 
 **Table 5.5.1.6-1: Modules of deviceDoorLock Device model**
@@ -2675,6 +2510,7 @@ A door lock is a device that can be used to lock, for example, a door.
 
 
 #### 5.5.1.7 deviceLight
+
 A light is a device that is used to control the state of an illumination appliance.
 
 **Table 5.5.1.7-1: Modules of deviceLight Device model**
@@ -2691,6 +2527,7 @@ A light is a device that is used to control the state of an illumination applian
 
 
 #### 5.5.1.8 deviceMultiFunctionPrinter
+
 A Multi Function Printer (MFP) is an office machine which incorporates the functionality of multiple devices in one, so as to have a smaller footprint in home or office. A typical MFP may act as a combination of printer, scanner and more. This MFP information model provides capabilities to control and monitor MFP specific functions and resources.
 
 **Table 5.5.1.8-1: Modules of deviceMultiFunctionPrinter Device model**
@@ -2705,6 +2542,7 @@ A Multi Function Printer (MFP) is an office machine which incorporates the funct
 
 
 #### 5.5.1.9 devicePrinter
+
 A printer is a device that is used to monitor or control the state of a printing appliance.
 
 **Table 5.5.1.9-1: Modules of devicePrinter Device model**
@@ -2717,6 +2555,7 @@ A printer is a device that is used to monitor or control the state of a printing
 
 
 #### 5.5.1.10 deviceScanner
+
 A scanner is a device that optically scans images, printed text, handwriting or an object, and converts it to a digital image.
 
 **Table 5.5.1.10-1: Modules of deviceScanner model**
@@ -2729,6 +2568,7 @@ A scanner is a device that optically scans images, printed text, handwriting or
 
 
 #### 5.5.1.11 deviceSmartPlug
+
 A smart plug is a device that can turn on and off a connected appliance.
 
 **Table 5.5.1.11-1: Modules of deviceSmartPlug model**
@@ -2748,6 +2588,7 @@ A smart plug is a device that can turn on and off a connected appliance.
 
 
 #### 5.5.1.12 deviceSwitch
+
 A switch is a device that is used to control and monitor the state of power.
 
 **Table 5.5.1.12-1deviceSwitch Device model**
@@ -2758,6 +2599,7 @@ A switch is a device that is used to control and monitor the state of power.
 
 
 #### 5.5.1.13 deviceThermometer
+
 A thermometer is a device that can be used to check, for example, the body or other temperatures.
 
 **Table 5.5.1.13-1: Modules of deviceThermoMeter Device model**
@@ -2770,6 +2612,7 @@ A thermometer is a device that can be used to check, for example, the body or ot
 
 
 #### 5.5.1.14 deviceThermostat
+
 A thermostat is used to control the ambient temperature of rooms within, for example, a house. This information model provides capabilities to interact with specific functions of thermostats.
 
 **Table 5.5.1.14-1: Modules of deviceThermostat Device model**
@@ -2782,6 +2625,7 @@ A thermostat is used to control the ambient temperature of rooms within, for exa
 
 
 #### 5.5.1.15 deviceWaterValve
+
 A water valve is a device that is used to turn the water supply ON or OFF remotely.
 
 **Table 5.5.1.15-1: Modules of waterValve Device model**
@@ -2792,6 +2636,7 @@ A water valve is a device that is used to turn the water supply ON or OFF remote
 
 
 #### 5.5.1.16 deviceServiceButton
+
 A service button is a device that initiates and controls technical or business processes, such as ordering consumer and industrial goods over the Internet. It may support optional ModuleClasses to present information to a user, such as presenting textual and graphical information.
 
 **Table 5.5.1.16-1: Modules of deviceServiceButton Device model**
@@ -2809,6 +2654,7 @@ A service button is a device that initiates and controls technical or business p
 
 
 #### 5.5.1.17 deviceGenericSensor
+
 A device that is composed of one or more basic sensors. This generic model is proposed to represent very simple appliances that feature one or more sensing behaviours (mono/multi sensors).
 
 **Table 5.5.1.17-1: Modules of deviceGenericSensor Device model**
@@ -2825,6 +2671,7 @@ A device that is composed of one or more basic sensors. This generic model is pr
 
 
 #### 5.5.1.18 device3DDisplay
+
 A 3D display is a device to display 3D contents such as 3D character or holographic image. 
 
 **Table 5.5.1.18-1: Modules of device3DDisplay Device model**
@@ -2841,6 +2688,7 @@ A 3D display is a device to display 3D contents such as 3D character or holograp
 
 
 #### 5.5.1.19 device3DScanner
+
 A 3D scanner is a device to scan 3D objects such as a statue of a character. 
 
 **Table 5.5.1.19-1: Modules of device3DScanner device model**
@@ -2857,9 +2705,9 @@ A 3D scanner is a device to scan 3D objects such as a statue of a character.
 ### 5.5.2 City Domain
 
 #### 5.5.2.1 deviceOutdoorLamp
+
 An outdoor lamp is a smart home appliance to provide lights and information for outside of home with smart sensing capabilities such as ultraviolet sensing.
 
-
 **Table 5.5.2.1-1: Modules of deviceOutdoorLamp Device model**
 
 |Module Instance Name |Module Class Name |Multiplicity |Description |
@@ -2889,6 +2737,7 @@ A parking detector is used to detect the state of the parking space. When the ve
 
 
 #### 5.5.2.3 deviceSmartElectricMeter
+
 A smart electric meter is a metering device that is used to measure consumption data for electricity.
 
 **Table 5.5.2.3-1: Modules of deviceSmartElectricMeter Device model**
@@ -2905,6 +2754,7 @@ A smart electric meter is a metering device that is used to measure consumption
 
 
 #### 5.5.2.4 deviceSmartGasMeter
+
 A smart gas meter is a metering device that is used to measure consumption data for gas.
 
 **Table 5.5.2.4-1: Modules of deviceSmartGasMeter Device model**
@@ -2921,6 +2771,7 @@ A smart gas meter is a metering device that is used to measure consumption data
 
 
 #### 5.5.2.5 deviceSmartWaterMeter
+
 A smart water meter is a metering device that is used to measure consumption data for water.
 
 **Table 5.5.2.5-1: Modules of deviceSmartWaterMeter Device model**
@@ -2938,6 +2789,7 @@ A smart water meter is a metering device that is used to measure consumption dat
 
 
 #### 5.5.2.6 deviceStreetLightController
+
 A street light controller is used to control the opening and closing of the street light.
 
 **Table 5.5.2.6-1: Modules of deviceStreetLightController Device model**
@@ -2953,6 +2805,7 @@ A street light controller is used to control the opening and closing of the stre
 
 
 #### 5.5.2.7 deviceWaterQualityMonitor
+
 A water quality monitor is an environmental monitoring device used to monitor water quality.
 
 **Table 5.5.2.7-1: Modules of deviceWaterQualityMonitor Device model**
@@ -2966,6 +2819,7 @@ A water quality monitor is an environmental monitoring device used to monitor wa
 
 
 #### 5.5.2.8 deviceWeatherStation
+
 A weather station is a device that measures various atmospheric parameters.
 
 **Table 5.5.2.8-1: Modules of deviceWeatherStation Device model**
@@ -2985,8 +2839,8 @@ A weather station is a device that measures various atmospheric parameters.
 ### 5.5.3 Health Domain
 
 #### 5.5.3.1 deviceBloodPressureMonitor
-A blood pressure monitor is a device that can be used to monitor the blood pressure and is composed of one or more cuffs and a main monitor machine.
 
+A blood pressure monitor is a device that can be used to monitor the blood pressure and is composed of one or more cuffs and a main monitor machine.
 
 **Table 5.5.3.1-1: Modules of deviceBloodPressureMonitor Device model**
 
@@ -3002,11 +2856,9 @@ A blood pressure monitor is a device that can be used to monitor the blood press
 |cuff |[subDeviceCuff](#5431-subdevicecuff) |1..N |See clause [5.4.3.1](#5431-subdevicecuff). |
 
 
-
-
 #### 5.5.3.2 deviceGlucosemeter
-A glucose meter is a device that can be used to monitor the blood glucose level.
 
+A glucose meter is a device that can be used to monitor the blood glucose level.
 
 **Table 5.5.3.2-1: Modules of deviceGlucoseMeter Device model**
 
@@ -3016,9 +2868,8 @@ A glucose meter is a device that can be used to monitor the blood glucose level.
 |battery |[battery](#53110-battery) |1 |See clause [5.3.1.10](#53110-battery). |
 
 
-
-
 #### 5.5.3.3 deviceHeartRateMonitor
+
 A heart rate monitor is a device that can be used to monitor the heart rate.
 
 **Table 5.5.3.3-1: Modules of deviceHeartRateMonitor Device model**
@@ -3029,11 +2880,9 @@ A heart rate monitor is a device that can be used to monitor the heart rate.
 |battery |[battery](#53110-battery) |1 |See clause [5.3.1.10](#53110-battery). |
 
 
-
-
 #### 5.5.3.4 devicePulseOximeter
-A pulse-oximeter is a device that can be used to monitor the blood characteristics.
 
+A pulse-oximeter is a device that can be used to monitor the blood characteristics.
 
 **Table 5.5.3.4-1: Modules of devicePulseOxiMeter Device model**
 
@@ -3044,9 +2893,8 @@ A pulse-oximeter is a device that can be used to monitor the blood characteristi
 |battery |[battery](#53110-battery) |1 |See clause [5.3.1.10](#53110-battery). |
 
 
-
-
 #### 5.5.3.5 deviceWeightScaleAndBodyCompositionAnalyser
+
 A weight scale and body composition analyser is a device that can be used to monitor the weight and body composition.
 
 **Table 5.5.3.5-1: Modules of deviceWeightScaleAndBodyCompositionAnalyser Device model**
@@ -3059,13 +2907,11 @@ A weight scale and body composition analyser is a device that can be used to mon
 |battery |[battery](#53110-battery) |1 |See clause [5.3.1.10](#53110-battery). |
 
 
-
-
 ### 5.5.4 Home Domain
 
 #### 5.5.4.1 deviceAirConditioner
-An air conditioner is a home appliance used to alter the properties of air (primarily temperature and humidity) to more comfortable conditions. This air conditioner information model provides capabilities to control and monitor air conditioner specific functions and resources.
 
+An air conditioner is a home appliance used to alter the properties of air (primarily temperature and humidity) to more comfortable conditions. This air conditioner information model provides capabilities to control and monitor air conditioner specific functions and resources.
 
 **Table 5.5.4.1-1: Modules of deviceAirConditioner Device model**
 
@@ -3087,6 +2933,7 @@ An air conditioner is a home appliance used to alter the properties of air (prim
 
 
 #### 5.5.4.2 deviceAirPurifier
+
 An airPurifier is a home appliance is used to prevent dust and other particles from air by filtering, washing or electrostatic precipitation. This airPurifier information model provides capabilities to control and monitor airPurifier specific functions and resources.
 
 **Table 5.5.4.2-1: Modules of deviceAirPurifier Device model**
@@ -3104,6 +2951,7 @@ An airPurifier is a home appliance is used to prevent dust and other particles f
 
 
 #### 5.5.4.3 deviceClothesDryer
+
 A clothes dryer is a home appliance for drying clothes. This clothesDryer information model provides capabilities to control and monitor clothes dryer specific functions and resources.
 
 **Table 5.5.4.3-1: Modules of deviceClothesDryer Device model**
@@ -3117,6 +2965,7 @@ A clothes dryer is a home appliance for drying clothes. This clothesDryer inform
 
 
 #### 5.5.4.4 deviceClothesWasher
+
 A clothes washer is a home appliance that is used to wash laundry, such as clothing and sheets. This information model provides capabilities to interact with specific functions and resources of clothes washers.
 
 **Table 5.5.4.4-1: Modules of deviceClothesWasher Device model**
@@ -3133,6 +2982,7 @@ A clothes washer is a home appliance that is used to wash laundry, such as cloth
 
 
 #### 5.5.4.5 deviceClothesWasherDryer
+
 A clothes washer dryer is a home appliance that is a combination of cloth washer and cloth dryer in a single cabinet. This information model provides capabilities to interact with specific functions and resources of clothes washers and dryers.
 
 **Table 5.5.4.5-1: Modules of deviceClothesWasherDryer Device model**
@@ -3149,6 +2999,7 @@ A clothes washer dryer is a home appliance that is a combination of cloth washer
 
 
 #### 5.5.4.6 deviceCoffeeMachine
+
 A coffee machine is a device that is used to brew a coffee, may add foamed milk, and may include some variants, for example a grinder.
 
 **Table 5.5.4.6-1: Modules of deviceCoffeeMachine Device model**
@@ -3169,6 +3020,7 @@ A coffee machine is a device that is used to brew a coffee, may add foamed milk,
 
 
 #### 5.5.4.7 deviceCookerHood
+
 A cooker hood is a device containing a mechanical fan that hangs above the stove or cooktop in the kitchen.
 
 **Table 5.5.4.7-1: Modules of deviceCookerHood model**
@@ -3182,6 +3034,7 @@ A cooker hood is a device containing a mechanical fan that hangs above the stove
 
 
 #### 5.5.4.8 deviceCooktop
+
 A cooktop is a device that is a kitchen appliance designed for the purpose of cooking food.
 
 **Table 5.5.4.8-1: Modules of deviceCooktop model**
@@ -3211,6 +3064,7 @@ A dehumidifier is a device that is used to monitor or control the state of a deh
 
 
 #### 5.5.4.10 deviceDigitalGallery
+
 A digital gallery is a device that is used to display picture, e.g., paintings from artists, photos from photographers or personal, etc.
 
 Table 5.5.4.10-1: Modules of deviceDigitalGallery Device model
@@ -3224,6 +3078,7 @@ Table 5.5.4.10-1: Modules of deviceDigitalGallery Device model
 
 
 #### 5.5.4.11 deviceDishWasher
+
 A dish washer is a home appliance used to wash dishes. This information model provides capabilities to interact with specific functions and resources of a dish washer. 
 
 **Table 5.5.4.11-1: Modules of deviceDishWasher Device model**
@@ -3236,6 +3091,7 @@ A dish washer is a home appliance used to wash dishes. This information model pr
 
 
 #### 5.5.4.12 deviceFan
+
 A fan is a device that is used to monitor or control the state of a fanning device.
 
 **Table 5.5.4.12-1: Modules of deviceFan model**
@@ -3246,6 +3102,7 @@ A fan is a device that is used to monitor or control the state of a fanning devi
 
 
 #### 5.5.4.13 deviceFoodProbe
+
 A food probe is a device that is used to measure the internal temperature of food.
 
 **Table 5.5.4.13-1: Modules of deviceFoodProbe model**
@@ -3256,6 +3113,7 @@ A food probe is a device that is used to measure the internal temperature of foo
 
 
 #### 5.5.4.14 deviceFreezer
+
 A freezer is a large container like a fridge in which the temperature is kept below freezing point, so that food can be stored inside of it for long periods. This freezer information model provides capabilities to monitor freezer specific functions and resources.
 
 **Table 5.5.4.14-1: Modules of deviceFreezer Device model**
@@ -3266,6 +3124,7 @@ A freezer is a large container like a fridge in which the temperature is kept be
 
 
 #### 5.5.4.15 deviceHomeCCTV
+
 A home CCTV is a smart home appliance to provide monitoring capabilities when people stay way from their home or a room, or to monitor the environmental status of their home or room.
 
 **Table 5.5.4.15-1: Modules of deviceHomeCCTV Device model**
@@ -3287,6 +3146,7 @@ A home CCTV is a smart home appliance to provide monitoring capabilities when pe
 
 
 #### 5.5.4.16 deviceHumidifier
+
 A humidifier is a device that is used to monitor or control the state of a humidifying appliance.
 
 **Table 5.5.4.16-1: Modules of deviceHumidifier Device model**
@@ -3297,6 +3157,7 @@ A humidifier is a device that is used to monitor or control the state of a humid
 
 
 #### 5.5.4.17 deviceKettle
+
 Kettle is a device used to boil water. It may set a desired temperature for water and may keep water warm for a desired time.
 
 **Table 5.5.4.17-1: Modules of deviceKettle Device model**
@@ -3312,6 +3173,7 @@ Kettle is a device used to boil water. It may set a desired temperature for wate
 
 
 #### 5.5.4.18 deviceMicrogeneration
+
 A microgeneration is a Home Energy Management System (HEMS) device that is used to generate energy. Examples of microgeneration devices are photovoltaics device or fuel cells.
 
 **Table 5.5.4.18-1: Modules of deviceMicrogeneration Device model**
@@ -3338,6 +3200,7 @@ An oven is a home appliance used to roast and heat food in a complete stove. Thi
 
 
 #### 5.5.4.20 deviceRefrigerator
+
 A refrigerator is a home appliance used to store food at temperatures which are a few degrees above the freezing point of water. This information model provides capabilities to interact with specific functions and resource of refrigerators.
 
 **Table 5.5.4.20-1: Modules of deviceRefrigerator Device model**
@@ -3356,6 +3219,7 @@ A refrigerator is a home appliance used to store food at temperatures which are
 
 
 #### 5.5.4.21 deviceRiceCooker
+
 A rice cooker is a home appliance used to cook and heat food. It may set a desired heating time for food and may keep food warm for a desired time.
 
 **Table 5.5.4.21-1: Modules of deviceRiceCooker Device model**
@@ -3370,6 +3234,7 @@ A rice cooker is a home appliance used to cook and heat food. It may set a desir
 
 
 #### 5.5.4.22 deviceRobotCleaner
+
 A robot cleaner is an autonomous robotic vacuum cleaner that has intelligent programming and a limited vacuum cleaning system. This robot cleaner information model provides capabilities to control and monitor robot cleaner specific functions and resources. 
 
 **Table 5.5.4.22-1: Modules of deviceRobotCleaner Device model**
@@ -3386,6 +3251,7 @@ A robot cleaner is an autonomous robotic vacuum cleaner that has intelligent pro
 
 
 #### 5.5.4.23 deviceSecurityPanel
+
 A security panel is a device that can change the security mode of, for example, an alarm system.
 
 **Table 5.5.4.23-1: Modules of deviceSecurityPanel model**
@@ -3396,6 +3262,7 @@ A security panel is a device that can change the security mode of, for example,
 
 
 #### 5.5.4.24 deviceSetTopBox
+
 A set top box is a device that in general contains a TV tuner input and displays output to a TV.
 
 **Table 5.5.4.24-1: Modules of deviceSetTopBox model**
@@ -3410,6 +3277,7 @@ A set top box is a device that in general contains a TV tuner input and displays
 
 
 #### 5.5.4.25 deviceSteamCloset
+
 A deviceSteamCloset is a home appliance that de-wrinkles, sanitizes and dries to clean fabrics similar to a dry cleaner. This information model provides capabilities to interact with specific functions and resources of the steam closet. 
 
 **Table 5.5.4.25-1: Modules of deviceSteamCloset Device model**
@@ -3423,6 +3291,7 @@ A deviceSteamCloset is a home appliance that de-wrinkles, sanitizes and dries to
 
 
 #### 5.5.4.26 deviceStorageBattery
+
 A storage battery is a Home Energy Management System HEMS device that is used to provide the home with electrical energy. 
 
 **Table 5.5.4.26-1: Modules of deviceStorageBattery Device model**
@@ -3436,6 +3305,7 @@ A storage battery is a Home Energy Management System HEMS device that is used to
 
 
 #### 5.5.4.27 deviceTelevision
+
 A television (TV) is a home appliance used to show audio and visual content such as broadcasting programs and network streaming. This TV information model provides capabilities to control and monitor TV specific resources.
 
 **Table 5.5.4.27-1: Modules of deviceTelevision Device model**
@@ -3451,6 +3321,7 @@ A television (TV) is a home appliance used to show audio and visual content such
 
 
 #### 5.5.4.28 deviceWaterHeater
+
 A water heater is a device that is used to provide hot water through home facilities.
 
 **Table 5.5.4.28-1: Modules of deviceWaterHeater Device model**
@@ -3466,6 +3337,7 @@ A water heater is a device that is used to provide hot water through home facili
 
 
 #### 5.5.4.29 deviceWindowShade
+
 The window shade is an appliance that provides the ability to cover windows. This device type includes but not limited to roller shades, drapes, and tilt-only blinds.
 
 **Table 5.5.4.29-1: Modules of deviceWindowShade Device model**
@@ -3478,6 +3350,7 @@ The window shade is an appliance that provides the ability to cover windows. Thi
 
 
 #### 5.5.4.30 deviceBottleWarmer
+
 A bottle warmer is an appliance designed for the purpose of warming the feeding bottle.
 
 **Table 5.5.4.30-1: Modules of deviceBottleWarmer Device model**
@@ -3490,6 +3363,7 @@ A bottle warmer is an appliance designed for the purpose of warming the feeding
 
 
 #### 5.5.4.31 deviceGarbageDisposal
+
 A Garbage Disposal is an appliance designed for the purpose of disposing the kitchen waste.
 
 **Table 5.5.4.31-1: Modules of deviceGarbageDisposal Device model**
@@ -3502,6 +3376,7 @@ A Garbage Disposal is an appliance designed for the purpose of disposing the kit
 
 
 #### 5.5.4.32 deviceWaterPurifier
+
 A Water Purifier is an appliance to filter the impurity substance in water by different filter elements. This Water Purifier information model provides capabilities to control and monitor Water Purifier specific functions and resources.
 
 **Table 5.5.4.32-1: Modules of deviceWaterPurifier Device model**
@@ -3518,6 +3393,7 @@ A Water Purifier is an appliance to filter the impurity substance in water by di
 
 
 #### 5.5.4.33 deviceAirHeater
+
 An air heater is a home appliance used to increase the temperature of an indoor space, for example, a room. This information model provides capabilities to interact with specific functions and resources of air heaters.
 
 **Table 5.5.4.33-1: Modules of deviceAirHeater Device model**
@@ -3531,6 +3407,7 @@ An air heater is a home appliance used to increase the temperature of an indoor
 
 
 #### 5.5.4.34 deviceJuicer
+
 Juicer is a machine that can quickly press fruits and vegetables into juice. It may set a desired stir time for juice and  can choose the right spin speed of blender according to the hardness of the object (such as fruits and vegetables)  which you want to stir.
 
 **Table 5.5.4.y-1: Modules of deviceJuicer Device model**
@@ -3545,6 +3422,7 @@ Juicer is a machine that can quickly press fruits and vegetables into juice. It
 
 
 #### 5.5.4.35 deviceShoesWasher
+
 A shoes washer is a home appliance used to wash shoes. This information model provides capabilities to interact with specific functions and resources of a shoes washer. 
 
 **Table 5.5.4.35-1: Modules of deviceShoesWasher Device model**
@@ -3559,11 +3437,12 @@ A shoes washer is a home appliance used to wash shoes. This information model pr
 
 ### 5.5.5 Industry Domain
 
-<mark>For further studies.</mark>
+None.
 
 ### 5.5.6 Vehicular Domain
 
 #### 5.5.6.1 deviceElectricVehicleCharger
+
 An electric vehicle charger is a device that is used for charging or discharging electric vehicles.
 
 
@@ -3578,9 +3457,8 @@ An electric vehicle charger is a device that is used for charging or discharging
 |electricVehicleConnector |[electricVehicleConnector](#53131-electricvehicleconnector) |1 |See clause [5.3.1.31](#53131-electricvehicleconnector). |
 
 
-
-
 #### 5.5.6.2 deviceElectricMotorcycle
+
 An electric motorcycle is a plug-in electric vehicle with two wheels. The electricity is stored on board in a rechargeable battery which drives one or more electric motors. This information model provides capabilities to interact with specific functions and resources of an electric motorcycle.
 
 **Table 5.5.6.2-1: Modules of deviceElectricMotorcycle Device model**
@@ -3600,6 +3478,7 @@ An electric motorcycle is a plug-in electric vehicle with two wheels. The electr
 ### 5.5.7 Agriculture Domain
 
 #### 5.5.7.1 deviceCowActivityMonitor
+
 A cow activity monitor device is a battery-powered wireless metering device that is used to measure the activity data (e.g. step count) of a cow in the dairy farming industry. The collected data can be used to analyse and predict the estrus of the cow for better mating and milk production.
 
 **Table 5.5.7.1-1: Modules of deviceCowActivityMonitor Device model**
@@ -3615,6 +3494,7 @@ A cow activity monitor device is a battery-powered wireless metering device that
 ### 5.5.8 Railway Domain
 
 #### 5.5.8.1 deviceHandheldPTTTerminal
+
 A handheld Push-to-Talk (PTT) terminal is a device of the Railway Domain. The terminal is usually used between the railway workers including train driver, crew and rail-side worker to share their work status via voice communication.
 
 **Table 5.5.8.1-1: Modules of deviceHandheldPTTTerminal Device model**
@@ -3635,6 +3515,7 @@ A handheld Push-to-Talk (PTT) terminal is a device of the Railway Domain. The te
 
 
 #### 5.5.8.2 deviceTrainborneTerminal
+
 A handheld Push-to-Talk (PTT) terminal is a device of the Railway Domain. The terminal is usually used between the railway workers including train driver, crew and rail-side worker to share their work status via voice communication.
 
 **Table 5.5.8.2-1: Modules of deviceTrainborneTerminal Device model**
@@ -3656,6 +3537,7 @@ A handheld Push-to-Talk (PTT) terminal is a device of the Railway Domain. The te
 
 
 #### 5.5.8.3 deviceCardRechargingMachine
+
 A card recharging machine is a device of the Railway Domain. The machine provides recharging service for pre-paid card for transportation. Railway users simply recharging their cards and use it as a payment method for transportation fare.
 
 **Table 5.5.8.3-1: Modules of deviceCardRechargingMachine Device model**
@@ -3680,6 +3562,7 @@ A card recharging machine is a device of the Railway Domain. The machine provide
 
 
 #### 5.5.8.4 deviceSmartGate
+
 A smart gate is a device of the Railway Domain. The gate provides passenger service for checking ticket and control the gate usage. Railway users simply use the gate with their ticket (e.g. passenger card) which have pre-paid card function.
 
 **Table 5.5.8.4-1: Modules of deviceSmartGate Device model**
@@ -3703,6 +3586,7 @@ A smart gate is a device of the Railway Domain. The gate provides passenger serv
 
 
 #### 5.5.8.5 deviceSmartScreenDoor
+
 A smart screen door is a device of the Railway Domain. The screen doors are pairs of sliding doors in a platform with synchronization of doors of a train that is staying in the platform. When the train doors are open, the smart screen doors are open in simultaneously, and vice versa. The screen doors are used in the metro platform mostly.
 
 **Table 5.5.8.5-1: Modules of deviceSmartScreenDoor Device Model**
@@ -3727,7 +3611,7 @@ A smart screen door is a device of the Railway Domain. The screen doors are pair
 
 #### 5.5.9.1 devicePWSCenter
 
-<mark>Missing description</mark>
+<mark>Editor note: Missing description</mark>
 
 **Table 5.5.9.1-1: Modules of devicePWSCenter Device**
 
@@ -3737,7 +3621,7 @@ A smart screen door is a device of the Railway Domain. The screen doors are pair
 
 #### 5.5.9.2 devicePWSEquipment
 
-<mark>Missing description</mark>
+<mark>Editor Note: Missing description</mark>
 
 **Table 5.5.9.2-1: Modules of devicePWSEquipment Device**
 
@@ -3754,266 +3638,375 @@ All enumeration types are defined in the same domain, Horizontal Domain, prefix
 
 
 ### 5.6.1 hd:enum3DprinterTechnology
-Used for the "printType" data point of the ["threeDprinter"](#5311-threeDprinter)  ModuleClass.
-
-**Table 5.6.11: Interpretation of hd:enum3DprinterTechnology**
 
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |Fused Filament Fabrication |FFF |
-|2 |Fused Deposition Modelling |FDM |
-|3 |Digital Light Processing |DLP |
-|4 |Powder Bed & inkjet head 3D Printing |PBP |
-|5 |Photopolymer Jetting Technology |PolyJet |
-|6 |Laminated Object Manufacturing |LOM |
-|7 |Stereolithography Apparatus |SLA |
-|8 |Selective Laser Sintering |SLS |
+Used for the "printType" data point of the ["threeDprinter"](#5311-threeDprinter)  ModuleClass.
 
-NOTE: See clause ["5.3.1.1 "threeDprinter"](#5311-threeDprinter).
+**Table 5.6.1-1: Interpretation of hd:enum3DprinterTechnology**
+
++------+--------------------------------------------------+--------+
+|Value |Interpretation                                    |Note    |
++:=====+:=================================================+:=======+
+|1     |Fused Filament Fabrication                        |FFF     |
++------+--------------------------------------------------+--------+
+|2     |Fused Deposition Modelling                        |FDM     |
++------+--------------------------------------------------+--------+
+|3     |Digital Light Processing                          |DLP     |
++------+--------------------------------------------------+--------+
+|4     |Powder Bed & inkjet head 3D Printing              |PBP     |
++------+--------------------------------------------------+--------+
+|5     |Photopolymer Jetting Technology                   |PolyJet |
++------+--------------------------------------------------+--------+
+|6     |Laminated Object Manufacturing                    |LOM     |
++------+--------------------------------------------------+--------+
+|7     |Stereolithography Apparatus                       |SLA     |
++------+--------------------------------------------------+--------+
+|8     |Selective Laser Sintering                         |SLS     |
++------+--------------------------------------------------+--------+
+|NOTE: See clause ["5.3.1.1 "threeDprinter"](#5311-threeDprinter). |
++------+--------------------------------------------------+--------+
 
 
 ### 5.6.2 hd:enumAdfState
-Used for the "currentAdfState" and "adfStates" data points of the "[autoDocumentFeeder](#5319-autodocumentfeeder)" ModuleClass.
-
-**Table 5.6.21: Interpretation of hd:enumAdfState**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |processing | |
-|2 |empty | |
-|3 |jam | |
-|4 |loaded | |
-|5 |mispick |The product did not pick up the paper in the document feeder. |
-|6 |hatchOpen |The product hatch is open. |
-|7 |duplexPageTooShort | |
-|8 |duplexPageTooLong | |
-|9 |multipickDetected | |
-|10 |inputTrayFailed | |
-|11 |inputTrayOverloaded | |
-
-NOTE: See clause [5.3.1.9 autoDocumentFeeder](#5319-autodocumentfeeder). <mark>Negative values are reserved for vendor specific modes.</mark>
 
+Used for the "currentAdfState" and "adfStates" data points of the "[autoDocumentFeeder](#5319-autodocumentfeeder)" ModuleClass.
 
+**Table 5.6.2-1: Interpretation of hd:enumAdfState**
+
++-------+--------------------+----------------------------------------------+
+|Value  |Interpretation      | Note                                         |
++:======+:===================+:=============================================+
+| 1     |processing          |                                              |
++-------+--------------------+----------------------------------------------+
+| 2     |empty               |                                              |
++-------+--------------------+----------------------------------------------+
+| 3     |jam                 |                                              |
++-------+--------------------+----------------------------------------------+
+| 4     |loaded              |                                              |
++-------+--------------------+----------------------------------------------+
+| 5     |mispick             | The product did not pick up the paper in the |
+|       |                    | document feeder.                             |
++-------+--------------------+----------------------------------------------+
+| 6     |hatchOpen           | The product hatch is open.                   |
++-------+--------------------+----------------------------------------------+
+| 7     |duplexPageTooShort  |                                              |
++-------+--------------------+----------------------------------------------+
+| 8     |duplexPageTooLong   |                                              |
++-------+--------------------+----------------------------------------------+
+| 9     |multipickDetected   |                                              |
++-------+--------------------+----------------------------------------------+
+| 10    |inputTrayFailed     |                                              |
++-------+--------------------+----------------------------------------------+
+| 11    |inputTrayOverloaded |                                              |
++-------+--------------------+----------------------------------------------+
+|NOTE: See clause [5.3.1.9 autoDocumentFeeder](#5319-autodocumentfeeder).   |
+|Negative values are reserved for vendor specific modes.                    |
++-------+--------------------+----------------------------------------------+
 
 
 ### 5.6.3 hd:enumAirConJobMode
+
 Used for the "currentJobMode" and "jobModes" data point of the "[airConJobMode](#5313-airconjobmode)" ModuleClass.
 
 <mark>Editor note: The notes below refer to the deviceAirConditioner, but are actually for attributes of the ModuleClass</mark>
 
-
-**Table 5.6.31: Interpretation of hd:enumAirConJobMode**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |cool |This value is for deviceAirConditioner and indicates cool mode. |
-|2 |airDry |This value is for deviceAirConditioner and indicates air dry mode. |
-|3 |fan |This value is for deviceAirConditioner and indicates fan mode. |
-|4 |AI |This value is for deviceAirConditioner and indicates artificial intelligence mode. |
-|5 |heat |This value is for deviceAirConditioner and indicates heat mode. |
-|6 |airClean |This value is for deviceAirConditioner and indicates air clean mode. |
-|7 |ACO |This value is for deviceAirConditioner and indicates Auto Change Over mode. |
-|8 |aroma |This value is for deviceAirConditioner and indicates aroma mode. |
-
-NOTE: See clause [5.3.1.3 airConJobMode](#5313-airconjobmode). <mark>Negative values are reserved for vendor specific modes</mark>.
-
-
+**Table 5.6.3-1: Interpretation of hd:enumAirConJobMode**
+
++-------+----------------+-----------------------------------------------------------------------------------+
+| Value | Interpretation | Note                                                                              |
++:======+:===============+:==================================================================================+
+| 1     | cool           | This value is for deviceAirConditioner and indicates cool mode.                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+| 2     | airDry         | This value is for deviceAirConditioner and indicates air dry mode.                |
++-------+----------------+-----------------------------------------------------------------------------------+
+| 3     | fan            | This value is for deviceAirConditioner and indicates fan mode.                    |
++-------+----------------+-----------------------------------------------------------------------------------+
+| 4     | AI             | This value is for deviceAirConditioner and indicates artificial intelligence mode.|
++-------+----------------+-----------------------------------------------------------------------------------+
+| 5     | heat           | This value is for deviceAirConditioner and indicates heat mode.                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+| 6     | airClean       | This value is for deviceAirConditioner and indicates air clean mode.              |
++-------+----------------+-----------------------------------------------------------------------------------+
+| 7     | ACO            | This value is for deviceAirConditioner and indicates Auto Change Over mode.       |
++-------+----------------+-----------------------------------------------------------------------------------+
+| 8     | aroma          | This value is for deviceAirConditioner and indicates aroma mode.                  |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.3 airConJobMode](#5313-airconjobmode).                                              |
+|Negative values are reserved for vendor specific modes.                                                     |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.4 hd:enumAirPurifierJobMode
-Used for the "currentJobMode" and "jobModes" data points of the "[airPurifierJobMode](#5315-airpurifierjobmode)" ModuleClass.
-
-
-**Table 5.6.41: Interpretation of hd:enumAirPurifierJobMode**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |normalClean |This indicates the normal mode that operates the basic function.  |
-|2 |sleep |This indicates the sleep mode that turns the operating function off at the time set by a timer. |
-|3 |silent |This indicates the silent mode that generates low noise |
-|4 |wet |This indicates the wet mode that passes the air that's already filtered through water filter once again to provide the humidification effect |
-|5 |circulate |This indicates the circulate mode that circulates the purified air by rotating the fan on top of the air purifier |
-|6 |dual |This indicates the dual mode that operates both the upper and lower parts of the air purifier |
-|7 |auto |This indicates the auto mode that first measures the pollution level (e.g., good, normal, bad, very bad) and then, triggers appropriate modes based on the measured level. In case of bad and very bad condition, the rotating fan on the upper side starts its operation |
-
-NOTE: See clause [5.3.1.5 airPurifierJobMode](#5315-airpurifierjobmode). <mark>Negative values are reserved for vendor specific modes.</mark>
 
+Used for the "currentJobMode" and "jobModes" data points of the "[airPurifierJobMode](#5315-airpurifierjobmode)" ModuleClass.
 
+**Table 5.6.4-1: Interpretation of hd:enumAirPurifierJobMode**
+
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |normalClean     |This indicates the normal mode that operates the basic function.                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |sleep           |This indicates the sleep mode that turns the operating function off at the time    |
+|       |                |set by a timer.                                                                    |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |silent          |This indicates the silent mode that generates low noise                            |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |wet             |This indicates the wet mode that passes the air that's already filtered through    |
+|       |                |water filter once again to provide the humidification effect                       |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |circulate       |This indicates the circulate mode that circulates the purified air by rotating the |
+|       |                |fan on top of the air purifier                                                     |
++-------+----------------+-----------------------------------------------------------------------------------+
+|6      |dual            |This indicates the dual mode that operates both the upper and lower parts of the   |
+|       |                |air purifier                                                                       |
++-------+----------------+-----------------------------------------------------------------------------------+
+|7      |auto            |This indicates the auto mode that first measures the pollution level (e.g., good,  |
+|       |                |normal, bad, very bad) and then, triggers appropriate modes based on the measured  |
+|       |                |level. In case of bad and very bad condition, the rotating fan on the upper side   |
+|       |                |starts its operation                                                               |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.5 airPurifierJobMode](#5315-airpurifierjobmode).                                    |
+|Negative values are reserved for vendor specific modes.                                                     |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.5 hd:enumAlertColourCode
-Used for the "light" data point of the "[alarmSpeaker](#5317-alarmspeaker)" ModuleClass.
-
 
-**Table 5.6.51: Interpretation of hd:enumAlertColourCode**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |red |This colour indicates the alarm status. |
-|2 |green |This colour indicates the alarm has been cleared. |
-
-NOTE: See clause [5.3.1.7 alarmSpeaker](#5317-alarmspeaker).
+Used for the "light" data point of the "[alarmSpeaker](#5317-alarmspeaker)" ModuleClass.
 
+**Table 5.6.5-1: Interpretation of hd:enumAlertColourCode**
 
++------+---------------+--------------------------------------------------+
+|Value |Interpretation |Note                                              |
++:=====+:==============+:=================================================+
+|1     |red            |This colour indicates the alarm status.           |
++------+---------------+--------------------------------------------------+
+|2     |green          |This colour indicates the alarm has been cleared. |
++------+---------------+--------------------------------------------------+
+|NOTE: See clause [5.3.1.7 alarmSpeaker](#5317-alarmspeaker).             |
++------+---------------+--------------------------------------------------+
 
 
 ### 5.6.6 hd:enumCallState
-Used for the "callState" data point in the "[phoneCall](#53164-phonecall)" ModuleClass.
-
-
-**Table 5.6.61: Interpretation of hd:enumCallState**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |hangup | |
-|2 |calling | |
-|3 |ringing | |
-|4 |busy | |
-|5 |answered | |
-|6 |noline | |
-|7 |voicemail | |
-|8 |redirected | |
 
-NOTE: See clause [5.3.1.64 "phoneCall"](#53164-phonecall).
+Used for the "callState" data point in the "[phoneCall](#53164-phonecall)" ModuleClass.
 
 
+**Table 5.6.6-1: Interpretation of hd:enumCallState**
+
++------+---------------+------------------------------------+
+|Value |Interpretation |Note                                |
++:=====+:==============+:===================================+
+|1     |hangup         |                                    |
++------+---------------+------------------------------------+
+|2     |calling        |                                    |
++------+---------------+------------------------------------+
+|3     |ringing        |                                    |
++------+---------------+------------------------------------+
+|4     |busy           |                                    |
++------+---------------+------------------------------------+
+|5     |answered       |                                    |
++------+---------------+------------------------------------+
+|6     |noline         |                                    |
++------+---------------+------------------------------------+
+|7     |voicemail      |                                    |
++------+---------------+------------------------------------+
+|8     |redirected     |                                    |
++------+---------------+------------------------------------+
+|NOTE: See clause [5.3.1.64 "phoneCall"](#53164-phonecall). |
++------+---------------+------------------------------------+
 
 
 ### 5.6.7 hd:enumClothesDryerJobMode
-Used for the "currentJobMode" and "jobModes" data points of the "[clothesDryerJobMode](#53119-clothesdryerjobmode)" ModuleClass.
-
-**Table 5.6.71: Interpretation of hd:enumClothesDryerJobMode**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |normal |Normal cycle. |
-|2 |quickDry |About half the length of a normal cycle, this setting uses high heat to dry a few items. |
-|3 |permanentPress |Slow drying with low heat helps wrinkle-free garments live up to their name and keeps the hard creases out of things one typically irons. |
-|4 |heavyDuty |Tumbling for an extended period with high heat for sturdy items (towels, sweats, jeans). |
-|5 |delicates |A short, low-heat cycle for delicates and other items such as spandex workout gear, which loses its stretch when too much heat is used. |
-|6 |airDry |A cool-air setting for items that can't take any heat, such as plastic tablecloths and rubber-backed rugs. |
-|7 |extendedTumble |Periodically tumbles clothes without heats for a preset amount of time after they're dry to prevent wrinkles. |
-
-NOTE: See clause [5.3.1.19 “clothesDryerJobMode”](#53119-clothesdryerjobmode). <mark>Negative values are reserved for vendor specific modes</mark>.
 
+Used for the "currentJobMode" and "jobModes" data points of the "[clothesDryerJobMode](#53119-clothesdryerjobmode)" ModuleClass.
 
+**Table 5.6.7-1: Interpretation of hd:enumClothesDryerJobMode**
+
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |normal          |Normal cycle.                                                                      |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |quickDry        |About half the length of a normal cycle, this setting uses high heat to dry a      |
+|       |                |few items.                                                                         |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |permanentPress  |Slow drying with low heat helps wrinkle-free garments live up to their name and    |
+|       |                | keeps the hard creases out of things one typically irons.                         |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |heavyDuty       |Tumbling for an extended period with high heat for sturdy items (towels, sweats,   |
+|       |                |jeans).                                                                            |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |delicates       |A short, low-heat cycle for delicates and other items such as spandex workout gear,|
+|       |                |which loses its stretch when too much heat is used.                                |
++-------+----------------+-----------------------------------------------------------------------------------+
+|6      |airDry          |A cool-air setting for items that can't take any heat, such as plastic tablecloths |
+|       |                |and rubber-backed rugs.                                                            |
++-------+----------------+-----------------------------------------------------------------------------------+
+|7      |extendedTumble  |Periodically tumbles clothes without heats for a preset amount of time after       |
+|       |                |they are dry to prevent wrinkles.                                                  |
++-------+----------------+-----------------------------------------------------------------------------------+
+| NOTE: See clause [5.3.1.19 clothesDryerJobMode](#53119-clothesdryerjobmode).                               |
+| Negative values are reserved for vendor specific modes.                                                    |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.8 hd:enumClothesWasherDryerJobMode
-Used for "currentJobModes" and "jobModes" data points of "[clothesWasherDryerJobMode](#53121-clotheswasherdryerjobmode)" ModuleClass. <mark>Manufacturers can define their own courses by setting this value to negative values.</mark>
-
-**Table 5.6.81: Interpretation of hd:enumClothesWasherDryerJobMode**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |normal | |
-|2 |quick | |
-|3 |auto | |
-|4 |delicates | |
-|5 |heavy duty | |
 
-NOTE: See clause [5.3.1.21 "clothesWasherDryerJobMode"](#53121-clotheswasherdryerjobmode). <mark>Negative values are reserved for vendor specific modes.</mark>
+Used for "currentJobModes" and "jobModes" data points of "[clothesWasherDryerJobMode](#53121-clotheswasherdryerjobmode)" ModuleClass. Manufacturers can define their own courses by setting this value to negative values.
 
+**Table 5.6.8-1: Interpretation of hd:enumClothesWasherDryerJobMode**
 
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |normal          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |quick           |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |auto            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |delicates       |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |heavy duty      |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+| NOTE: See clause [5.3.1.21 clothesWasherDryerJobMode](#53121-clotheswasherdryerjobmode).                   |
+| Negative values are reserved for vendor specific modes.                                                    |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.9 hd:enumClothesWasherJobMode
-Used for the "currentJobModes" and "jobModes " data points of the "[clothesWasherJobMode](#53120-clotheswasherjobmode)" ModuleClass. Washing options such as water temperature and spin speed are decided to pre-set values upon selected washing course. <mark>Manufacturers can define their own courses by setting this value to negative values</mark>.
-
-
-**Table 5.6.91: Interpretation of hd:enumClothesWasherJobMode**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |normal | |
-|2 |smallLoad | |
-|3 |delicate | |
-|4 |comforter | |
-|5 |expressWash | |
-|6 |cleanWash | |
-|7 |kidsWear | |
-|8 |workoutWears | |
-
-NOTE: See clause [5.3.1.20 "clothesWasherJobMode"](#53120-clotheswasherjobmode). <mark>Negative values are reserved for vendor specific modes</mark>.
-
 
+Used for the "currentJobModes" and "jobModes " data points of the "[clothesWasherJobMode](#53120-clotheswasherjobmode)" ModuleClass. Washing options such as water temperature and spin speed are decided to pre-set values upon selected washing course. Manufacturers can define their own courses by setting this value to negative values.
+
+**Table 5.6.9-1: Interpretation of hd:enumClothesWasherJobMode**
+
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |normal          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |smallLoad       |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |delicate        |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |comforter       |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |expressWash     |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|6      |cleanWash       |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|7      |kidsWear        |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|8      |workoutWears    |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.20 clothesWasherJobMode](#53120-clotheswasherjobmode).                              |
+|Negative values are reserved for vendor specific modes.                                                     |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.10 hd:enumCookerHoodJobMode
-Used for the "currentJobMode" and "jobModes" DataPoints of the "[cookerHoodJobMode](#53126-cookerhoodjobmode)" ModuleClass.
 
-**Table 5.6.101: Interpretation of hd:enumCookerHoodJobMode**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |Always-on |This value indicates the always-on mode which keeps running the fan for ventilation. |
-|2 |Intensive |This value indicates the intensive mode used when a large volume of cooking fume is being produced. |
-|3 |Sensor |This value indicates the sensor mode which changes fan speed depend on the volume and heat of cooking fume. |
-
-NOTE: See clause [5.3.1.26 "cookerHoodJobMode"](#53126-cookerhoodjobmode). <mark>Negative values are reserved for vendor specific modes</mark>.
+Used for the "currentJobMode" and "jobModes" DataPoints of the "[cookerHoodJobMode](#53126-cookerhoodjobmode)" ModuleClass.
 
+**Table 5.6.10-1: Interpretation of hd:enumCookerHoodJobMode**
 
++-------+----------------+-------------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                                 |
++:======+:===============+:====================================================================================+
+|1      |Always-on       |This value indicates the always-on mode which keeps running the fan for ventilation. |
++-------+----------------+-------------------------------------------------------------------------------------+
+|2      |Intensive       |This value indicates the intensive mode used when a large volume of cooking fume is  |
+|       |                |being produced.                                                                      |
++-------+----------------+-------------------------------------------------------------------------------------+
+|3      |Sensor          |This value indicates the sensor mode which changes fan speed depend on the volume    |
+|       |                |and heat of cooking fume.                                                            |
++-------+----------------+-------------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.26 "cookerHoodJobMode"](#53126-cookerhoodjobmode).                                    |
+|Negative values are reserved for vendor specific modes.                                                       |
++-------+----------------+-------------------------------------------------------------------------------------+
 
 
 ### 5.6.11 hd:enumDehumidifierJobMode
-Used for "currentJobMode" and "jobModes" data points of the "[dehumidifierJobMode](#53128-dehumidifierjobmode)" ModuleClass.
-
-
-**Table 5.6.111: Interpretation of hd:enumDehumidifierJobMode**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |smart |This value indicates the smart mode that first gets the target humidity level from user input, next detects the correct relative humidity, then automatically change the de-humidity level to keep the target humidity level.  |
-|2 |fast |This value indicates the fast mode that speeds the operating level up to quickly dehumidify when the humidity level is so high. It is a kind of turbo mode. |
-|3 |silent |This value indicates the silent mode that can be used when a user sleeps. It reduces the noise. |
-|4 |focus |This value indicates the focus mode that dehumidifies focusing on a particular part. |
-|5 |clothes |This value indicates the clothes mode that dehumidifies adjusting the wind direction vertically. It is normally used to dehumidify clothes. |
 
-NOTE: See clause [5.3.1.28 "dehumidifierJobMode"](#53128-dehumidifierjobmode). <mark>Negative values are reserved for vendor specific modes</mark>.
+Used for "currentJobMode" and "jobModes" data points of the "[dehumidifierJobMode](#53128-dehumidifierjobmode)" ModuleClass.
 
+**Table 5.6.11-1: Interpretation of hd:enumDehumidifierJobMode**
+
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |smart           |This value indicates the smart mode that first gets the target humidity level from |
+|       |                |user input, next detects the correct relative humidity, then automatically change  |
+|       |                |the de-humidity level to keep the target humidity level.                           |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |fast            |This value indicates the fast mode that speeds the operating level up to quickly   |
+|       |                |dehumidify when the humidity level is so high. It is a kind of turbo mode.         |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |silent          |This value indicates the silent mode that can be used when a user sleeps. It       |
+|       |                |reduces the noise.                                                                 |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |focus           |This value indicates the focus mode that dehumidifies focusing on a particular     |
+|       |                |part.                                                                              |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |clothes         |This value indicates the clothes mode that dehumidifies adjusting the wind         |
+|       |                |direction vertically. It is normally used to dehumidify clothes.                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.28 "dehumidifierJobMode"](#53128-dehumidifierjobmode).                              |
+|Negative values are reserved for vendor specific modes.                                                     |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 
 ### 5.6.12 hd:enumDishWasherJobMode
-Used for the "currentJobMode" and "jobModes" DataPoints of the "[dishWasherJobMode](#53129-dishwasherjobmode)" ModuleClass.
-
-
-**Table 5.6.121: Interpretation of hd:enumDishWasherJobMode**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |Normal wash | |
-|2 |Intensive wash | |
-|3 |Quick wash | |
-|4 |Sensor wash | |
-|5 |Eco wash | |
-|6 |Quiet wash | |
-|7 |Maintenance wash | |
-
-NOTE: See clause [5.3.1.29 "dishWasherJobMode"](#53129-dishwasherjobmode). <mark>Negative values are reserved for vendor specific modes.</mark>
-
 
+Used for the "currentJobMode" and "jobModes" DataPoints of the "[dishWasherJobMode](#53129-dishwasherjobmode)" ModuleClass.
 
+**Table 5.6.12-1: Interpretation of hd:enumDishWasherJobMode**
+
++-------+-----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation   |Note                                                                               |
++:======+:================+:==================================================================================+
+|1      |Normal wash      |                                                                                   |
++-------+-----------------+-----------------------------------------------------------------------------------+
+|2      |Intensive wash   |                                                                                   |
++-------+-----------------+-----------------------------------------------------------------------------------+
+|3      |Quick wash       |                                                                                   |
++-------+-----------------+-----------------------------------------------------------------------------------+
+|4      |Sensor wash      |                                                                                   |
++-------+-----------------+-----------------------------------------------------------------------------------+
+|5      |Eco wash         |                                                                                   |
++-------+-----------------+-----------------------------------------------------------------------------------+
+|6      |Quiet wash       |                                                                                   |
++-------+-----------------+-----------------------------------------------------------------------------------+
+|7      |Maintenance wash |                                                                                   |
++-------+-----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.29 "dishWasherJobMode"](#53129-dishwasherjobmode).                                   |
+|Negative values are reserved for vendor specific modes.</mark>                                               |
++-------+-----------------+-----------------------------------------------------------------------------------+
 
 ### 5.6.13 hd:enumDisplayOrder
-Used for the "displayOrder" data point of the ["galleryMode"](#53137-gallerymode) ModuleClass.
 
+Used for the "displayOrder" data point of the ["galleryMode"](#53137-gallerymode) ModuleClass.
 
 **Table 5.6.13-1: Interpretation of hd:enumDisplayOrder**
 
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |fixed | |
-|2 |sequence | |
-|3 |loop | |
-|4 |random | |
-
-
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |fixed           |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |sequence        |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |loop            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |random          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.14 hd:enumDisplayOrientation
-Used for the "displayOrientation" data point of the ["galleryMode"](#53137-gallerymode) ModuleClass.
 
+Used for the "displayOrientation" data point of the ["galleryMode"](#53137-gallerymode) ModuleClass.
 
 **Table 5.6.14-1: Interpretation of hd:enumDisplayOrientation**
 
@@ -4023,524 +4016,652 @@ Used for the "displayOrientation" data point of the ["galleryMode"](#53137-galle
 |2 |portrait | |
 
 
-
-
 ### 5.6.15 hd:enumDoorState
-Used for the "doorState" DataPoint of ["doorStatus"](#53130-doorstatus) ModuleClass.
-
-**Table 5.6.151: Interpretation of hd:enumDoorState**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |closed |This indicates that door is closed.  |
-|2 |open |This indicates that the door is open. |
-|3 |opening |This indicates that the door is opening. |
-|4 |closing |This indicates that the door is closing. |
-|5 |stopped |This indicates that the door is in stationary state. |
-
-NOTE: See clause [5.3.1.30 "doorStatus"](#53130-doorstatus).
 
+Used for the "doorState" DataPoint of ["doorStatus"](#53130-doorstatus) ModuleClass.
 
+**Table 5.6.15-1: Interpretation of hd:enumDoorState**
+
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |closed          |This indicates that door is closed.                                                |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |open            |This indicates that the door is open.                                              |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |opening         |This indicates that the door is opening.                                           |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |closing         |This indicates that the door is closing.                                           |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |stopped         |This indicates that the door is in stationary state.                               |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.30 "doorStatus"](#53130-doorstatus).                                                |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.16 hd:enumFoamStrength
-Used for data points indicating the strength of a foam, for example, foaming milk from a coffee machine.
-
-
-**Table 5.6.161: Interpretation of hd:enumFoamStrength**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |zero | |
-|2 |low | |
-|3 |medium | |
-|4 |high | |
-|5 |maximum | |
-
-NOTE: See clause [5.3.1.36 "foaming"](#53136-foaming).
 
+Used for data points indicating the strength of a foam, for example, foaming milk from a coffee machine.
 
+**Table 5.6.16-1: Interpretation of hd:enumFoamStrength**
+
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |zero            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |low             |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |medium          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |high            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |maximum         |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.36 "foaming"](#53136-foaming).                                                      |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.17 hd:enumGeneralLevel
-Used for the "soilLevel" data point of the "[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption)" ModuleClass.
 
+Used for the "soilLevel" data point of the "[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption)" ModuleClass.
 
-**Table 5.6.171: Interpretation of hd:enumGeneralLevel**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |light | |
-|2 |normal | |
-|3 |heavy | |
-
-NOTE: See clause [5.3.1.22 clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption).
-
+**Table 5.6.17-1: Interpretation of hd:enumGeneralLevel**
 
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |light           |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |normal          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |heavy           |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.22 clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption).                  |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.18 hd:enumGeneralSpeed
-Used for the "spinSpeed" data point of the "[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption)" ModuleClass.
-
 
-**Table 5.6.181: Interpretation of hd:enumGeneralSpeed**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |low | |
-|2 |medium | |
-|3 |high | |
-|4 |extraHigh | |
-
-NOTE: See clause [5.3.1.22 clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption).
+Used for the "spinSpeed" data point of the "[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption)" ModuleClass.
 
+**Table 5.6.18-1: Interpretation of hd:enumGeneralSpeed**
 
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |low             |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |medium          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |high            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |extraHigh       |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.22 clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption).                  |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.19 hd:enumGeneralTemperature
-Used for the "washTemp" data point of the "[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption)" ModuleClass.
 
-**Table 5.6.191: Interpretation of hd:enumGeneralTemperature**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |cold |The actual temperature is defined by the manufacturer. |
-|2 |warm | |
-|3 |hot | |
-
-NOTE: See clause [5.3.1.22 clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption).
+Used for the "washTemp" data point of the "[clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption)" ModuleClass.
 
+**Table 5.6.19-1: Interpretation of hd:enumGeneralTemperature**
 
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |cold            |The actual temperature is defined by the manufacturer.                             |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |warm            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |hot             |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.22 clothesWasherJobModeOption](#53122-clotheswasherjobmodeoption).                  |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.20 hd:enumGrainsLevel
+
 Used for the "grainsRemaining" data point of the "[grinder](#53143-grinder)" ModuleClass.  This type specifies a level for supplies that have a grain-aspect, for example the level of remaining coffee beans in the grinder part of a coffee machine, or the desired level of coffee beans in this machine.
 
 The values for the level of a liquid is covered by "[hd:enumLiquidLevel](#5624-hdenumliquidlevel)" (see clause [5.6.24](#5624-hdenumliquidlevel)).
 
-**Table 5.6.201: Interpretation of hd:enumGrainsLevel**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |zero | |
-|2 |low | |
-|3 |medium | |
-|4 |high | |
-|5 |maximum | |
-
-  NOTE: See clause [5.3.1.43 "grinder"](#53143-grinder). 
-
-
+**Table 5.6.20-1: Interpretation of hd:enumGrainsLevel**
+
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |zero            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |low             |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |medium          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |high            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |maximum         |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.43 "grinder"](#53143-grinder).                                                      |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.21 hd:enumGrindCoarseness
-Used for the coarseness data points of the "[grinder](#53143-grinder)" ModuleClass. This type specifies the level of coarseness of a solid after grinding, for example grinded coffee beans.
-
-
-**Table 5.6.211: Interpretation of hd:enumGrindCoarseness**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |ultrafine | |
-|2 |fine | |
-|3 |medium | |
-|4 |coarse | |
-|5 |coarsest | |
-
-NOTE: See clause [5.3.1.43 "grinder"](#53143-grinder).
 
+Used for the coarseness data points of the "[grinder](#53143-grinder)" ModuleClass. This type specifies the level of coarseness of a solid after grinding, for example grinded coffee beans.
 
+**Table 5.6.21-1: Interpretation of hd:enumGrindCoarseness**
+
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |ultrafine       |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |fine            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |medium          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |coarse          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |coarsest        |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.43 "grinder"](#53143-grinder).                                                      |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.22 hd:enumHorizontalDirection
-Used for the "horizontalDirection" and "supportedHorizontalDirection" of the "[airFlow](#5314-airflow)" ModuleClass, indicating horizontal directions.
-
 
-**Table 5.6.221: Interpretation of hd:enumHorizontalDirection**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |auto | |
-|2 |center | |
-|3 |left | |
-|4 |right | |
-
-  NOTE: See clause [5.3.1.4 airFlow](#5314-airflow). 
+Used for the "horizontalDirection" and "supportedHorizontalDirection" of the "[airFlow](#5314-airflow)" ModuleClass, indicating horizontal directions.
 
+**Table 5.6.22-1: Interpretation of hd:enumHorizontalDirection**
 
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |auto            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |center          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |left            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |right           |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.4 airFlow](#5314-airflow).                                                          |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.23 hd:enumJobState
-Used for the "currentJobState" and "jobStates" data points of the "[printQueue](#53167-printqueue)" and "[runState](#53175-runstate)" ModuleClasses.
-
-
-**Table 5.6.231: Interpretation of hd:enumJobState**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |aborted | |
-|2 |cancelled | |
-|3 |completed | |
-|4 |paused | |
-|5 |pending | |
-|6 |processing | |
-
-NOTE: See clause [5.3.1.67 "printQueue"](#53167-printqueue) and [5.3.1.75 "runState"](#53175-runstate).
 
+Used for the "currentJobState" and "jobStates" data points of the "[printQueue](#53167-printqueue)" and "[runState](#53175-runstate)" ModuleClasses.
 
+**Table 5.6.23-1: Interpretation of hd:enumJobState**
+
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |aborted         |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |cancelled       |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |completed       |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |paused          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |pending         |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|6      |processing      |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.67 "printQueue"](#53167-printqueue) and [5.3.1.75 "runState"](#53175-runstate).     |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.24 hd:enumLiquidLevel
-Used for the "liquidLevel" and "liquidRemaining" data points in the  respective ["liquidLevel"](#53150-liquidlevel) and ["liquidRemaining"](#53151-liquidremaining) ModuleClasses.
-
-**Table 5.6.241: Interpretation of hd:LiquidLevel**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |zero | |
-|2 |low | |
-|3 |medium | |
-|4 |high | |
-|5 |maximum | |
-
-NOTE: See clause  [5.3.1.50 "liquidLevel"](#53150-liquidlevel) and clause [5.3.1.51 "liquidRemaining"](#53151-liquidremaining).
 
+Used for the "liquidLevel" and "liquidRemaining" data points in the  respective ["liquidLevel"](#53150-liquidlevel) and ["liquidRemaining"](#53151-liquidremaining) ModuleClasses.
 
+**Table 5.6.24-1: Interpretation of hd:LiquidLevel**
+
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |zero            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |low             |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |medium          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |high            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |maximum         |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause  [5.3.1.50 "liquidLevel"](#53150-liquidlevel) and                                          |
+|clause [5.3.1.51 "liquidRemaining"](#53151-liquidremaining).                                                |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.25 hd:enumMachineState
-Used for the "currentMachineState" and "machineStates" data points of the "[runState](#53175-runstate)" ModuleClass.
-
-**Table 5.6.251: Interpretation of hd:enumMachineState**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |idle |Machine is ready to operate |
-|2 |preActive |Machine is operating its pre-functions (ex. pre-heat) |
-|3 |active |Machine is operating its functions |
-|4 |reserved |Reservation is made by user |
-|5 |stopped |Operation is stopped/aborted by some other reasons |
-|6 |error |Error has occurred  |
-|7 |diagnostic |Machine reports diagnostic information to the server |
-|8 |test |Particular functions run for test |
-|9 |maintenance |Machine is needed to maintain |
-|10 |clear |The result is not removed yet |
-|11 |charging |Machine is being charged |
-
-NOTE: See clause [5.3.1.75 "runState"](#53175-runstate).
 
+Used for the "currentMachineState" and "machineStates" data points of the "[runState](#53175-runstate)" ModuleClass.
 
+**Table 5.6.25-1: Interpretation of hd:enumMachineState**
+
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |idle            |Machine is ready to operate                                                        |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |preActive       |Machine is operating its pre-functions (ex. pre-heat)                              |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |active          |Machine is operating its functions                                                 |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |reserved        |Reservation is made by user                                                        |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |stopped         |Operation is stopped/aborted by some other reasons                                 |
++-------+----------------+-----------------------------------------------------------------------------------+
+|6      |error           |Error has occurred                                                                 |
++-------+----------------+-----------------------------------------------------------------------------------+
+|7      |diagnostic      |Machine reports diagnostic information to the server                               |
++-------+----------------+-----------------------------------------------------------------------------------+
+|8      |test            |Particular functions run for test                                                  |
++-------+----------------+-----------------------------------------------------------------------------------+
+|9      |maintenance     |Machine is needed to maintain                                                      |
++-------+----------------+-----------------------------------------------------------------------------------+
+|10     |clear           |The result is not removed yet                                                      |
++-------+----------------+-----------------------------------------------------------------------------------+
+|11     |charging        |Machine is being charged                                                           |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.75 "runState"](#53175-runstate).                                                    |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.26 hd:enumOzoneStatus
-Used for the "ozoneStatus" property of the ["ozoneMeter"](#53160-ozonemeter) ModuleClass.
-
-**Table 5.6.261: Interpretation of hd:enumOzoneStatus**
 
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |Good  |For example,  0 to 0.030 ppm. |
-|2 |Normal |For example, 0.031 to 0.090 ppm. |
-|3 |Bad |For example, 0.091 to 0.150ppm. |
-|4 |Very bad |For example, 0.151 ppm or above. |
+Used for the "ozoneStatus" property of the ["ozoneMeter"](#53160-ozonemeter) ModuleClass.
 
-NOTE: See clause [5.3.1.60 "ozoneMeter"](#53160-ozonemeter).
+**Table 5.6.26-1: Interpretation of hd:enumOzoneStatus**
+
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |Good            |For example,  0 to 0.030 ppm.                                                      |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |Normal          |For example, 0.031 to 0.090 ppm.                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |Bad             |For example, 0.091 to 0.150ppm.                                                    |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |Very bad        |For example, 0.151 ppm or above.                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.60 "ozoneMeter"](#53160-ozonemeter).                                                |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 The examples in the notes are references from the Korean Environmental Standard <a href="#_ref_i.7">[i.7]</a>.
 
 
-
-
 ### 5.6.27 hd:enumPlayerMode
-Used for the "currentMode" and "supportedModes" data points in the "[playerControl](#53165-playercontrol)" ModuleClass.
-
-
-**Table 5.6.271: Interpretation of hd:enumPlayerMode**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |stop | |
-|2 |play | |
-|3 |pause | |
-|4 |resume | |
-|5 |record | |
-|6 |rewind | |
-|7 |fast-rewind | |
-|8 |forward | |
-|9 |fast-forward | |
-|10 |searchPrevious | |
-|11 |searchNext | |
-
-NOTE: See clause [5.3.1.65 "playerControl"](#53165-playercontrol).
 
+Used for the "currentMode" and "supportedModes" data points in the "[playerControl](#53165-playercontrol)" ModuleClass.
 
+**Table 5.6.27-1: Interpretation of hd:enumPlayerMode**
+
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |stop            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |play            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |pause           |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |resume          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |record          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|6      |rewind          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|7      |fast-rewind     |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|8      |forward         |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|9      |fast-forward    |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|10     |searchPrevious  |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|11     |searchNext      |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.65 "playerControl"](#53165-playercontrol).                                          |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.28 hd:enumRobotCleanerJobMode
-Used for the "currentJobMode" and "jobModes" data points of the "[robotCleanerJobMode](#53174-robotcleanerjobmode)" ModuleClass.
-
 
-**Table 5.6.281: Interpretation of hd:enumRobotCleanerJobMode**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |zigzag |The machine moves forward by going at an angle first to one side then to the other. |
-|2 |sectorBase |The machine first cleans a specific sector (for example, 1 x 1 m), then moves to another sector. |
-|3 |spot |The machine cleans a targeted area of about specific spot. |
-
-NOTE: See clause [5.3.1.74 "robotCleanerJobMode"](#53174-robotcleanerjobmode). <mark>Negative values are reserved for vendor specific modes.</mark>
+Used for the "currentJobMode" and "jobModes" data points of the "[robotCleanerJobMode](#53174-robotcleanerjobmode)" ModuleClass.
 
+**Table 5.6.28-1: Interpretation of hd:enumRobotCleanerJobMode**
 
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |zigzag          |The machine moves forward by going at an angle first to one side then to the other.|
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |sectorBase      |The machine first cleans a specific sector (for example, 1 x 1 m), then moves to   |
+|       |                |another sector.                                                                    |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |spot            |The machine cleans a targeted area of about specific spot.                         |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.74 "robotCleanerJobMode"](#53174-robotcleanerjobmode).                              |
+|Negative values are reserved for vendor specific modes.                                                     | 
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.29 hd:enumSecurityMode
-Used for the "currentSecurityMode" and "securityModes" data points of the "[securityMode](#53176-securitymode)" ModuleClass. 
-
-
-**Table 5.6.291: Interpretation of hd:enumSecurityMode**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |active |Unit is active |
-|2 |armedAway |Unit is armed for away |
-|3 |armedInstant |Unit is armed instantly |
-|4 |armedMaximum |Unit is armed at maximum level |
-|5 |armedNightStay |Unit is armed in night stay |
-|6 |armedStay |Unit is armed in stay mode |
-
-NOTE: See clause [5.3.1.76 "securityMode"](#53176-securitymode).
 
+Used for the "currentSecurityMode" and "securityModes" data points of the "[securityMode](#53176-securitymode)" ModuleClass. 
 
+**Table 5.6.29-1: Interpretation of hd:enumSecurityMode**
+
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |active          |Unit is active                                                                     |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |armedAway       |Unit is armed for away                                                             |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |armedInstant    |Unit is armed instantly                                                            |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |armedMaximum    |Unit is armed at maximum level                                                     |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |armedNightStay  |Unit is armed in night stay                                                        |
++-------+----------------+-----------------------------------------------------------------------------------+
+|6      |armedStay       |Unit is armed in stay mode                                                         |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.76 "securityMode"](#53176-securitymode).                                            |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.30 hd:enumSpinLevelStrength
-Used for the "spinLevelStrength" data points of the "[spinLevel](#53184-spinlevel)" ModuleClass, and used for the "spinSpeed"  data points of the "[blender](#531118-blender)" ModuleClass, indicating the strength of a spinLevel.
-
-
-**Table 5.6.301: Interpretation of hd:enumSpinLevelStrength**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |zero | |
-|2 |sensitive | |
-|3 |weak  | |
-|4 |medium | |
-|5 |strong | |
-|6 |maximum | |
-
-NOTE: See clause [5.3.1.84 "spinLevel"](#53184-spinlevel) and clause [5.3.1.118 "blender"](#531118-blender).
-
 
+Used for the "spinLevelStrength" data points of the "[spinLevel](#53184-spinlevel)" ModuleClass, and used for the "spinSpeed"  data points of the "[blender](#531118-blender)" ModuleClass, indicating the strength of a spinLevel.
 
+**Table 5.6.30-1: Interpretation of hd:enumSpinLevelStrength**
+
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |zero            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |sensitive       |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |weak            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |medium          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |strong          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|6      |maximum         |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.84 "spinLevel"](#53184-spinlevel) and clause [5.3.1.118 "blender"](#531118-blender).|
++-------+----------------+-----------------------------------------------------------------------------------+
 
 ### 5.6.31 hd:enumSteamClosetJobMode
-Used for "currentJobMode" and "jobModes" data points of the "[steamClosetJobMode](#53185-steamclosetjobmode)" ModuleClass.
-
-
-**Table 5.6.311: Interpretation of hd:enumSteamClosetJobMode**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |reduceOdor |Using pure water, the machine help remove the smells on clothes. |
-|2 |steamWrinkle |The machine steams away wrinkles and also creates pant creases, as well as keep them crisp. |
-|3 |helpClean |Using pure water without chemical additives, the machine sanitizes fabrics and items that are difficult to wash. |
-|4 |gentleDry |The machine dries fragile garments without worrying about shrinkage or damage. |
-
-NOTE:	See clause [5.3.1.85 "steamClosetJobMode"](#53185-steamclosetjobmode). <mark>Negative values are reserved for vendor specific modes</mark>.
 
+Used for "currentJobMode" and "jobModes" data points of the "[steamClosetJobMode](#53185-steamclosetjobmode)" ModuleClass.
 
+**Table 5.6.31-1: Interpretation of hd:enumSteamClosetJobMode**
+
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |reduceOdor      |Using pure water, the machine help remove the smells on clothes.                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |steamWrinkle    |The machine steams away wrinkles and also creates pant creases, as well as keep    |
+|       |                |them crisp.                                                                        |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |helpClean       |Using pure water without chemical additives, the machine sanitizes fabrics and     |
+|       |                |items that are difficult to wash.                                                  |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |gentleDry       |The machine dries fragile garments without worrying about shrinkage or damage.     |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.85 "steamClosetJobMode"](#53185-steamclosetjobmode).                                |
+|Negative values are reserved for vendor specific modes.                                                     |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.32 hd:enumSupportedMediaSources
-Used for the "supportedMediaSources" data point of the "[mediaSelect](#53153-mediaselect)" ModuleClass.
-
-
-**Table 5.6.321: Interpretation of hd:enumSupportedMediaSources**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |tuner | |
-|2 |component | |
-|3 |composite | |
-|4 |svideo | |
-|5 |rgb | |
-|6 |dvi | |
-|7 |hdmi | |
-|8 |displayPort | |
-|9 |scart | |
-|10 |externalStorage | |
-|11 |network | |
-
-NOTE:	See clause [5.3.1.53 "mediaSelect"](#53153-mediaselect). <mark>Negative values are reserved for vendor specific sources</mark>.
 
+Used for the "supportedMediaSources" data point of the "[mediaSelect](#53153-mediaselect)" ModuleClass.
 
+**Table 5.6.32-1: Interpretation of hd:enumSupportedMediaSources**
+
+
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |tuner           |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |component       |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |composite       |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |svideo          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |rgb             |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|6      |dvi             |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|7      |hdmi            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|8      |displayPort     |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|9      |scart           |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|10     |externalStorage |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|11     |network         |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.53 "mediaSelect"](#53153-mediaselect).                                              |
+|Negative values are reserved for vendor specific sources                                                    |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.33 hd:enumTasteStrength
-Used for the "strength" data point of the "[brewing](#53116-brewing)" ModuleClass, indicating strength of a drink taste, for example coffee strength.
-
-
-**Table 5.6.331: Interpretation of hd:enumTasteStrength**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |zero | |
-|2 |sensitive | |
-|3 |medium | |
-|4 |strong | |
-|5 |maximum | |
-
-NOTE:	See clause [5.3.1.16 "brewing"](#53116-brewing).
 
+Used for the "strength" data point of the "[brewing](#53116-brewing)" ModuleClass, indicating strength of a drink taste, for example coffee strength.
 
+**Table 5.6.33-1: Interpretation of hd:enumTasteStrength**
+
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |zero            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |sensitive       |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |medium          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |strong          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |maximum         |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.16 "brewing"](#53116-brewing).                                                      |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.34 hd:enumTone
-Used for the "tone" data point of the "[alarmSpeaker](#5317-alarmspeaker)" ModuleClass.
-
-
-**Table 5.6.341: Interpretation of hd:enumTone**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |fire | |
-|2 |theft | |
-|3 |emergency | |
-|4 |doorbell | |
-|5 |deviceFail | |
-
-NOTE:	See clause [5.3.1.7 alarmSpeaker](#5317-alarmspeaker).
 
+Used for the "tone" data point of the "[alarmSpeaker](#5317-alarmspeaker)" ModuleClass.
 
+**Table 5.6.34-1: Interpretation of hd:enumTone**
+
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |fire            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |theft           |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |emergency       |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |doorbell        |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |deviceFail      |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.7 alarmSpeaker](#5317-alarmspeaker).                                                |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.35 hd:enumUvStatus
-Used for the "uvStatus" data point of the "[uvSensor](#53192-uvsensor)" ModuleClass.
-
-**Table 5.6.351: Interpretation of hd:enumUvStatus**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |Good | |
-|2 |Normal | |
-|3 |Bad | |
-|4 |Very Bad | |
-|5 |Danger | |
-
-NOTE: See clause [5.3.1.92 "uvSensor"](#53192-uvsensor).
-
-
-
-
-### 5.6.36 hd:enumVerticalDirection
-Used for the "verticalDirection" and "supportedVerticalDirection" data points of the "[airFlow](#5314-airflow)" ModuleClass, indicating vertical direction.
-
-**Table 5.6.361: Interpretation of hd:enumVerticalDirection**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |auto | |
-|2 |center | |
-|3 |up | |
-|4 |down | |
-
-NOTE: See clause [5.3.1.4 airFlow](#5314-airflow).
 
+Used for the "uvStatus" data point of the "[uvSensor](#53192-uvsensor)" ModuleClass.
 
+**Table 5.6.35-1: Interpretation of hd:enumUvStatus**
+
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |Good            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |Normal          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |Bad             |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |Very Bad        |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |Danger          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.92 "uvSensor"](#53192-uvsensor).                                                    |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
-### 5.6.37 hd:enumWaterFlowStrength
-Used for the "waterLevelStrength" data point of the "[waterFlow](#53193-waterflow)" ModuleClass,  indicating the strength of a water flow.
-
-
-**Table 5.6.371: Interpretation of hd:enumWaterFlowStrength**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |zero | |
-|2 |sensitive | |
-|3 |weak  | |
-|4 |medium | |
-|5 |strong | |
-|6 |maximum | |
-
-NOTE: See clause [5.3.1.93 "waterFlow"](#53193-waterflow).
-
-
-
-
-### 5.6.38 hd:enumBaliseSystemIndicator
-Used for the "[baliseTransmissionModule](#5381-balisetransmissionmodule)" ModuleClass.
-
-**Table 5.6.381: Interpretation of hd:enumBaliseSystemIndicator**
-
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |ATC |Korea <a href="#_ref_i.9">[i.9]</a> |
-|2 |ATP |Korea <a href="#_ref_i.9">[i.9]</a> |
-|3 |CTCS-3 |China <a href="#_ref_i.10">[i.10]</a> |
-
-NOTE: The Note shows countries which are using a balise system which is indicated on left-hand side.
-
+### 5.6.36 hd:enumVerticalDirection
 
+Used for the "verticalDirection" and "supportedVerticalDirection" data points of the "[airFlow](#5314-airflow)" ModuleClass, indicating vertical direction.
 
+**Table 5.6.36-1: Interpretation of hd:enumVerticalDirection**
 
-### 5.6.39 hd:enumWeightUnit
-Used for the "unit" data point related to all ModuleClass which contains weight, indicating the units of the weight.
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |auto            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |center          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |up              |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |down            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.4 airFlow](#5314-airflow).                                                          |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
-**Table 5.6.391: Interpretation of hd:enumWeight**
+### 5.6.37 hd:enumWaterFlowStrength
 
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |kg |kilogram |
-|2 |lb |pound |
-|3 |oz |ounce |
+Used for the "waterLevelStrength" data point of the "[waterFlow](#53193-waterflow)" ModuleClass,  indicating the strength of a water flow.
 
-  NOTE: See clause [5.3.1.99 "weight"](#53199-weight). 
+**Table 5.6.37-1: Interpretation of hd:enumWaterFlowStrength**
+
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |zero            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |sensitive       |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |weak            |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |medium          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |strong          |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|6      |maximum         |                                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.93 "waterFlow"](#53193-waterflow).                                                  |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
+### 5.6.38 hd:enumBaliseSystemIndicator
 
+Used for the "[baliseTransmissionModule](#5381-balisetransmissionmodule)" ModuleClass.
 
-### 5.6.40 hd:enumTemperatureUnit
-Used for the "unit" data point related to "[temperature](#53187-temperature)" and "[temperatureAlarm](#53188-temperaturealarm)" ModuleClasses which contains temperature,  indicating the units of the temperature.
+**Table 5.6.38-1: Interpretation of hd:enumBaliseSystemIndicator**
 
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |ATC             |Korea [\[i.9\]](#_ref_i.9)                                                         |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |ATP             |Korea [\[i.9\]](#_ref_i.9)                                                         |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |CTCS-3          |China [\[i.10\]](#_ref_i.10)                                                       |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: The Note shows countries which are using a balise system which is indicated on left-hand side.        |
++-------+----------------+-----------------------------------------------------------------------------------+
 
-**Table 5.6.401: Interpretation of hd:enumTemperatureUnit**
 
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |C |Celsius |
-|2 |F |Fahrenheit |
-|3 |K |Kelvin |
+### 5.6.39 hd:enumWeightUnit
+
+Used for the "unit" data point related to all ModuleClass which contains weight, indicating the units of the weight.
 
-NOTE: See clause [5.3.1.87 "temperature"](#53187-temperature) and clause [5.3.1.88 "temperatureAlarm"](#53188-temperaturealarm).
+**Table 5.6.39-1: Interpretation of hd:enumWeight**
 
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |kg              |kilogram                                                                           |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |lb              |pound                                                                              |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |oz              |ounce                                                                              |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.99 "weight"](#53199-weight).                                                        |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
+### 5.6.40 hd:enumTemperatureUnit
 
-### 5.6.41 hd:enumWaterFilterType
-Used for the "filterType" data point of the "[waterFilterType](#531105-waterfiltertype)" ModuleClass.
+Used for the "unit" data point related to "[temperature](#53187-temperature)" and "[temperatureAlarm](#53188-temperaturealarm)" ModuleClasses which contains temperature,  indicating the units of the temperature.
 
+**Table 5.6.40-1: Interpretation of hd:enumTemperatureUnit**
 
-**Table 5.6.411: Interpretation of hd:enumWaterFilterType**
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |C               |Celsius                                                                            |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |F               |Fahrenheit                                                                         |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |K               |Kelvin                                                                             |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.87 "temperature"](#53187-temperature) and clause                                    |
+|[5.3.1.88 "temperatureAlarm"](#53188-temperaturealarm).                                                     |
++-------+----------------+-----------------------------------------------------------------------------------+
 
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |RO |This value indicates the Reverse Osmosis type water filter. |
-|2 |UV |This value indicates the Ultraviolet type water filter. |
-|3 |UF |This value indicates the UltraFiltration type water filter. |
-|4 |AC |This value indicates the Activate Carbon type water filter. |
-|5 |SF |This value indicates the Sediment type water filter. |
 
-NOTE: See clause [5.3.1.105 "waterFilterType"](#531105-waterfiltertype).
+### 5.6.41 hd:enumWaterFilterType
 
+Used for the "filterType" data point of the "[waterFilterType](#531105-waterfiltertype)" ModuleClass.
 
+**Table 5.6.41-1: Interpretation of hd:enumWaterFilterType**
+
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |RO              |This value indicates the Reverse Osmosis type water filter.                        |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |UV              |This value indicates the Ultraviolet type water filter.                            |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |UF              |This value indicates the UltraFiltration type water filter.                        |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |AC              |This value indicates the Activate Carbon type water filter.                        |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |SF              |This value indicates the Sediment type water filter.                               |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.105 "waterFilterType"](#531105-waterfiltertype).                                    |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.42 hd:enumDataModelType
-Used for the "dataModelType" DataPoint of the "[dmDataModelIO](#584-dmdatamodelio)" ModuleClass.
 
+Used for the "dataModelType" DataPoint of the "[dmDataModelIO](#584-dmdatamodelio)" ModuleClass.
 
 **Table 5.6.42-1 Interpretation of hd:enumDataModelType**
 
@@ -4555,9 +4676,8 @@ Used for the "dataModelType" DataPoint of the "[dmDataModelIO](#584-dmdatamodeli
 |7 |oneM2M |For native oneM2M devices |
 
 
-
-
 ### 5.6.43 hd:enumDmAgentState
+
 Used for the "state" DataPoint of the "[dmAgent](#582-dmagent)" ModuleClass.
 
 **Table 5.6.43-1 Interpretation of hd:enumDmAgentState**
@@ -4570,9 +4690,8 @@ Used for the "state" DataPoint of the "[dmAgent](#582-dmagent)" ModuleClass.
 |4 |unreachable |The device is not accessible  |
 
 
-
-
 ### 5.6.44 hd:enumFirmwareState
+
 Used for the "state" DataPoint of the "[dmFirmware](#585-dmfirmware)" ModuleClass.
 
 **Table 5.6.44-1 Interpretation of hd:enumFirmwareState**
@@ -4587,8 +4706,6 @@ Used for the "state" DataPoint of the "[dmFirmware](#585-dmfirmware)" ModuleClas
 |6 |Archival |The firmware is an archival record that cannot be reactivated. |
 
 
-
-
 ### 5.6.45 hd:enumPowerState
 Used for the "powerStatus" DataPoint of the "[dmAgent](#582-dmagent)" ModuleClass.
 
@@ -4605,11 +4722,9 @@ Used for the "powerStatus" DataPoint of the "[dmAgent](#582-dmagent)" ModuleClas
 |7 |notInstalled | |
 
 
-
-
 ### 5.6.46 hd:enumRebootType
-Used for the "rebootType" argument of the "[reboot](#582-dmagent)" action of the "[dmAgent](#582-dmagent)" ModuleClass.
 
+Used for the "rebootType" argument of the "[reboot](#582-dmagent)" action of the "[dmAgent](#582-dmagent)" ModuleClass.
 
 **Table 5.6.46-1 Interpretation of hd:enumRebootType**
 
@@ -4621,11 +4736,9 @@ Used for the "rebootType" argument of the "[reboot](#582-dmagent)" action of the
 |4 |softReset | |
 
 
-
-
 ### 5.6.47 hd:enumSoftwareState
-Used for the "state" data point of the "[dmSoftware](#586-dmsoftware)" ModuleClass.
 
+Used for the "state" data point of the "[dmSoftware](#586-dmsoftware)" ModuleClass.
 
 **Table 5.6.47-1 Interpretation of hd:enumSoftwareState**
 
@@ -4637,8 +4750,6 @@ Used for the "state" data point of the "[dmSoftware](#586-dmsoftware)" ModuleCla
 |4 |Deactivating | |
 
 
-
-
 ### 5.6.48 hd:enumPackageState
 Used for the "state" data point of the "[dmPackage](#588-dmpackage)" ModuleClass.
 
@@ -4654,7 +4765,6 @@ Used for the "state" data point of the "[dmPackage](#588-dmpackage)" ModuleClass
 |6 |Uninstalling | |
 
 
-
 ### 5.6.49 hd:enumPackageType
 
 Used for the "type" data point of the "[dmPackage](#588-dmpackage)" ModuleClass.
@@ -4671,12 +4781,10 @@ Used for the "type" data point of the "[dmPackage](#588-dmpackage)" ModuleClass.
 |6 |Undefined | |
 
 
-
 ### 5.6.50 hd:enumBatteryMaterial
 
 Used for the "batteryMaterial" DataPoint of the "[battery](#53110-battery)" ModuleClass.
 
-
 **Table 5.6.50-1 Interpretation of hd:enumBatteryMaterial**
 
 |Value |Interpretation |Note |
@@ -4698,7 +4806,6 @@ Used for the "batteryMaterial" DataPoint of the "[battery](#53110-battery)" Modu
 |15 |Rechargeable_alkaline_battery |Secondary cells or rechargeable |
 
 
-
 ### 5.6.51 hd:enumBatteryShape
 
 Used for the "batteryShape" DataPoint of the "[battery](#53110-battery)" ModuleClass.
@@ -4733,9 +4840,8 @@ Used for the "batteryShape" DataPoint of the "[battery](#53110-battery)" ModuleC
 |24 |Custom_made |Custom-made by manufacturer |
 
 
-
-
 ### 5.6.52 hd:enum3DDisplayType
+
 Used for the "threeDDisplayType" DataPoint of the "[threeDDisplay](#531116-threeddisplay)" ModuleClass.
 
 **Table 5.6.52-1 Interpretation of hd:enum3DDisplayType**
@@ -4748,9 +4854,8 @@ Used for the "threeDDisplayType" DataPoint of the "[threeDDisplay](#531116-three
 |4 |ETC | |
 
 
-
-
 ### 5.6.53 hd:enum3DScannerType
+
 Used for the "threeDScannerType" DataPoint of the "[threeDScanner](#531117-threedscanner)" ModuleClass.
 
 **Table 5.6.53-1 Interpretation of hd:enum3DScannerType**
@@ -4764,121 +4869,144 @@ Used for the "threeDScannerType" DataPoint of the "[threeDScanner](#531117-three
 |5 |ETC |The other technology is used to scan an object. |
 
 
-
-
 ### 5.6.54 hd:enumShoesWasherJobMode
+
 Used for the "currentJobMode" and "jobModes" DataPoints of the "[shoesWasherJobMode](#531119-shoeswasherjobmode)" ModuleClass.
 
 **Table 5.6.54-1: Interpretation of hd:enumShoesWasherJobMode**
 
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |normalWash | |
-|2 |intensiveWash | |
-|3 |quickWash | |
-|4 |maintenanceWash | |
-|5 |antibacterialWash | |
-
-NOTE:	See clause [5.3.1.119 "shoesWasherJobMode"](#531119-shoeswasherjobmode). <mark>Negative values are reserved for vendor specific modes</mark>.
-
-
++-------+------------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation    |Note                                                                               |
++:======+:=================+:==================================================================================+
+|2      |intensiveWash     |                                                                                   |
++-------+------------------+-----------------------------------------------------------------------------------+
+|1      |normalWash        |                                                                                   |
++-------+------------------+-----------------------------------------------------------------------------------+
+|3      |quickWash         |                                                                                   |
++-------+------------------+-----------------------------------------------------------------------------------+
+|4      |maintenanceWash   |                                                                                   |
++-------+------------------+-----------------------------------------------------------------------------------+
+|5      |antibacterialWash |                                                                                   |
++-------+------------------+-----------------------------------------------------------------------------------+
+|NOTE: See clause [5.3.1.119 "shoesWasherJobMode"](#531119-shoeswasherjobmode).                                |
+|Negative values are reserved for vendor specific modes.                                                       |
++-------+------------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.55 hd:enumAlertStatus
+
 The enumeration type, hd:enumAlertStatus, enables things to identify the alert status that describes whether a received public warning message as oneM2M based information is an actual alert issued by authorities or an alert for testing the public warning service over oneM2M system.
 
 **Table 5.6.55-1: Interpretation of hd:enumAlertStatus**
 
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |Actual |Actionable by all targeted recipients |
-|2 |Exercise |Actionable only by designated exercise participants  |
-|3 |System |For messages that support alert network internal functions |
-|4 |Test |Technical testing only, all recipients disregard |
-|5 |Draft |A preliminary template or draft, not actionable in its current form |
-
-NOTE:  Listed names for this enumeration are specified on the CAP 1.2 specification <a href="#_ref_22">[22]</a>.
-
-
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |Actual          |Actionable by all targeted recipients                                              |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |Exercise        |Actionable only by designated exercise participants                                |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |System          |For messages that support alert network internal functions                         |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |Test            |Technical testing only, all recipients disregard                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |Draft           |A preliminary template or draft, not actionable in its current form                |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: Listed names for this enumeration are specified on the CAP 1.2 specification [\[22\]](#_ref_22).      |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.56 hd:enumAlertMsgType
-The enumeration type, hd:enumAlertMsgType, describes the message type of oneM2M based information transformed from CAP based information issued by authorities.
 
+The enumeration type, hd:enumAlertMsgType, describes the message type of oneM2M based information transformed from CAP based information issued by authorities.
 
 **Table 5.6.56-1: Interpretation of hd:enumAlertMsgType**
 
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |Alert |Initial information requiring attention by targeted recipients |
-|2 |Update |Updates and supersedes the earlier message(s) |
-|3 |Cancel |Cancels the earlier message(s) |
-
-NOTE:  Listed names for this enumeration are specified on the CAP 1.2 specification <a href="#_ref_22">[22]</a>.
-
-
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |Alert           |Initial information requiring attention by targeted recipients                     |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |Update          |Updates and supersedes the earlier message(s)                                      |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |Cancel          |Cancels the earlier message(s)                                                     |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: Listed names for this enumeration are specified on the CAP 1.2 specification [\[22\]](#_ref_22).      |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.57 hd:enumUrgency
-The enumeration type, hd:enumUrgency, describes the urgency of the event defined in oneM2M based information transformed from CAP based information issued by authorities.
 
+The enumeration type, hd:enumUrgency, describes the urgency of the event defined in oneM2M based information transformed from CAP based information issued by authorities.
 
 **Table 5.6.57-1: Interpretation of hd:enumUrgency**
 
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |Immediate |Responsive action should be taken immediately |
-|2 |Expected |Responsive action should be taken soon (within next hour) |
-|3 |Future |Responsive action should be taken in the near future |
-|4 |Past |Responsive action is no longer required |
-|5 |Unknown |Urgency not known |
-
-NOTE:  Listed names for this enumeration are specified on the CAP 1.2 specification <a href="#_ref_22">[22]</a>.
-
-
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |Immediate       |Responsive action should be taken immediately                                      |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |Expected        |Responsive action should be taken soon (within next hour)                          |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |Future          |Responsive action should be taken in the near future                               |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |Past            |Responsive action is no longer required                                            |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |Unknown         |Urgency not known                                                                  |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: Listed names for this enumeration are specified on the CAP 1.2 specification [\[22\]](#_ref_22).      |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.58 hd:enumSeverity
-The enumeration type, hd:enumSeverity, describes the severity of the event defined in oneM2M based information transformed from CAP based information issued by authorities.
 
+The enumeration type, hd:enumSeverity, describes the severity of the event defined in oneM2M based information transformed from CAP based information issued by authorities.
 
 **Table 5.6.58-1: Interpretation of hd:enumSeverity**
 
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |Extreme |Extraordinary threat to life or property |
-|2 |Severe |Significant threat to life or property |
-|3 |Moderate |Possible threat to life or property |
-|4 |Minor |Minimal to no known threat to life or property |
-|5 |Unknown |Severity unknown |
-
-NOTE:  Listed names for this enumeration are specified on the CAP 1.2 specification <a href="#_ref_22">[22]</a>.
-
-
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |Extreme         |Extraordinary threat to life or property                                           |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |Severe          |Significant threat to life or property                                             |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |Moderate        |Possible threat to life or property                                                |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |Minor           |Minimal to no known threat to life or property                                     |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |Unknown         |Severity unknown                                                                   |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: Listed names for this enumeration are specified on the CAP 1.2 specification [\[22\]](#_ref_22).      |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ### 5.6.59 hd:enumCertainty
-The enumeration type, hd:enumCertainty, describes the certainty of the event defined in oneM2M based information transformed from CAP based information issued by authorities.
 
+The enumeration type, hd:enumCertainty, describes the certainty of the event defined in oneM2M based information transformed from CAP based information issued by authorities.
 
 **Table 5.6.59-1: Interpretation of hd:enumCertainty**
 
-|Value |Interpretation |Note |
-|-|-|-|
-|1 |Observed |Determined to have occurred or to be ongoing |
-|2 |Likely |Likely (p > ~50 %) |
-|3 |Possible |Possible but not likely (p <= ~50 %) |
-|4 |Unlikely |Not expected to occur (p ~ 0) |
-|5 |Unknown |Certainty unknown |
-
-NOTE: Listed names for this enumeration are specified on the CAP 1.2 specification <a href="#_ref_22">[22]</a>.
-
-
++-------+----------------+-----------------------------------------------------------------------------------+
+|Value  |Interpretation  |Note                                                                               |
++:======+:===============+:==================================================================================+
+|1      |Observed        |Determined to have occurred or to be ongoing                                       |
++-------+----------------+-----------------------------------------------------------------------------------+
+|2      |Likely          |Likely (p > ~50 %)                                                                 |
++-------+----------------+-----------------------------------------------------------------------------------+
+|3      |Possible        |Possible but not likely (p <= ~50 %)                                               |
++-------+----------------+-----------------------------------------------------------------------------------+
+|4      |Unlikely        |Not expected to occur (p ~ 0)                                                      |
++-------+----------------+-----------------------------------------------------------------------------------+
+|5      |Unknown         |Certainty unknown                                                                  |
++-------+----------------+-----------------------------------------------------------------------------------+
+|NOTE: Listed names for this enumeration are specified on the CAP 1.2 specification [\[22\]](#_ref_22).      |
++-------+----------------+-----------------------------------------------------------------------------------+
 
 
 ## 5.7 Universal and Common Properties for Device models
-Universal and common properties are defined either 
 
+Universal and common properties are defined either 
 
 - As specialized custom attributes of a [dmDeviceInfo](#583-dmdeviceinfo) &lt;flexContainer> specialization, defined in [clause 5.8.3](#583-dmdeviceinfo), when the &lt;node> resource targeted by the nodeLink attribute of the Device model contains a [[flexNode](#581-flexnode)] child,
 - Or as specialized object attributes of the [deviceInfo] &lt;mgmtObj> specialization, defined in Annex D.8 of TS-0001<a href="#_ref_3">[3]</a>, child of this &lt;node> resource, otherwise.
@@ -4887,7 +5015,7 @@ Some properties are mandatory for all device models and called "Universal Proper
 
 Universal and common properties are applicable to all device models. They are not repeated in the property table of each device model in [clause 5.5](#55-device-models), where only device specific properties shall be specified. 
 
-NOTE: The instantiated values of the universal properties might be empty in case of exceptional scenarios, e.g. interworking with non-oneM2M device models.
+>NOTE: The instantiated values of the universal properties might be empty in case of exceptional scenarios, e.g. interworking with non-oneM2M device models.
 
 ## 5.8 Device Management
 
@@ -4910,23 +5038,36 @@ This resource is a &lt;flexContainer> child of the &lt;node> resource targeted b
 
 **Table 5.8.1-1: Child resources of [flexNode] resource**
 
-|Child Resources of [flexNode] |Child Resource Type |Multiplicity |Description |
-|-|-|-|-|
-|dmAreaNwkInfo_&lt;i> |[[dmAreaNwkInfo]](#589-dmareanwkinfo)] |0..n |See clause [5.8.9](#589-dmareanwkinfo). |
-|dmAgent |[[dmAgent]](#582-dmagent)	 |0..1 |See clause [5.8.2](#582-dmagent). |
-|dmDeviceInfo |[[dmDeviceInfo]](#583-dmdeviceinfo) |1 |See clause [5.8.3](#583-dmdeviceinfo). |
-|dmDataModelIO_&lt;i> |[[dmDataModelIO]](#584-dmdatamodelio) |0..N |See clause [5.8.4](#584-dmdatamodelio). |
-|dmFirmware_&lt;i> |[[dmFirmware]](#585-dmfirmware) |1..N |See clause [5.8.5](#585-dmfirmware). |
-|dmSoftware_&lt;i> |[[dmSoftware]](#586-dmsoftware) |0..N |See clause [5.8.6](#586-dmsoftware). |
-|dmEventLog_&lt;i> |[[dmEventLog]](#587-dmeventlog) |0..N |See clause [5.8.7](#587-dmeventlog). |
-|dmPackage_&lt;i> |[[dmPackage]](#588-dmpackage)] |0..N |See clause [5.8.8](#588-dmpackage), |
-|battery_&lt;i> |[[battery]](#5310-battery) |0..N |See clause [5.3.1.10](#53110-battery). |
-|dmCapability_&lt;i> |[[dmCapability]](#5811-dmcapability)] |0..N |See clause [5.8.11](#5811-dmcapability). |
-|dmStorage_&lt;i> |[[dmStorage]](#5812-dmstorage)] |0..N |See clause [5.8.12](#5812-dmstorage). |
-
-NOTE 1: The notation '&lt;i>' for child resources indicates that the resource name is the name of the child ModuleClass or SubDevice flexContainer, appended with an underscore '_' and an incrementing index so that it is unique in the [flexNode] children (e.g. "dmFirmware_0", "dmFirmware_1", etc.). The index shall not have leading 0's.
-
-NOTE 2: The current list of modules for Device Management is not fixed and can evolve with new optional features.
++------------------------------+-----------------------------------------+-------------+-----------------------------------------+
+|Child Resources of [flexNode] |Child Resource Type                      |Multiplicity |Description                              |
++:=============================+:========================================+:============+:========================================+
+|dmAreaNwkInfo_&lt;i>          |[\[dmAreaNwkInfo\]](#589-dmareanwkinfo)  |0..n         |See clause [5.8.9](#589-dmareanwkinfo).  |
++------------------------------+-----------------------------------------+-------------+-----------------------------------------+
+|dmAgent                       |[\[dmAgent\]](#582-dmagent)              |0..1         |See clause [5.8.2](#582-dmagent).        |
++------------------------------+-----------------------------------------+-------------+-----------------------------------------+
+|dmDeviceInfo                  |[\[dmDeviceInfo\]](#583-dmdeviceinfo)    |1            |See clause [5.8.3](#583-dmdeviceinfo).   |
++------------------------------+-----------------------------------------+-------------+-----------------------------------------+
+|dmDataModelIO_&lt;i>          |[\[dmDataModelIO\]](#584-dmdatamodelio)  |0..N         |See clause [5.8.4](#584-dmdatamodelio).  |
++------------------------------+-----------------------------------------+-------------+-----------------------------------------+
+|dmSoftware_&lt;i>             |[\[dmSoftware\]](#586-dmsoftware)        |0..N         |See clause [5.8.6](#586-dmsoftware).     |
++------------------------------+-----------------------------------------+-------------+-----------------------------------------+
+|dmEventLog_&lt;i>             |[\[dmEventLog\]](#587-dmeventlog)        |0..N         |See clause [5.8.7](#587-dmeventlog).     |
++------------------------------+-----------------------------------------+-------------+-----------------------------------------+
+|dmFirmware_&lt;i>             |[\[dmFirmware\]](#585-dmfirmware)        |1..N         |See clause [5.8.5](#585-dmfirmware).     |
++------------------------------+-----------------------------------------+-------------+-----------------------------------------+
+|dmPackage_&lt;i>              |[\[dmPackage\]](#588-dmpackage)          |0..N         |See clause [5.8.8](#588-dmpackage).      |
++------------------------------+-----------------------------------------+-------------+-----------------------------------------+
+|battery_&lt;i>                |[\[battery\]](#5310-battery)             |0..N         |See clause [5.3.1.10](#53110-battery).   |
++------------------------------+-----------------------------------------+-------------+-----------------------------------------+
+|dmCapability_&lt;i>           |[\[dmCapability\]](#5811-dmcapability)   |0..N         |See clause [5.8.11](#5811-dmcapability). |
++------------------------------+-----------------------------------------+-------------+-----------------------------------------+
+|dmStorage_&lt;i>              |[\[dmStorage\]](#5812-dmstorage)         |0..N         |See clause [5.8.12](#5812-dmstorage).    |
++------------------------------+-----------------------------------------+-------------+-----------------------------------------+
+
+>Notes:
+>
+>- The notation '&lt;i>' for child resources indicates that the resource name is the name of the child ModuleClass or SubDevice	flexContainer, appended with an underscore '_' and an incrementing index so that it is unique in the [flexNode] children (e.g. "dmFirmware_0", "dmFirmware_1", etc.). The index shall not have leading 0's.
+>- The current list of modules for Device Management is not fixed and can evolve with new optional features.
 
 
 ### 5.8.2 dmAgent
@@ -4981,7 +5122,7 @@ This ModuleClass is used to share static information regarding the device.
 |friendlyName |xs:string |RW |true | |The device friendly name.  |
 |description |xs:string |RW |true | |A human readable description of the device (e.g. Alice's cell phone, kitchen's fridge, etc.) |
 
-NOTE:  Although all data points are optional, depending on the underlying DM technology, some data points should be filled, for instance *serialNumber*, *manufacturer* and *model* when this information is available.
+>NOTE: Although all data points are optional, depending on the underlying DM technology, some data points should be filled, for instance *serialNumber*, *manufacturer* and *model* when this information is available.
 
 
 ### 5.8.4 dmDataModelIO
@@ -5008,7 +5149,7 @@ Example of *address* values could be ```'Device.WiFi.SSID.1' if dataModelType=6`
 
 These *address* and *payload* argument can contain several values separated by a comma ','. The *payload* argument's value types are the valid JSON primitive types (string, number, boolean, null).
 
-EXAMPLES:
+Examples:
 
 ```
 readIO(address="Device.WiFi.SSID.SSID")
@@ -5020,11 +5161,11 @@ readIO(address="/3/0/1,/3/0/2")
 writeIO(address="Device.DeviceInfo.FriendlyName,Device.WiFi.SSID.SSID", payload="my device,my ssid"}
     -> {"Device.DeviceInfo.FriendlyName,Device.WiFi.SSID.SSID"}
 
-writeIO(address="/3/0/15", payload="[Europe/Paris](Europe/Paris)")
+writeIO(address="/3/0/15", payload="Europe/Paris")
     -> {"/3/0/15"}
 ```
 
-NOTE: Some data points of the [\[dmAgent\]](#582-dmagent) and [\[dmDeviceInfo\]](#583-dmdeviceinfo) ModuleClasses correspond to fixed parameters in OMA & BBF data models. The corresponding concepts in OMA DM / LwM2M data models (resp. BBF TR-181 <a href="#_ref_i.12">[i.12]</a>) are specified in oneM2M TS-0005 (resp. TS-0006 <a href="#_ref_i.1">[i.15]</a>). For instance the data point *memAvailable* corresponds to `'Device.DeviceInfo.MemoryStatus.Free'` in BBF TR-181 <a href="#_ref_i.12">[i.12]</a> (see oneM2M TS-0006 <a href="#_ref_i.15">[i.15]</a> clause 7.3) and to `'/3/0/10'` in LwM2M (oneM2M TS-0005 clause 6.3.4).
+>NOTE: Some data points of the [\[dmAgent\]](#582-dmagent) and [\[dmDeviceInfo\]](#583-dmdeviceinfo) ModuleClasses correspond to fixed parameters in OMA & BBF data models. The corresponding concepts in OMA DM / LwM2M data models (resp. BBF TR-181 <a href="#_ref_i.12">[i.12]</a>) are specified in oneM2M TS-0005 (resp. TS-0006 <a href="#_ref_i.1">[i.15]</a>). For instance the data point *memAvailable* corresponds to `'Device.DeviceInfo.MemoryStatus.Free'` in BBF TR-181 <a href="#_ref_i.12">[i.12]</a> (see oneM2M TS-0006 <a href="#_ref_i.15">[i.15]</a> clause 7.3) and to `'/3/0/10'` in LwM2M (oneM2M TS-0005 clause 6.3.4).
 
 
 ### 5.8.5 dmFirmware
@@ -5042,7 +5183,6 @@ Individual firmwares are managed using the [dmFirmware] actions presented in Tab
 |xs:string |updateFirmware |url: xs:url<br />version:  xs:string |true |Downloads a new firmware to the device / sub-component. In case of devices that do support toggling between multiple pre-installed firmware versions it also starts the firmware flashing/installation process.<br />The updateFirmware action as it results returns an AE/IPE message indicating if the action was successful or not. |
 |xs:string |toggle |none |true |Toggles between the firmware versions installed on a device/sub-component. In case of devices that do not support such toggling, it triggers the firmware flashing/installation process.<br />The toggle action as it results returns an AE/IPE message indicating if the action was successful or not. |
 
-
 The abstraction model used for [dmFirmware] manages the firmware through two images: a *primary* firmware image and a *secondary* one. Despite the naming both images are equivalent and a secondary image can be actively used by a device just like the primary one.
 
 Using an abstraction model based on two firmware images it is possible to effectively manage firmware on devices with different firmware capabilities. The state machine for firmware management using two images is shown in Figure 5.8.5-1 for devices that do support toggling between multiple pre-installed firmware versions and in Figure 5.8.5-2 for devices that can have only one firmware version installed. 
@@ -5062,7 +5202,7 @@ Using an abstraction model based on two firmware images it is possible to effect
 |secondaryUrl |xs:url |R |true | |The URL from which the secondary firmware image was downloaded. |
 |component |xs:string |R |true | |Allows to identify the sub-component that uses this firmware. <br />This data point is mandatory if this is a sub-component firmware. |
 
-NOTE 1: Both primary and secondary firmware image related dataPoints are mandatory when *updateFirmware* is available, however depending on the device capabilities one of the two state machines - the one presented in Figure 5.8.5-1 or the one shown in Figure 5.8.5-2 should be used.
+>NOTE: Both primary and secondary firmware image related dataPoints are mandatory when *updateFirmware* is available, however depending on the device capabilities one of the two state machines - the one presented in Figure 5.8.5-1 or the one shown in Figure 5.8.5-2 should be used.
 
 ![Figure 5.8.5-1: Lifecycle of a dmFirmware for devices that support toggling between pre-installed firmware images](media/lifecycle_of_a_dmfirmware_1.svg)
 
@@ -5074,7 +5214,7 @@ For devices that support toggling between multiple pre-installed firmware images
 - Toggling between firmware images is only possible if one image is in "Ready" state and the other image is in "Active" state. 
 - *updateFirmware* action is always performed on the  image that  is in "Ready" or "Failure" state.
 
-NOTE 2: It is the AE/IPE responsibility to provide the appropriate action result pointing if the action was triggered on the device or not (e.g. if the current firmware state did not allow it).
+>NOTE: It is the AE/IPE responsibility to provide the appropriate action result pointing if the action was triggered on the device or not (e.g. if the current firmware state did not allow it).
 
 ![Figure 5.8.5-2: Lifecycle of a dmFirmware for devices that can have only one firmware version installed](media/lifecycle_of_a_dmfirmware_2.svg)
 
@@ -5092,7 +5232,7 @@ For devices that can have only one firmware version installed the following rule
 
 If one image is in "Archival" state and the other is in "Failure" state the *updateFirmware* action is always performed on the image that is in "Archival" state.
 
-NOTE 3: It is the AE/IPE responsibility to provide the appropriate action result pointing if the action was triggered on the device or not (e.g. if the current firmware state did not allow it).
+>NOTE: It is the AE/IPE responsibility to provide the appropriate action result pointing if the action was triggered on the device or not (e.g. if the current firmware state did not allow it).
 
 
 ### 5.8.6 dmSoftware
@@ -5170,11 +5310,11 @@ This ModuleClass provides DM capabilities to deploy, control and monitor package
 |none |uninstall |none |false |Uninstall the package. |
 |none |update |version: xs:string<br />url: xs:string |false |Update the package. |
 
-NOTE:
-
-- The package can be pre-downloaded when the [dmPackage] resource is created.
-- In the *update* action, the arguments version and url can be empty strings (case for instance of updating a package on a Linux-type system).
-- When the [dmPackage] resource is deleted, the package shall be removed from the device.
+>NOTE:
+>
+>- The package can be pre-downloaded when the [dmPackage] resource is created.
+>- In the *update* action, the arguments version and url can be empty strings (case for instance of updating a package on a Linux-type system).
+>- When the [dmPackage] resource is deleted, the package shall be removed from the device.
 
 **Table 5.8.8-2 DataPoints of dmPackage ModuleClass**
 
@@ -5187,10 +5327,10 @@ NOTE:
 |url |xs:url |R |true | |The URL from which the package can be downloaded |
 |softwares |m2m:listOfM2MID |R |true | |The list of [dmSoftware](#586-dmsoftware) modules, if any, that are associated with this [dmPackage] module |
 
-NOTE: 
-
-- The [dmPackage] *name* and *version* data points are optional because they can be deduced from the downloaded resource. The *url* data point is optional because the package can be pre-installed or downloaded from a default repository (for instance a package on a Linux-type system).
-- The possible dependencies between [dmPackage] modules (for instance the [dmPackage] of an executable software image depends on the deployment of other dmPackage that correspond to libraries needed by this software) is out of scope of the present document.
+>NOTE: 
+>
+>- The [dmPackage] *name* and *version* data points are optional because they can be deduced from the downloaded resource. The *url* data point is optional because the package can be pre-installed or downloaded from a default repository (for instance a package on a Linux-type system).
+>- The possible dependencies between [dmPackage] modules (for instance the [dmPackage] of an executable software image depends on the deployment of other dmPackage that correspond to libraries needed by this software) is out of scope of the present document.
 
 The control of the association between a dmPackage and an associated [\[dmSoftware\]](#586-dmsoftware) module, for instance updating a [dmPackage] when the [\[dmSoftware\]](#586-dmsoftware) is active, is out of scope of the present document.
 
@@ -5282,6 +5422,7 @@ This ModuleClass is used to model the storage on a managed device.
 # 6 The Principle of Resource Mapping for Harmonized Information Model
 
 ## 6.1 Introduction
+
 Harmonized information models which are defined in clause [5](#5-harmonised-information-model) need to be represented as resources in the oneM2M system. This clause defines the principle of resource mapping based on &lt;flexContainer>. The individual information mapping is provided in annexes [A](#annex-a-(informative)--resource-mapping-examples), [B](#annex-b-(informative)--introduction-of-external-organizations'-data-models), and [C](#annex-c-(informative)--mapping-to-content-attribute).
 
 
@@ -5294,28 +5435,18 @@ The present clause specifies the rule to map the "Harmonized Information Model"
 ### 6.2.2 Resource mapping for Device model
 When the AE exposes a controlling interface for a device which is specified as an information model in clause [5.5](#55-device-models), a specialization of the &lt;flexContainer> resource shall be created as the mapping of the model following conversion rules:
 
-
 - Rule 1-1: Each Device model defined in clause [5.5](#55-device-models) shall be mapped to a specialization of &lt;flexContainer>. The *containerDefinition* attribute shall be set according to clause [6.4.2](#642-device-models).
-
 - Rule 1-2: Each entry in the 'Module' table shall be mapped to a child resource(s) which is mapped as a specialised &lt;flexContainer> following the rule in clause [6.2.3](#623-resource-mapping-for-moduleclass).
-
 - Rule 1-3: The specialized &lt;flexContainer> resource of the Device model may contain an optional attribute *nodeLink* (as defined in oneM2M TS-0001<a href="#_ref_3">[3]</a> and in oneM2M TS-0004<a href="#_ref_4">[4]</a>). The value of *nodeLink* shall be set to the resource identifier of a &lt;node> resource described in Rule 1-5 below. See also clause Rule 1-8.
-
 - Rule 1-4: XSD file for each Device model shall be named according to clause [6.5.2](#652-xsd-definitions-for-device-models).
-
 - Rule 1-5:  A &lt;node> resource shall be created on the same hosting CSE as the &lt;flexContainer> representing this Device model. If the &lt;node> resource does not contain a [flexNode] child resource (see Rule 1.7), then it contains all the management information as specialized &lt;mgmtObj> resources (e.g. [firmware]) about the Device model instance for device management purposes. 
-
 - Rule 1-6: Void.
-
 - Rule 1-7:The &lt;node> resource targeted by the *nodeLink* attribute may have a [flexNode] child resource. This [flexNode] resource contains all the Device Management information as specialized &lt;flexContainer> resources defined in clause [5.8](#58-device-management) (e.g. [[dmFirmware](#585-dmfirmware)]) about the device model instance for Device Management purposes.
-
 - Rule 1-8: Void.
-
 - Rule 1-9: Each entry in the 'SubDevice' table shall be mapped to a child resource(s) which is mapped as a specialised &lt;flexContainer> following the rule in clause [6.2.7](#627-resource-mapping-for-subdevice-model).
-
 - Rule 1-10: Each &lt;flexContainer> associated to a Device model may have as child resource any &lt;flexContainer> associated to a ModuleClass model of the Metadata domain defined in clause [5.3.9](#539-metadata-domain).
 
-  In other words, all devices implicitly have the following lines in their modules table:
+In other words, all devices implicitly have the following lines in their modules table:
 
 **Table 6.2.2-1: Modules of deviceXXX model**
 
@@ -5325,75 +5456,64 @@ When the AE exposes a controlling interface for a device which is specified as a
 
 
 ### 6.2.3 Resource mapping for ModuleClass
+
 The ModuleClass models shall be mapped to the specializations of a &lt;flexContainer> resource. The following rules shall be applied: 
 
 When the Device or SubDevice models in clauses [5.4](#54-subdevice-models), [5.5](#55-device-models), [5.8.1](#581-flexnode) or [5.8.9](#589-dmareanwkinfo)  are mapped to the &lt;flexContainer> resource, and if the device or sub-device supports the functionality associated with a ModuleClass in the model, a &lt;flexContainer> resource which is mapped from ModuleClass definitions shall be created as a child resource:
 
-
 - Rule 2-1: The *containerDefinition* attribute shall be set according to clause [6.4.3](#643-moduleclasses).
 - Rule 2-2: Each entry of 'Action', 'Property', and 'DataPoint' in ModuleClass definitions shall be mapped following the resource mapping rules described in clauses [6.2.4](#624-resource-mapping-for-action) to [6.2.7 ](#627-resource-mapping-for-subdevice-model).
 - Rule 2-3: XSD file for each ModuleClass shall be named according to clause [6.5.3](#653-xsd-definitions-for-moduleclass).
 - Rule 2-4: The *resourceName* attribute for each module class that appears as a child of a Device or SubDevice model shall be CREATED    with the value set to "Module Instance Name". If the module class is contained in a list (multiplicity 0..N or 1..N), its *resourceName* attribute shall be set to "Module Instance Name" appended with an underscore '_' and an incrementing index so that it is unique in the parent's children (e.g. "firmware_0", "firmware_1", etc.). The index shall not have leading 0's.
 - Rule 2-5: The specialized &lt;flexContainer> resource of the Module model may contain an optional [customAttribute] named *dataGenerationTime*. The value of *dataGenerationTime* contains the time when the data was generated by the device. The data type of this custom attribute is m2m:timestamp.
 
+
 ### 6.2.4 Resource mapping for Action
 
 Actions defined as part of  a ModuleClass model shall be mapped to the specializations of a &lt;flexContainer> resource. The following rules shall be applied: 
 
-
 - Rule 3-1: The *containerDefinition* attribute shall be set according to clause [6.4.](#644-actions).
 - Rule 3-2: When the Action supports any 'Arguments', they are mapped to [customizedAttribute] with their variable names (short names are given in clause 6.3.4). When the Action supports a 'Return Type', it is mapped to a [customizedAttribute] named 'result' (short name 'resut'). The keyword 'result' is reserved and cannot be used as an Argument name.
 - Rule 3-3: XSD file for each Action shall be named according to clause [6.5.4](#654-xsd-definitions-for-action).
 - Rule 3-4: The Action shall be triggered:
-
-  - by updating at least one of the Arguments custom attributes with any value, if the action has at least one argument; or
-  - by updating the &lt;flexContainer> resource with empty content if it has no argument.
-
+	- by updating at least one of the Arguments custom attributes with any value, if the action has at least one argument; or
+	- by updating the &lt;flexContainer> resource with empty content if it has no argument.
 - Rule 3-5: The resourceName attribute for each Action model that appears as a child of a ModuleClass model shall be CREATED with the value set to "Action name".
 - Rule 3-6: If an action returns a value that is of a complex data type, i.e. not one of the standard scalar types, then this value shall be encoded as a JSON structure and returned serialized in an xs:string.
 
+
 ### 6.2.5 Resource mapping for Property
 
 When the Device model (in clause [5.5](#55-device-models)) or the ModuleClass model (in clause [5.3](#53-moduleclasses)) is mapped to the &lt;flexContainer> resource, and if the device supports a Property, the following rules shall be applied:
 
-
 - Rule 4-1: Each entry of 'Property' table in ModuleClass model, shall be mapped to the [customAttribute] of &lt;flexContainer> resource which is mapped from associated ModuleClass model, with its Property name with prefix 'prop'.
 - Rule 4-2: If the &lt;node> resource targeted by the nodeLink attribute of a Device model does not have a [flexNode] child resource, then each 'Property' of the Device model is mapped to a specialized [objectAttribute] of a [deviceInfo] &lt;mgmtObj> resource child of this &lt;node>, otherwise it is mapped to a [customAttribute] of a [[dmDeviceInfo](#583-dmdeviceinfo)] &lt;flexContainer> resource child of this [flexNode].
 - Rule 4-3: Each entry of 'Property' table in SubDevice model, shall be mapped to the [customAttribute] of &lt;flexContainer> resource which is mapped from associated SubDevice model, with its Property name with prefix 'prop'.
 
+
 ### 6.2.6 Resource mapping for DataPoint
 
 When the ModuleClass model (in clause [5.3](#53-moduleclasses)) is mapped to the &lt;flexContainer> resource, and if the ModuleClass supports a DataPoint, the following rules shall be applied:
 
-
 - Rule 5-1: Each entry of DataPoint table in ModuleClass model, shall be mapped to [customAttribute] of &lt;flexContainer> resource which is mapped from associated ModuleClass model, with its DataPoint name.
 
+
 ### 6.2.7 Resource mapping for SubDevice model
 
 The SubDevice models (in clause [5.4](#54-subdevice-models) or [5.8.9](#589-dmareanwkinfo)) shall be mapped to the specializations of a &lt;flexContainer> resource. The following rules shall be applied: 
 
-- When the SubDevice model in clause [5.4](#54-subdevice-models) or [5.8.9](#589-dmareanwkinfo) is mapped to the &lt;flexContainer> resource, and if the device supports the functionality associated with a SubDevice in the model, a &lt;flexContainer> resource which is mapped from SubDevices definitions shall be created as a child resource.
+When the SubDevice model in clause [5.4](#54-subdevice-models) or [5.8.9](#589-dmareanwkinfo) is mapped to the &lt;flexContainer> resource, and if the device supports the functionality associated with a SubDevice in the model, a &lt;flexContainer> resource which is mapped from SubDevices definitions shall be created as a child resource.
 
 
   - Rule 7-1: The containerDefinition attribute shall be set according to clause [6.4.5](#645-subdevices).
-
-
   - Rule 7-1a: Each entry in the 'Module' table shall be mapped to a child resource(s) which is mapped as a specialised &lt;flexContainer> following the rule in clause [6.2.3](#623-resource-mapping-for-moduleclass).
-
-
   - Rule 7-2: The XSD file for each SubDevice model shall be named according to clause [6.5.5](#655-xsd-definitions-for-subdevices).
-
-
   - Rule 7-3: void
-
-
   - Rule 7-4: The resourceName attribute for each SubDevice that appears as a child of a Device or FlexNode model shall be created with the value set to "SubDevice Instance Name". If the SubDevice is contained in a list (multiplicity 0..N or 1..N), its resourceName attribute shall be set to "SubDevice Instance Name" appended with an underscore '_' and an incrementing index so that it is unique in the parent's children (e.g. "cuff_0", "cuff_1", etc.). The index shall not have leading 0's.
-
-
   - Rule 7-5: Each &lt;flexContainer> associated to a SubDevice model may have as child resource any &lt;flexContainer> associated to a ModuleClass model of the Metadata domain defined in clause [5.3.9](#539-metadata-domain).
 
 
-  - In other words, all SubDevices implicitly have the following lines in their modules table:
+In other words, all SubDevices implicitly have the following lines in their modules table:
 
 
 **Table 6.2.7-1: Modules of subDeviceXXX model**
@@ -5413,9 +5533,8 @@ The mapping between the full names and their shortened form is given in the clau
 
 
 ### 6.3.2 Resource types
-In protocol bindings resource type names for device models shall be translated into short names of Table 6.3.2-1.
-
 
+In protocol bindings resource type names for device models shall be translated into short names of Table 6.3.2-1.
 
 **Table 6.3.2-1: Specialization type short names (Device models)**
 
@@ -5512,7 +5631,7 @@ In protocol bindings resource type names for SubDevice model shall be translated
 |[subDeviceCuff](#5431-subdevicecuff) |sDPOt |
 |[dmAreaNwkInfo](#589-dmareanwkinfo) |dANIo |
 
-NOTE: see clause [6.2.7](#627-resource-mapping-for-subdevice-model), rule 7-4.
+>NOTE: see clause [6.2.7](#627-resource-mapping-for-subdevice-model), rule 7-4.
 
 In protocol bindings resource type names for module classes shall be translated into short names of Table 6.3.2-3.
 
@@ -5647,8 +5766,6 @@ In protocol bindings resource type names for module classes shall be translated
 |[waterStatus](#53151-liquidremaining) |watSs |
 |[weight](#53199-weight) |weigt |
 
-
-
 In protocol bindings resource type names for actions shall be translated into short names of Table 6.3.2-4.
 
 **Table 6.3.2-4: Specialization type short names (Actions)**
@@ -5694,9 +5811,8 @@ In protocol bindings resource type names for actions shall be translated into sh
 |[writeIO](#584-dmdatamodelio) |wriIO |
 
 
-
-
 ### 6.3.3 Resource attributes for properties and data points
+
 In protocol bindings resource attributes names for properties of module classes shall be translated into short names of Table 6.3.3-1.
 
 **Table 6.3.3-1: Resource attribute short names (ModuleClass properties)**
@@ -5704,12 +5820,10 @@ In protocol bindings resource attributes names for properties of module classes
 |Attribute Name |Occurs in |Short Name |
 |-|-|-|
 |chargingCapacity | [electricVehicleConnector](#53131-electricvehicleconnector) | chaCy |
-| dischargingCapacity | [5.3.1.31 electricVehicleConnector](#53131-electricvehicleconnector) | disCy |
-| electricEnergy | [battery](#53110-battery) | eleEy |
-| material | [battery](#53110-battery) | matel |
-| voltage | [battery](#53110-battery) | volte |
-
-
+|dischargingCapacity | [5.3.1.31 electricVehicleConnector](#53131-electricvehicleconnector) | disCy |
+|electricEnergy | [battery](#53110-battery) | eleEy |
+|material | [battery](#53110-battery) | matel |
+|voltage | [battery](#53110-battery) | volte |
 
 In protocol bindings resource attributes names for data points of module classes shall be translated into short names of Table 6.3.3-2.
 
@@ -5887,7 +6001,7 @@ In protocol bindings resource attributes names for data points of module classes
 |highFlowDuration |[waterMeterAlarm](#53194-watermeteralarm)|hiFDn |
 |highPressureAlarm |[waterMeterAlarm](#53194-watermeteralarm)|hiPAm |
 |highPressureAlarmThreshold |[waterMeterAlarm](#53194-watermeteralarm)|hPATd |
-|highTemperatureAlarm |temperatureAlarm](#53188-temperaturealarm), [waterMeterAlarm](#53194-watermeteralarm)|hiTAm |
+|highTemperatureAlarm |[temperatureAlarm](#53188-temperaturealarm), [waterMeterAlarm](#53194-watermeteralarm)|hiTAm |
 |highTemperatureAlarmThreshold |[temperatureAlarm](#53188-temperaturealarm), [waterMeterAlarm](#53194-watermeteralarm)|hTATh |
 |highTemperatureInnerAlarmThreshold |[waterMeterAlarm](#53194-watermeteralarm)|hTIAd |
 |historyStepCounts |[cowActivityMonitor](#5371-cowactivitymonitor) |hiSCs |
@@ -6238,21 +6352,17 @@ In protocol bindings resource attributes names for data points of module classes
 |writeSpeed |[dmStorage](#5812-dmstorage) |wriSd |
 |zn |[waterQualityMonitor](#53198-waterqualitymonitor) |zn |
 
-
-
 In protocol bindings resource attributes names for properties of sub-devices shall be translated into short names of Table 6.3.3-3.
 
-
 **Table 6.3.3-3: Resource attribute short names (SubDevice properties)**
 
-|		Attribute Name |Occurs in |Short Name |
+|Attribute Name |Occurs in |Short Name |
 |-|-|-|
 |propAreaNwkType |[dmAreaNwkInfo](#589-dmareanwkinfo) |pANTe |
 
 
-
-
 ### 6.3.4 Resource attributes for actions arguments
+
 In protocol bindings resource attributes names for arguments of actions shall be translated into short names of Table 6.3.4-1.
 
 **Table 6.3.4-1: Resource attribute short names (Action arguments)**
@@ -6270,11 +6380,10 @@ In protocol bindings resource attributes names for arguments of actions shall be
 |version |[deployPackage](#582-dmagent), [updateFirmware](#585-dmfirmware), [update](#588-dmpackage) |versn |
 
 
-
-
 ## 6.4 containerDefinition values
 
 ### 6.4.1 Introduction
+
 Each specialization has a *containerDefinition* attribute which can be used as a unique identifier and contains the information of the resource. In this clause, the detailed values of *containerDefinition* attributes in every specializations for the harmonized information model are given.  
 
 The full list of domains is:
@@ -6283,6 +6392,7 @@ The full list of domains is:
 
 
 ### 6.4.2 Device models
+
 Depending on the domain, the *containerDefinition* attribute of specializations for device models shall have the values that comply with the following rule.  
 
 - Rule: "org.onem2m.[domain].device.[device name]", where [domain] is one of the domain names defined in [6.4.1](#641-introduction). The name is chosen according to the domain in which the device is defined.
@@ -6291,6 +6401,7 @@ For example, the *containerDefinition* attribute of the specialization for the "
 
 
 ### 6.4.3 ModuleClasses
+
 Depending on the domain, the *containerDefinition* attribute of specializations for module classes shall have the values that comply with the following rule.  
 
 - Rule: "org.onem2m.[domain].moduleclass.[moduleclass name]", where [domain] is one of the domain names defined in [6.4.1](#641-introduction). The name is chosen according to the domain in which the module class is defined.
@@ -6299,6 +6410,7 @@ For example, the *containerDefinition* attribute of the specialization for the "
 
 
 ### 6.4.4 Actions
+
 Depending on the domain, the *containerDefinition* attribute of specializations for actions shall have the values that comply with the following rule:
 
 - Rule: "org.onem2m.[domain].action.[action name]", where [domain] is one of the domain names defined in [6.4.1](#641-introduction). The name is chosen according to the domain in which the action is defined.
@@ -6307,18 +6419,18 @@ For example, the *containerDefinition* attribute of the specialization for "[act
 
 
 ### 6.4.5 SubDevices
+
 Depending on the domain, the *containerDefinition* attribute of specializations for sub-devices shall have the values that comply with the following rule:
 
--    Rule: "org.onem2m.[domain].subdevice.[subDevice name]", where [domain] is one of the following names: "agriculture", "city", "common", "health", "home", "industry", "railway", "vehicular" and "management". The name is chosen according to the domain in which the sub-device is defined.
+- Rule: "org.onem2m.[domain].subdevice.[subDevice name]", where [domain] is one of the following names: "agriculture", "city", "common", "health", "home", "industry", "railway", "vehicular" and "management". The name is chosen according to the domain in which the sub-device is defined.
 
 For example, the *containerDefinition* attribute of specialization for "subDevicePowerOutlet" of the "common" domain shall be "org.onem2m.common.subdevice.subDevicePowerOutlet", the *containerDefinition* attribute of the specialization for the "[dmAreaNwkInfo](#589-dmareanwkinfo)" for the "management" domain shall be "org.onem2m. management.subdevice.dmAreaNwkInfo".
 
 
-
-
 ## 6.5 XSD definitions
 
 ### 6.5.1 Introduction
+
 The present clause specifies how to name the files which define data types in XSD for Device and SubDevice models, ModuleClasses, Actions and enumerated types.
 
 Seven SDT domains correspond to different vertical, economic domains (Agriculture, Smart City, Health, Home, Industry, Public Safety, Railway, Vehicular), they contain devices and modules that are specific to these domains.
@@ -6346,9 +6458,8 @@ The following table defines the short names for XML name spaces and file name pr
 |Vehicular |xmlns:ved |VED |http://www.onem2m.org/xml/protocols/vehiculardomain |
 
 
-
-
 ### 6.5.2 XSD definitions for Device models
+
 The XSD definitions for Device models are specified upon the following rule:
 
 - Rule: [Domain Prefix]-[device name]-v&lt;TS-version>.xsd where the string '&lt;TS-version>' shall be interpreted as the version of the present document.
@@ -6357,6 +6468,7 @@ For example, the XSD definition for "[deviceAirConditioner](#5541-deviceaircondi
 
 
 ### 6.5.3 XSD definitions for ModuleClass
+
 The XSD definitions for ModuleClass are specified upon the following rule:
 
 - Rule: [Domain Prefix]-mod-[ModuleClass name]-v&lt;TS-version>.xsd where the string '&lt;TS-version>' shall be interpreted as the version of the present document. 
@@ -6365,6 +6477,7 @@ For example, the XSD definition for "[alarmSpeaker](#5317-alarmspeaker)" specifi
 
 
 ### 6.5.4 XSD definitions for Action
+
 The XSD definitions for Actions are specified upon the following rule:
 
 - Rule: [Domain Prefix]-act-[action name]-v&lt;TS-version>.xsd where the string '&lt;TS-version>' shall be interpreted as the version of the present document.
@@ -6373,6 +6486,7 @@ For example, the XSD definition for "[activateClockTimer](#53190-timer)" specifi
 
 
 ### 6.5.5 XSD definitions for SubDevices
+
 The XSD definitions for SubDevices are specified upon the following rule:
 
 - Rule: [Domain Prefix]-[SubDevice name]-v&lt;TS-version>.xsd where the string '&lt;TS-version>' shall be interpreted as the version of the present document.
@@ -6381,6 +6495,7 @@ For example, the XSD definition for "subDeviceCuff" specified in TS-0023 v4.3.0
 
 
 ### 6.5.6 XSD definitions for Enumerated Types
+
 The XSD definitions for enumerated types are specified upon the following rule:
 
 - Rule: HD-enumerationTypes-v&lt;TS-version>.xsd where the string '&lt;TS-version>' shall be interpreted as the version of the present document.
@@ -6388,7 +6503,6 @@ The XSD definitions for enumerated types are specified upon the following rule:
 This file contains the definitions of all enumerated types, and nothing else.
 
 
-
 # 7 Mapping with Other Information Models from External Organizations
 
 ## 7.0 Introduction
@@ -6399,6 +6513,7 @@ This clause specifies how the Harmonized Information Model (HIM) defined in the
 ## 7.1 OMA GotAPI(DWAPI)
 
 ### 7.1.1 Introduction
+
 The following clauses are intended to specify the mapping relationship between HAIM and OMA DWAPI with tables.
 
 OMA Device Web Application Programming Interface (DWAPI)) <a href="#_ref_7">[7]</a> is based on OMA Generic Open Terminal Application Programming Interface (GotAPI) <a href="#_ref_19">[19]</a>  and supports Personal Healthcare Devices (DWAPI-PCH) and 3D printer (DWAPI-3DP).
@@ -6409,6 +6524,7 @@ OMA DWAPI has no concept  that corresponds to ModuleClass in oneM2M. The mapping
 ### 7.1.2 Device Models
 
 #### 7.1.2.1 device3Dprinter
+
 The [device3DPrinter](#5511-device3dprinter) of HAIM shall be mapped to 3D printer of OMA DWAPI-3DP on the basis of Table 7.1.2.1-1.
 
 **Table 7.1.2.1-1: Map of device3Dprinter of oneM2M HAIM to OMA DWAPI-3DP**
@@ -6429,7 +6545,6 @@ The [device3DPrinter](#5511-device3dprinter) of HAIM shall be mapped to 3D print
 |[printQueue](#53167-printqueue) |printingState |msg |See clause [5.3.1.67](#53167-printqueue).<br />This value represents the machineState of the queued printing job. This value shall be interpreted by using hd:enumMachineState and generated msg as a string.<br />See the Table 7.1.2-3.  |
 
 
-
 **Table 7.1.2.1-2: Map of hd:enumMachineState of oneM2M HAIM to operatingStatus of OMA DWAPI-3DP**
 
 |Value |Interpretation |operatingStatus of OMA DWAPI-3DP |Note |
@@ -6446,8 +6561,6 @@ The [device3DPrinter](#5511-device3dprinter) of HAIM shall be mapped to 3D print
 |10 |clear |CLR |Printing completed but the result is not removed yet |
 |11 |charging | |Not available |
 
-
-
 **Table 7.1.2-1-3: Map of hd:enumJobState of oneM2M HAIM to msg of OMA DWAPI-3DP**
 
 |Value |Interpretation |msg of OMA DWAPI-3DP |Note |
@@ -6460,9 +6573,8 @@ The [device3DPrinter](#5511-device3dprinter) of HAIM shall be mapped to 3D print
 |6 |processing |Good Start | |
 
 
-
-
 #### 7.1.2.2 deviceBloodPressureMonitor
+
 DeviceBloodPressureMonitor of HAIM shall be mapped to Blood Pressure Monitor of OMA DWAPI-PCH on the basis of Table 7.1.2.2-1. 
 
 **Table 7.1.2-2-1: Map of deviceBloodPressureMonitor of oneM2M HAIM to OMA DWAPI-PCH**
@@ -6477,6 +6589,7 @@ DeviceBloodPressureMonitor of HAIM shall be mapped to Blood Pressure Monitor of
 
 
 #### 7.1.2.3 deviceGlucosemeter
+
 DeviceGlucometer of HAIM shall be mapped to Glucometer of OMA DWAPI-PCH on the basis of Table 7.1.2.3-1. 
 
 **Table 7.1.2.3-1: Map of deviceGlucometer of oneM2M HAIM to OMA DWAPI-PCH**
@@ -6496,9 +6609,8 @@ DeviceGlucometer of HAIM shall be mapped to Glucometer of OMA DWAPI-PCH on the b
 |[battery](#53110-battery) |level |batteryLevel |See clause [5.3.1.10](#53110-battery).<br />It shall be the integer type at HAIM, but shall be the float type at OMA DWAPI-PCH.<br />It shall be the rounded percentage of the current level of battery in the range of [0, 100] at HAIM, but shall be a float number in the range of [0,0, 1,0] atOMA DWAPI-PCH. |
 
 
-
-
 #### 7.1.2.4 devicePulseOximeter
+
 DevicePulseOximeter of HAIM shall be mapped to Pulse Oximeter of OMA DWAPI-PCH on the basis of Table 7.1.2.4-1. 
 
 **Table 7.1.2.4-1: Map of devicePulseOximeter of oneM2M HAIM to OMA DWAPI-PCH**
@@ -6510,9 +6622,8 @@ DevicePulseOximeter of HAIM shall be mapped to Pulse Oximeter of OMA DWAPI-PCH o
 |[battery](#53110-battery) |level |batteryLevel |See clause [5.3.1.10](#53110-battery).<br />It shall be the integer type at HAIM, but shall be the float type at OMA DWAPI-PCH.<br />It shall be the rounded percentage of the current level of battery in the range of [0, 100] at HAIM, but shall be a float number in the range of [0,0, 1,0] atOMA DWAPI-PCH. |
 
 
-
-
 #### 7.1.2.5 deviceThermometer
+
 DeviceThermometer of HAIM shall be mapped to Thermometer of OMA DWAPI-PCH on the basis of Table 7.1.2.5-1. 
 
 **Table 7.1.2.5-1: Map of deviceThermometer of oneM2M HAIM to OMA DWAPI-PCH**
@@ -6523,9 +6634,8 @@ DeviceThermometer of HAIM shall be mapped to Thermometer of OMA DWAPI-PCH on the
 |[battery](#53110-battery) |level |batteryLevel |See clause [5.3.1.10](#53110-battery).<br />It shall be the integer type at HAIM, but shall be the float type at OMA DWAPI-PCH.<br />It shall be the rounded percentage of the current level of battery in the range of [0, 100] at HAIM, but shall be a float number in the range of [0,0, 1,0] atOMA DWAPI-PCH. |
 
 
-
-
 #### 7.1.2.6 deviceWeightScaleAndBodyCompositionAnalyser
+
 DeviceWeightScaleAdBodyCompositionAnalyser of HAIM shall be mapped to Weight Scale Body Composition Analyser of OMA DWAPI-PCH on the basis of Table . 
 
 **Table 7.1.2.6-1: Map of deviceWeightScaleAdBodyCompositionAnalyser of oneM2M HAIM to OMA DWAPI-PCH**
@@ -6546,9 +6656,8 @@ DeviceWeightScaleAdBodyCompositionAnalyser of HAIM shall be mapped to Weight Sca
 |[battery](#53110-battery) |level |batteryLevel |See clause [5.3.1.10](#53110-battery).<br />It shall be the integer type at HAIM, but shall be the float type at OMA DWAPI-PCH.<br />It shall be the rounded percentage of the current level of battery in the range of [0, 100] at HAIM, but shall be a float number in the range of [0,0, 1,0] at OMA DWAPI-PCH. |
 
 
-
-
 #### 7.1.2.7 deviceHeartRateMonitor
+
 DeviceHeartRateMonitor of HAIM shall be mapped to Heart Rate Monitor of OMA DWAPI-PCH on the basis of Table 7.1.2.7-1. 
 
 **Table 7.1.2.7-1: Map of deviceHeartRateMonitor of oneM2M HAIM to OMA DWAPI-PCH**
@@ -6561,9 +6670,8 @@ DeviceHeartRateMonitor of HAIM shall be mapped to Heart Rate Monitor of OMA DWAP
 |[battery](#53110-battery) |level |batteryLevel |See clause [5.3.1.10](#53110-battery).<br />It shall be the integer type at HAIM, but shall be the float type at OMA DWAPI-PCH.<br />It shall be the rounded percentage of the current level of battery in the range of [0, 100] at HAIM, but shall be a float number in the range of [0,0, 1,0] atOMA DWAPI-PCH. |
 
 
-
-
 ### 7.1.3 Data Types
+
 Data types of oneM2M HAIM and OMA DWAPI-PCH shall be mapped each other on the basis of Table 7.1.3-1.
 
 **Table 7.1.3-1: Map of data types between oneM2M and OMA DWAPI-PCH**
@@ -6576,64 +6684,82 @@ Data types of oneM2M HAIM and OMA DWAPI-PCH shall be mapped each other on the ba
 |xs:boolean |boolean |Data type for Boolean. |
 
 
-
-
 # 8 Ontology for the Harmonized Information Model aligned with oneM2M Base Ontology
+
 The following table shows a mapping of the Harmonized Information Model (HIM) to the oneM2M Base Ontology in oneM2M TS-0012 <a href="#_ref_i.5">[i.5]</a>. 
 
 Table 8-1 only shows mapping of SDT concepts that are used to classify all concepts in the HIM. Therefore, since any concept in the HIM can be classified according to a specific SDT concept it also (transitively) maps to the related class of the oneM2M Base Ontology.
 
 **Table 8-1: Mapping between SDT concepts in the Harmonized Information Model <br />and the oneM2M Base Ontology**
 
-|SDT Concept in the Harmonized Information Model |Mapping relationship | Class in Base Ontology |Property in Base Ontology |Comment |
-|-|-|-|-|-|
-|SDT: Device |sub-class of |Device | | |
-|SDT: SubDevice |sub-class of |Device | |The base ontology allows a Device to consist of (sub-) Devices |
-|SDT: Action |sub-class of |Operation | | |
-|SDT: Args (of an Action) |sub-class of |OperationInput | | |
-|SDT: ReturnType (of an Action) |sub-class of |OperationOutput | | |
-|SDT: Event |sub-class of |Operation | | |
-|SDT: Data (of an Event) |sub-class of |OutputDataPoint | | |
-|SDT: Module |sub-class of |Service | |The base ontology allows a Service to have subServices. Each SDT:Module implements one SDT:ModuleClass. <br />Therefore  SDT:Module can be considered a subclass of SDT:ModuleClass and therefore subclass of oneM2M:Service.<br />See note.  |
-|SDT: ModuleClass |sub-class of |Service | |See note  |
-|SDT: UnitOfMeasure |sub-class of |MetaData | | |
-|SDT: DataPoint |sub-class of |InputDataPoint | |If  SDT:DataPoint is writeable |
-|SDT: DataPoint |sub-class of |OutputDataPoint | |If  SDT:DataPoint is readable  |
-|SDT: Property (of a Device) |sub-class of |ThingProperty | | |
-|SDT: Property (of a ModuleClass) |sub-class of |Aspect  | |Aspect  (of the Functionality) |
-|SDT: SimpleType |sub-property of | |hasDataType |The base ontology's SimpleTypeVariable class has data properties: <br />hasDataType<br />hasDataRestriction |
-|SDT: Constraint |sub-property of | |hasDataRestriction | |
-
-
-
-NOTE: In RESTful technologies the Service (i.e. the electronic representation of a Functionality in a network) is implicitly bound to its Functionality by the naming of the used resources (e.g. the Functionality of ModuleClass "[audioVolume](#5318-audiovolume)" is implemented as a Service through CRUD operations on a [audioVolume] &lt;flexContainer> specialization).
-
-
++------------------------------------------------+---------------------+------------------------+--------------------------+-------------------------------------------------------------------+
+|SDT Concept in the Harmonized Information Model |Mapping relationship | Class in Base Ontology |Property in Base Ontology |Comment                                                            |
++:===============================================+:====================+:=======================+:=========================+:==================================================================+
+|SDT: Device                                     |sub-class of         |Device                  |                          |                                                                   |
++------------------------------------------------+---------------------+------------------------+--------------------------+-------------------------------------------------------------------+
+|SDT: SubDevice                                  |sub-class of         |Device                  |                          |The base ontology allows a Device to consist of (sub-) Devices     |
++------------------------------------------------+---------------------+------------------------+--------------------------+-------------------------------------------------------------------+
+|SDT: Action                                     |sub-class of         |Operation               |                          |                                                                   |
++------------------------------------------------+---------------------+------------------------+--------------------------+-------------------------------------------------------------------+
+|SDT: Args (of an Action)                        |sub-class of         |OperationInput          |                          |                                                                   |
++------------------------------------------------+---------------------+------------------------+--------------------------+-------------------------------------------------------------------+
+|SDT: ReturnType (of an Action)                  |sub-class of         |OperationOutput         |                          |                                                                   |
++------------------------------------------------+---------------------+------------------------+--------------------------+-------------------------------------------------------------------+
+|SDT: Event                                      |sub-class of         |Operation               |                          |                                                                   |
++------------------------------------------------+---------------------+------------------------+--------------------------+-------------------------------------------------------------------+
+|SDT: Data (of an Event)                         |sub-class of         |OutputDataPoint         |                          |                                                                   |
++------------------------------------------------+---------------------+------------------------+--------------------------+-------------------------------------------------------------------+
+|SDT: Module                                     |sub-class of         |Service                 |                          |The base ontology allows a Service to have subServices.            |
+|                                                |                     |                        |                          |Each SDT:Module implements one SDT:ModuleClass. \                  |
+|                                                |                     |                        |                          |Therefore SDT:Module can be considered a subclass of               |
+|                                                |                     |                        |                          |SDT:ModuleClass and therefore subclass of oneM2M:Service.\         |
+|                                                |                     |                        |                          |See note.                                                          |
++------------------------------------------------+---------------------+------------------------+--------------------------+-------------------------------------------------------------------+
+|SDT: ModuleClass                                |sub-class of         |Service                 |                          |See note.                                                          |
++------------------------------------------------+---------------------+------------------------+--------------------------+-------------------------------------------------------------------+
+|SDT: UnitOfMeasure                              |sub-class of         |MetaData                |                          |                                                                   |
++------------------------------------------------+---------------------+------------------------+--------------------------+-------------------------------------------------------------------+
+|SDT: DataPoint                                  |sub-class of         |InputDataPoint          |                          |If SDT:DataPoint is writeable                                      |
++------------------------------------------------+---------------------+------------------------+--------------------------+-------------------------------------------------------------------+
+|SDT: DataPoint                                  |sub-class of         |OutputDataPoint         |                          |If SDT:DataPoint is readable                                       |
++------------------------------------------------+---------------------+------------------------+--------------------------+-------------------------------------------------------------------+
+|SDT: Property (of a Device)                     |sub-class of         |ThingProperty           |                          |                                                                   |
++------------------------------------------------+---------------------+------------------------+--------------------------+-------------------------------------------------------------------+
+|SDT: Property (of a ModuleClass)                |sub-class of         |Aspect                  |                          |Aspect  (of the Functionality)                                     |
++------------------------------------------------+---------------------+------------------------+--------------------------+-------------------------------------------------------------------+
+|SDT: SimpleType                                 |sub-property of      |                        |hasDataType               |The base ontology's SimpleTypeVariable class has data properties:\ |
+|                                                |                     |                        |                          |- hasDataType                                                      |
+|                                                |                     |                        |                          |- hasDataRestriction                                               |
++------------------------------------------------+---------------------+------------------------+--------------------------+-------------------------------------------------------------------+
+|SDT: Constraint                                 |sub-property of      |                        |hasDataRestriction        |                                                                   |
++------------------------------------------------+---------------------+------------------------+--------------------------+-------------------------------------------------------------------+
+|NOTE: In RESTful technologies the Service (i.e. the electronic representation of a Functionality in a network) is implicitly bound to its Functionality by the naming of the used resources   |
+|(e.g. the Functionality of ModuleClass "[audioVolume](#5318-audiovolume)" is implemented as a Service through CRUD operations on a [audioVolume] &lt;flexContainer> specialization).          |
++------------------------------------------------+---------------------+------------------------+--------------------------+-------------------------------------------------------------------+
 
 
 # Annex A (informative):  Resource Mapping Examples
 
 ## A.1 Introduction
+
 The AE may construct oneM2M resource tree on hosting CSE as the mapping of associated device, and each XSD definition for the device information models is generated following 'Resource Mapping Rule' in clause [6.2](#62-the-resource-mapping-rules).
 
 The present clause explains how to use the oneM2M resource tree to map Device model for each device (see clause [5.5](#55-device-models)).
 
 
 ## A.2 Example for Device model 'deviceAirConditioner'
+
 The present clause explains the creation process for the device typed '[deviceAirConditioner](#5541-deviceairconditioner)' (see clause [5.5.4.1](#5541-deviceairconditioner) for device model definition of 'deviceAirConditioner').
 
 Using the definition, '[deviceAirConditioner](#5541-deviceairconditioner)' model is mapped to [deviceAirConditioner] resource which is a specialization of &lt;flexContainer> resource (see Figure A.2-1).
 
-
-
-![deviceAirConditioner](media/deviceAirConditioner.svg)
+![Figure A.2-1: Structure of [deviceAirConditioner] resource](media/deviceAirConditioner.svg)
 
 **Figure A.2-1: Structure of [deviceAirConditioner] resource**
 
-
 The AE creates the [[deviceAirConditioner](#5541-deviceairconditioner)] specialization of &lt;flexContainer> resource for the Device model [[deviceAirConditioner](#5541-deviceairconditioner)] resource.
 
-The [[deviceAirConditioner](#5541-deviceairconditioner)] resource contains the child resource specified in Table A.2-1.
+The [\[deviceAirConditioner\]](#5541-deviceairconditioner) resource contains the child resource specified in Table A.2-1.
 
 **Table A.2-1: Child resources of [deviceAirConditioner] resource**
 
@@ -6654,8 +6780,7 @@ The [[deviceAirConditioner](#5541-deviceairconditioner)] resource contains the c
 |[variable] |&lt;flexContainer> as defined in the specialization [[filterInfo](#53135-filterinfo)] |0..1 |This resource is used to map 'filterInfo' ModuleClass defined in clause [5.3.1.35](#53135-filterinfo). |
 |[variable] |&lt;subscription> |0..n |See clause 9.6.8 in oneM2M TS-0001 <a href="#_ref_i.3">[i.3]</a> |
 
-The [[deviceAirConditioner](#5541-deviceairconditioner)] resource contains the attributes specified in Table A.2-2.
-
+The [\[deviceAirConditioner\]](#5541-deviceairconditioner) resource contains the attributes specified in Table A.2-2.
 
 **Table A.2-2: Attributes of [deviceAirConditioner] resource**
 
@@ -6679,18 +6804,14 @@ The [[deviceAirConditioner](#5541-deviceairconditioner)] resource contains the a
 |nodeLink |0..1 |RO |nodeLink attribute links to a &lt;node> resource that is hosted on the same hosting CSE of the &lt;flexContainer>. See clause 6.2.2 and 6.2.5 for more details. |
 
 
-
-
 ## A.3 Example of ModuleClass 'binarySwitch'
-The [[binarySwitch](#53112-binaryswitch)] resource is used to share information regarding the modelled binary switch module as a ModuleClass. The [binarySwitch] resource is a specialization of the &lt;flexContainer> resource.
-
 
+The [[binarySwitch](#53112-binaryswitch)] resource is used to share information regarding the modelled binary switch module as a ModuleClass. The [binarySwitch] resource is a specialization of the &lt;flexContainer> resource.
 
-![binarySwitch](media/binarySwitch.svg)
+![Figure A.3-1: Structure of [binarySwitch] resource](media/binarySwitch.svg)
 
 **Figure A.3-1: Structure of [binarySwitch] resource**
 
-
 The [[binarySwitch](#53112-binaryswitch)] resource contains the child resource specified in Table A.3-1.
 
 **Table A.3-1: Child resources of [binarySwitch] resource**
@@ -6701,7 +6822,6 @@ The [[binarySwitch](#53112-binaryswitch)] resource contains the child resource s
 |[variable] |&lt;subscription> |0..n |See clause 9.6.8 in oneM2M TS-0001 <a href="#_ref_i.3">[i.3]</a>. |
 
 
-
 The [[binarySwitch](#53112-binaryswitch)] resource contains the attributes specified in Table A.3-2.
 
 **Table A.3-2: Attributes of [binarySwitch] resource**
@@ -6728,18 +6848,14 @@ The [[binarySwitch](#53112-binaryswitch)] resource contains the attributes speci
 |state |1 |RW |See clause [5.3.1.12](#53112-binaryswitch). |
 
 
-
-
 ## A.4 Example of Action 'toggle'
-The [[toggle](#53112-binaryswitch)] resource is used to share information regarding the modelled toggle as an Action. The [[toggle](#53112-binaryswitch)] resource is a specialization of the &lt;flexContainer> resource.
-
 
+The [[toggle](#53112-binaryswitch)] resource is used to share information regarding the modelled toggle as an Action. The [[toggle](#53112-binaryswitch)] resource is a specialization of the &lt;flexContainer> resource.
 
-![toggle](media/toggle.svg)
+![Figure A.4-1: Structure of [toggle] resource](media/toggle.svg)
 
 **Figure A.4-1: Structure of [toggle] resource**
 
-
 The [[toggle](#53112-binaryswitch)] resource contains the child resource specified in Table A.4-1.
 
 **Table A.4-1: Child resources of [toggle] resource**
@@ -6748,8 +6864,6 @@ The [[toggle](#53112-binaryswitch)] resource contains the child resource specifi
 |-|-|-|-|
 |[variable] |&lt;subscription> |0..n |See clause 9.6.8 in oneM2M TS-0001 <a href="#_ref_i.3">[i.3]</a> |
 
-
-
 The [[toggle](#53112-binaryswitch)] resource contains the attributes specified in Table A.4-2.
 
 **Table A.4-2: Attributes of [toggle] resource**
@@ -6774,17 +6888,17 @@ The [[toggle](#53112-binaryswitch)] resource contains the attributes specified i
 |nodeLink |0..1 |RW |Not applicable to an Action specialization. This attribute is not present in an instantiation of this resource. |
 
 
-
-
 # Annex B (informative):  Introduction of External Organizations' Data Models
 
 ## B.1 OMA Got API (DWAPI-PCH)
+
 OMA GotAPI(OMA Generic Open Terminal API Framework) provides the framework to enable applications and multi-type devices through GotAPI Servers and Extension Plug-Ins <a href="#_ref_6">[6]</a>. When APIs are implemented in Extension Plug-Ins under the GotAPI framework, these APIs are called as OMA Device WebAPIs Enabler. In case of healthcare devices, these APIs are called as OMA Device WebAPIs for Personal Connected Healthcare (DWAPI-PCH).
 
 Healthcare devices can be a one of the smart home devices so OMA DWWAPI-PCH can have relationship with oneM2M SDT. 
 
 
 ## B.2 OCF
+
 ### B.2.1 Introduction
 
 OCF specifications provide a common, open connectivity framework for embedded developers that enables a common device discovery and interaction model, common data model and a robust security framework whilst abstracting away the physical connectivity hardware (and related protocols).
@@ -6795,11 +6909,11 @@ This clause specifies the mapping relationship between oneM2M and OCF Devices.
 
 
 ### B.2.2 Device Type Mapping
+
 Table B.2.2-1 captures the equivalency mapping between OCF defined Device Types and oneM2M defined Devices. The minimum module sets for each oneM2M device is provided in the present document. The minimum resource sets for each OCF Device is provided in the OCF Device Specification <a href="#_ref_i.8">[i.8]</a>. 
 
 **Table B.2.2-1: OCF to oneM2M Device Type Mapping** 
 
-
 |OCF Device Name |OCF Device Type |oneM2M Device |
 |-|-|-|
 |Active Speaker |oic.d.speaker |N/A |
@@ -6848,8 +6962,6 @@ Table B.2.2-1 captures the equivalency mapping between OCF defined Device Types
 |Window |oic.d.window |N/A |
 
 
-
-
 # Annex C (informative):  Mapping to Content Attribute
 
 ## C.1 Introduction
@@ -6879,6 +6991,7 @@ Normative work for defining the mapping rules from SDT to XML/JSON instance are
 
 
 ### C.2.1 Mapping Rules of XML representation
+
 Mapping from SDT instance into XML representation is following. Inclusion relationship of SDT instances are directly expressed as inclusion relationship of XML tags. Tag name is the same as each classes.
 
 ```XML
@@ -6898,6 +7011,7 @@ When a certain device does not have any SubDevice, the tags about SubDevices don
 
 
 ### C.2.2 Example of XML representation
+
 Below is the example for deviceThreeDPrinter:
 
 ```XML
@@ -7049,7 +7163,6 @@ In content attribute, a value of DataPoint may be written between tags named the
 
 contentInfo attribute is able to be omitted because content attribute has tags named the certain Module class name (&lt;temp>&lt;/temp>).
 
-
 An example for only DataPoint class mapping is shown below.:
 
 ```XML
@@ -7083,55 +7196,125 @@ If a contentInfo attribute is not used, content attribute may change as follows:
 # Annex D (informative) Bibliography
 
 - Open Mobile Alliance, OMA-TS-Blood-Pressure-Monitor-APIs-V1-0-20160419-C: "Blood Pressure Monitor APIs".
-
 	> NOTE: Available at [http://www.openmobilealliance.org/release/DWAPI/V1_0-20160419-C/OMA-TS-Blood_Pressure_Monitor_APIs-V1_0-20160419-C.pdf](http://www.openmobilealliance.org/release/DWAPI/V1_0-20160419-C/OMA-TS-Blood_Pressure_Monitor_APIs-V1_0-20160419-C.pdf)
-
 - Open Mobile Alliance, OMA-TS-Glucometer-APIs-V1-0-20160419-C: "Glucometer APIs ".
-
 	> NOTE: Available at [http://www.openmobilealliance.org/release/DWAPI/V1_0-20160419-C/OMA-TS-Glucometer_APIs-V1_0-20160419-C.pdf](http://www.openmobilealliance.org/release/DWAPI/V1_0-20160419-C/OMA-TS-Glucometer_APIs-V1_0-20160419-C.pdf)
-
 - Open Mobile Alliance, OMA-TS-Heart-Rate-Monitor-APIs-V1-0-20160419-C: " Heart Rate Monitor APIs".
-
 	> NOTE: Available at [http://www.openmobilealliance.org/release/DWAPI/V1_0-20160419-C/OMA-TS-Heart_Rate_Monitor_APIs-V1_0-20160419-C.pdf](http://www.openmobilealliance.org/release/DWAPI/V1_0-20160419-C/OMA-TS-Heart_Rate_Monitor_APIs-V1_0-20160419-C.pdf)
-
 - Open Mobile Alliance, OMA-TS-Pulse-Oximeter-APIs-V1-0-20160419-C: " Pulse Oximeter APIs".
-
 	> NOTE: Available at [http://www.openmobilealliance.org/release/DWAPI/V1_0-20160419-C/OMA-TS-Pulse_Oximeter_APIs-V1_0-20160419-C.pdf](http://www.openmobilealliance.org/release/DWAPI/V1_0-20160419-C/OMA-TS-Pulse_Oximeter_APIs-V1_0-20160419-C.pdf)
-
 - Open Mobile Alliance, OMA-TS-Thermometer-APIs-V1-0-20160419-C: " Thermometer APIs".
-
 	> NOTE: Available at [http://www.openmobilealliance.org/release/DWAPI/V1_0-20160419-C/OMA-TS-Thermometer_APIs-V1_0-20160419-C.pdf](http://www.openmobilealliance.org/release/DWAPI/V1_0-20160419-C/OMA-TS-Thermometer_APIs-V1_0-20160419-C.pdf)
-
 - Open Mobile Alliance, OMA-TS-Weight-Scale-Body-Composition-Analyzer-APIs-V1-0-20160419-C: "Weight Scale / Body Composition Analyzer APIs".
-
 	> NOTE: Available at [http://www.openmobilealliance.org/release/DWAPI/V1_0-20160419-C/OMA-TS-Weight_Scale_Body_Composition_Analyzer_APIs-V1_0-20160419-C.pdf](http://www.openmobilealliance.org/release/DWAPI/V1_0-20160419-C/OMA-TS-Weight_Scale_Body_Composition_Analyzer_APIs-V1_0-20160419-C.pdf)
 
 
-
 # History
 
-**Publication history**
-
-| Version | Date       | Description             |
-|-|-|-|
-|V2.0.0 |2016-08-30 |Release 2 - Publication |
-| V4.8.0 | December 2023 | Partners pre-processing done by **editHelp!<br />e-mail: [edithelp@etsi.org](mailto:edithelp@etsi.org) |
-| | | |
-| | | |
-| | | |
-
-
-
-**Draft history (to be removed on publication)**
-
-
-| Version | Date       | Description                                                  |
-| ------- | ---------- | ------------------------------------------------------------ |
-| V 5.0.0 | 2021-04-06 | TS-0023 adaptation to Release 5 (v4.8.0  v5.0.0)             |
-| V5.1.0  | 2021-12-02 | RDM-2021-0067-TS-0023_Metadata<br />RDM-2021-0093-SDT-issues-identified_in_TDE_R5 |
-| V5.2.0  | 2022-07-15 | Reflecting comments from issues tracker. see link https://git.onem2m.org/issues/issues/-/issues?scope=all&utf8=%E2%9C%93&state=opened&search=rdm |
-| V5.3.0  | 2022-09-28 | RDM-2022-0017R03-Proposed_changes_to_TS-0023_for_WI_0109<br />RDM-2022-0031R01-Adding_a_heater_device_to_TS-0023<br />RDM-2022-0045R01-TS-0023_PropertyNames_rel-5<br />RDM-2022-0051-Adding_the_remoteControlEnable_Module_to_the_deviceRobotCleaner_Device<br />RDM-2022-0052R01-Adding_a_new_Device_model_deviceJuicer_to_TS-0023<br />RDM-2022-0053R01-Adding_a_new_Device_model_deviceShoesWasher_to_TS-0023<br />RDM-2022-0055-Adding_an_electric motorcycle_device_to_TS-0023 |
-| V5.4.0  | 2022-11-28 | RDM-2022-0062-TS-0023_v5_1_0_add_Public_Safety_Domain_clause<br />RDM-2022-0070R01-Updating_an_electric_motorcycle_device_information_model<br />RDM-2022-0075-TS-0023_v5_2_0_add_SDT_definitions_for_Public_Safety_Domain |
-| V5.5.0  | 2023-04-20 | RDM-2023-0020-TS-0023_Moving_SubDeviceCuff_to_health_domain_(R5)<br />RDM-2023-0021-Adding_rule_for_FlexContainerInstance_specialization_naming_(R5)<br />RDM-2023-0022-TS-0023_Clarification_for_naming_elements_(R5)<br />RDM-2023-0023-TS-0023_Correcting_units_of_measure_(R5) |
-| V5.6.0  | 2024-06-27 | RDM-2024-0014-Initial_conversion_of_TS-0023_to_markdown |
-| Vx.x.x  | yyyy-mm-dd | [RDM-2024-0029-Editorial_changes](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/4), <br /> [RDM-2024-0030-Attribute_spelling_corrections](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/5),<br /> [RDM-2024-0031-TS-0023_-_Correcting_old_binarySwitch_powerState_references](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/6),<br /> [RDM-2024-0036-Correcting_UoM_of_MemorySize_in_threeDprinter_ModuleClass](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/7), <br />[RDM-2024-0036-Correcting_UoM_of_MemorySize_in_threeDprinter_ModuleClass](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/8), <br />[RDM-2024-0038-Adding_short_names_for_connectivity_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/9),<br /> [RDM-2024-0039-Adding_short_names_for_galleryMode_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/10),<br /> [RDM-2024-0040-Adding_short_names_for_gasChargingControl_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/11),<br /> [RDM-2024-0041-Adding_short_names_for_gasMeterAlarm_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/12),<br /> [RDM-2024-0042R01-Adding_short_names_for_gasMeterReportInfo_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/13),<br /> [RDM-2024-0043-Adding_short_names_for_magneticSensorParameters_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/14),<br /> [RDM-2024-0044-Adding_short_names_for_parkingStatus_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/15),<br /> [RDM-2024-0045-Adding_short_names_for_periodicalReportConfig_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/16), <br />[RDM-2024-0046-Adding_short_names_for_slcAlarm_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/17),<br /> [RDM-2024-0047-Adding_short_names_for_slcParameterSetting_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/18),<br /> [RDM-2024-0048-Adding_short_names_for_slcReportInfo_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/19),<br /> [RDM-2024-0062-Correcting_short_name_for_lightCurrent_attribute](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/20),<br /> [RDM-2025-0001-Adding_short_names_for_temperatureAlarm_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/21),<br /> [RDM-2025-0002-Added_missing_link_for_unit_attribute](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/23),<br /> [RDM-2025-0002-Added_missing_link_for_unit_attribute](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/24),<br /> [RDM-2025-0005R01-Adding_short_names_for_waterMeterSetting_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/25), <br />[RDM-2025-0006-Adding_short_names_for_waterQualityMonitor_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/26),<br /> [RDM-2025-0007-Correcting_attribute_name_and_UoM_for_anemometer_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/27),<br /> [RDM-2025-0008-Adding_short_names_and_UoM_for_barometer_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/28),<br /> [RDM-2025-0009-Adding_short_names_for_disposal_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/29), <br />[RDM-2025-0010-Correcting_action_and_attribute_name_for_raingauge_MC_Adding_short_nam](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/30),<br /> [RDM-2025-0011-Adding_short_names_for_infraredSensor_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/31),<br /> [RDM-2025-0012-Adding_short_names_for_waterFilterType_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/32),<br /> [RDM-2025-0013-Adding_short_names_for_touchScreen_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/33),<br /> [RDM-2025-0014-Adding_short_names_for_prePaidCardReader_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/34),<br /> [RDM-2025-0015-Adding_short_names_for_billDeposit_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/35), <br />[RDM-2025-0016-Adding_short_names_for_billWithdrawal_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/36),<br /> [RDM-2025-0017-Adding_short_names_for_coinDeposit_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/37),<br /> [RDM-2025-0017-Adding_short_names_for_coinDeposit_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/38),<br /> [RDM-2025-0024-Adding_short_names_for_cardScanner_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/39),<br /> [RDM-2025-0026-Adding_short_names_for_waterMeterReportInfo_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/40), <br />[RDM-2025-0027-Adding_references_to_shortnames_of_headingSensor_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/41),<br /> [RDM-2025-0028-Adding_short_names_for_signalPanel_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/42), <br />[RDM-2025-0029-Adding_short_names_for_crossingBarrier_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/43),<br /> [RDM-2025-0030-Adding_short_names_for_threeDDisplay_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/44), <br />[RDM-2025-0031-Adding_short_names_for_threeDScanner_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/45), <br />[RDM-2025-0032-Adding_short_names_for_blender_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/46),<br /> [RDM-2025-0033-Adding_short_names_for_shoesWasherJobMode_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/47),<br /> [RDM-2025-0034-Adding_short_names_for_cowActivityMonitor_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/48),<br /> [RDM-2025-0035-Adding_short_names_for_baliseTransmissionModule_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/49),<br /> [RDM-2025-0036-Adding_short_names_for_localization_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/50),<br /> [RDM-2025-0037-Adding_short_names_for_disseminator_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/51),<br /> [RDM-2025-0038-Adding_short_names_for_emergencyHandler_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/52),<br />[RDM-2025-0039-Adding_short_names_for_settings_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/53)<br />[RDM-2025-0042-Add_missing_short_names_for_common_domain_devices](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/55)<br />[RDM-2025-0043-Add_missing_short_names_for_city_domain_devices](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/56)<br />[RDM-2025-0044-Add_missing_short_names_for_home_domain_devices](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/57)<br />[RDM-2025-0045-Added_for_further_study_note_to_industry_domain_devices](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/58)<br />[RDM-2025-0046-Add_missing_short_names_for_agriculture_domain_devices](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/59)<br />[RDM-2025-0047-Add_missing_short_names_for_railway_domain_devices](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/60)<br />[RDM-2025-0048-Add_missing_short_names_for_public_safety_domain_devices](hthttps://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/61) |
++---------+--------------+-------------------------------------------------------------------------------------------------------+
+| Publication history                                                                                                            |
++---------+--------------+-------------------------------------------------------------------------------------------------------+
+| Version | Date         |Description                                                                                            |
++:========+:=============+:======================================================================================================+
+|V2.0.0   |2016-08-30    |Release 2 - Publication                                                                                |
++---------+--------------+-------------------------------------------------------------------------------------------------------+
+|V4.8.0   |December 2023 |Partners pre-processing done by **editHelp**\                                                          |
+|         |              |e-mail: [edithelp@etsi.org](mailto:edithelp@etsi.org)                                                  |
++---------+--------------+-------------------------------------------------------------------------------------------------------+
+|         |              |                                                                                                       |
++---------+--------------+-------------------------------------------------------------------------------------------------------+
+|         |              |                                                                                                       |
++---------+--------------+-------------------------------------------------------------------------------------------------------+
+|         |              |                                                                                                       |
++---------+--------------+-------------------------------------------------------------------------------------------------------+
+
+
+
++---------+--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| Draft history (to be removed on publication)                                                                                                                                          |
++---------+--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| Version | Date         |Description                                                                                                                                                   |
++:========+:=============+:=============================================================================================================================================================+
+| V5.0.0  |2021-04-06    |TS-0023 adaptation to Release 5 (v4.8.0  v5.0.0)                                                                                                              |
++---------+--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| V5.1.0  |2021-12-02    |RDM-2021-0067-TS-0023_Metadata<br />RDM-2021-0093-SDT-issues-identified_in_TDE_R5                                                                             |
++---------+--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| V5.2.0  |2022-07-15    |Reflecting comments from issues tracker. see link                                                                                                             | 
+|         |              |https://git.onem2m.org/issues/issues/-/issues?scope=all&utf8=%E2%9C%93&state=opened&search=rdm                                                                |
++---------+--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| V5.3.0  |2022-09-28    |RDM-2022-0017R03-Proposed_changes_to_TS-0023_for_WI_0109\                                                                                                     |
+|         |              |RDM-2022-0031R01-Adding_a_heater_device_to_TS-0023<br />RDM-2022-0045R01-TS-0023_PropertyNames_rel-5\                                                         |
+|         |              |RDM-2022-0051-Adding_the_remoteControlEnable_Module_to_the_deviceRobotCleaner_Device\                                                                         |
+|         |              |RDM-2022-0052R01-Adding_a_new_Device_model_deviceJuicer_to_TS-0023\                                                                                           |
+|         |              |RDM-2022-0053R01-Adding_a_new_Device_model_deviceShoesWasher_to_TS-0023\                                                                                      |
+|         |              |RDM-2022-0055-Adding_an_electric motorcycle_device_to_TS-0023                                                                                                 |
++---------+--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| V5.4.0  |2022-11-28    |RDM-2022-0062-TS-0023_v5_1_0_add_Public_Safety_Domain_clause\                                                                                                 |
+|         |              |RDM-2022-0070R01-Updating_an_electric_motorcycle_device_information_model\                                                                                    |
+|         |              |RDM-2022-0075-TS-0023_v5_2_0_add_SDT_definitions_for_Public_Safety_Domain                                                                                     |
++---------+--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| V5.5.0  |2023-04-20    |RDM-2023-0020-TS-0023_Moving_SubDeviceCuff_to_health_domain_(R5)\                                                                                             |
+|         |              |RDM-2023-0021-Adding_rule_for_FlexContainerInstance_specialization_naming_(R5)\                                                                               |
+|         |              |RDM-2023-0022-TS-0023_Clarification_for_naming_elements_(R5)\                                                                                                 |
+|         |              |RDM-2023-0023-TS-0023_Correcting_units_of_measure_(R5)                                                                                                        |
++---------+--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| V5.6.0  |2024-06-27    |RDM-2024-0014-Initial_conversion_of_TS-0023_to_markdown                                                                                                       |
++---------+--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| Vx.x.x  |yyyy-mm-dd    |[RDM-2024-0029-Editorial_changes](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/4)\                                                       |
+|         |              |[RDM-2024-0030-Attribute_spelling_corrections](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/5)\                                          | 
+|         |              |[RDM-2024-0031-TS-0023_-_Correcting_old_binarySwitch_powerState_references](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/6)\             |
+|         |              |[RDM-2024-0036-Correcting_UoM_of_MemorySize_in_threeDprinter_ModuleClass](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/7)\               |
+|         |              |[RDM-2024-0036-Correcting_UoM_of_MemorySize_in_threeDprinter_ModuleClass](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/8)\               |
+|         |              |[RDM-2024-0038-Adding_short_names_for_connectivity_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/9)\                                  | 
+|         |              |[RDM-2024-0039-Adding_short_names_for_galleryMode_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/10)\                                  | 
+|         |              |[RDM-2024-0040-Adding_short_names_for_gasChargingControl_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/11)\                           |
+|         |              |[RDM-2024-0041-Adding_short_names_for_gasMeterAlarm_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/12)\                                | 
+|         |              |[RDM-2024-0042R01-Adding_short_names_for_gasMeterReportInfo_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/13)\                        | 
+|         |              |[RDM-2024-0043-Adding_short_names_for_magneticSensorParameters_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/14)\                     |
+|         |              |[RDM-2024-0044-Adding_short_names_for_parkingStatus_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/15)\                                |
+|         |              |[RDM-2024-0045-Adding_short_names_for_periodicalReportConfig_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/16)\                       |
+|         |              |[RDM-2024-0046-Adding_short_names_for_slcAlarm_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/17)\                                     | 
+|         |              |[RDM-2024-0047-Adding_short_names_for_slcParameterSetting_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/18)\                          |
+|         |              |[RDM-2024-0048-Adding_short_names_for_slcReportInfo_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/19)\                                |
+|         |              |[RDM-2024-0062-Correcting_short_name_for_lightCurrent_attribute](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/20)\                       | 
+|         |              |[RDM-2025-0001-Adding_short_names_for_temperatureAlarm_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/21)\                             | 
+|         |              |[RDM-2025-0002-Added_missing_link_for_unit_attribute](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/23)\                                  | 
+|         |              |[RDM-2025-0002-Added_missing_link_for_unit_attribute](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/24)\                                  | 
+|         |              |[RDM-2025-0005R01-Adding_short_names_for_waterMeterSetting_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/25)\                         |
+|         |              |[RDM-2025-0006-Adding_short_names_for_waterQualityMonitor_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/26)\                          |
+|         |              |[RDM-2025-0007-Correcting_attribute_name_and_UoM_for_anemometer_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/27)\                    |
+|         |              |[RDM-2025-0008-Adding_short_names_and_UoM_for_barometer_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/28)\                            | 
+|         |              |[RDM-2025-0009-Adding_short_names_for_disposal_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/29)\                                     |
+|         |              |[RDM-2025-0010-Correcting_action_and_attribute_name_for_raingauge_MC_Adding_short_nam](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/30)\ | 
+|         |              |[RDM-2025-0011-Adding_short_names_for_infraredSensor_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/31)\                               |
+|         |              |[RDM-2025-0012-Adding_short_names_for_waterFilterType_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/32)\                              | 
+|         |              |[RDM-2025-0013-Adding_short_names_for_touchScreen_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/33)\                                  | 
+|         |              |[RDM-2025-0014-Adding_short_names_for_prePaidCardReader_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/34)\                            | 
+|         |              |[RDM-2025-0015-Adding_short_names_for_billDeposit_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/35)\                                  |
+|         |              |[RDM-2025-0016-Adding_short_names_for_billWithdrawal_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/36)\                               |
+|         |              |[RDM-2025-0017-Adding_short_names_for_coinDeposit_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/37)\                                  |
+|         |              |[RDM-2025-0017-Adding_short_names_for_coinDeposit_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/38)\                                  |
+|         |              |[RDM-2025-0024-Adding_short_names_for_cardScanner_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/39)\                                  |
+|         |              |[RDM-2025-0026-Adding_short_names_for_waterMeterReportInfo_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/40)\                         |
+|         |              |[RDM-2025-0027-Adding_references_to_shortnames_of_headingSensor_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/41)\                    |
+|         |              |[RDM-2025-0028-Adding_short_names_for_signalPanel_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/42)\                                  |
+|         |              |[RDM-2025-0029-Adding_short_names_for_crossingBarrier_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/43)\                              |
+|         |              |[RDM-2025-0030-Adding_short_names_for_threeDDisplay_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/44)\                                |
+|         |              |[RDM-2025-0031-Adding_short_names_for_threeDScanner_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/45)\                                |
+|         |              |[RDM-2025-0032-Adding_short_names_for_blender_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/46)\                                      |
+|         |              |[RDM-2025-0033-Adding_short_names_for_shoesWasherJobMode_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/47)\                           |
+|         |              |[RDM-2025-0034-Adding_short_names_for_cowActivityMonitor_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/48)\                           |
+|         |              |[RDM-2025-0035-Adding_short_names_for_baliseTransmissionModule_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/49)\                     |
+|         |              |[RDM-2025-0036-Adding_short_names_for_localization_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/50)\                                 |
+|         |              |[RDM-2025-0037-Adding_short_names_for_disseminator_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/51)\                                 |
+|         |              |[RDM-2025-0038-Adding_short_names_for_emergencyHandler_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/52)\                             |
+|         |              |[RDM-2025-0039-Adding_short_names_for_settings_MC](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/53)\                                     |
+|         |              |[RDM-2025-0042-Add_missing_short_names_for_common_domain_devices](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/55)\                      |
+|         |              |[RDM-2025-0043-Add_missing_short_names_for_city_domain_devices](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/56)\                        |
+|         |              |[RDM-2025-0044-Add_missing_short_names_for_home_domain_devices](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/57)\                        |
+|         |              |[RDM-2025-0045-Added_for_further_study_note_to_industry_domain_devices](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/58)\                |
+|         |              |[RDM-2025-0046-Add_missing_short_names_for_agriculture_domain_devices](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/59)\                 |
+|         |              |[RDM-2025-0047-Add_missing_short_names_for_railway_domain_devices](https://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/60)\                     |
+|         |              |[RDM-2025-0048-Add_missing_short_names_for_public_safety_domain_devices](hthttps://git.onem2m.org/specifications/ts/ts-0023/-/merge_requests/61)              |
++---------+--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------+
+ 
\ No newline at end of file