From db0d9b06295b495f6d75ea274ac2d3516a5a2a44 Mon Sep 17 00:00:00 2001
From: ankraft <an.kraft@googlemail.com>
Date: Wed, 6 Jun 2018 16:04:20 +0200
Subject: [PATCH] Added - XSD files - SDT Device and ModuleClass definitions -
 shortnames

---
 3.7.0/SDT-TS0023-Devices.xml                  | 1276 +++++++++
 3.7.0/SDT-TS0023-ModuleClasses.xml            | 2449 +++++++++++++++++
 3.7.0/shortnames.csv                          |  532 ++++
 .../xsd/HD-act-activateClockTimer-v3_7_0.xsd  |   84 +
 3.7.0/xsd/HD-act-answer-v3_7_0.xsd            |   84 +
 3.7.0/xsd/HD-act-call-v3_7_0.xsd              |   84 +
 3.7.0/xsd/HD-act-close-v3_7_0.xsd             |   84 +
 .../HD-act-deactivateClockTimer-v3_7_0.xsd    |   84 +
 .../HD-act-decrementNumberValue-v3_7_0.xsd    |   84 +
 3.7.0/xsd/HD-act-downChannel-v3_7_0.xsd       |   84 +
 3.7.0/xsd/HD-act-downVolume-v3_7_0.xsd        |   84 +
 3.7.0/xsd/HD-act-hangup-v3_7_0.xsd            |   84 +
 .../HD-act-incrementNumberValue-v3_7_0.xsd    |   84 +
 3.7.0/xsd/HD-act-nextTrack-v3_7_0.xsd         |   84 +
 3.7.0/xsd/HD-act-open-v3_7_0.xsd              |   84 +
 3.7.0/xsd/HD-act-previousTrack-v3_7_0.xsd     |   84 +
 3.7.0/xsd/HD-act-resetNumberValue-v3_7_0.xsd  |   84 +
 3.7.0/xsd/HD-act-resetTextMessage-v3_7_0.xsd  |   84 +
 3.7.0/xsd/HD-act-start3Dprint-v3_7_0.xsd      |   84 +
 3.7.0/xsd/HD-act-stop3Dprint-v3_7_0.xsd       |   84 +
 3.7.0/xsd/HD-act-toggle-v3_7_0.xsd            |   84 +
 3.7.0/xsd/HD-act-upChannel-v3_7_0.xsd         |   84 +
 3.7.0/xsd/HD-act-upVolume-v3_7_0.xsd          |   84 +
 3.7.0/xsd/HD-commonTypes-v3_7_0.xsd           |  147 +
 3.7.0/xsd/HD-deviceAirConditioner-v3_7_0.xsd  |  141 +
 3.7.0/xsd/HD-deviceAirPurifier-v3_7_0.xsd     |  123 +
 .../xsd/HD-deviceAirQualityMonitor-v3_7_0.xsd |   96 +
 3.7.0/xsd/HD-deviceAudioReceiver-v3_7_0.xsd   |  106 +
 .../HD-deviceBloodPressureMonitor-v3_7_0.xsd  |  119 +
 3.7.0/xsd/HD-deviceCamera-v3_7_0.xsd          |  104 +
 3.7.0/xsd/HD-deviceClothesDryer-v3_7_0.xsd    |  107 +
 3.7.0/xsd/HD-deviceClothesWasher-v3_7_0.xsd   |  119 +
 .../HD-deviceClothesWasherDryer-v3_7_0.xsd    |  119 +
 3.7.0/xsd/HD-deviceCoffeeMachine-v3_7_0.xsd   |  131 +
 3.7.0/xsd/HD-deviceCookerHood-v3_7_0.xsd      |  108 +
 3.7.0/xsd/HD-deviceCooktop-v3_7_0.xsd         |  110 +
 3.7.0/xsd/HD-deviceDehumidifier-v3_7_0.xsd    |  119 +
 3.7.0/xsd/HD-deviceDishWasher-v3_7_0.xsd      |  104 +
 3.7.0/xsd/HD-deviceDoor-v3_7_0.xsd            |  103 +
 3.7.0/xsd/HD-deviceDoorLock-v3_7_0.xsd        |  103 +
 ...HD-deviceElectricVehicleCharger-v3_7_0.xsd |  112 +
 3.7.0/xsd/HD-deviceFan-v3_7_0.xsd             |   96 +
 3.7.0/xsd/HD-deviceFoodProbe-v3_7_0.xsd       |   96 +
 3.7.0/xsd/HD-deviceFreezer-v3_7_0.xsd         |   96 +
 3.7.0/xsd/HD-deviceGlucosemeter-v3_7_0.xsd    |  100 +
 .../xsd/HD-deviceHeartRateMonitor-v3_7_0.xsd  |  100 +
 3.7.0/xsd/HD-deviceHomeCCTV-v3_7_0.xsd        |  140 +
 3.7.0/xsd/HD-deviceHumidifier-v3_7_0.xsd      |   96 +
 3.7.0/xsd/HD-deviceKettle-v3_7_0.xsd          |  114 +
 3.7.0/xsd/HD-deviceLight-v3_7_0.xsd           |  116 +
 3.7.0/xsd/HD-deviceMicrogeneration-v3_7_0.xsd |  108 +
 .../HD-deviceMultiFunctionPrinter-v3_7_0.xsd  |  110 +
 3.7.0/xsd/HD-deviceOutdoorLamp-v3_7_0.xsd     |  120 +
 3.7.0/xsd/HD-deviceOven-v3_7_0.xsd            |  108 +
 3.7.0/xsd/HD-devicePrinter-v3_7_0.xsd         |  104 +
 3.7.0/xsd/HD-devicePulseOximeter-v3_7_0.xsd   |  104 +
 3.7.0/xsd/HD-deviceRefrigerator-v3_7_0.xsd    |  123 +
 3.7.0/xsd/HD-deviceRobotCleaner-v3_7_0.xsd    |  115 +
 3.7.0/xsd/HD-deviceScanner-v3_7_0.xsd         |  104 +
 3.7.0/xsd/HD-deviceSecurityPanel-v3_7_0.xsd   |   96 +
 3.7.0/xsd/HD-deviceSetTopBox-v3_7_0.xsd       |  109 +
 .../HD-deviceSmartElectricMeter-v3_7_0.xsd    |  116 +
 3.7.0/xsd/HD-deviceSmartPlug-v3_7_0.xsd       |  123 +
 3.7.0/xsd/HD-deviceSteamCloset-v3_7_0.xsd     |  107 +
 3.7.0/xsd/HD-deviceStorageBattery-v3_7_0.xsd  |  108 +
 3.7.0/xsd/HD-deviceSwitch-v3_7_0.xsd          |   96 +
 3.7.0/xsd/HD-deviceTelevision-v3_7_0.xsd      |  114 +
 3.7.0/xsd/HD-deviceThermometer-v3_7_0.xsd     |  100 +
 3.7.0/xsd/HD-deviceThermostat-v3_7_0.xsd      |  104 +
 3.7.0/xsd/HD-deviceThreeDPrinter-v3_7_0.xsd   |  116 +
 3.7.0/xsd/HD-deviceWaterHeater-v3_7_0.xsd     |  116 +
 3.7.0/xsd/HD-deviceWaterValve-v3_7_0.xsd      |   96 +
 ...ScaleAndBodyCompositionAnalyser-v3_7_0.xsd |  108 +
 3.7.0/xsd/HD-deviceWindowShade-v3_7_0.xsd     |  100 +
 3.7.0/xsd/HD-enumerationTypes-v3_7_0.xsd      |  716 +++++
 3.7.0/xsd/HD-mod-acousticSensor-v3_7_0.xsd    |   96 +
 3.7.0/xsd/HD-mod-airConJobMode-v3_7_0.xsd     |  106 +
 3.7.0/xsd/HD-mod-airFlow-v3_7_0.xsd           |  124 +
 .../xsd/HD-mod-airPurifierJobMode-v3_7_0.xsd  |  106 +
 3.7.0/xsd/HD-mod-airQualitySensor-v3_7_0.xsd  |  112 +
 3.7.0/xsd/HD-mod-alarmSpeaker-v3_7_0.xsd      |   98 +
 3.7.0/xsd/HD-mod-audioVolume-v3_7_0.xsd       |  106 +
 .../xsd/HD-mod-autoDocumentFeeder-v3_7_0.xsd  |  104 +
 3.7.0/xsd/HD-mod-battery-v3_7_0.xsd           |  110 +
 3.7.0/xsd/HD-mod-binaryObject-v3_7_0.xsd      |  100 +
 3.7.0/xsd/HD-mod-binarySwitch-v3_7_0.xsd      |   97 +
 ...-bioElectricalImpedanceAnalysis-v3_7_0.xsd |  106 +
 .../HD-mod-bodyCompositionAnalyser-v3_7_0.xsd |  106 +
 3.7.0/xsd/HD-mod-boiler-v3_7_0.xsd            |   94 +
 3.7.0/xsd/HD-mod-brewing-v3_7_0.xsd           |   96 +
 3.7.0/xsd/HD-mod-brightness-v3_7_0.xsd        |   94 +
 3.7.0/xsd/HD-mod-clock-v3_7_0.xsd             |   98 +
 .../xsd/HD-mod-clothesDryerJobMode-v3_7_0.xsd |   96 +
 ...D-mod-clothesWasherDryerJobMode-v3_7_0.xsd |  106 +
 .../HD-mod-clothesWasherJobMode-v3_7_0.xsd    |  106 +
 ...-mod-clothesWasherJobModeOption-v3_7_0.xsd |  108 +
 3.7.0/xsd/HD-mod-colour-v3_7_0.xsd            |   98 +
 3.7.0/xsd/HD-mod-colourSaturation-v3_7_0.xsd  |   94 +
 3.7.0/xsd/HD-mod-cookerHoodJobMode-v3_7_0.xsd |  106 +
 3.7.0/xsd/HD-mod-credentials-v3_7_0.xsd       |   98 +
 .../xsd/HD-mod-dehumidifierJobMode-v3_7_0.xsd |  106 +
 3.7.0/xsd/HD-mod-dishWasherJobMode-v3_7_0.xsd |  106 +
 3.7.0/xsd/HD-mod-doorStatus-v3_7_0.xsd        |   98 +
 ...HD-mod-electricVehicleConnector-v3_7_0.xsd |   98 +
 3.7.0/xsd/HD-mod-energyConsumption-v3_7_0.xsd |  110 +
 3.7.0/xsd/HD-mod-energyGeneration-v3_7_0.xsd  |  102 +
 3.7.0/xsd/HD-mod-faultDetection-v3_7_0.xsd    |   98 +
 3.7.0/xsd/HD-mod-filterInfo-v3_7_0.xsd        |   98 +
 3.7.0/xsd/HD-mod-foaming-v3_7_0.xsd           |   94 +
 3.7.0/xsd/HD-mod-geoLocation-v3_7_0.xsd       |  112 +
 3.7.0/xsd/HD-mod-glucometer-v3_7_0.xsd        |  112 +
 3.7.0/xsd/HD-mod-grinder-v3_7_0.xsd           |   98 +
 3.7.0/xsd/HD-mod-heatingZone-v3_7_0.xsd       |   96 +
 3.7.0/xsd/HD-mod-height-v3_7_0.xsd            |   94 +
 3.7.0/xsd/HD-mod-hotWaterSupply-v3_7_0.xsd    |   94 +
 3.7.0/xsd/HD-mod-impactSensor-v3_7_0.xsd      |  100 +
 3.7.0/xsd/HD-mod-keepWarm-v3_7_0.xsd          |   94 +
 3.7.0/xsd/HD-mod-keypad-v3_7_0.xsd            |   94 +
 3.7.0/xsd/HD-mod-liquidLevel-v3_7_0.xsd       |   94 +
 3.7.0/xsd/HD-mod-liquidRemaining-v3_7_0.xsd   |   94 +
 3.7.0/xsd/HD-mod-lock-v3_7_0.xsd              |   94 +
 3.7.0/xsd/HD-mod-mediaSelect-v3_7_0.xsd       |  110 +
 3.7.0/xsd/HD-mod-motionSensor-v3_7_0.xsd      |   98 +
 3.7.0/xsd/HD-mod-numberValue-v3_7_0.xsd       |  111 +
 3.7.0/xsd/HD-mod-openLevel-v3_7_0.xsd         |  106 +
 3.7.0/xsd/HD-mod-operationMode-v3_7_0.xsd     |   94 +
 3.7.0/xsd/HD-mod-overcurrentSensor-v3_7_0.xsd |   98 +
 3.7.0/xsd/HD-mod-oximeter-v3_7_0.xsd          |   94 +
 3.7.0/xsd/HD-mod-ozoneMeter-v3_7_0.xsd        |  100 +
 3.7.0/xsd/HD-mod-phoneCall-v3_7_0.xsd         |  107 +
 3.7.0/xsd/HD-mod-playerControl-v3_7_0.xsd     |  114 +
 3.7.0/xsd/HD-mod-powerSave-v3_7_0.xsd         |   94 +
 3.7.0/xsd/HD-mod-printQueue-v3_7_0.xsd        |  112 +
 3.7.0/xsd/HD-mod-pulsemeter-v3_7_0.xsd        |  100 +
 3.7.0/xsd/HD-mod-pushButton-v3_7_0.xsd        |   94 +
 3.7.0/xsd/HD-mod-recorder-v3_7_0.xsd          |   94 +
 3.7.0/xsd/HD-mod-refrigeration-v3_7_0.xsd     |   98 +
 3.7.0/xsd/HD-mod-relativeHumidity-v3_7_0.xsd  |   96 +
 .../xsd/HD-mod-remoteControlEnable-v3_7_0.xsd |   94 +
 .../xsd/HD-mod-robotCleanerJobMode-v3_7_0.xsd |  106 +
 3.7.0/xsd/HD-mod-runState-v3_7_0.xsd          |  118 +
 3.7.0/xsd/HD-mod-securityMode-v3_7_0.xsd      |  104 +
 .../xsd/HD-mod-sessionDescription-v3_7_0.xsd  |   96 +
 3.7.0/xsd/HD-mod-signalStrength-v3_7_0.xsd    |   96 +
 3.7.0/xsd/HD-mod-smokeSensor-v3_7_0.xsd       |  100 +
 3.7.0/xsd/HD-mod-sphygmomanometer-v3_7_0.xsd  |   98 +
 3.7.0/xsd/HD-mod-spinLevel-v3_7_0.xsd         |   94 +
 .../xsd/HD-mod-steamClosetJobMode-v3_7_0.xsd  |  106 +
 3.7.0/xsd/HD-mod-televisionChannel-v3_7_0.xsd |  114 +
 3.7.0/xsd/HD-mod-temperature-v3_7_0.xsd       |  104 +
 3.7.0/xsd/HD-mod-temperatureAlarm-v3_7_0.xsd  |   98 +
 3.7.0/xsd/HD-mod-textMessage-v3_7_0.xsd       |  115 +
 3.7.0/xsd/HD-mod-threeDPrinter-v3_7_0.xsd     |  110 +
 3.7.0/xsd/HD-mod-timer-v3_7_0.xsd             |  114 +
 3.7.0/xsd/HD-mod-turbo-v3_7_0.xsd             |   94 +
 3.7.0/xsd/HD-mod-uvSensor-v3_7_0.xsd          |   96 +
 3.7.0/xsd/HD-mod-waterFlow-v3_7_0.xsd         |   94 +
 3.7.0/xsd/HD-mod-waterSensor-v3_7_0.xsd       |   94 +
 3.7.0/xsd/HD-mod-weight-v3_7_0.xsd            |   94 +
 3.7.0/xsd/HD-subDeviceCuff-v3_7_0.xsd         |  104 +
 3.7.0/xsd/HD-subDevicePowerOutlet-v3_7_0.xsd  |  107 +
 161 files changed, 21004 insertions(+)
 create mode 100644 3.7.0/SDT-TS0023-Devices.xml
 create mode 100644 3.7.0/SDT-TS0023-ModuleClasses.xml
 create mode 100644 3.7.0/shortnames.csv
 create mode 100644 3.7.0/xsd/HD-act-activateClockTimer-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-act-answer-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-act-call-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-act-close-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-act-deactivateClockTimer-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-act-decrementNumberValue-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-act-downChannel-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-act-downVolume-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-act-hangup-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-act-incrementNumberValue-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-act-nextTrack-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-act-open-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-act-previousTrack-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-act-resetNumberValue-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-act-resetTextMessage-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-act-start3Dprint-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-act-stop3Dprint-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-act-toggle-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-act-upChannel-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-act-upVolume-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-commonTypes-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceAirConditioner-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceAirPurifier-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceAirQualityMonitor-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceAudioReceiver-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceBloodPressureMonitor-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceCamera-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceClothesDryer-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceClothesWasher-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceClothesWasherDryer-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceCoffeeMachine-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceCookerHood-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceCooktop-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceDehumidifier-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceDishWasher-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceDoor-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceDoorLock-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceElectricVehicleCharger-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceFan-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceFoodProbe-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceFreezer-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceGlucosemeter-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceHeartRateMonitor-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceHomeCCTV-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceHumidifier-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceKettle-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceLight-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceMicrogeneration-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceMultiFunctionPrinter-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceOutdoorLamp-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceOven-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-devicePrinter-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-devicePulseOximeter-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceRefrigerator-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceRobotCleaner-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceScanner-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceSecurityPanel-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceSetTopBox-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceSmartElectricMeter-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceSmartPlug-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceSteamCloset-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceStorageBattery-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceSwitch-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceTelevision-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceThermometer-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceThermostat-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceThreeDPrinter-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceWaterHeater-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceWaterValve-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceWeightScaleAndBodyCompositionAnalyser-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-deviceWindowShade-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-enumerationTypes-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-acousticSensor-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-airConJobMode-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-airFlow-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-airPurifierJobMode-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-airQualitySensor-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-alarmSpeaker-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-audioVolume-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-autoDocumentFeeder-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-battery-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-binaryObject-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-binarySwitch-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-bioElectricalImpedanceAnalysis-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-bodyCompositionAnalyser-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-boiler-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-brewing-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-brightness-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-clock-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-clothesDryerJobMode-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-clothesWasherDryerJobMode-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-clothesWasherJobMode-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-clothesWasherJobModeOption-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-colour-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-colourSaturation-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-cookerHoodJobMode-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-credentials-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-dehumidifierJobMode-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-dishWasherJobMode-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-doorStatus-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-electricVehicleConnector-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-energyConsumption-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-energyGeneration-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-faultDetection-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-filterInfo-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-foaming-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-geoLocation-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-glucometer-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-grinder-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-heatingZone-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-height-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-hotWaterSupply-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-impactSensor-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-keepWarm-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-keypad-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-liquidLevel-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-liquidRemaining-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-lock-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-mediaSelect-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-motionSensor-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-numberValue-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-openLevel-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-operationMode-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-overcurrentSensor-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-oximeter-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-ozoneMeter-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-phoneCall-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-playerControl-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-powerSave-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-printQueue-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-pulsemeter-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-pushButton-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-recorder-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-refrigeration-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-relativeHumidity-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-remoteControlEnable-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-robotCleanerJobMode-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-runState-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-securityMode-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-sessionDescription-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-signalStrength-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-smokeSensor-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-sphygmomanometer-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-spinLevel-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-steamClosetJobMode-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-televisionChannel-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-temperature-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-temperatureAlarm-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-textMessage-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-threeDPrinter-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-timer-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-turbo-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-uvSensor-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-waterFlow-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-waterSensor-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-mod-weight-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-subDeviceCuff-v3_7_0.xsd
 create mode 100644 3.7.0/xsd/HD-subDevicePowerOutlet-v3_7_0.xsd

diff --git a/3.7.0/SDT-TS0023-Devices.xml b/3.7.0/SDT-TS0023-Devices.xml
new file mode 100644
index 0000000..19ad309
--- /dev/null
+++ b/3.7.0/SDT-TS0023-Devices.xml
@@ -0,0 +1,1276 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+-->
+
+<Domain xmlns:xi="http://www.w3.org/2001/XInclude" 
+		xmlns="http://homegatewayinitiative.org/xml/dal/3.0" id="org.onem2m.home.device">
+
+	<Imports>
+      <xi:include href="./SDT-TS0023-ModuleClasses.xml" parse="xml" />
+   </Imports>
+
+   <Devices>
+		<Device id="deviceThreeDPrinter">
+			<Doc>A 3D printer is a smart home appliance to provide 3D printing capabilities.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="faultDetection" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="faultDetection"/>
+				</Module>
+				<Module name="threeDPrinter" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="threeDPrinter"/>
+				</Module>
+				<Module name="runState" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="temperature" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="temperature"/>
+					<Doc>This value of “currentTemperature” in this module instance represents the temperature of the nozzle. This value SHALL be a float number in a range from 0.0 to 1000.0.</Doc>
+				</Module>
+				<Module name="printQueue" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="printQueue"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceAirConditioner">
+			<Doc>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.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="runState" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="airConJobMode" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="airConJobMode"/>
+				</Module>
+				<Module name="airConOperationMode" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="operationMode"/>
+					<Doc>This module instance is used to trigger an airCon operation that is pre-set in "airConJobMode". If this data point is not present, then the air conditioner’s job mode can be triggered by setting the "airConJobMode".</Doc>
+				</Module>
+				<Module name="airCleanOperationMode" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="operationMode"/>
+					<Doc>This module instance is used to trigger airClean operation.</Doc>
+				</Module>
+				<Module name="temperature" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="temperature"/>
+				</Module>
+				<Module name="timer" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="timer"/>
+				</Module>
+				<Module name="sleepTimer" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="timer"/>
+					<Doc>The sleep function, which is vendor-specific algorithm (for example increasing the remperature by one degree for every 30 minutes), is triggered instantly when "targetDuration" is set, and it indicates the time to the end of appliance operation. It is set at runtime by a user application.</Doc>
+				</Module>
+				<Module name="turbo" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="turbo"/>
+				</Module>
+				<Module name="airFlow" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="airFlow"/>
+				</Module>
+				<Module name="powerSave" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="powerSave"/>
+				</Module>
+				<Module name="airQualitySensor" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="airQualitySensor"/>
+				</Module>
+				<Module name="filterInfo" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="filterInfo"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceAirPurifier">
+			<Doc>An airPurifieris 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.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="runState" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="airPurifierJobMode" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="airPurifierJobMode"/>
+				</Module>
+				<Module name="airPurifierOperationMode" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="operationMode"/>
+					<Doc>This module instance is used to trigger the airPurifier operation.</Doc>
+				</Module>
+				<Module name="timer" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="timer"/>
+				</Module>
+				<Module name="powerSave" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="powerSave"/>
+				</Module>
+				<Module name="airQualitySensor" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="airQualitySensor"/>
+				</Module>
+				<Module name="filterInfo" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="filterInfo"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceAirQualityMonitor">
+			<Doc>An air quality monitor is a home appliance for monitoring the air quality. This airQualityMonitor information model provides capabilities to monitor the airQualityMonitor functions and resources.</Doc>
+			<Modules>
+				<Module name="airQualitySensor" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="airQualitySensor"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceAudioReceiver">
+			<Doc>An audio receiver is a device that receives audio signals from a number of sources, processing them to drive speakers.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="audioVolume" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="audioVolume"/>
+				</Module>
+				<Module name="mediaInput" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="mediaSelect"/>
+				</Module>
+				<Module name="mediaOutput" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="mediaSelect"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceBloodPressureMonitor">
+			<Doc>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 montor machine.</Doc>
+			<Modules>
+				<Module name="battery" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="battery"/>
+				</Module>
+				<Module name="binarySwitch" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+			</Modules>
+			<SubDevices>
+				<SubDevice id="cuff0">
+					<Doc>A cuff is a subDevice that expresses the attachment device for measuring blood pressure.</Doc>
+					<extends domain="org.onem2m.home.device" class="subDeviceCuff"/>
+					<Modules>
+						<Module name="binarySwitch" optional="true">
+							<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+						</Module>					
+						<Module name="sphygmomanometer" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="sphygmomanometer"/>
+						</Module>
+						<Module name="pulsemeter" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="pulsemeter"/>
+						</Module>
+					</Modules>
+				</SubDevice>
+				<SubDevice id="cuff1">
+					<Doc>A cuff is a subDevice that expresses the attachment device for measuring blood pressure.</Doc>
+					<extends domain="org.onem2m.home.device" class="subDeviceCuff"/>
+					<Modules>
+						<Module name="binarySwitch" optional="true">
+							<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+						</Module>					
+						<Module name="sphygmomanometer" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="sphygmomanometer"/>
+						</Module>
+						<Module name="pulsemeter" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="pulsemeter"/>
+						</Module>
+					</Modules>
+				</SubDevice>
+				<SubDevice id="cuff2">
+					<Doc>A cuff is a subDevice that expresses the attachment device for measuring blood pressure.</Doc>
+					<extends domain="org.onem2m.home.device" class="subDeviceCuff"/>
+					<Modules>
+						<Module name="binarySwitch" optional="true">
+							<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+						</Module>					
+						<Module name="sphygmomanometer" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="sphygmomanometer"/>
+						</Module>
+						<Module name="pulsemeter" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="pulsemeter"/>
+						</Module>
+					</Modules>
+				</SubDevice>
+				<SubDevice id="cuff3">
+					<Doc>A cuff is a subDevice that expresses the attachment device for measuring blood pressure.</Doc>
+					<extends domain="org.onem2m.home.device" class="subDeviceCuff"/>
+					<Modules>
+						<Module name="binarySwitch" optional="true">
+							<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+						</Module>					
+						<Module name="sphygmomanometer" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="sphygmomanometer"/>
+						</Module>
+						<Module name="pulsemeter" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="pulsemeter"/>
+						</Module>
+					</Modules>
+				</SubDevice>
+				<SubDevice id="cuff4">
+					<Doc>A cuff is a subDevice that expresses the attachment device for measuring blood pressure.</Doc>
+					<extends domain="org.onem2m.home.device" class="subDeviceCuff"/>
+					<Modules>
+						<Module name="binarySwitch" optional="true">
+							<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+						</Module>					
+						<Module name="sphygmomanometer" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="sphygmomanometer"/>
+						</Module>
+						<Module name="pulsemeter" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="pulsemeter"/>
+						</Module>
+					</Modules>
+				</SubDevice>
+				<SubDevice id="cuff5">
+					<Doc>A cuff is a subDevice that expresses the attachment device for measuring blood pressure.</Doc>
+					<extends domain="org.onem2m.home.device" class="subDeviceCuff"/>
+					<Modules>
+						<Module name="binarySwitch" optional="true">
+							<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+						</Module>					
+						<Module name="sphygmomanometer" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="sphygmomanometer"/>
+						</Module>
+						<Module name="pulsemeter" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="pulsemeter"/>
+						</Module>
+					</Modules>
+				</SubDevice>
+			</SubDevices>
+		</Device>
+
+
+		<Device id="deviceCamera">
+			<Doc>A camera is an optical instrument for recording or capturing images, which may be stored locally or transmitted to another locations.</Doc>
+			<Modules>
+				<Module name="sessionDescription" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="sessionDescription"/>
+				</Module>
+				<Module name="playerControl" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="playerControl"/>
+				</Module>
+				<Module name="motionSensor" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="motionSensor"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceClothesDryer">
+			<Doc>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.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="runState" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="clothesDryerJobMode" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="clothesDryerJobMode"/>
+				</Module>
+				<Module name="clothesDryerOperationMode" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="operationMode"/>
+					<Doc>This module instance is used to trigger the clothesDryer operation.</Doc>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceClothesWasher">
+			<Doc>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.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="clothesWasherOperationMode" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="operationMode"/>
+				</Module>
+				<Module name="runState" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="clothesWasherJobMode" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="clothesWasherJobMode"/>
+				</Module>
+				<Module name="clothesWasherJobModeOption" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="clothesWasherJobModeOption"/>
+				</Module>
+				<Module name="remoteControlEnable" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="remoteControlEnable"/>
+				</Module>
+				<Module name="timer" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="timer"/>
+				</Module>
+			</Modules>
+		</Device>
+
+		<Device id="deviceClothesWasherDryer">
+			<Doc>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.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+					<Doc></Doc>
+				</Module>
+				<Module name="clothesWasherDryerOperationMode" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="operationMode"/>
+					<Doc></Doc>
+				</Module>
+				<Module name="runState" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+					<Doc></Doc>
+				</Module>
+				<Module name="clothesWasherDryerJobMode" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="clothesWasherDryerJobMode"/>
+					<Doc></Doc>
+				</Module>
+				<Module name="clothesWasherJobModeOption" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="clothesWasherJobModeOption"/>
+					<Doc></Doc>
+				</Module>
+				<Module name="remoteControlEnable" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="remoteControlEnable"/>
+					<Doc></Doc>
+				</Module>
+				<Module name="timer" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="timer"/>
+					<Doc></Doc>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceCoffeeMachine">
+			<Doc>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.</Doc>
+			<Modules>
+				<Module name="faultDetection" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="faultDetection"/>
+				</Module>
+				<Module name="runState" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="clock" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="clock"/>
+				</Module>
+				<Module name="brewing" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="brewing"/>
+				</Module>
+				<Module name="waterStatus" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="liquidRemaining"/>
+				</Module>
+				<Module name="milkStatus" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="liquidRemaining"/>
+				</Module>
+				<Module name="grinder" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="grinder"/>
+				</Module>
+				<Module name="milkFoaming" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="foaming"/>
+				</Module>
+				<Module name="milkQuantity" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="liquidLevel"/>
+				</Module>
+				<Module name="brewingSwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="keepWarm" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="keepWarm"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceCookerHood">
+			<Doc>A cooker hood is a device containing a mechanical fan that hangs above the stove or cooktop in the kitchen.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="runState" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="airFlow" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="airFlow"/>
+				</Module>
+				<Module name="cookerHoodJobMode" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="cookerHoodJobMode"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceCooktop">
+			<Doc>A cooktop is a device that is a kitchen appliance designed for the purpose of cooking food.</Doc>
+			<Modules>
+				<Module name="heatingZone0" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="heatingZone"/>
+				</Module>
+				<Module name="heatingZone1" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="heatingZone"/>
+				</Module>
+				<Module name="heatingZone2" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="heatingZone"/>
+				</Module>
+				<Module name="heatingZone3" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="heatingZone"/>
+				</Module>
+				<Module name="heatingZone4" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="heatingZone"/>
+				</Module>
+				<Module name="heatingZone5" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="heatingZone"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceDehumidifier">
+			<Doc>A dehumidifier is a device that is used to monitor or control the state of a dehumidifying appliance.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="relativeHumidity" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="relativeHumidity"/>
+				</Module>
+				<Module name="runState" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="dehumidifierJobMode" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="dehumidifierJobMode"/>
+				</Module>
+				<Module name="dehumidifierOperationMode" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="operationMode"/>
+					<Doc>This module instance is used to trigger dehumidifier operation.</Doc>
+				</Module>
+				<Module name="timer" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="timer"/>
+				</Module>
+				<Module name="powerSave" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="powerSave"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceDishWasher">
+			<Doc>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.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="runState" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="dishWasherJobMode" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="dishWasherJobMode"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceDoor">
+			<Doc>A door is a device that is used to open and close a door.</Doc>
+			<Modules>
+				<Module name="openLevel" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="openLevel"/>
+				</Module>
+				<Module name="doorlock" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="lock"/>
+				</Module>
+				<Module name="doorStatus" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="doorStatus"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceDoorLock">
+			<Doc>A door lock is a device that can be used to lock, for example, a door.</Doc>
+			<Modules>
+				<Module name="doorLock" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="lock"/>
+				</Module>
+				<Module name="doorStatus" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="doorStatus"/>
+				</Module>
+				<Module name="battery" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="battery"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceElectricVehicleCharger">
+			<Doc>An electric vehicle charger is a device that is used for charging or discharging electric vehicles.</Doc>
+			<Modules>
+				<Module name="faultDetection" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="faultDetection"/>
+				</Module>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="runState" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="battery" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="battery"/>
+				</Module>
+				<Module name="electricVehicleConnector" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="electricVehicleConnector"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceFan">
+			<Doc>A fan is a device that is used to monitor or control the state of a fanning device.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceFoodProbe">
+			<Doc>A food probe is a device that is used to measure the internal temperature of food.</Doc>
+			<Modules>
+				<Module name="temperature" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="temperature"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceFreezer">
+			<Doc>A freezer is a large container like a fridge in which the temperature is kept below freezing point, so that food can be storeed inside of it for long periods. This freezer information model provides capabilities to monitor freezer specific functions and resources.</Doc>
+			<Modules>
+				<Module name="temperature" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="temperature"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceGlucosemeter">
+			<Doc>A glucometer is a device that can be used to monitor the blood glucose level.</Doc>
+			<Modules>
+				<Module name="glucometer" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="glucometer"/>
+				</Module>
+				<Module name="battery" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="battery"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceHeartRateMonitor">
+			<Doc>A heart rate monitor is a device that can be used to monitor the heart rate.</Doc>
+			<Modules>
+				<Module name="pulsemeter" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="pulsemeter"/>
+				</Module>
+				<Module name="battery" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="battery"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceHomeCCTV">
+			<Doc>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.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="sessionDescription" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="sessionDescription"/>
+				</Module>
+				<Module name="playerControl" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="playerControl"/>
+				</Module>
+				<Module name="runState" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="motionSensor" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="motionSensor"/>
+				</Module>
+				<Module name="airQualitySensor" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="airQualitySensor"/>
+				</Module>
+				<Module name="ozoneMeter" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="ozoneMeter"/>
+				</Module>
+				<Module name="smokeSensor" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="smokeSensor"/>
+				</Module>
+				<Module name="acousticSensor" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="acousticSensor"/>
+				</Module>
+				<Module name="impactSensor" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="impactSensor"/>
+				</Module>
+				<Module name="faultDetection" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="faultDetection"/>
+				</Module>
+				<Module name="alarmSpeaker" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="alarmSpeaker"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceHumidifier">
+			<Doc>A humidifier is a device that is used to monitor or control the state of a humidifying appliance.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="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.
+			<Doc>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.</Doc>
+			<Modules>
+				<Module name="faultDetection" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="faultDetection"/>
+				</Module>
+				<Module name="runState" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="waterStatus" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="liquidRemaining"/>
+				</Module>
+				<Module name="boilingSwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="temperature" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="temperature"/>
+				</Module>
+				<Module name="keepWarm" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="keepWarm"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceLight">
+			<Doc>A light is a device that is used to control the state of an illumination appliance.</Doc>
+			<Modules>
+				<Module name="faultDetection" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="faultDetection"/>
+				</Module>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="runState" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="colour" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="colour"/>
+				</Module>
+				<Module name="colourSaturation" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="colourSaturation"/>
+				</Module>
+				<Module name="brightness" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="brightness"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceMicrogeneration">
+			<Doc>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.</Doc>
+			<Modules>
+				<Module name="faultDetection" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="faultDetection"/>
+				</Module>
+				<Module name="binarySwitch" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="runState" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="energyGeneration" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="energyGeneration"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceMultiFunctionPrinter">
+			<Doc>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.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="printerRunState" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="scannerRunState" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="autoDocumentFeeder" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="autoDocumentFeeder"/>
+				</Module>
+				<Module name="printQueue" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="printQueue"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceOutdoorLamp">
+			<Doc>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.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="brightness" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="brightness"/>
+				</Module>
+				<Module name="motionSensor" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="motionSensor"/>
+				</Module>
+				<Module name="airQualitySensor" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="airQualitySensor"/>
+				</Module>
+				<Module name="uvSensor" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="uvSensor"/>
+				</Module>
+				<Module name="timer" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="timer"/>
+					<Doc>The timer is used to set duration of giving lights from the moment of triggering by the "brightness" module or "motionSensor" module.</Doc>
+				</Module>
+				<Module name="faultDetection" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="faultDetection"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceOven">
+			<Doc>An oven is a home appliance used to roast and heat food in a complete stove. This information model is applicable to different types of ovens: gas ovens, electrical ovens, steam ovens, microwave ovens, etc. This information model provides capabilities to interact with specific functions and resources of ovens.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+					<Doc>Depending on the manufacturer policies or regulations, the binary switch might only be used to turn the device off.</Doc>
+				</Module>
+				<Module name="runState" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="timer" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="timer"/>
+				</Module>
+				<Module name="temperature" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="temperature"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="devicePrinter">
+			<Doc>A printer is a device that is used to monitor or control the state of a printing appliance.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="runState" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="printQueue" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="printQueue"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="devicePulseOximeter">
+			<Doc>A pulseoximeter is a device that can be used to monitor the blood characteristics.</Doc>
+			<Modules>
+				<Module name="pulsemeter" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="pulsemeter"/>
+					<Doc>When the "oximeter" module doesn’t exist, then the "pulsemeter" module is mandatory.</Doc>
+				</Module>
+				<Module name="oximeter" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="oximeter"/>
+					<Doc>When the "pulsemeter" module doesn’t exist, then the "oximeter" module is mandatory.</Doc>
+				</Module>
+				<Module name="battery" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="battery"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceRefrigerator">
+			<Doc>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.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="powerSave" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="powerSave"/>
+				</Module>
+				<Module name="doorStatus" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="doorStatus"/>
+				</Module>
+				<Module name="frozenTemperature" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="temperature"/>
+				</Module>
+				<Module name="fridgeTemperature" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="temperature"/>
+				</Module>
+				<Module name="customTemperature" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="temperature"/>
+					<Doc>This module can be configured to fridge temperature or frozen temperature based on its usage by manufacturer</Doc>
+				</Module>
+				<Module name="refrigeration" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="refrigeration"/>
+				</Module>
+				<Module name="controlPanelLock" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="lock"/>
+				</Module>
+				<Module name="waterFilterInfo" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="filterInfo"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceRobotCleaner">
+			<Doc>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.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="runState" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="robotCleanerJobMode" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="robotCleanerJobMode"/>
+				</Module>
+				<Module name="robotCleanerOperationMode" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="operationMode"/>
+				</Module>
+				<Module name="battery" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="battery"/>
+				</Module>
+				<Module name="timer" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="timer"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceScanner">
+			<Doc>A scanner is a device that optically scans images, printed text, handwriting or an object, and converts it to a digital image.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="runState" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="autoDocumentFeeder" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="autoDocumentFeeder"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceSecurityPanel">
+			<Doc>A security pannel is a device that can change the security mode of, for example, an alarm system.</Doc>
+			<Modules>
+				<Module name="securityMode" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="securityMode"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceSetTopBox">
+			<Doc>A set top box is a device that in general contains a TV tuner input and displays output to a TV.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="audioVolume" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="audioVolume"/>
+				</Module>
+				<Module name="channel" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="televisionChannel"/>
+				</Module>
+				<Module name="mediaInput" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="mediaSelect"/>
+				</Module>
+				<Module name="mediaOutput" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="mediaSelect"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceSmartElectricMeter">
+			<Doc>A smart electric meter is a metering device that is used to measure consumption data for electrictricity.</Doc>
+			<Modules>
+				<Module name="faultDetection" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="faultDetection"/>
+				</Module>
+				<Module name="binarySwitch" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="runState" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="clock" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="clock"/>
+				</Module>
+				<Module name="energyConsumption" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="energyConsumption"/>
+				</Module>
+				<Module name="energyGeneration" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="energyGeneration"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceSmartPlug">
+			<Doc>A smart plug is a device that can turn on and off a connected appliance.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="faultDetection" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="faultDetection"/>
+				</Module>
+				<Module name="remoteControlEnable" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="remoteControlEnable"/>
+				</Module>
+			</Modules>
+			<SubDevices>
+				<SubDevice id="powerOutlet0">
+					<Doc>A powerOutlet is a subDevice that specifies the attachment device for deviceSmartPlug.</Doc>
+					<extends domain="org.onem2m.home.device" class="subDevicePowerOutlet"/>
+					<Modules>
+						<Module name="binarySwitch" optional="true">
+							<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+						</Module>					
+						<Module name="energyConsumption" optional="true">
+							<extends domain="org.onem2m.home.moduleclass" class="energyConsumption"/>
+						</Module>
+						<Module name="overcurrentSensor" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="overcurrentSensor"/>
+						</Module>
+						<Module name="dimmingLevel" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="numberValue"/>
+							<Doc>This provides the capability to change the energy.</Doc>
+						</Module>
+					</Modules>
+				</SubDevice>
+				<SubDevice id="powerOutlet1">
+					<Doc>A powerOutlet is a subDevice that specifies the attachment device for deviceSmartPlug.</Doc>
+					<extends domain="org.onem2m.home.device" class="subDevicePowerOutlet"/>
+					<Modules>
+						<Module name="binarySwitch" optional="true">
+							<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+						</Module>					
+						<Module name="energyConsumption" optional="true">
+							<extends domain="org.onem2m.home.moduleclass" class="energyConsumption"/>
+						</Module>
+						<Module name="overcurrentSensor" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="overcurrentSensor"/>
+						</Module>
+						<Module name="dimmingLevel" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="numberValue"/>
+							<Doc>This provides the capability to change the energy.</Doc>
+						</Module>
+					</Modules>
+				</SubDevice>
+				<SubDevice id="powerOutlet2">
+					<Doc>A powerOutlet is a subDevice that specifies the attachment device for deviceSmartPlug.</Doc>
+					<extends domain="org.onem2m.home.device" class="subDevicePowerOutlet"/>
+					<Modules>
+						<Module name="binarySwitch" optional="true">
+							<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+						</Module>					
+						<Module name="energyConsumption" optional="true">
+							<extends domain="org.onem2m.home.moduleclass" class="energyConsumption"/>
+						</Module>
+						<Module name="overcurrentSensor" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="overcurrentSensor"/>
+						</Module>
+						<Module name="dimmingLevel" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="numberValue"/>
+							<Doc>This provides the capability to change the energy.</Doc>
+						</Module>
+					</Modules>
+				</SubDevice>
+				<SubDevice id="powerOutlet3">
+					<Doc>A powerOutlet is a subDevice that specifies the attachment device for deviceSmartPlug.</Doc>
+					<extends domain="org.onem2m.home.device" class="subDevicePowerOutlet"/>
+					<Modules>
+						<Module name="binarySwitch" optional="true">
+							<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+						</Module>					
+						<Module name="energyConsumption" optional="true">
+							<extends domain="org.onem2m.home.moduleclass" class="energyConsumption"/>
+						</Module>
+						<Module name="overcurrentSensor" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="overcurrentSensor"/>
+						</Module>
+						<Module name="dimmingLevel" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="numberValue"/>
+							<Doc>This provides the capability to change the energy.</Doc>
+						</Module>
+					</Modules>
+				</SubDevice>
+				<SubDevice id="powerOutlet4">
+					<Doc>A powerOutlet is a subDevice that specifies the attachment device for deviceSmartPlug.</Doc>
+					<extends domain="org.onem2m.home.device" class="subDevicePowerOutlet"/>
+					<Modules>
+						<Module name="binarySwitch" optional="true">
+							<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+						</Module>					
+						<Module name="energyConsumption" optional="true">
+							<extends domain="org.onem2m.home.moduleclass" class="energyConsumption"/>
+						</Module>
+						<Module name="overcurrentSensor" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="overcurrentSensor"/>
+						</Module>
+						<Module name="dimmingLevel" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="numberValue"/>
+							<Doc>This provides the capability to change the energy.</Doc>
+						</Module>
+					</Modules>
+				</SubDevice>
+				<SubDevice id="powerOutlet5">
+					<Doc>A powerOutlet is a subDevice that specifies the attachment device for deviceSmartPlug.</Doc>
+					<extends domain="org.onem2m.home.device" class="subDevicePowerOutlet"/>
+					<Modules>
+						<Module name="binarySwitch" optional="true">
+							<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+						</Module>					
+						<Module name="energyConsumption" optional="true">
+							<extends domain="org.onem2m.home.moduleclass" class="energyConsumption"/>
+						</Module>
+						<Module name="overcurrentSensor" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="overcurrentSensor"/>
+						</Module>
+						<Module name="dimmingLevel" optional="false">
+							<extends domain="org.onem2m.home.moduleclass" class="numberValue"/>
+							<Doc>This provides the capability to change the energy.</Doc>
+						</Module>
+					</Modules>
+				</SubDevice>
+			</SubDevices>
+		</Device>
+
+
+		<Device id="deviceSteamCloset">
+			<Doc>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.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="runState" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="steamClosetJobMode" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="steamClosetJobMode"/>
+				</Module>
+				<Module name="steamClosetOperationMode" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="operationMode"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceStorageBattery">
+			<Doc>A storage battery is a Home Energy Management System HEMS device that is used to provide the home with electrical energy.</Doc>
+			<Modules>
+				<Module name="faultDetection" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="faultDetection"/>
+				</Module>
+				<Module name="binarySwitch" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="runState" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="battery" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="battery"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceSwitch">
+			<Doc>A switch is a device that is used to control and monitor the state of power. Although there is only one module instance in Table 5.5.42-1, the binarySwitch module instance can be extended using different module instance names according to the requirement.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceTelevision">
+			<Doc>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.</Doc>
+			<Modules>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="audioVolume" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="audioVolume"/>
+				</Module>
+				<Module name="televisionChannel" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="televisionChannel"/>
+				</Module>
+				<Module name="playerControl" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="playerControl"/>
+				</Module>
+				<Module name="mediaInput" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="mediaSelect"/>
+				</Module>
+				<Module name="mediaOutput" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="mediaSelect"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceThermometer">
+			<Doc>A thermometer is a device that can be used to check, for example, the body or other temperatures.</Doc>
+			<Modules>
+				<Module name="temperature" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="temperature"/>
+				</Module>
+				<Module name="battery" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="battery"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceThermostat">
+			<Doc>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.</Doc>
+			<Modules>
+				<Module name="runState" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+					<Doc>The possible values of the “supportedModes” datapoint for the thermostat device are included in clause 5.6.18.</Doc>
+				</Module>
+				<Module name="timer" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="timer"/>
+				</Module>
+				<Module name="temperature" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="temperature"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceWaterHeater">
+			<Doc>A water heater is a device that is used to provide hot water through home facilities.</Doc>
+			<Modules>
+				<Module name="faultDetection" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="faultDetection"/>
+				</Module>
+				<Module name="binarySwitch" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="binarySwitch"/>
+				</Module>
+				<Module name="runState" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="runState"/>
+				</Module>
+				<Module name="clock" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="clock"/>
+				</Module>
+				<Module name="boiler" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="boiler"/>
+				</Module>
+				<Module name="hotWaterSupply" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="hotWaterSupply"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceWaterValve">
+			<Doc>A water valve is a device that is used to turn the water supply ON or OFF remotely.</Doc>
+			<Modules>
+				<Module name="openLevel" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="openLevel"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceWeightScaleAndBodyCompositionAnalyser">
+			<Doc>A weight scale and body composition analyser is a device that can be used to monitor the weight and body composition.</Doc>
+			<Modules>
+				<Module name="weight" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="weight"/>
+				</Module>
+				<Module name="bodyCompositionAnalyser" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="bodyCompositionAnalyser"/>
+				</Module>
+				<Module name="bioElectricalImpedanceAnalysis" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="bioElectricalImpedanceAnalysis"/>
+				</Module>
+				<Module name="battery" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="battery"/>
+				</Module>
+			</Modules>
+		</Device>
+
+
+		<Device id="deviceWindowShade">
+			<Doc>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.</Doc>
+			<Modules>
+				<Module name="openLevel" optional="false">
+					<extends domain="org.onem2m.home.moduleclass" class="openLevel"/>
+				</Module>
+				<Module name="battery" optional="true">
+					<extends domain="org.onem2m.home.moduleclass" class="battery"/>
+				</Module>
+			</Modules>
+		</Device>
+
+	</Devices>
+</Domain>
+
diff --git a/3.7.0/SDT-TS0023-ModuleClasses.xml b/3.7.0/SDT-TS0023-ModuleClasses.xml
new file mode 100644
index 0000000..203d5d9
--- /dev/null
+++ b/3.7.0/SDT-TS0023-ModuleClasses.xml
@@ -0,0 +1,2449 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+-->
+
+<Domain xmlns="http://homegatewayinitiative.org/xml/dal/3.0" id="org.onem2m.home.moduleclass">
+	<Modules>
+		<ModuleClass name="threeDPrinter">
+			<Doc>This ModuleClass describes capabilities of a 3D printer.</Doc>
+			<Actions>
+				<Action name="start3Dprint" optional="truet">
+					<Doc>Start 3D printing.</Doc>
+				</Action>
+				<Action name="stop3Dprint" optional="true">
+					<Doc>Stop 3D printing.</Doc>
+				</Action>
+			</Actions>
+			<Data>
+				<DataPoint name="printType" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>The type of printing technology (see clause 5.6.1).</Doc>
+					<DataType>
+						<SimpleType type="hd:enum3DPrinterTechnology" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="printSizeX" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>This data pointrepresents the maximum size of a printing object in the direction of X-axis. The unit of measure is "mm". (1/10cm).</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="printSizeY" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>This data poin represents the maximum size of printing object in the direction of Y-axis. The unit of measure is "mm". (1/10cm).</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="printSizeZ" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>This data point represents the maximum size of printing object in the direction of Z-axis. The unit of measure is “mm”. (1/10cm).</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="network" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>This value indicates the Wide Area Network (WAN) connectivity of the 3D printer, such as Internet or GSM. "False" indicates that the printer does not have network connectivity to a WAN. "True" indicates that the printer has WAN network connectivity.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="memorySize" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>This value represents the total memory size of the printer. The unit of measure is MB(Mega Bytes).</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="acousticSensor">
+			<Doc>This ModuleClass provides capabilities for an acoustic sensor.</Doc>
+			<Data>
+				<DataPoint name="loudness" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>The unit of measure of the loudness is "dB^2".</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="acousticStatus" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The acousticStatus is expressed in percent, whereas a value of 0 means "no sound" and a value of 100 means "most noisy".</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="airConJobMode">
+			<Doc>This ModuleClasses provides capabilities to control and monitor the job modes of an air conditioner.</Doc>
+			<Data>
+				<DataPoint name="currentJobMode" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>Currently active job mode (see clause 5.6.3).</Doc>
+					<DataType>
+						<SimpleType type="hd:enumAirConJobMode" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="currentJobModeName" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>Name of the current job mode as a  string. This can be used when currentJobMode is vendor-specific.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="jobModes" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>List of possible job states the device supports (??? see clause 5.3.1).</Doc>
+					<DataType>
+						<Array>
+							<DataType>
+								<SimpleType type="hd:enumAirConJobMode" />
+							</DataType>
+						</Array>
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="airFlow">
+			<Doc>This ModuleClass provides capabilities for controlling the air flow of a device.</Doc>
+			<Data>
+				<DataPoint name="speed" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>The current speed level in the range of the [minSpeed, maxSpeed] data poins.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="minSpeed" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The minimum value for the speed level. If not present, the default is 0.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="maxSpeed" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The maximum value for the speed level. If not present, the default is 100.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="verticalDirection" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The vertical direction of the air flow (see clause 5.6.31).</Doc>
+					<DataType>
+						<SimpleType type="hd:enumVerticalDirection" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="supportedVerticalDirection" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>List of supported vertical directions.</Doc>
+					<DataType>
+						<Array>
+							<DataType>
+								<SimpleType type="hd:enumVerticalDirection" />
+							</DataType>
+						</Array>
+					</DataType>
+				</DataPoint>
+				<DataPoint name="horizontalDirection" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The horizontal direction of the air flow (see clause 5.6.17).</Doc>
+					<DataType>
+						<SimpleType type="hd:enumHorizontalDirection" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="supportedHorizontalDirection" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>List of supported horizontal directions.</Doc>
+					<DataType>
+						<Array>
+							<DataType>
+								<SimpleType type="hd:enumHorizontalDirection" />
+							</DataType>
+						</Array>
+					</DataType>
+				</DataPoint>
+				<DataPoint name="automode" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>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.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="airPurifierJobMode">
+			<Doc>This ModuleClasses provides capabilities to control and monitor the job modes of an airPurifier.</Doc>
+			<Data>
+				<DataPoint name="currentJobMode" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>Currently active job mode (see clause 5.6.4).</Doc>
+					<DataType>
+						<SimpleType type="hd:enumAirPurifierJobMode" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="currentJobModeName" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>Name of the current job mode as a string. This can be used when currentJobMode is vendor-specific.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="jobModes" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>List of possible job states the device supports (see clause 5.6.4).</Doc>
+					<DataType>
+						<Array>
+							<DataType>
+								<SimpleType type="hd:enumAirPurifierJobMode" />
+							</DataType>
+						</Array>
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="airQualitySensor">
+			<Doc>ThThis ModuleClass provides capabilities for a monitoring sensor that measures the air quality.</Doc>
+			<Data>
+				<DataPoint name="sensorPM1" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The concentration of particle matter under 1um. The minimum value is 0, and the maximum value is 1000.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="sensorPM2" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The concentration of particle matter under 2.5um. The minimum value is 0, and the maximum value is 1000.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="sensorPM10" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The concentration of particle matter under 10um. The minimum value is 0, and the maximum value is 1000.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="sensorOdor" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The concentration of odor that reflects air pollution. The minimum value is 0, and the maximum value is 1000.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="sensorHumidity" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The measured humidity. The minimum value is 0, and the maximum value is 100.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="monitoringEnabled" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The current status of monitoring. "True" indicates enabled, and "False" indicates not enabled..</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="co2" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>This value indicates the CO2 level in ppm (parts per million).</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="co" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>This value indicates the CO level in ppm..</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="ch2o" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>This value indicates the CH2O level in ppm.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="voc" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>ThThis value indicates the VOC (Volatile Organic Compounds) value in ppm.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="alarmSpeaker">
+			<Doc>This ModuleClass provides the capabilites to initiate and monitor an alarm.</Doc>
+			<Data>
+				<DataPoint name="tone" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>Representing the tones of the alarm (see clause 5.6.29).</Doc>
+					<DataType>
+						<SimpleType type="hd:enumTone" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="light" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>Representing the lighting mode of the alarm (see clause 5.6.5).</Doc>
+					<DataType>
+						<SimpleType type="hd:enumAlertColourCode" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="alarmStatus" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>"True" indicates the alarm start while "False" indicates the alarm stop.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="audioVolume">
+			<Doc>This ModuleClass provides capabilities to control and monitor volume.</Doc>
+			<Actions>
+				<Action name="upVolume" optional="true">
+					<Doc>Increase volume by the amount of the stepValue up to the maxValue.</Doc>
+				</Action>
+				<Action name="downVolume" optional="true">
+					<Doc>Decrease volume by the amount of the stepValue down to 0.</Doc>
+				</Action>
+			</Actions>
+			<Data>
+				<DataPoint name="volumePercentage" readable="true" writable="true" eventable="true" optional="false">
+					<Doc>The rounded percentage of the current volume in the range of [0, maxValue]. 0% shall mean no sound produced.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="stepValue" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>Step value used by the "UpVolume" and "DownVolume" actions.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="maxValue" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>Maximum value allowed for Volume. maxValue is 100 by default if "maxValue" is not provided.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="muteEnabled" readable="true" writable="true" eventable="true" optional="false">
+					<Doc>The current status of the mute enablement. "True" indicates enabled (that is, no sound), and "False" indicates not enabled (that is, sound is played).</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="autoDocumentFeeder">
+			<Doc>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.</Doc>
+			<Data>
+				<DataPoint name="currentAdfState" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>Current state of the ADF.</Doc>
+					<DataType>
+						<SimpleType type="hd:enumAdfState" />
+					</DataType>
+				</DataPoint>
+
+				<DataPoint name="adfStates" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>List of possible ADF states that are supported by the device (see clause 5.6.2).</Doc>
+					<DataType>
+						<Array>
+							<DataType>
+								<SimpleType type="hd:enumAdfState" />
+							</DataType>
+						</Array>
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="battery">
+			<Doc>This ModuleClass provides capabilities to indicate the detection of low battery and gives an alarm if triggering criterion is met. The level data point in the module represents the current battery charge level.</Doc>
+			<Data>
+				<DataPoint name="level" readable="true" writable="false" eventable="true" optional="false">
+					<Doc>TThe rounded percentage of the current charging level of a battery in the range of [0, 100]. 0 percentage shall mean that no charge remains.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="capacity" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>The total capacity of a battery in mAh.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="charging" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>The status of charging. "True" indicates charging, and "False" indicates not charging.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="discharging" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>The status of discharging. "True" indicates discharging, and "False" indicates not discharging.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="lowBattery" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>To indicate that the battery is in a low charge level.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="batteryThreshold" readable="true" writable="true" eventable="true" optional="true">
+					<Doc>When a battery’s "level" is less than "batteryThreshold" then the "lowBattery" is "true". This datapoint can be used to raise an alarm, depending on the implementation.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="electricEnergy" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>Rated electric energy. The unit of measure is ampere (A).</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="voltage" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>Rated voltage. The unit of measure is ampere (A).</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="material" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>The material of the cell (for example lithium ion, nickel and lead.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="binaryObject">
+			<Doc>This ModuleClass describes the handling of a binary object (blob). </Doc>
+			<Data>
+				<DataPoint name="object" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>This data point contains the base64 encoded binary object.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="objectType" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>This data point contains the type and subtype of the binary object as a MIME type.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="size" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The size of the decoded binary object.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="hash" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>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. The data point contains the hash as a hex encoded value.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="binarySwitch">
+			<Doc>This ModuleClass provides capabilities to control and monitor the state of power.</Doc>
+			<Actions>
+				<Action name="toggle" optional="true">
+					<Doc>Toggle the switch.</Doc>
+				</Action>
+			</Actions>
+			<Data>
+				<DataPoint name="powerState" readable="true" writable="true" eventable="true" optional="false">
+					<Doc>The current status of the binarySwitch. "True" indicates turned-on, and "False" indicates turned-off.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="bioElectricalImpedanceAnalysis">
+			<Doc>This ModuleClass provides the analysis of human body tissue based on impedance measurement.</Doc>
+			<Data>
+				<DataPoint name="water" readable="true" writable="false" eventable="true" optional="false">
+					<Doc>The water content measurement from the BIA. The unit of measure is percentage.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="fat" readable="true" writable="false" eventable="true" optional="false">
+					<Doc>The fat content measurement from the BIAT he unit of measure is percentage.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="muscle" readable="true" writable="false" eventable="true" optional="false">
+					<Doc>The muscle content measurement from the BIA. The unit of measure is percentage.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="bone" readable="true" writable="false" eventable="true" optional="false">
+					<Doc>The bone content measurement from the BIA The unit of measure is percentage.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="visceraFat" readable="true" writable="false" eventable="true" optional="false">
+					<Doc>The viscera fat content measurement from the BIA The unit of measure is percentage.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="kcal" readable="true" writable="false" eventable="true" optional="false">
+					<Doc>The kcal (kilocalories) measurement from the BIA.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="resistance" readable="true" writable="false" eventable="true" optional="false">
+					<Doc>The resistance measurement of a human body. The unit of measure is ohm.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="bodyCompositionAnalyser">
+			<Doc>This ModuleClass provides the capability to report the measurement of a body composition analyser.</Doc>
+			<Data>
+				<DataPoint name="bodyLength" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The measurement of body length by Weight scale and Body composition analyser. The unit of measure is centimeter(cm)..</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="bmi" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The measurement of Body Mass Index (BMI) by a weight scale and a body composition analyser. The unit of measure is kg/m^2.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="fatFreeMass" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The measurement of fat free mass by a Weight scale and a Body composition analyser. The unit of measure is kilogram (kg).</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="softLeanMass" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The measurement of soft lean mass by a weight scale and a body composition analyser. The unit of measure is kilogram (kg).</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="muscleMass" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The measurement of muscle mass by a weight scale and a body composition analyser. The unit of measure is kilogram (kg).</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="basalMetabolism" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The measurement of muscle mass by a weight scale and a body composition analyser. The unit of measure is kilogram (kg).</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="impedance" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The measurement of impedance by a weight scale and a body composition analyser. The unit of measure is ohm.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="boiler">
+			<Doc>This ModuleClass provides the capabilities to control the status of the boiling functionality for water heaters.</Doc>
+			<Data>
+				<DataPoint name="status" readable="true" writable="true" eventable="true" optional="false">
+					<Doc>The status of boiling. "True" indicates boiling, "False" indicates not boiling.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="brewing">
+			<Doc>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.</Doc>
+			<Data>
+				<DataPoint name="cupsNumber" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>The current number of the cups requested to brew.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="strength" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The current strength of the drink taste (see clause 5.6.28). A higher value indicates a stronger taste.</Doc>
+					<DataType>
+						<SimpleType type="hd:enumTasteStrength" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+   
+		<ModuleClass name="brightness">
+			<Doc>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).</Doc>
+			<Data>
+				<DataPoint name="brightness" readable="true" writable="true" eventable="true" optional="false">
+					<Doc>The status of brightness level in percentage.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="clock">
+			<Doc>This ModuleClass provides capabilities to control and monitor time and date information.</Doc>
+			<Data>
+				<DataPoint name="currentTime" readable="true" writable="true" eventable="true" optional="false">
+					<Doc>Information of the current time.</Doc>
+					<DataType>
+						<SimpleType type="time" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="currentDate" readable="true" writable="true" eventable="true" optional="false">
+					<Doc>Information of the current date.</Doc>
+					<DataType>
+						<SimpleType type="date" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="currentTimeZone" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>Name of current time zone according to the IANA Timezone data format (TZ), for example, "America/New York". </Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="clothesDryerJobMode">
+			<Doc>This ModuleClasses provides capabilities to control and monitor the job modes of a clothes dryer.</Doc>
+			<Data>
+				<DataPoint name="currentJobMode" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>Currently active job mode  (see clause 5.6.7). </Doc>
+					<DataType>
+						<SimpleType type="hd:enumClothesDryerJobMode" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="currentJobModeName" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>Name of current job mode as a string. This can be used when "currentJobMode" is vendor-specific.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="clothesWasherDryerJobMode">
+			<Doc>This ModuleClasses provides capabilities to control and monitor the job modes of clothesWasherDryer.</Doc>
+			<Data>
+				<DataPoint name="currentJobMode" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>Currently active job mode.</Doc>
+					<DataType>
+						<SimpleType type="hd:enumClothesWasherDryerJobMode" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="currentJobModeName" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The name of the current job mode as a string. This can be used when currentJobMode is vendor-specific.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="jobModes" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>List of possible job states that the device supports.</Doc>
+					<DataType>
+						<Array>
+							<DataType>
+								<SimpleType type="hd:enumClothesWasherDryerJobMode" />
+							</DataType>
+						</Array>
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="clothesWasherJobMode">
+			<Doc>This ModuleClasses provides capabilities to control and monitor the job mode of a washer.</Doc>
+			<Data>
+				<DataPoint name="currentJobMode" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>Currently active job mode (see clause 5.6.8).</Doc>
+					<DataType>
+						<SimpleType type="hd:enumClothesWasherJobMode" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="currentJobModeName" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The name of the current job mode as a string. This can be used when the currentJobMode is vendor-specific.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="jobModes" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>List of possible job states that the device supports (see clause 5.6.8).</Doc>
+					<DataType>
+						<Array>
+							<DataType>
+								<SimpleType type="hd:enumClothesWasherJobMode" />
+							</DataType>
+						</Array>
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="clothesWasherJobModeOption">
+			<Doc>This ModuleClasses provides capabilities to control and monitor the washing job mode options of a washer.</Doc>
+			<Data>
+				<DataPoint name="washTemp" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>This data point represents the water temperature level (see clause 5.6.14).</Doc>
+					<DataType>
+						<SimpleType type="hd:enumGeneralTemperature" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="soilLevel" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>This data point represents the washing level (see clause 5.6.12).</Doc>
+					<DataType>
+						<SimpleType type="hd:enumGeneralLevel" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="spinSpeed" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>This data point represents the spin-dry speed level (see clause 5.6.13).</Doc>
+					<DataType>
+						<SimpleType type="hd:enumGeneralSpeed" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="preWash" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>This data point indicates pre-wash. "True" indicates enabled, "False" indicates disabled.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="speedWash" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>This data point indicates speed wash. "True" indicates enabled, "False" indicates disabled.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="steamTreat" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>This data point indicates steam treat. "True" indicates enabled, "False" indicates disabled.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="coldWash" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>This data point indicates cold wash. "True" indicates enabled, "False" indicates disabled.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="extraRinse" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>This data point indicates extra rinse. "True" indicates enabled, "False" indicates disabled.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="colour">
+			<Doc>This ModuleClass provides the capabilities to set the value of the Red, Green, and Blue colour channels for a colour device.</Doc>
+			<Data>
+				<DataPoint name="red" readable="true" writable="true" eventable="true" optional="false">
+					<Doc>The value of the Red colour channel of RGB. The range is [0,255].</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="green" readable="true" writable="true" eventable="true" optional="false">
+					<Doc>The value of the Green colour channel of RGB. The range is [0,255].</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="blue" readable="true" writable="true" eventable="true" optional="false">
+					<Doc>TThe value of the Blue colour channel of RGB. The range is [0,255].</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="colourSaturation">
+			<Doc>This ModuleClass provides cababilities to control and monitor a colour saturation value.</Doc>
+			<Data>
+				<DataPoint name="colourSaturation" readable="true" writable="true" eventable="true" optional="false">
+					<Doc>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 colourfull images.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="cookerHoodJobMode">
+			<Doc>This ModuleClasses provides capabilities to control and monitor the job modes of a cookerHood.</Doc>
+			<Data>
+				<DataPoint name="currentJobMode" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>The currently active job mode.</Doc>
+					<DataType>
+						<SimpleType type="hd:enumCookerHoodJobMode" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="currentJobModeName" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The name of the current job mode as a string. This can be used when currentJobMode is vendor-specific.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="jobModes" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>List of possible job states the device supports.</Doc>
+					<DataType>
+						<Array>
+							<DataType>
+								<SimpleType type="hd:enumCookerHoodJobMode" />
+							</DataType>
+						</Array>
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="credentials">
+			<Doc>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. </Doc>
+			<Data>
+				<DataPoint name="loginName" readable="false" writable="true" eventable="true" optional="true" >
+					<Doc>The user’s login name.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="password" readable="false" writable="true" eventable="true" optional="true" >
+					<Doc>The user’s password.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="token" readable="false" writable="true" eventable="true" optional="true" >
+					<Doc>An authentication token, for example an OAuth token.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="dehumidifierJobMode">
+			<Doc>This ModuleClasses provides capabilities to control and monitor the job modes of a dehumidifier device.</Doc>
+			<Data>
+				<DataPoint name="currentJobMode" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>The currently active job mode (see clause 5.6.8). </Doc>
+					<DataType>
+						<SimpleType type="hd:enumDehumidifierJobMode" />
+					</DataType>
+				</DataPoint>
+
+				<DataPoint name="currentJobModeName" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The name of the current job mode as a string. This can be used when currentJobMode is vendor-specific.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+
+				<DataPoint name="jobModes" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>List of possible job states the device supports. </Doc>
+					<DataType>
+						<Array>
+							<DataType>
+								<SimpleType type="hd:enumDehumidifierJobMode" />
+							</DataType>
+						</Array>
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="dishWasherJobMode">
+			<Doc>This ModuleClasses provides capabilities to control and monitor the job modes of a dishWasher.</Doc>
+			<Data>
+				<DataPoint name="currentJobMode" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>The currently active job mode.</Doc>
+					<DataType>
+						<SimpleType type="hd:enumDishWasherJobMode" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="currentJobModeName" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The name of the current job mode as a string. This can be used when the currentJobMode is vendor-specific.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="jobModes" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>List of possible job states the device supports.</Doc>
+					<DataType>
+						<Array>
+							<DataType>
+								<SimpleType type="hd:enumDishWasherJobMode" />
+							</DataType>
+						</Array>
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="doorStatus">
+			<Doc>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. </Doc>
+			<Data>
+				<DataPoint name="doorState" readable="true" writable="false" eventable="true" optional="false">
+					<Doc>Current state of the door </Doc>
+					<DataType>
+						<SimpleType type="hd:enumDoorState" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="openDuration" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>The time duration the door has been open.</Doc>
+					<DataType>
+						<SimpleType type="datetime" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="openAlarm" readable="true" writable="true" eventable="true" optional="true">
+					<Doc>The state of the door open alarm. "True" indicates that the open alarm is active. "False" indicates that the open alarm is not active.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="electricVehicleConnector">
+			<Doc>This ModuleClass provides information about charging/discharging devices for electric vehicles.</Doc>
+			<Data>
+				<DataPoint name="status" readable="true" writable="false" eventable="true" optional="false">
+					<Doc>The status of connection. "True" means connected, "False" means not connected.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="chargingCapacity" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>Rated charging capacity. The unit of measure is ampere hours.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="dischargingCapacity" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>Rated discharging capacity.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="energyConsumption">
+			<Doc>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</Doc>
+			<Data>
+				<DataPoint name="power" readable="true" writable="false" eventable="true" optional="false">
+					<Doc>The power of the device. The unit of measure is Watt (W).</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="absoluteEnergyConsumption" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>The absolute energy consumption, reflecting the real measurement of accumulative energy. The unit of measure is Watt-hour (Wh).</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="roundingEnergyConsumption" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>This energy consumption data is calculated by multiplying significantDigits with multiplyingFactors, and rounding down the result.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="significantDigits" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>The number of effective digits for data.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="multiplyingFactors" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>The unit for data multiplying factors, for example 1 kWh, 0,1 kWh, 0,01 kWh etc.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="voltage" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>The voltage of the device. The unit of measure is volts (V).</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="current" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>The current of the device. The unit of measure is ampere (A).</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="frequency" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>The frequency of the device. The unit of measure is hertz (Hz).</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="measuringScope" readable="true" writable="true" eventable="true" optional="true">
+					<Doc>The measuring scope of the meter, for example the whole house, a room, or a device.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="energyGeneration">
+			<Doc>This ModuleClass provides information about generation data on electric generator devices such as a photo voltaic power system, fuel cells, or microgeneration</Doc>
+			<Data>
+				<DataPoint name="powerGenerationData" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>Amount of instaneous generation data.  The unit of measure is Watt (W).</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="roundingEnergyGeneration" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>This energy consumption data is calculated by multiplying significantDigits with multiplyingFactors, and rounding down the result.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="significantDigits" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>The number of effective digits for data.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="multiplyingFactors" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>The unit for data multiplying factors, for example. 1 kWh, 0,1 kWh, 0,01 kWh etc.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="generationSource" readable="true" writable="true" eventable="true" optional="true">
+					<Doc>The type of generating source.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="faultDetection">
+			<Doc>This ModuleClass provides information about whether a fault has occurred in a device.</Doc>
+			<Data>
+				<DataPoint name="status" readable="true" writable="false" eventable="true" optional="false">
+					<Doc>Status of fault detection.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="code" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>The numeric representation of the fault.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="description" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>The message representation of the fault.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="filterInfo">
+			<Doc>This ModuleClass provides capabilities for monitoring filter information of a device.</Doc>
+			<Data>
+				<DataPoint name="status" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>The status of fault detection.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="code" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The numeric representation of the fault.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="filterLifetime" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>Percentage life time remaining for the water filter.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="foaming">
+			<Doc>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).</Doc>
+			<Data>
+				<DataPoint name="foamingStrength" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>The current strength of foamed milk. A higher value indicates more foamed milk (see clause 5.6.11).</Doc>
+					<DataType>
+						<SimpleType type="hd:enumFoamStrength" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="geoLocation">
+			<Doc>This ModuleClass provides the capability to get or set geo-location information.</Doc>
+			<Data>
+				<DataPoint name="latitude" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>The current latitude part of a geo-location. The unit of measures is degrees.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="longitude" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>The current longitude part of a geo-location. The unit of measures is degrees.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="altitude" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The optional current altitude part of a geo-location. The unit of measures is meters.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="heading" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The azimuth of a device measured in degrees to true north. North is 0.0 degrees, east is 90.0 degrees, south is 180.0 degrees, west is 270.0 degrees. A negative value indicates an unknown heading.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="horizontalAccuracy" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The optional current horizontal accuracy of the geo-location. The unit of measures is meters and describes a radius around the latitude/longitude coordinate.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="verticalAccuracy" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The optional current vertical accuracy of the altitude. The unit of measures is meters.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="headingAccuracy" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The optional current maximum deviation between the heading and the true geomagnetic heading. The unit of measures is degrees.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="targetLatitude" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The optional target latitude part of a geo-location. This can be used to move a device to a new location. The unit of measures is degrees.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="targetLongitude" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The optional target longitude part of a geo-location. This can be used to move a device to a new location. The unit of measures is degrees.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="targetAltitude" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The optional target altitude part of a geo-location. This can be used to move a device to a new altitude. The unit of measures is meters.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="glucometer">
+			<Doc>This ModuleClass provides the capability to report the measurement of glucose characteristics.</Doc>
+			<Data>
+				<DataPoint name="concentration" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>The measurement of concentration by Glucometer. The unit of measure is mg/dl.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="hba1c" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The measurement of HbA1c by Glucometer. The unit of measure is percentage.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="contextExercise" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The measurement of context exercise by Glucometer. The unit of measure is percentage.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="contextMedication" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The measurement of context medication by Glucometer. The unit of measure is mg/dl.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="contextCarbohydratesAmount" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The measurement of context carbohydrates by Glucometer. The unit of measure is gram (g).</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="contextCarbohydratesSource" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The timing of meals (for example "breakfast carbohydrates").</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="contextMeal" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The style of meals (for examople "casual").</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="contextLocation" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The body location where the Glucometer is worn (for example "finger").</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="contextTester" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The test style (for example "self").</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="contextHealth" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The severity of symptoms (for example "minor"),</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="grinder">
+			<Doc>This ModuleClass is for controlling a grinder, for example in a coffee machine.</Doc>
+			<Data>
+				<DataPoint name="useGrinder" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>The current status of the grinder enablement. "True" indicates enabled, and "False" indicates disabled.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="coarseness" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The wished coarseness of the solid supplies after grinding, for example for coffee beans (see clause 5.6.16).</Doc>
+					<DataType>
+						<SimpleType type="hd:enumGrindCoarseness" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="grainsRemaining" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>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.15).</Doc>
+					<DataType>
+						<SimpleType type="hd:enumGrainsLevel" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="heatingZone">
+			<Doc>This ModuleClass provides the capabilities to monitor the status of the heating zone, for example for a cooktop.</Doc>
+			<Data>
+				<DataPoint name="heatingLevel" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>The current heating level of the zone. The value range is from 0 (indicating that the zone is not heating) up to the maxHeatingLevel.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+
+				<DataPoint name="maxHeatingLevel" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>The maximum value allowed for the heating level of the zone.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="height">
+			<Doc>This ModuleClass provides the capability to report the measurement of height.</Doc>
+			<Data>
+				<DataPoint name="height" readable="true" writable="false" eventable="true" optional="false">
+					<Doc>The height measurement. The common unit of measure is meter (m).</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="hotWaterSupply">
+			<Doc>This ModuleClass provides the information about the status of supplying hot water into tanks or bath tubes.</Doc>
+			<Data>
+				<DataPoint name="bath" readable="true" writable="true" eventable="true" optional="true">
+					<Doc>The status of whether a bath tub is filled.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="impactSensor">
+			<Doc>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.</Doc>
+			<Data>
+				<DataPoint name="impactStatus" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>The "impactStatus" indicates as follows: "True"  means that a physical impact is detected, "False" means indicates a normal status (no impact detected).</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="impactLevel" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>The "impactLevel" provides the level of impact. The unit of measure is "g" (G-force).</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="impactDirectionHorizontal" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The "impactDirection" indicates the horizontal direction where the impact comes from. The value is 0° to 360°. 0 is the front of the sensor and with clockwise increment. </Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="impactDirectionVertical" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The "impactDirection" indicates the vertical direction where the impact comes from. The value is 0° to 360°. 0 is the front of the sensor and with upward increment.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="keepWarm">
+			<Doc>This module allows to control the ‘keep warm’ feature in devices like coffe machines, kettles etc. It allows to keep water warm for a desired time. This ModuleClass inherits from binarySwitch (see clause 5.3.12) to store setting for the ‘keep warm’ feature. If the "powerState" 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).</Doc>
+			<Data>
+				<DataPoint name="time" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The desired duration of ‘keep water warm’ function. It indicates how long water shall be kept warm, for example after the boiling in a kettle. The value indicates a time expressed in minutes.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="keypad">
+			<Doc>This ModuleClass provides the capability to require a user defined service through the key-in number. For example, a user can define key 1 as "require a takeout from restaurant XXX with combo meal 1". The IoT service provider or user can define the services.</Doc>
+			<Data>
+				<DataPoint name="keyNumber" readable="true" writable="false" eventable="true" optional="false">
+					<Doc>The number of key.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="liquidLevel">
+			<Doc>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.</Doc>
+			<Data>
+				<DataPoint name="liquidLevel" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>The desired level of water or other liquid, for example the desired level of milk in a cup of coffee (see clause 5.6.19).</Doc>
+					<DataType>
+						<SimpleType type="hd:enumLiquidLevel" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="liquidRemaining">
+			<Doc>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.</Doc>
+			<Data>
+				<DataPoint name="liquidRemaining" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>The remaining level of water or other liquid in an appliance (see clause 5.6.19).</Doc>
+					<DataType>
+						<SimpleType type="hd:enumLiquidLevel" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="lock">
+			<Doc>This ModuleClass provides the function to lock and unlock an object. </Doc>
+			<Data>
+				<DataPoint name="lock" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>"True" indicates the object is locked, while "False" indicates the object is not locked.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="mediaSelect">
+			<Doc>This ModuleClass provides capabilities to control and monitor media input and output of device such as TV or SetTopBox.</Doc>
+			<Data>
+				<DataPoint name="mediaID" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>The numeric index of the activated media in the supported media sources list "supportedMediaSources".</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="supportedMediaSources" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>List of supported input or output media for the given device (see clause 5.6.27).</Doc>
+					<DataType>
+						<Array>
+							<DataType>
+								<SimpleType type="hd:enumSupportedMediaSource" />
+							</DataType>
+						</Array>
+					</DataType>
+				</DataPoint>
+				<DataPoint name="mediaName" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>Specifies a pre-defined media input or output.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="status" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>Specifies whether the specific media instance is selected ("True") or not ("False").</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="mediaType" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>Specifies the type of the media (see clause 5.6.27).</Doc>
+					<DataType>
+						<SimpleType type="hd:enumSupportedMediaSource" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="motionSensor">
+			<Doc>This ModuleClass provides the capabilities to indicate the occurrence of motion and raising of an alarm if the triggering criterion is met.</Doc>
+			<Data>
+				<DataPoint name="alarm" readable="true" writable="false" eventable="true" optional="false">
+					<Doc>The detection of the motion occurrence.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="silentTime" readable="true" writable="true" eventable="true" optional="true">
+					<Doc>The time that a motionSensor restrains from sending an alarm in case continous motions are detected after one alarm is produced. This data point can be used to avoid repeated alarm reports. The unit of measure is seconds.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="sensitivity" readable="true" writable="true" eventable="true" optional="true">
+					<Doc>The level of the detection accuracy of the motion sensor. This data point can be used to control the number of the report.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="numberValue">
+			<Doc>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.</Doc>
+			<Actions>
+				<Action name="decrementNumberValue" optional="true">
+					<Doc>Decrement the "numberValue" by the value of "step", down to the value of "minimum".</Doc>
+				</Action>
+				<Action name="incrementNumberValue" optional="true">
+					<Doc>Increment the "numberValue" by the value of "stepValue", up to the value of "maxValue".</Doc>
+				</Action>
+				<Action name="resetNumberValue" optional="true">
+					<Doc>Reset the "numberValue" to its "defaultValue".</Doc>
+				</Action>
+			</Actions>
+			<Data>
+				<DataPoint name="numberValue" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>The actual value of the number.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="minValue" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The optional minimum value of the number. The default is the system-specific minimum value for a float value.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="maxValue" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The optional maximum value of the number. The default is the system-specific maximum value for a float value.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="defaultValue" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The optional default value for the number. The default is 0.0 .</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="step" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The optional step size for controlled increment and decrement. The default is 1.0, even when this data point is not implemeneted.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="openLevel">
+			<Doc>This ModuleClass provides the capabilities to control and monitor the open status of an entity, for example a curtain.</Doc>
+			<Actions>
+				<Action name="open" optional="true">
+					<Doc>Increase the open level by the amount of the "stepValue" up to the "maxLevel".</Doc>
+				</Action>
+				<Action name="close" optional="true">
+					<Doc>Decrease the open level by the amount of the "stepValue" down to the "minLevel".</Doc>
+				</Action>
+			</Actions>
+			<Data>
+				<DataPoint name="openLevel" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>The rounded percentage of the current open level of entity in the range of [0, 100]. 0 percentage shall mean the entity is closed.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="stepValue" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The step value used by the "open" and "close" actions.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="minLevel" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The minimum value allowed for the "openLevel" status. The default value is 0, which means fully closed.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="maxLevel" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The maximum value allowed for the "openLevel" status. The default value is 100, which means fully opened.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="operationMode">
+			<Doc>This ModuleClasses provides capabilities to control or monitor the operation mode of appliances.</Doc>
+			<Data>
+				<DataPoint name="startPause" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>A value of "True" triggers or starts an operation, and "False" pauses the operation.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="overcurrentSensor">
+			<Doc>This ModuleClass provides capabilities for an over-current sensor. </Doc>
+			<Data>
+				<DataPoint name="overcurrentStatus" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>The overcurrentStatus indicates as follows:
+"True" indicates that an over-current is detected, and "False" indicates a normal status, this means that an over-current is not detected.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="detectedTime" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The time when the over-current was detected.</Doc>
+					<DataType>
+						<SimpleType type="datetime" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="duration" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The duration of the detected over-current. The unit of measure is "ms".</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="oximeter">
+			<Doc>This ModuleClass provides the capability to report the measurement of blood oxygen characteristics.</Doc>
+			<Data>
+				<DataPoint name="oxygenSaturation" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>The measurement of oxygensaturation by Oximeter. The unit of measure is in percentage.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="ozoneMeter">
+			<Doc>This ModuleClass provides capabilities for an ozone meter. The "ozoneValue…" attributes are optional, but one of them SHALL be provided.</Doc>
+			<Data>
+				<DataPoint name="ozoneValuePPM" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The unit of measure of ozone measurement is "ppm".</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="ozoneValueMG" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The unit of ozone measurement is "mg/m^3".</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="ozoneStatus" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The ozoneStatus indicates the level of ozone status. (see clause 5.6.21).</Doc>
+					<DataType>
+						<SimpleType type="hd:enumOzoneStatus" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="maxValue" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The mazimum 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 ozoneMeter provides "ppm" value.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="phoneCall">
+			<Doc>This ModuleClass provides the capability get or set the caller and receipient IDs as well as to initate and terminate a call.</Doc>
+			<Actions>
+				<Action name="call" optional="true">
+					<Doc>Initiate an outgoing call.</Doc>
+				</Action>
+				<Action name="answer" optional="true">
+					<Doc>Answer (pickup) an incoming call.</Doc>
+				</Action>
+				<Action name="hangup" optional="true">
+					<Doc>Hangup an established call.</Doc>
+				</Action>
+			</Actions>
+			<Data>
+				<DataPoint name="callerID" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>This data point represents the initiating caller identification of a call. In case of an outgoing call this would be the local line ID. This data point is optional. When it is empty for an incomming call, then the caller ID is unknown. When it is empty for an outgoing call, then it is exepected that it is set by the PBX or the operator. The format of caller ID is not specified here.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="recipientID" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>This data point represents the receiving caller identification of a call. In case of an incoming call this would be the local line ID and optionally extension. The format of caller ID is not specified here.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="callState" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>This data point represents the current state of an associated phone device regarding calls.</Doc>
+					<DataType>
+						<SimpleType type="hd:enumCallState" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="playerControl">
+			<Doc>This ModuleClass provides capabilities to control and monitor the operational modes of a media player functionality.</Doc>
+			<Actions>
+				<Action name="nextTrack" optional="true">
+					<Doc>Go forward to a next chapter, section or similar marker in the media.</Doc>
+				</Action>
+				<Action name="previousTrack" optional="true">
+					<Doc>Go back to a previous chapter, section or similar marker in the media.</Doc>
+				</Action>
+			</Actions>
+			<Data>
+				<DataPoint name="currentPlayerMode" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>The current mode of the player.</Doc>
+					<DataType>
+						<SimpleType type="hd:enumPlayerMode" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="currentPlayerModeName" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>Name of current player mode in string. This can be used when "currentPlayerMode" is vendor-specific.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="supportedPlayerModes" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>List of supported modes for a player.</Doc>
+					<DataType>
+						<Array>
+							<DataType>
+								<SimpleType type="hd:enumPlayerMode" />
+							</DataType>
+						</Array>	
+					</DataType>
+				</DataPoint>
+				<DataPoint name="speedFactor" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The optional factor of speeding up or slowing down playback, rewind or fast forward.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="powerSave">
+			<Doc>This ModuleClass provides capabilities to enable the power saving mode of a device and monitor the current status.</Doc>
+			<Data>
+				<DataPoint name="powerSaveEnabled" readable="true" writable="true" eventable="true" optional="false">
+					<Doc>The current status of the power saving mode. "True" indicates enabled, and "False" indicates not enabled.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="printQueue">
+			<Doc>This ModuleClass provides the capabilities for monitoring printing list information.</Doc>
+			<Data>
+				<DataPoint name="uri" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>The URI of the printing file. The URI could be "file://www.example.com/file.extension"</Doc>
+					<DataType>
+						<Array>
+							<DataType>
+								<SimpleType type="uri" />
+							</DataType>
+						</Array>
+					</DataType>
+				</DataPoint>
+				<DataPoint name="printingState" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>The printingState is indicating the status of the printing file.</Doc>
+					<DataType>
+						<Array>
+							<DataType>
+								<SimpleType type="hd:enumJobState" />
+							</DataType>
+						</Array>
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="pulsemeter">
+			<Doc>This ModuleClass provides the capability to report the measurement of pulse characteristics.</Doc>
+			<Data>
+				<DataPoint name="pulseRate" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>The measurement of pulserate by pulsemeter. The unit of measure is in beats per minute.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="rr" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>The measurement of RR interval by pulsemeter. The unit of measure is millisecond (ms).</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="energy" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The measurement of energy by pulsemeter. The unit of mease is kilocalorie per hour.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="modality" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The modality of a particular SpO2 measurement.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="pushButton">
+			<Doc>This ModuleClass provides the capability to indicate the operation of a button style switch. A typical application can be an SOS button.</Doc>
+			<Data>
+				<DataPoint name="pushed" readable="true" writable="false" eventable="true" optional="false">
+					<Doc>To indicate the press of the button.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="recorder">
+			<Doc>This ModuleClass provides the capability to record the video/audio for a defined duration.</Doc>
+			<Data>
+				<DataPoint name="duration" readable="true" writable="true" eventable="true" optional="false">
+					<Doc>The duration for video/audio recording. Set to trigger the recorder. The unit of measure is seconds.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="refrigeration">
+			<Doc>This ModuleClass provides capabilities for a refrigeration function. </Doc>
+			<Data>
+				<DataPoint name="rapidFreeze" readable="true" writable="true" eventable="true" optional="true">
+					<Doc>Controls the rapid freeze capability. "True" indicates active, "False" indicates inactive.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="rapidCool" readable="true" writable="true" eventable="true" optional="true">
+					<Doc>Controls the rapid cool capability. "True" indicates active, "False" indicates inactive.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="defrost" readable="true" writable="true" eventable="true" optional="true">
+					<Doc>Controls the defrost cycle. "True" indicates active, "False" indicates inactive.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="relativeHumidity">
+			<Doc>This ModuleClass provides the capability for the device to report the humidity based on a specified rule that is vendor dependent.</Doc>
+			<Data>
+				<DataPoint name="relativeHumidity" readable="true" writable="false" eventable="true" optional="false">
+					<Doc>The measurement of the relative humidity value; the unit of measure is percentage.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="desiredHumidity" readable="true" writable="true" eventable="true" optional="true">
+					<Doc>Desired value for humidity. This data point indicates the desired humidity.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="remoteControlEnable">
+			<Doc>This ModuleClasses provides capabilities to monitor the remote controllability of the appliance.</Doc>
+			<Data>
+				<DataPoint name="remoteControlEnabled" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>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.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="robotCleanerJobMode">
+			<Doc>This ModuleClasses provides capabilities to control and monitor the job modes of a robotCleaner.</Doc>
+			<Data>
+				<DataPoint name="currentJobMode" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>Currently active job mode (see clause 5.6.23).</Doc>
+					<DataType>
+						<SimpleType type="hd:enumRobotCleanerJobMode" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="currentJobModeName" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>Name of current job mode as a string. This can be used when "currentJobMode" is vendor-specific.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="jobModes" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>List of possible job states the device supports (see clause 5.6.23).</Doc>
+					<DataType>
+						<Array>
+							<DataType>
+								<SimpleType type="hd:enumRobotCleanerJobMode" />
+							</DataType>
+						</Array>
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="runState">
+			<Doc>This ModuleClasses provides capabilities to control and the monitor machine state of appliances.</Doc>
+			<Data>
+				<DataPoint name="currentMachineState" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>The currently active machine state (see clause 5.6.20).</Doc>
+					<DataType>
+						<SimpleType type="hd:enumMachineState" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="machineStates" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>A list of possible machine states the device supports (see clause 5.6.20).</Doc>
+					<DataType>
+						<Array>
+							<DataType>
+								<SimpleType type="hd:enumMachineState" />
+							</DataType>
+						</Array>
+					</DataType>
+				</DataPoint>
+				<DataPoint name="currentJobState" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The currently active job state at the level of some transaction being executed by the device (see clause 5.6.18).</Doc>
+					<DataType>
+						<SimpleType type="hd:enumJobState" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="jobStates" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The list of possible job states that the device supports (see clause 5.6.18).</Doc>
+					<DataType>
+						<Array>
+							<DataType>
+								<SimpleType type="hd:enumJobState" />
+							</DataType>
+						</Array>
+					</DataType>
+				</DataPoint>
+				<DataPoint name="progressPercentage" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The indication of current job progress in percentage.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="securityMode">
+			<Doc>This ModuleClasses provides capabilities to control and monitor a security mode.</Doc>
+			<Data>
+				<DataPoint name="currentSecurityMode" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>Current security mode (see clause 5.6.24).</Doc>
+					<DataType>
+						<SimpleType type="hd:enumSecurityMode" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="securityModes" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>List of possible security modes the device supports (see clause 5.6.24).</Doc>
+					<DataType>
+						<Array>
+							<DataType>
+								<SimpleType type="hd:enumSecurityMode" />
+							</DataType>
+						</Array>
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="sessionDescription">
+			<Doc>This ModuleClass provides the capabilities for a sessionDescription containing a URL at twhich the specified media can be accessed and the definition of media using SDP.</Doc>
+			<Data>
+				<DataPoint name="url" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>A URL at which the specified media can be accessed.</Doc>
+					<DataType>
+						<SimpleType type="uri" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="sdp" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>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 RFC4566.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="signalStrength">
+			<Doc>This ModuleClass provides the capability to monitor the strength of the signal.</Doc>
+			<Data>
+				<DataPoint name="lqi" readable="true" writable="false" eventable="true" optional="false">
+					<Doc>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, please see IEEE 802.15.4 [i.4], clause 6.7.8.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="rssi" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>The current value of received signal strength indicator, which reflects the raw signal level.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="smokeSensor">
+			<Doc>This ModuleClass provides the capabilities to indicate the detection of smoke and raising an alarm if the triggering criterion is met.</Doc>
+			<Data>
+				<DataPoint name="alarm" readable="true" writable="false" eventable="true" optional="false">
+					<Doc>The alarm is indicated as follows: "True" indicates that smoke has been detected, "False" indicates a normal status, that means that smoke is not detected.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="detectedTime" readable="true" writable="true" eventable="true" optional="true">
+					<Doc>The date and time the smoke is detected.</Doc>
+					<DataType>
+						<SimpleType type="datetime" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="smokeThreshhold" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The threshhold to trigger the alarm. The unit of measure is ppm.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="currentValue" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The current data value of the smoke sensor.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="sphygmomanometer">
+			<Doc>This ModuleClass provides the capability to report the measurement of blood pressure characteristics.</Doc>
+			<Data>
+				<DataPoint name="diastolicPressure" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>The measurement of diastolic pressure by sphygmomanometer. The unit of measure is millimetre of mercury (mmHg).</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="systolicPressure" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>The measurement of systolic pressure by sphygmomanometer. The unit of measure is millimetre of mercury (mmHg).</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="meanPressure" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>The measurement of mean arterial pressure by sphygmomanometer. The unit of measure is millimetre of mercury (mmHg).</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="spinLevel">
+			<Doc>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.</Doc>
+			<Data>
+				<DataPoint name="spinLevelStrength" readable="true" writable="true" eventable="true" optional="false">
+					<Doc>The value of spin-dry level (see clause 5.6.25). A higher value indicates a higher spin level.</Doc>
+					<DataType>
+						<SimpleType type="hd:enumSpinLevelStrength" />
+					</DataType>
+				</DataPoint>				
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="steamClosetJobMode">
+			<Doc>This ModuleClasses provides capabilities to control and monitor the job modes of steamCloset.</Doc>
+			<Data>
+				<DataPoint name="currentJobMode" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>Currently active job mode (see clause 5.6.26).</Doc>
+					<DataType>
+						<SimpleType type="hd:enumSteamClosetJobMode" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="currentJobModeName" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>Name of current job mode as a string. This can be used when "currentJobMode" is vendor-specific.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="jobModes" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>List of possible job states the device supports (see clause 5.6.26).</Doc>
+					<DataType>
+						<Array>
+							<DataType>
+								<SimpleType type="hd:enumSteamClosetJobMode" />
+							</DataType>
+						</Array>
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="televisionChannel">
+			<Doc>This ModuleClass provides capabilities to set and get channels of a device that has a channel list.</Doc>
+			<Actions>
+				<Action name="upChannel" optional="true">
+					<Doc>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.</Doc>
+				</Action>
+				<Action name="downChannel" optional="true">
+					<Doc>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.</Doc>
+				</Action>
+			</Actions>
+			<Data>
+				<DataPoint name="channelId" readable="true" writable="true" eventable="true" optional="false">
+					<Doc>Current channel number.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>				
+				<DataPoint name="availableChannels" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>The list of available channel numbers which may be build by automatic scan and/or manual selction.</Doc>
+					<DataType>
+						<Array>
+							<DataType>
+								<SimpleType type="integer" />
+							</DataType>
+						</Array>
+					</DataType>
+				</DataPoint>				
+				<DataPoint name="previousChannel" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>The channel number which was selected previously.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="channelName" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>Current human-friendly channel name in string, for example ‘CNN’.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="temperature">
+			<Doc>This ModuleClass provides capabilities to represent the current temperature and target temperature of devices such as an air conditioner, refrigerator, oven and etc.</Doc>
+			<Data>
+				<DataPoint name="currentTemperature" readable="true" writable="false" eventable="true" optional="false">
+					<Doc>The current temperature.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>				
+				<DataPoint name="targetTemperature" readable="true" writable="true" eventable="true" optional="true">
+					<Doc>The desired temperature to reach.</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>				
+				<DataPoint name="unit" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>The unit of measure for the temperature values. The default is celsius (C).</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>				
+				<DataPoint name="minValue" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>Minimum value of "targetTemperature".</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>				
+				<DataPoint name="maxValue" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>Maximum value of "targetTemperature".</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="stepValue" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>Step value allowed for "targetTemperature".</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>				
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="temperatureAlarm">
+			<Doc>This ModuleClass provides the capabilities to indicate the detection of abnormal temperatures and raises an alarm if the triggering criterion is met.</Doc>
+			<Data>
+				<DataPoint name="alarm" readable="true" writable="false" eventable="true" optional="false">
+					<Doc>This data point indicates the status of detection of an abnormal temperature. "True" indicates an abnormal temperature, "False" indicates a normal temperature.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>				
+				<DataPoint name="temperature" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>To report the value of the temperature. The unit of measure is celsius (C).</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>				
+				<DataPoint name="temperatureThreshhold" readable="true" writable="true" eventable="true" optional="true">
+					<Doc>The threshhold to trigger the alarm.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>				
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="textMessage">
+			<Doc>This ModuleClass provides capabilities to set and get a text message.</Doc>
+			<Actions>
+				<Action name="resetTextMessage" optional="true">
+					<Doc>Reset the receiver of the message to the "defaultValue".</Doc>
+				</Action>
+			</Actions>
+			<Data>
+				<DataPoint name="textMessage" readable="true" writable="true" eventable="true" optional="false" >
+					<Doc>The current message value.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="supportedMessageValues" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>List of supported values for the message. Each of the values in this list must be URL-encoded. An encoded value must not contain white spaces.</Doc>
+					<DataType>
+						<Array>
+							<DataType>
+								<SimpleType type="string" />
+							</DataType>
+						</Array>
+					</DataType>
+				</DataPoint>
+				<DataPoint name="minLength" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The optional minimum length in characters of the message. The default is 0.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="maxLength" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The optional maximum length in characters of the message. The default is unlimited.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="messageEncoding" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The optional expected method for character encoding of the message. The default is "UTF8".</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="defaultValue" readable="true" writable="true" eventable="true" optional="true" >
+					<Doc>The optional default value for "textMessage". The default is an empty string.</Doc>
+					<DataType>
+						<SimpleType type="string" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="timer">
+			<Doc>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.</Doc>
+			<Actions>
+				<Action name="activateClockTimer" optional="true">
+					<Doc>Activate current clock timer.</Doc>
+				</Action>
+				<Action name="deactivateClockTimer" optional="true">
+					<Doc>Deactivate current clock timer.</Doc>
+				</Action>
+			</Actions>
+			<Data>
+				<DataPoint name="referenceTimer" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>A timer (for example. a time-based value, App Defined Epoch, Progressive) expressed in seconds. The value indicates a time counter to be used as reference for the other time-based data points of this ModuleClass. Usually it is the time since the last event of power-on of the producer (or more in detail the since the boot of its connectivity node).</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>				
+				<DataPoint name="targetTimeToStart" readable="true" writable="true" eventable="true" optional="true">
+					<Doc>A time span (for example a time-based value, App Defined Epoch, Fixed) expressed in seconds. The value indicates the time when the appliance is expected to start its operation, starting counting from the last "referenceTimer".</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>				
+				<DataPoint name="targetTimeToStop" readable="true" writable="true" eventable="true" optional="true">
+					<Doc>A time span (for example a time-based value, App Defined Epoch, Fixed) expressed in seconds. The value indicates the time when the appliance is expected to stop its operation, starting counting from the last ”referenceTimer”.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>				
+				<DataPoint name="estimatedTimeToEnd" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>A timer (for example a time-based value, App Defined Epoch, Progressive) expressed in seconds. The value indicates the time to the end of an appliance’s operations. It is calculated at runtime by the device itself during the execution of its operation.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>				
+				<DataPoint name="runningTime" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>A timer (for example a time-based value, App Defined Epoch, Progressive) expressed in seconds. It indicates the time of the current operation. Usually its value is increasing one value per second. It starts counting from 0 when the operation starts and stops counting when the operation ends.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>				
+				<DataPoint name="targetDuration" readable="true" writable="false" eventable="true" optional="true">
+					<Doc>A time span (for a time-based value, App Defined Epoch, Fixed) expressed in seconds. The value indicates a time that represents the target duration of the operation as per user selection.</Doc>
+					<DataType>
+						<SimpleType type="integer" />
+					</DataType>
+				</DataPoint>				
+				<DataPoint name="absoluteStartTime" readable="true" writable="true" eventable="true" optional="true">
+					<Doc>An absolute time to specify the start time.</Doc>
+					<DataType>
+						<SimpleType type="datetime" />
+					</DataType>
+				</DataPoint>				
+				<DataPoint name="absoluteStopTime" readable="true" writable="true" eventable="true" optional="true">
+					<Doc>An absolute time to specify the stop time.</Doc>
+					<DataType>
+						<SimpleType type="datetime" />
+					</DataType>
+				</DataPoint>				
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="turbo">
+			<Doc>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.</Doc>
+			<Data>
+				<DataPoint name="turboEnabled" readable="true" writable="true" eventable="true" optional="false">
+					<Doc>The current status of the turbo mode. "True" indicates enabaled, and "False" indicates not enabled.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>				
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="uvSensor">
+			<Doc>This ModuleClass describes the capabilities of an ultraviolet sensor.</Doc>
+			<Data>
+				<DataPoint name="uvValue" readable="true" writable="false" eventable="true" optional="false" >
+					<Doc>The unit of measure of the UV intensity of radiation is "mW/cm^2".</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+				<DataPoint name="uvStatus" readable="true" writable="false" eventable="true" optional="true" >
+					<Doc>The "uvStatus" indicates the level of the UV radiation status (see clause 5.6.30).</Doc>
+					<DataType>
+						<SimpleType type="hd:enumUvStatus" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="waterFlow">
+			<Doc>This ModuleClass provides capabilities for controlling the water strength of a device.</Doc>
+			<Data>
+				<DataPoint name="waterFlowStrength" readable="true" writable="true" eventable="true" optional="false">
+					<Doc>The desired level of water flow (see clause 5.6.33). A higher value indicates higher water flow.</Doc>
+					<DataType>
+						<SimpleType type="hd:enumWaterFlowStrength" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="waterSensor">
+			<Doc>This ModuleClass provides the capabilities to indicate whether or not water has been sensed, and raising an alarm if the triggering criterion is met.</Doc>
+			<Data>
+				<DataPoint name="alarm" readable="true" writable="false" eventable="true" optional="false">
+					<Doc>The detection of water. The alarm is indicated as follows: "True" indicates that water has been detected, "False" indicates a normal status, that means that water is not detected.</Doc>
+					<DataType>
+						<SimpleType type="boolean" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+
+		<ModuleClass name="weight">
+			<Doc>This ModuleClass provides the capability to report the measurement of weight.</Doc>
+			<Data>
+				<DataPoint name="weight" readable="true" writable="false" eventable="true" optional="false">
+					<Doc>The weight measurement. The common unit is kilogram (kg).</Doc>
+					<DataType>
+						<SimpleType type="float" />
+					</DataType>
+				</DataPoint>
+			</Data>
+		</ModuleClass>
+
+	</Modules>
+</Domain>
+
diff --git a/3.7.0/shortnames.csv b/3.7.0/shortnames.csv
new file mode 100644
index 0000000..f4fc190
--- /dev/null
+++ b/3.7.0/shortnames.csv
@@ -0,0 +1,532 @@
+threeDPrinter,thDPr
+printType,priTe
+printSizeX,priSX
+printSizeY,priSY
+printSizeZ,priSZ
+network,netwk
+memorySize,memSe
+acousticSensor,acoSr
+loudness,louds
+acousticStatus,acoSs
+airConJobMode,aCJMe
+currentJobMode,cuJMe
+currentJobModeName,cJMNe
+jobModes,jobMs
+airFlow,airFw
+speed,speed
+minSpeed,minSd
+maxSpeed,maxSd
+verticalDirection,verDn
+supportedVerticalDirection,suVDn
+horizontalDirection,horDn
+supportedHorizontalDirection,suHDn
+automode,autoe
+airPurifierJobMode,aPJMe
+airQualitySensor,aiQSr
+sensorPM1,sePM1
+sensorPM2,sePM2
+sensorPM10,sePM0
+sensorOdor,senOr
+sensorHumidity,senHy
+monitoringEnabled,monEd
+co2,co2
+co,co
+ch2o,ch2o
+voc,voc
+alarmSpeaker,alaSr
+tone,tone
+light,light
+alarmStatus,alaSs
+audioVolume,audVe
+volumePercentage,volPe
+stepValue,steVe
+maxValue,maxVe
+muteEnabled,mutEd
+autoDocumentFeeder,auDFr
+currentAdfState,cuASe
+adfStates,adfSs
+battery,bat
+level,lvl
+capacity,capay
+charging,charg
+discharging,discg
+lowBattery,lowBy
+batteryThreshold,batTd
+electricEnergy,eleEy
+voltage,volte
+material,matel
+binaryObject,binOt
+object,objet
+objectType,objTe
+size,size
+hash,hash
+binarySwitch,binSh
+powerState,powSe
+bioElectricalImpedanceAnalysis,bEIAs
+water,water
+fat,fat
+muscle,musce
+bone,bone
+visceraFat,visFt
+kcal,kcal
+resistance,resie
+bodyCompositionAnalyser,boCAr
+bodyLength,bodLh
+bmi,bmi
+fatFreeMass,faFMs
+softLeanMass,soLMs
+muscleMass,musMs
+basalMetabolism,basMm
+impedance,impee
+boiler,boilr
+status,sus
+brewing,brewg
+cupsNumber,cupNr
+strength,streh
+brightness,brigs
+clock,clock
+currentTime,curTe
+currentDate,curDe
+currentTimeZone,cuTZe
+clothesDryerJobMode,cDJMe
+clothesWasherDryerJobMode,cWDJM
+clothesWasherJobMode,cWJMe
+clothesWasherJobModeOption,cWJMO
+washTemp,wasTp
+soilLevel,soiLl
+spinSpeed,spiSd
+preWash,preWh
+speedWash,speWh
+steamTreat,steTt
+coldWash,colWh
+extraRinse,extRe
+colour,color
+red,red
+green,green
+blue,blue
+colourSaturation,colSn
+cookerHoodJobMode,cHJMe
+credentials,creds
+loginName,logNe
+password,pwd
+token,tk
+dehumidifierJobMode,deJMe
+dishWasherJobMode,dWJMe
+doorStatus,dooSs
+doorState,dooSe
+openDuration,opeDn
+openAlarm,opeAm
+electricVehicleConnector,elVCr
+chargingCapacity,chaCy
+dischargingCapacity,disCy
+energyConsumption,eneCn
+power,power
+absoluteEnergyConsumption,abECn
+roundingEnergyConsumption,roECn
+significantDigits,sigDs
+multiplyingFactors,mulFs
+current,currt
+frequency,freqy
+measuringScope,meaSe
+energyGeneration,eneGn
+powerGenerationData,poGDa
+roundingEnergyGeneration,roEGn
+generationSource,genSe
+faultDetection,fauDn
+code,code
+description,dc
+filterInfo,filIo
+filterLifetime,filLe
+foaming,foamg
+foamingStrength,foaSh
+geoLocation,geoLn
+latitude,latie
+longitude,longe
+altitude,altie
+heading,headg
+horizontalAccuracy,horAy
+verticalAccuracy,verAy
+headingAccuracy,heaAy
+targetLatitude,tarLe
+targetLongitude,tarL0
+targetAltitude,tarAe
+glucometer,glucr
+concentration,concn
+hba1c,hba1c
+contextExercise,conEe
+contextMedication,conMn
+contextCarbohydratesAmount,coCAt
+contextCarbohydratesSource,coCSe
+contextMeal,conMl
+contextLocation,conLn
+contextTester,conTr
+contextHealth,conHh
+grinder,grinr
+useGrinder,useGr
+coarseness,coars
+grainsRemaining,graRg
+heatingZone,heaZe
+heatingLevel,heaLl
+maxHeatingLevel,maHLl
+height,heigt
+hotWaterSupply,hoWSy
+bath,bath
+impactSensor,impSr
+impactStatus,impSs
+impactLevel,impLl
+impactDirectionHorizontal,imDHl
+impactDirectionVertical,imDVl
+keepWarm,keeWm
+time,time
+keypad,keypd
+keyNumber,keyNr
+liquidLevel,liqLl
+liquidRemaining,liqRg
+lock,lock
+mediaSelect,medSt
+mediaID,medID
+supportedMediaSources,suMSs
+mediaName,medNe
+mediaType,medTe
+motionSensor,motSr
+alarm,alarm
+silentTime,silTe
+sensitivity,sensy
+numberValue,numVe
+minValue,minVe
+defaultValue,defVe
+step,step
+openLevel,opeLl
+minLevel,minLl
+maxLevel,maxLl
+operationMode,opeMe
+startPause,staPe
+overcurrentSensor,oveSr
+overcurrentStatus,oveSs
+detectedTime,detTe
+duration,dur
+oximeter,oximr
+oxygenSaturation,oxySn
+ozoneMeter,ozoMr
+ozoneValuePPM,oVPPM
+ozoneValueMG,ozVMG
+ozoneStatus,ozoSs
+phoneCall,phoCl
+callerID,calID
+recipientID,recID
+callState,calSe
+playerControl,plaCl
+currentPlayerMode,cuPMe
+currentPlayerModeName,cPMNe
+supportedPlayerModes,suPMs
+speedFactor,speFr
+powerSave,powS0
+powerSaveEnabled,poSEd
+printQueue,priQe
+uri,ur0
+printingState,priSe
+pulsemeter,pulsr
+pulseRate,pulRe
+rr,r0
+energy,enery
+modality,moday
+pushButton,pusBn
+pushed,pushd
+recorder,recor
+refrigeration,refrn
+rapidFreeze,rapFe
+rapidCool,rapCl
+defrost,defrt
+relativeHumidity,relHy
+desiredHumidity,desHy
+remoteControlEnable,reCEe
+remoteControlEnabled,reCEd
+robotCleanerJobMode,rCJMe
+runState,runSe
+currentMachineState,cuMSe
+machineStates,macSs
+currentJobState,cuJSe
+jobStates,jobSs
+progressPercentage,proPe
+securityMode,secMe
+currentSecurityMode,cuSMe
+securityModes,secMs
+sessionDescription,sesDn
+url,ur1
+sdp,sdp
+signalStrength,sigSh
+lqi,lqi
+rssi,rssi
+smokeSensor,smoSr
+smokeThreshhold,smoTd
+currentValue,crv
+sphygmomanometer,sphyr
+diastolicPressure,diaPe
+systolicPressure,sysPe
+meanPressure,meaPe
+spinLevel,spiLl
+spinLevelStrength,spLSh
+steamClosetJobMode,sCJMe
+televisionChannel,telCl
+channelId,chaId
+availableChannels,avaCs
+previousChannel,preCl
+channelName,chaNe
+temperature,tempe
+currentTemperature,curT0
+targetTemperature,tarTe
+unit,unit
+temperatureAlarm,temAm
+temperatureThreshhold,temTd
+textMessage,texMe
+supportedMessageValues,suMVs
+minLength,minLh
+maxLength,maxLh
+messageEncoding,mesEg
+timer,timer
+referenceTimer,refTr
+targetTimeToStart,tTTSt
+targetTimeToStop,tTTSp
+estimatedTimeToEnd,eTTEd
+runningTime,runTe
+targetDuration,tarDn
+absoluteStartTime,abSTe
+absoluteStopTime,abST0
+turbo,turbo
+turboEnabled,turEd
+uvSensor,uveSr
+uvValue,uvaVe
+uvStatus,uvtSs
+waterFlow,watFw
+waterFlowStrength,waFSh
+waterSensor,watSr
+weight,weigt
+upChannel,uphCl
+nextTrack,nexTk
+resetNumberValue,reNVe
+answer,answr
+start3Dprint,staDt
+previousTrack,preTk
+downChannel,dowCl
+close,close
+upVolume,upoVe
+decrementNumberValue,deNVe
+activateClockTimer,acCTr
+stop3Dprint,stoDt
+hangup,hangp
+resetTextMessage,reTMe
+call,call
+downVolume,dowVe
+incrementNumberValue,inNVe
+toggle,togge
+deactivateClockTimer,deCTr
+open,open
+commonTypes,comTs
+deviceThreeDPrinter,dTDPr
+binarySwitchAnnc,binShAnnc
+faultDetectionAnnc,fauDnAnnc
+threeDPrinterAnnc,thDPrAnnc
+runStateAnnc,runSeAnnc
+temperatureAnnc,tempeAnnc
+printQueueAnnc,priQeAnnc
+deviceAirConditioner,deACr
+airConOperationMode,aCOMe
+airCleanOperationMode,aCOM0
+sleepTimer,sleTr
+airConJobModeAnnc,aCJMeAnnc
+airConOperationModeAnnc,aCOMeAnnc
+airCleanOperationModeAnnc,aCOM0Annc
+timerAnnc,timerAnnc
+sleepTimerAnnc,sleTrAnnc
+turboAnnc,turboAnnc
+airFlowAnnc,airFwAnnc
+powerSaveAnnc,powS0Annc
+airQualitySensorAnnc,aiQSrAnnc
+filterInfoAnnc,filIoAnnc
+deviceAirPurifier,deAPr
+airPurifierOperationMode,aPOMe
+airPurifierJobModeAnnc,aPJMeAnnc
+airPurifierOperationModeAnnc,aPOMeAnnc
+deviceAirQualityMonitor,dAQMr
+deviceAudioReceiver,deARr
+mediaInput,medIt
+mediaOutput,medOt
+audioVolumeAnnc,audVeAnnc
+mediaInputAnnc,medItAnnc
+mediaOutputAnnc,medOtAnnc
+deviceBloodPressureMonitor,dBPMr
+cuff0,cuff0
+cuff1,cuff1
+cuff2,cuff2
+cuff3,cuff3
+cuff4,cuff4
+cuff5,cuff5
+batteryAnnc,batAnnc
+cuff0Annc,cuff0Annc
+cuff1Annc,cuff1Annc
+cuff2Annc,cuff2Annc
+cuff3Annc,cuff3Annc
+cuff4Annc,cuff4Annc
+cuff5Annc,cuff5Annc
+subDeviceCuff,suDCf
+sphygmomanometerAnnc,sphyrAnnc
+pulsemeterAnnc,pulsrAnnc
+deviceCamera,devCa
+sessionDescriptionAnnc,sesDnAnnc
+playerControlAnnc,plaClAnnc
+motionSensorAnnc,motSrAnnc
+deviceClothesDryer,deCDr
+clothesDryerOperationMode,cDOMe
+clothesDryerJobModeAnnc,cDJMeAnnc
+clothesDryerOperationModeAnnc,cDOMeAnnc
+deviceClothesWasher,deCWr
+clothesWasherOperationMode,cWOMe
+clothesWasherOperationModeAnnc,cWOMeAnnc
+clothesWasherJobModeAnnc,cWJMeAnnc
+clothesWasherJobModeOptionAnnc,cWJMOAnnc
+remoteControlEnableAnnc,reCEeAnnc
+deviceClothesWasherDryer,dCWDr
+clothesWasherDryerOperationMode,cWDOM
+clothesWasherDryerOperationModeAnnc,cWDOMAnnc
+clothesWasherDryerJobModeAnnc,cWDJMAnnc
+deviceCoffeeMachine,deCMe
+waterStatus,watSs
+milkStatus,milSs
+milkFoaming,milFg
+milkQuantity,milQy
+brewingSwitch,breSh
+clockAnnc,clockAnnc
+brewingAnnc,brewgAnnc
+waterStatusAnnc,watSsAnnc
+milkStatusAnnc,milSsAnnc
+grinderAnnc,grinrAnnc
+milkFoamingAnnc,milFgAnnc
+milkQuantityAnnc,milQyAnnc
+brewingSwitchAnnc,breShAnnc
+keepWarmAnnc,keeWmAnnc
+deviceCookerHood,deCHd
+cookerHoodJobModeAnnc,cHJMeAnnc
+deviceCooktop,devCp
+heatingZone0,heaZ0
+heatingZone1,heaZ1
+heatingZone2,heaZ2
+heatingZone3,heaZ3
+heatingZone4,heaZ4
+heatingZone5,heaZ5
+heatingZone0Annc,heaZ0Annc
+heatingZone1Annc,heaZ1Annc
+heatingZone2Annc,heaZ2Annc
+heatingZone3Annc,heaZ3Annc
+heatingZone4Annc,heaZ4Annc
+heatingZone5Annc,heaZ5Annc
+deviceDehumidifier,devDr
+dehumidifierOperationMode,deOMe
+relativeHumidityAnnc,relHyAnnc
+dehumidifierJobModeAnnc,deJMeAnnc
+dehumidifierOperationModeAnnc,deOMeAnnc
+deviceDishWasher,deDWr
+dishWasherJobModeAnnc,dWJMeAnnc
+deviceDoor,devD0
+doorlock,doork
+openLevelAnnc,opeLlAnnc
+doorlockAnnc,doorkAnnc
+doorStatusAnnc,dooSsAnnc
+deviceDoorLock,deDLk
+doorLock,dooLk
+doorLockAnnc,dooLkAnnc
+deviceElectricVehicleCharger,dEVCr
+electricVehicleConnectorAnnc,elVCrAnnc
+deviceFan,devFn
+deviceFoodProbe,deFPe
+deviceFreezer,devFr
+deviceGlucosemeter,devGr
+glucometerAnnc,glucrAnnc
+deviceHeartRateMonitor,dHRMr
+deviceHomeCCTV,dHCCT
+ozoneMeterAnnc,ozoMrAnnc
+smokeSensorAnnc,smoSrAnnc
+acousticSensorAnnc,acoSrAnnc
+impactSensorAnnc,impSrAnnc
+alarmSpeakerAnnc,alaSrAnnc
+deviceHumidifier,devHr
+deviceKettle,devKe
+boilingSwitch,boiSh
+boilingSwitchAnnc,boiShAnnc
+deviceLight,devLt
+colourAnnc,colorAnnc
+colourSaturationAnnc,colSnAnnc
+brightnessAnnc,brigsAnnc
+deviceMicrogeneration,devMn
+energyGenerationAnnc,eneGnAnnc
+deviceMultiFunctionPrinter,dMFPr
+printerRunState,prRSe
+scannerRunState,scRSe
+printerRunStateAnnc,prRSeAnnc
+scannerRunStateAnnc,scRSeAnnc
+autoDocumentFeederAnnc,auDFrAnnc
+deviceOutdoorLamp,deOLp
+uvSensorAnnc,uveSrAnnc
+deviceOven,devOn
+devicePrinter,devPr
+devicePulseOximeter,dePOr
+oximeterAnnc,oximrAnnc
+deviceRefrigerator,devRr
+frozenTemperature,froTe
+fridgeTemperature,friTe
+customTemperature,cusTe
+controlPanelLock,coPLk
+waterFilterInfo,waFIo
+frozenTemperatureAnnc,froTeAnnc
+fridgeTemperatureAnnc,friTeAnnc
+customTemperatureAnnc,cusTeAnnc
+refrigerationAnnc,refrnAnnc
+controlPanelLockAnnc,coPLkAnnc
+waterFilterInfoAnnc,waFIoAnnc
+deviceRobotCleaner,deRCr
+robotCleanerOperationMode,rCOMe
+robotCleanerJobModeAnnc,rCJMeAnnc
+robotCleanerOperationModeAnnc,rCOMeAnnc
+deviceScanner,devSr
+deviceSecurityPanel,deSPl
+securityModeAnnc,secMeAnnc
+deviceSetTopBox,dSTBx
+channel,chanl
+channelAnnc,chanlAnnc
+deviceSmartElectricMeter,dSEMr
+energyConsumptionAnnc,eneCnAnnc
+deviceSmartPlug,deSPg
+powerOutlet0,powO0
+powerOutlet1,powO1
+powerOutlet2,powO2
+powerOutlet3,powO3
+powerOutlet4,powO4
+powerOutlet5,powO5
+powerOutlet0Annc,powO0Annc
+powerOutlet1Annc,powO1Annc
+powerOutlet2Annc,powO2Annc
+powerOutlet3Annc,powO3Annc
+powerOutlet4Annc,powO4Annc
+powerOutlet5Annc,powO5Annc
+subDevicePowerOutlet,sDPOt
+dimmingLevel,dimLl
+overcurrentSensorAnnc,oveSrAnnc
+dimmingLevelAnnc,dimLlAnnc
+deviceSteamCloset,deSCt
+steamClosetOperationMode,sCOMe
+steamClosetJobModeAnnc,sCJMeAnnc
+steamClosetOperationModeAnnc,sCOMeAnnc
+deviceStorageBattery,deSBy
+deviceSwitch,devSh
+deviceTelevision,devTn
+televisionChannelAnnc,telClAnnc
+deviceThermometer,devTr
+deviceThermostat,devTt
+deviceWaterHeater,deWHr
+boilerAnnc,boilrAnnc
+hotWaterSupplyAnnc,hoWSyAnnc
+deviceWaterValve,deWVe
+deviceWeightScaleAndBodyCompositionAnalyser,dWSAB
+weightAnnc,weigtAnnc
+bodyCompositionAnalyserAnnc,boCArAnnc
+bioElectricalImpedanceAnalysisAnnc,bEIAsAnnc
+deviceWindowShade,deWSe
diff --git a/3.7.0/xsd/HD-act-activateClockTimer-v3_7_0.xsd b/3.7.0/xsd/HD-act-activateClockTimer-v3_7_0.xsd
new file mode 100644
index 0000000..f0872d2
--- /dev/null
+++ b/3.7.0/xsd/HD-act-activateClockTimer-v3_7_0.xsd
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="activateClockTimer" type="hd:activateClockTimer" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="activateClockTimer">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="activateClockTimerAnnc" type="hd:activateClockTimerAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="activateClockTimerAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                                    
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>    
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-act-answer-v3_7_0.xsd b/3.7.0/xsd/HD-act-answer-v3_7_0.xsd
new file mode 100644
index 0000000..75e7229
--- /dev/null
+++ b/3.7.0/xsd/HD-act-answer-v3_7_0.xsd
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="answer" type="hd:answer" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="answer">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="answerAnnc" type="hd:answerAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="answerAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                                    
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>    
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-act-call-v3_7_0.xsd b/3.7.0/xsd/HD-act-call-v3_7_0.xsd
new file mode 100644
index 0000000..158cad5
--- /dev/null
+++ b/3.7.0/xsd/HD-act-call-v3_7_0.xsd
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="call" type="hd:call" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="call">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="callAnnc" type="hd:callAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="callAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                                    
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>    
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-act-close-v3_7_0.xsd b/3.7.0/xsd/HD-act-close-v3_7_0.xsd
new file mode 100644
index 0000000..14ece05
--- /dev/null
+++ b/3.7.0/xsd/HD-act-close-v3_7_0.xsd
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="close" type="hd:close" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="close">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="closeAnnc" type="hd:closeAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="closeAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                                    
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>    
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-act-deactivateClockTimer-v3_7_0.xsd b/3.7.0/xsd/HD-act-deactivateClockTimer-v3_7_0.xsd
new file mode 100644
index 0000000..4448b3f
--- /dev/null
+++ b/3.7.0/xsd/HD-act-deactivateClockTimer-v3_7_0.xsd
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="deactivateClockTimer" type="hd:deactivateClockTimer" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deactivateClockTimer">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deactivateClockTimerAnnc" type="hd:deactivateClockTimerAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deactivateClockTimerAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                                    
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>    
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-act-decrementNumberValue-v3_7_0.xsd b/3.7.0/xsd/HD-act-decrementNumberValue-v3_7_0.xsd
new file mode 100644
index 0000000..8b3b4ac
--- /dev/null
+++ b/3.7.0/xsd/HD-act-decrementNumberValue-v3_7_0.xsd
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="decrementNumberValue" type="hd:decrementNumberValue" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="decrementNumberValue">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="decrementNumberValueAnnc" type="hd:decrementNumberValueAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="decrementNumberValueAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                                    
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>    
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-act-downChannel-v3_7_0.xsd b/3.7.0/xsd/HD-act-downChannel-v3_7_0.xsd
new file mode 100644
index 0000000..24b8d59
--- /dev/null
+++ b/3.7.0/xsd/HD-act-downChannel-v3_7_0.xsd
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="downChannel" type="hd:downChannel" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="downChannel">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="downChannelAnnc" type="hd:downChannelAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="downChannelAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                                    
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>    
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-act-downVolume-v3_7_0.xsd b/3.7.0/xsd/HD-act-downVolume-v3_7_0.xsd
new file mode 100644
index 0000000..d333c69
--- /dev/null
+++ b/3.7.0/xsd/HD-act-downVolume-v3_7_0.xsd
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="downVolume" type="hd:downVolume" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="downVolume">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="downVolumeAnnc" type="hd:downVolumeAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="downVolumeAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                                    
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>    
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-act-hangup-v3_7_0.xsd b/3.7.0/xsd/HD-act-hangup-v3_7_0.xsd
new file mode 100644
index 0000000..1153d76
--- /dev/null
+++ b/3.7.0/xsd/HD-act-hangup-v3_7_0.xsd
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="hangup" type="hd:hangup" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="hangup">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="hangupAnnc" type="hd:hangupAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="hangupAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                                    
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>    
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-act-incrementNumberValue-v3_7_0.xsd b/3.7.0/xsd/HD-act-incrementNumberValue-v3_7_0.xsd
new file mode 100644
index 0000000..09a508b
--- /dev/null
+++ b/3.7.0/xsd/HD-act-incrementNumberValue-v3_7_0.xsd
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="incrementNumberValue" type="hd:incrementNumberValue" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="incrementNumberValue">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="incrementNumberValueAnnc" type="hd:incrementNumberValueAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="incrementNumberValueAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                                    
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>    
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-act-nextTrack-v3_7_0.xsd b/3.7.0/xsd/HD-act-nextTrack-v3_7_0.xsd
new file mode 100644
index 0000000..3921cce
--- /dev/null
+++ b/3.7.0/xsd/HD-act-nextTrack-v3_7_0.xsd
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="nextTrack" type="hd:nextTrack" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="nextTrack">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="nextTrackAnnc" type="hd:nextTrackAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="nextTrackAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                                    
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>    
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-act-open-v3_7_0.xsd b/3.7.0/xsd/HD-act-open-v3_7_0.xsd
new file mode 100644
index 0000000..09a253b
--- /dev/null
+++ b/3.7.0/xsd/HD-act-open-v3_7_0.xsd
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="open" type="hd:open" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="open">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="openAnnc" type="hd:openAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="openAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                                    
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>    
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-act-previousTrack-v3_7_0.xsd b/3.7.0/xsd/HD-act-previousTrack-v3_7_0.xsd
new file mode 100644
index 0000000..688b30d
--- /dev/null
+++ b/3.7.0/xsd/HD-act-previousTrack-v3_7_0.xsd
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="previousTrack" type="hd:previousTrack" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="previousTrack">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="previousTrackAnnc" type="hd:previousTrackAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="previousTrackAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                                    
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>    
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-act-resetNumberValue-v3_7_0.xsd b/3.7.0/xsd/HD-act-resetNumberValue-v3_7_0.xsd
new file mode 100644
index 0000000..60b32d5
--- /dev/null
+++ b/3.7.0/xsd/HD-act-resetNumberValue-v3_7_0.xsd
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="resetNumberValue" type="hd:resetNumberValue" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="resetNumberValue">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="resetNumberValueAnnc" type="hd:resetNumberValueAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="resetNumberValueAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                                    
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>    
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-act-resetTextMessage-v3_7_0.xsd b/3.7.0/xsd/HD-act-resetTextMessage-v3_7_0.xsd
new file mode 100644
index 0000000..155d8de
--- /dev/null
+++ b/3.7.0/xsd/HD-act-resetTextMessage-v3_7_0.xsd
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="resetTextMessage" type="hd:resetTextMessage" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="resetTextMessage">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="resetTextMessageAnnc" type="hd:resetTextMessageAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="resetTextMessageAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                                    
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>    
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-act-start3Dprint-v3_7_0.xsd b/3.7.0/xsd/HD-act-start3Dprint-v3_7_0.xsd
new file mode 100644
index 0000000..639dad1
--- /dev/null
+++ b/3.7.0/xsd/HD-act-start3Dprint-v3_7_0.xsd
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="start3Dprint" type="hd:start3Dprint" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="start3Dprint">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="start3DprintAnnc" type="hd:start3DprintAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="start3DprintAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                                    
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>    
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-act-stop3Dprint-v3_7_0.xsd b/3.7.0/xsd/HD-act-stop3Dprint-v3_7_0.xsd
new file mode 100644
index 0000000..cb5d9e8
--- /dev/null
+++ b/3.7.0/xsd/HD-act-stop3Dprint-v3_7_0.xsd
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="stop3Dprint" type="hd:stop3Dprint" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="stop3Dprint">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="stop3DprintAnnc" type="hd:stop3DprintAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="stop3DprintAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                                    
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>    
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-act-toggle-v3_7_0.xsd b/3.7.0/xsd/HD-act-toggle-v3_7_0.xsd
new file mode 100644
index 0000000..d5e9d86
--- /dev/null
+++ b/3.7.0/xsd/HD-act-toggle-v3_7_0.xsd
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="toggle" type="hd:toggle" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="toggle">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="toggleAnnc" type="hd:toggleAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="toggleAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                                    
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>    
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-act-upChannel-v3_7_0.xsd b/3.7.0/xsd/HD-act-upChannel-v3_7_0.xsd
new file mode 100644
index 0000000..6592ae5
--- /dev/null
+++ b/3.7.0/xsd/HD-act-upChannel-v3_7_0.xsd
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="upChannel" type="hd:upChannel" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="upChannel">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="upChannelAnnc" type="hd:upChannelAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="upChannelAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                                    
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>    
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-act-upVolume-v3_7_0.xsd b/3.7.0/xsd/HD-act-upVolume-v3_7_0.xsd
new file mode 100644
index 0000000..3dbed20
--- /dev/null
+++ b/3.7.0/xsd/HD-act-upVolume-v3_7_0.xsd
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="upVolume" type="hd:upVolume" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="upVolume">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="upVolumeAnnc" type="hd:upVolumeAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="upVolumeAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+                                    
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>    
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-commonTypes-v3_7_0.xsd b/3.7.0/xsd/HD-commonTypes-v3_7_0.xsd
new file mode 100644
index 0000000..fccd0fb
--- /dev/null
+++ b/3.7.0/xsd/HD-commonTypes-v3_7_0.xsd
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:include schemaLocation="HD-subDeviceCuff-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-subDevicePowerOutlet-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-operationMode-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-timer-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-mediaSelect-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-liquidRemaining-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-foaming-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-liquidLevel-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-heatingZone-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-lock-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-temperature-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-filterInfo-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-televisionChannel-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-numberValue-v3_7_0.xsd" />
+
+    <xs:element name="cuff0" type="hd:subDeviceCuff" />
+    <xs:element name="cuff0Annc" type="hd:subDeviceCuffAnnc" />
+    <xs:element name="cuff1" type="hd:subDeviceCuff" />
+    <xs:element name="cuff1Annc" type="hd:subDeviceCuffAnnc" />
+    <xs:element name="cuff2" type="hd:subDeviceCuff" />
+    <xs:element name="cuff2Annc" type="hd:subDeviceCuffAnnc" />
+    <xs:element name="cuff3" type="hd:subDeviceCuff" />
+    <xs:element name="cuff3Annc" type="hd:subDeviceCuffAnnc" />
+    <xs:element name="cuff4" type="hd:subDeviceCuff" />
+    <xs:element name="cuff4Annc" type="hd:subDeviceCuffAnnc" />
+    <xs:element name="cuff5" type="hd:subDeviceCuff" />
+    <xs:element name="cuff5Annc" type="hd:subDeviceCuffAnnc" />
+    <xs:element name="powerOutlet0" type="hd:subDevicePowerOutlet" />
+    <xs:element name="powerOutlet0Annc" type="hd:subDevicePowerOutletAnnc" />
+    <xs:element name="powerOutlet1" type="hd:subDevicePowerOutlet" />
+    <xs:element name="powerOutlet1Annc" type="hd:subDevicePowerOutletAnnc" />
+    <xs:element name="powerOutlet2" type="hd:subDevicePowerOutlet" />
+    <xs:element name="powerOutlet2Annc" type="hd:subDevicePowerOutletAnnc" />
+    <xs:element name="powerOutlet3" type="hd:subDevicePowerOutlet" />
+    <xs:element name="powerOutlet3Annc" type="hd:subDevicePowerOutletAnnc" />
+    <xs:element name="powerOutlet4" type="hd:subDevicePowerOutlet" />
+    <xs:element name="powerOutlet4Annc" type="hd:subDevicePowerOutletAnnc" />
+    <xs:element name="powerOutlet5" type="hd:subDevicePowerOutlet" />
+    <xs:element name="powerOutlet5Annc" type="hd:subDevicePowerOutletAnnc" />
+
+    <xs:element name="airConOperationMode" type="hd:operationMode" />
+    <xs:element name="airConOperationModeAnnc" type="hd:operationModeAnnc" />
+    <xs:element name="airCleanOperationMode" type="hd:operationMode" />
+    <xs:element name="airCleanOperationModeAnnc" type="hd:operationModeAnnc" />
+    <xs:element name="sleepTimer" type="hd:timer" />
+    <xs:element name="sleepTimerAnnc" type="hd:timerAnnc" />
+    <xs:element name="airPurifierOperationMode" type="hd:operationMode" />
+    <xs:element name="airPurifierOperationModeAnnc" type="hd:operationModeAnnc" />
+    <xs:element name="mediaInput" type="hd:mediaSelect" />
+    <xs:element name="mediaInputAnnc" type="hd:mediaSelectAnnc" />
+    <xs:element name="mediaOutput" type="hd:mediaSelect" />
+    <xs:element name="mediaOutputAnnc" type="hd:mediaSelectAnnc" />
+    <xs:element name="clothesDryerOperationMode" type="hd:operationMode" />
+    <xs:element name="clothesDryerOperationModeAnnc" type="hd:operationModeAnnc" />
+    <xs:element name="clothesWasherOperationMode" type="hd:operationMode" />
+    <xs:element name="clothesWasherOperationModeAnnc" type="hd:operationModeAnnc" />
+    <xs:element name="clothesWasherDryerOperationMode" type="hd:operationMode" />
+    <xs:element name="clothesWasherDryerOperationModeAnnc" type="hd:operationModeAnnc" />
+    <xs:element name="waterStatus" type="hd:liquidRemaining" />
+    <xs:element name="waterStatusAnnc" type="hd:liquidRemainingAnnc" />
+    <xs:element name="milkStatus" type="hd:liquidRemaining" />
+    <xs:element name="milkStatusAnnc" type="hd:liquidRemainingAnnc" />
+    <xs:element name="milkFoaming" type="hd:foaming" />
+    <xs:element name="milkFoamingAnnc" type="hd:foamingAnnc" />
+    <xs:element name="milkQuantity" type="hd:liquidLevel" />
+    <xs:element name="milkQuantityAnnc" type="hd:liquidLevelAnnc" />
+    <xs:element name="brewingSwitch" type="hd:binarySwitch" />
+    <xs:element name="brewingSwitchAnnc" type="hd:binarySwitchAnnc" />
+    <xs:element name="heatingZone0" type="hd:heatingZone" />
+    <xs:element name="heatingZone0Annc" type="hd:heatingZoneAnnc" />
+    <xs:element name="heatingZone1" type="hd:heatingZone" />
+    <xs:element name="heatingZone1Annc" type="hd:heatingZoneAnnc" />
+    <xs:element name="heatingZone2" type="hd:heatingZone" />
+    <xs:element name="heatingZone2Annc" type="hd:heatingZoneAnnc" />
+    <xs:element name="heatingZone3" type="hd:heatingZone" />
+    <xs:element name="heatingZone3Annc" type="hd:heatingZoneAnnc" />
+    <xs:element name="heatingZone4" type="hd:heatingZone" />
+    <xs:element name="heatingZone4Annc" type="hd:heatingZoneAnnc" />
+    <xs:element name="heatingZone5" type="hd:heatingZone" />
+    <xs:element name="heatingZone5Annc" type="hd:heatingZoneAnnc" />
+    <xs:element name="dehumidifierOperationMode" type="hd:operationMode" />
+    <xs:element name="dehumidifierOperationModeAnnc" type="hd:operationModeAnnc" />
+    <xs:element name="doorlock" type="hd:lock" />
+    <xs:element name="doorlockAnnc" type="hd:lockAnnc" />
+    <xs:element name="doorLock" type="hd:lock" />
+    <xs:element name="doorLockAnnc" type="hd:lockAnnc" />
+    <xs:element name="boilingSwitch" type="hd:binarySwitch" />
+    <xs:element name="boilingSwitchAnnc" type="hd:binarySwitchAnnc" />
+    <xs:element name="printerRunState" type="hd:runState" />
+    <xs:element name="printerRunStateAnnc" type="hd:runStateAnnc" />
+    <xs:element name="scannerRunState" type="hd:runState" />
+    <xs:element name="scannerRunStateAnnc" type="hd:runStateAnnc" />
+    <xs:element name="frozenTemperature" type="hd:temperature" />
+    <xs:element name="frozenTemperatureAnnc" type="hd:temperatureAnnc" />
+    <xs:element name="fridgeTemperature" type="hd:temperature" />
+    <xs:element name="fridgeTemperatureAnnc" type="hd:temperatureAnnc" />
+    <xs:element name="customTemperature" type="hd:temperature" />
+    <xs:element name="customTemperatureAnnc" type="hd:temperatureAnnc" />
+    <xs:element name="controlPanelLock" type="hd:lock" />
+    <xs:element name="controlPanelLockAnnc" type="hd:lockAnnc" />
+    <xs:element name="waterFilterInfo" type="hd:filterInfo" />
+    <xs:element name="waterFilterInfoAnnc" type="hd:filterInfoAnnc" />
+    <xs:element name="robotCleanerOperationMode" type="hd:operationMode" />
+    <xs:element name="robotCleanerOperationModeAnnc" type="hd:operationModeAnnc" />
+    <xs:element name="channel" type="hd:televisionChannel" />
+    <xs:element name="channelAnnc" type="hd:televisionChannelAnnc" />
+    <xs:element name="dimmingLevel" type="hd:numberValue" />
+    <xs:element name="dimmingLevelAnnc" type="hd:numberValueAnnc" />
+    <xs:element name="steamClosetOperationMode" type="hd:operationMode" />
+    <xs:element name="steamClosetOperationModeAnnc" type="hd:operationModeAnnc" />
+
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceAirConditioner-v3_7_0.xsd b/3.7.0/xsd/HD-deviceAirConditioner-v3_7_0.xsd
new file mode 100644
index 0000000..1a146f5
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceAirConditioner-v3_7_0.xsd
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-airConJobMode-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-temperature-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-timer-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-turbo-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-airFlow-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-powerSave-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-airQualitySensor-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-filterInfo-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceAirConditioner" type="hd:deviceAirConditioner" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceAirConditioner">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:airConJobMode" />
+                                <xs:element ref="hd:airConOperationMode" />
+                                <xs:element ref="hd:airCleanOperationMode" />
+                                <xs:element ref="hd:temperature" />
+                                <xs:element ref="hd:timer" />
+                                <xs:element ref="hd:sleepTimer" />
+                                <xs:element ref="hd:turbo" />
+                                <xs:element ref="hd:airFlow" />
+                                <xs:element ref="hd:powerSave" />
+                                <xs:element ref="hd:airQualitySensor" />
+                                <xs:element ref="hd:filterInfo" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceAirConditionerAnnc" type="hd:deviceAirConditionerAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceAirConditionerAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:airConJobMode" />
+                                <xs:element ref="hd:airConJobModeAnnc" />
+                                <xs:element ref="hd:airConOperationMode" />
+                                <xs:element ref="hd:airConOperationModeAnnc" />
+                                <xs:element ref="hd:airCleanOperationMode" />
+                                <xs:element ref="hd:airCleanOperationModeAnnc" />
+                                <xs:element ref="hd:temperature" />
+                                <xs:element ref="hd:temperatureAnnc" />
+                                <xs:element ref="hd:timer" />
+                                <xs:element ref="hd:timerAnnc" />
+                                <xs:element ref="hd:sleepTimer" />
+                                <xs:element ref="hd:sleepTimerAnnc" />
+                                <xs:element ref="hd:turbo" />
+                                <xs:element ref="hd:turboAnnc" />
+                                <xs:element ref="hd:airFlow" />
+                                <xs:element ref="hd:airFlowAnnc" />
+                                <xs:element ref="hd:powerSave" />
+                                <xs:element ref="hd:powerSaveAnnc" />
+                                <xs:element ref="hd:airQualitySensor" />
+                                <xs:element ref="hd:airQualitySensorAnnc" />
+                                <xs:element ref="hd:filterInfo" />
+                                <xs:element ref="hd:filterInfoAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceAirPurifier-v3_7_0.xsd b/3.7.0/xsd/HD-deviceAirPurifier-v3_7_0.xsd
new file mode 100644
index 0000000..188bdb3
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceAirPurifier-v3_7_0.xsd
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-airPurifierJobMode-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-timer-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-powerSave-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-airQualitySensor-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-filterInfo-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceAirPurifier" type="hd:deviceAirPurifier" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceAirPurifier">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:airPurifierJobMode" />
+                                <xs:element ref="hd:airPurifierOperationMode" />
+                                <xs:element ref="hd:timer" />
+                                <xs:element ref="hd:powerSave" />
+                                <xs:element ref="hd:airQualitySensor" />
+                                <xs:element ref="hd:filterInfo" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceAirPurifierAnnc" type="hd:deviceAirPurifierAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceAirPurifierAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:airPurifierJobMode" />
+                                <xs:element ref="hd:airPurifierJobModeAnnc" />
+                                <xs:element ref="hd:airPurifierOperationMode" />
+                                <xs:element ref="hd:airPurifierOperationModeAnnc" />
+                                <xs:element ref="hd:timer" />
+                                <xs:element ref="hd:timerAnnc" />
+                                <xs:element ref="hd:powerSave" />
+                                <xs:element ref="hd:powerSaveAnnc" />
+                                <xs:element ref="hd:airQualitySensor" />
+                                <xs:element ref="hd:airQualitySensorAnnc" />
+                                <xs:element ref="hd:filterInfo" />
+                                <xs:element ref="hd:filterInfoAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceAirQualityMonitor-v3_7_0.xsd b/3.7.0/xsd/HD-deviceAirQualityMonitor-v3_7_0.xsd
new file mode 100644
index 0000000..f640ed5
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceAirQualityMonitor-v3_7_0.xsd
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-airQualitySensor-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceAirQualityMonitor" type="hd:deviceAirQualityMonitor" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceAirQualityMonitor">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:airQualitySensor" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceAirQualityMonitorAnnc" type="hd:deviceAirQualityMonitorAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceAirQualityMonitorAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:airQualitySensor" />
+                                <xs:element ref="hd:airQualitySensorAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceAudioReceiver-v3_7_0.xsd b/3.7.0/xsd/HD-deviceAudioReceiver-v3_7_0.xsd
new file mode 100644
index 0000000..37abbf2
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceAudioReceiver-v3_7_0.xsd
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-audioVolume-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceAudioReceiver" type="hd:deviceAudioReceiver" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceAudioReceiver">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:audioVolume" />
+                                <xs:element ref="hd:mediaInput" />
+                                <xs:element ref="hd:mediaOutput" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceAudioReceiverAnnc" type="hd:deviceAudioReceiverAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceAudioReceiverAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:audioVolume" />
+                                <xs:element ref="hd:audioVolumeAnnc" />
+                                <xs:element ref="hd:mediaInput" />
+                                <xs:element ref="hd:mediaInputAnnc" />
+                                <xs:element ref="hd:mediaOutput" />
+                                <xs:element ref="hd:mediaOutputAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceBloodPressureMonitor-v3_7_0.xsd b/3.7.0/xsd/HD-deviceBloodPressureMonitor-v3_7_0.xsd
new file mode 100644
index 0000000..4e51b20
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceBloodPressureMonitor-v3_7_0.xsd
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-battery-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-subDeviceCuff-v3_7_0.xsd" />
+
+
+
+    <xs:element name="deviceBloodPressureMonitor" type="hd:deviceBloodPressureMonitor" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceBloodPressureMonitor">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:battery" />
+                                <xs:element ref="hd:binarySwitch" />
+
+                                <xs:element ref="hd:cuff0" />
+                                <xs:element ref="hd:cuff1" />
+                                <xs:element ref="hd:cuff2" />
+                                <xs:element ref="hd:cuff3" />
+                                <xs:element ref="hd:cuff4" />
+                                <xs:element ref="hd:cuff5" />
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceBloodPressureMonitorAnnc" type="hd:deviceBloodPressureMonitorAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceBloodPressureMonitorAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:battery" />
+                                <xs:element ref="hd:batteryAnnc" />
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+
+                                <xs:element ref="hd:cuff0" />
+                                <xs:element ref="hd:cuff0Annc" />
+                                <xs:element ref="hd:cuff1" />
+                                <xs:element ref="hd:cuff1Annc" />
+                                <xs:element ref="hd:cuff2" />
+                                <xs:element ref="hd:cuff2Annc" />
+                                <xs:element ref="hd:cuff3" />
+                                <xs:element ref="hd:cuff3Annc" />
+                                <xs:element ref="hd:cuff4" />
+                                <xs:element ref="hd:cuff4Annc" />
+                                <xs:element ref="hd:cuff5" />
+                                <xs:element ref="hd:cuff5Annc" />
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceCamera-v3_7_0.xsd b/3.7.0/xsd/HD-deviceCamera-v3_7_0.xsd
new file mode 100644
index 0000000..ec908e8
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceCamera-v3_7_0.xsd
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-sessionDescription-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-playerControl-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-motionSensor-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceCamera" type="hd:deviceCamera" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceCamera">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:sessionDescription" />
+                                <xs:element ref="hd:playerControl" />
+                                <xs:element ref="hd:motionSensor" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceCameraAnnc" type="hd:deviceCameraAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceCameraAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:sessionDescription" />
+                                <xs:element ref="hd:sessionDescriptionAnnc" />
+                                <xs:element ref="hd:playerControl" />
+                                <xs:element ref="hd:playerControlAnnc" />
+                                <xs:element ref="hd:motionSensor" />
+                                <xs:element ref="hd:motionSensorAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceClothesDryer-v3_7_0.xsd b/3.7.0/xsd/HD-deviceClothesDryer-v3_7_0.xsd
new file mode 100644
index 0000000..b81843f
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceClothesDryer-v3_7_0.xsd
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-clothesDryerJobMode-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceClothesDryer" type="hd:deviceClothesDryer" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceClothesDryer">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:clothesDryerJobMode" />
+                                <xs:element ref="hd:clothesDryerOperationMode" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceClothesDryerAnnc" type="hd:deviceClothesDryerAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceClothesDryerAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:clothesDryerJobMode" />
+                                <xs:element ref="hd:clothesDryerJobModeAnnc" />
+                                <xs:element ref="hd:clothesDryerOperationMode" />
+                                <xs:element ref="hd:clothesDryerOperationModeAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceClothesWasher-v3_7_0.xsd b/3.7.0/xsd/HD-deviceClothesWasher-v3_7_0.xsd
new file mode 100644
index 0000000..cf6e3ce
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceClothesWasher-v3_7_0.xsd
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-clothesWasherJobMode-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-clothesWasherJobModeOption-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-remoteControlEnable-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-timer-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceClothesWasher" type="hd:deviceClothesWasher" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceClothesWasher">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:clothesWasherOperationMode" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:clothesWasherJobMode" />
+                                <xs:element ref="hd:clothesWasherJobModeOption" />
+                                <xs:element ref="hd:remoteControlEnable" />
+                                <xs:element ref="hd:timer" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceClothesWasherAnnc" type="hd:deviceClothesWasherAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceClothesWasherAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:clothesWasherOperationMode" />
+                                <xs:element ref="hd:clothesWasherOperationModeAnnc" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:clothesWasherJobMode" />
+                                <xs:element ref="hd:clothesWasherJobModeAnnc" />
+                                <xs:element ref="hd:clothesWasherJobModeOption" />
+                                <xs:element ref="hd:clothesWasherJobModeOptionAnnc" />
+                                <xs:element ref="hd:remoteControlEnable" />
+                                <xs:element ref="hd:remoteControlEnableAnnc" />
+                                <xs:element ref="hd:timer" />
+                                <xs:element ref="hd:timerAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceClothesWasherDryer-v3_7_0.xsd b/3.7.0/xsd/HD-deviceClothesWasherDryer-v3_7_0.xsd
new file mode 100644
index 0000000..b8f6907
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceClothesWasherDryer-v3_7_0.xsd
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-clothesWasherDryerJobMode-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-clothesWasherJobModeOption-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-remoteControlEnable-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-timer-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceClothesWasherDryer" type="hd:deviceClothesWasherDryer" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceClothesWasherDryer">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:clothesWasherDryerOperationMode" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:clothesWasherDryerJobMode" />
+                                <xs:element ref="hd:clothesWasherJobModeOption" />
+                                <xs:element ref="hd:remoteControlEnable" />
+                                <xs:element ref="hd:timer" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceClothesWasherDryerAnnc" type="hd:deviceClothesWasherDryerAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceClothesWasherDryerAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:clothesWasherDryerOperationMode" />
+                                <xs:element ref="hd:clothesWasherDryerOperationModeAnnc" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:clothesWasherDryerJobMode" />
+                                <xs:element ref="hd:clothesWasherDryerJobModeAnnc" />
+                                <xs:element ref="hd:clothesWasherJobModeOption" />
+                                <xs:element ref="hd:clothesWasherJobModeOptionAnnc" />
+                                <xs:element ref="hd:remoteControlEnable" />
+                                <xs:element ref="hd:remoteControlEnableAnnc" />
+                                <xs:element ref="hd:timer" />
+                                <xs:element ref="hd:timerAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceCoffeeMachine-v3_7_0.xsd b/3.7.0/xsd/HD-deviceCoffeeMachine-v3_7_0.xsd
new file mode 100644
index 0000000..ee463ed
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceCoffeeMachine-v3_7_0.xsd
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-faultDetection-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-clock-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-brewing-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-grinder-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-keepWarm-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceCoffeeMachine" type="hd:deviceCoffeeMachine" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceCoffeeMachine">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:faultDetection" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:clock" />
+                                <xs:element ref="hd:brewing" />
+                                <xs:element ref="hd:waterStatus" />
+                                <xs:element ref="hd:milkStatus" />
+                                <xs:element ref="hd:grinder" />
+                                <xs:element ref="hd:milkFoaming" />
+                                <xs:element ref="hd:milkQuantity" />
+                                <xs:element ref="hd:brewingSwitch" />
+                                <xs:element ref="hd:keepWarm" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceCoffeeMachineAnnc" type="hd:deviceCoffeeMachineAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceCoffeeMachineAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:faultDetection" />
+                                <xs:element ref="hd:faultDetectionAnnc" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:clock" />
+                                <xs:element ref="hd:clockAnnc" />
+                                <xs:element ref="hd:brewing" />
+                                <xs:element ref="hd:brewingAnnc" />
+                                <xs:element ref="hd:waterStatus" />
+                                <xs:element ref="hd:waterStatusAnnc" />
+                                <xs:element ref="hd:milkStatus" />
+                                <xs:element ref="hd:milkStatusAnnc" />
+                                <xs:element ref="hd:grinder" />
+                                <xs:element ref="hd:grinderAnnc" />
+                                <xs:element ref="hd:milkFoaming" />
+                                <xs:element ref="hd:milkFoamingAnnc" />
+                                <xs:element ref="hd:milkQuantity" />
+                                <xs:element ref="hd:milkQuantityAnnc" />
+                                <xs:element ref="hd:brewingSwitch" />
+                                <xs:element ref="hd:brewingSwitchAnnc" />
+                                <xs:element ref="hd:keepWarm" />
+                                <xs:element ref="hd:keepWarmAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceCookerHood-v3_7_0.xsd b/3.7.0/xsd/HD-deviceCookerHood-v3_7_0.xsd
new file mode 100644
index 0000000..791cae4
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceCookerHood-v3_7_0.xsd
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-airFlow-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-cookerHoodJobMode-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceCookerHood" type="hd:deviceCookerHood" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceCookerHood">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:airFlow" />
+                                <xs:element ref="hd:cookerHoodJobMode" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceCookerHoodAnnc" type="hd:deviceCookerHoodAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceCookerHoodAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:airFlow" />
+                                <xs:element ref="hd:airFlowAnnc" />
+                                <xs:element ref="hd:cookerHoodJobMode" />
+                                <xs:element ref="hd:cookerHoodJobModeAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceCooktop-v3_7_0.xsd b/3.7.0/xsd/HD-deviceCooktop-v3_7_0.xsd
new file mode 100644
index 0000000..4e28ca4
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceCooktop-v3_7_0.xsd
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+
+
+    <xs:element name="deviceCooktop" type="hd:deviceCooktop" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceCooktop">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:heatingZone0" />
+                                <xs:element ref="hd:heatingZone1" />
+                                <xs:element ref="hd:heatingZone2" />
+                                <xs:element ref="hd:heatingZone3" />
+                                <xs:element ref="hd:heatingZone4" />
+                                <xs:element ref="hd:heatingZone5" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceCooktopAnnc" type="hd:deviceCooktopAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceCooktopAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:heatingZone0" />
+                                <xs:element ref="hd:heatingZone0Annc" />
+                                <xs:element ref="hd:heatingZone1" />
+                                <xs:element ref="hd:heatingZone1Annc" />
+                                <xs:element ref="hd:heatingZone2" />
+                                <xs:element ref="hd:heatingZone2Annc" />
+                                <xs:element ref="hd:heatingZone3" />
+                                <xs:element ref="hd:heatingZone3Annc" />
+                                <xs:element ref="hd:heatingZone4" />
+                                <xs:element ref="hd:heatingZone4Annc" />
+                                <xs:element ref="hd:heatingZone5" />
+                                <xs:element ref="hd:heatingZone5Annc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceDehumidifier-v3_7_0.xsd b/3.7.0/xsd/HD-deviceDehumidifier-v3_7_0.xsd
new file mode 100644
index 0000000..bbe9d37
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceDehumidifier-v3_7_0.xsd
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-relativeHumidity-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-dehumidifierJobMode-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-timer-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-powerSave-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceDehumidifier" type="hd:deviceDehumidifier" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceDehumidifier">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:relativeHumidity" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:dehumidifierJobMode" />
+                                <xs:element ref="hd:dehumidifierOperationMode" />
+                                <xs:element ref="hd:timer" />
+                                <xs:element ref="hd:powerSave" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceDehumidifierAnnc" type="hd:deviceDehumidifierAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceDehumidifierAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:relativeHumidity" />
+                                <xs:element ref="hd:relativeHumidityAnnc" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:dehumidifierJobMode" />
+                                <xs:element ref="hd:dehumidifierJobModeAnnc" />
+                                <xs:element ref="hd:dehumidifierOperationMode" />
+                                <xs:element ref="hd:dehumidifierOperationModeAnnc" />
+                                <xs:element ref="hd:timer" />
+                                <xs:element ref="hd:timerAnnc" />
+                                <xs:element ref="hd:powerSave" />
+                                <xs:element ref="hd:powerSaveAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceDishWasher-v3_7_0.xsd b/3.7.0/xsd/HD-deviceDishWasher-v3_7_0.xsd
new file mode 100644
index 0000000..f74acaa
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceDishWasher-v3_7_0.xsd
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-dishWasherJobMode-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceDishWasher" type="hd:deviceDishWasher" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceDishWasher">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:dishWasherJobMode" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceDishWasherAnnc" type="hd:deviceDishWasherAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceDishWasherAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:dishWasherJobMode" />
+                                <xs:element ref="hd:dishWasherJobModeAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceDoor-v3_7_0.xsd b/3.7.0/xsd/HD-deviceDoor-v3_7_0.xsd
new file mode 100644
index 0000000..7c6d8df
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceDoor-v3_7_0.xsd
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-openLevel-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-doorStatus-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceDoor" type="hd:deviceDoor" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceDoor">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:openLevel" />
+                                <xs:element ref="hd:doorlock" />
+                                <xs:element ref="hd:doorStatus" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceDoorAnnc" type="hd:deviceDoorAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceDoorAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:openLevel" />
+                                <xs:element ref="hd:openLevelAnnc" />
+                                <xs:element ref="hd:doorlock" />
+                                <xs:element ref="hd:doorlockAnnc" />
+                                <xs:element ref="hd:doorStatus" />
+                                <xs:element ref="hd:doorStatusAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceDoorLock-v3_7_0.xsd b/3.7.0/xsd/HD-deviceDoorLock-v3_7_0.xsd
new file mode 100644
index 0000000..baea05e
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceDoorLock-v3_7_0.xsd
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-doorStatus-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-battery-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceDoorLock" type="hd:deviceDoorLock" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceDoorLock">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:doorLock" />
+                                <xs:element ref="hd:doorStatus" />
+                                <xs:element ref="hd:battery" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceDoorLockAnnc" type="hd:deviceDoorLockAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceDoorLockAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:doorLock" />
+                                <xs:element ref="hd:doorLockAnnc" />
+                                <xs:element ref="hd:doorStatus" />
+                                <xs:element ref="hd:doorStatusAnnc" />
+                                <xs:element ref="hd:battery" />
+                                <xs:element ref="hd:batteryAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceElectricVehicleCharger-v3_7_0.xsd b/3.7.0/xsd/HD-deviceElectricVehicleCharger-v3_7_0.xsd
new file mode 100644
index 0000000..0445355
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceElectricVehicleCharger-v3_7_0.xsd
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-faultDetection-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-battery-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-electricVehicleConnector-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceElectricVehicleCharger" type="hd:deviceElectricVehicleCharger" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceElectricVehicleCharger">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:faultDetection" />
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:battery" />
+                                <xs:element ref="hd:electricVehicleConnector" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceElectricVehicleChargerAnnc" type="hd:deviceElectricVehicleChargerAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceElectricVehicleChargerAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:faultDetection" />
+                                <xs:element ref="hd:faultDetectionAnnc" />
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:battery" />
+                                <xs:element ref="hd:batteryAnnc" />
+                                <xs:element ref="hd:electricVehicleConnector" />
+                                <xs:element ref="hd:electricVehicleConnectorAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceFan-v3_7_0.xsd b/3.7.0/xsd/HD-deviceFan-v3_7_0.xsd
new file mode 100644
index 0000000..4c85aae
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceFan-v3_7_0.xsd
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceFan" type="hd:deviceFan" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceFan">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceFanAnnc" type="hd:deviceFanAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceFanAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceFoodProbe-v3_7_0.xsd b/3.7.0/xsd/HD-deviceFoodProbe-v3_7_0.xsd
new file mode 100644
index 0000000..45d5117
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceFoodProbe-v3_7_0.xsd
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-temperature-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceFoodProbe" type="hd:deviceFoodProbe" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceFoodProbe">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:temperature" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceFoodProbeAnnc" type="hd:deviceFoodProbeAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceFoodProbeAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:temperature" />
+                                <xs:element ref="hd:temperatureAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceFreezer-v3_7_0.xsd b/3.7.0/xsd/HD-deviceFreezer-v3_7_0.xsd
new file mode 100644
index 0000000..1b8dc2a
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceFreezer-v3_7_0.xsd
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-temperature-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceFreezer" type="hd:deviceFreezer" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceFreezer">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:temperature" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceFreezerAnnc" type="hd:deviceFreezerAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceFreezerAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:temperature" />
+                                <xs:element ref="hd:temperatureAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceGlucosemeter-v3_7_0.xsd b/3.7.0/xsd/HD-deviceGlucosemeter-v3_7_0.xsd
new file mode 100644
index 0000000..b6ce028
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceGlucosemeter-v3_7_0.xsd
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-glucometer-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-battery-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceGlucosemeter" type="hd:deviceGlucosemeter" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceGlucosemeter">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:glucometer" />
+                                <xs:element ref="hd:battery" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceGlucosemeterAnnc" type="hd:deviceGlucosemeterAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceGlucosemeterAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:glucometer" />
+                                <xs:element ref="hd:glucometerAnnc" />
+                                <xs:element ref="hd:battery" />
+                                <xs:element ref="hd:batteryAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceHeartRateMonitor-v3_7_0.xsd b/3.7.0/xsd/HD-deviceHeartRateMonitor-v3_7_0.xsd
new file mode 100644
index 0000000..6b13004
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceHeartRateMonitor-v3_7_0.xsd
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-pulsemeter-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-battery-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceHeartRateMonitor" type="hd:deviceHeartRateMonitor" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceHeartRateMonitor">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:pulsemeter" />
+                                <xs:element ref="hd:battery" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceHeartRateMonitorAnnc" type="hd:deviceHeartRateMonitorAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceHeartRateMonitorAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:pulsemeter" />
+                                <xs:element ref="hd:pulsemeterAnnc" />
+                                <xs:element ref="hd:battery" />
+                                <xs:element ref="hd:batteryAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceHomeCCTV-v3_7_0.xsd b/3.7.0/xsd/HD-deviceHomeCCTV-v3_7_0.xsd
new file mode 100644
index 0000000..b9dcae9
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceHomeCCTV-v3_7_0.xsd
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-sessionDescription-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-playerControl-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-motionSensor-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-airQualitySensor-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-ozoneMeter-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-smokeSensor-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-acousticSensor-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-impactSensor-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-faultDetection-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-alarmSpeaker-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceHomeCCTV" type="hd:deviceHomeCCTV" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceHomeCCTV">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:sessionDescription" />
+                                <xs:element ref="hd:playerControl" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:motionSensor" />
+                                <xs:element ref="hd:airQualitySensor" />
+                                <xs:element ref="hd:ozoneMeter" />
+                                <xs:element ref="hd:smokeSensor" />
+                                <xs:element ref="hd:acousticSensor" />
+                                <xs:element ref="hd:impactSensor" />
+                                <xs:element ref="hd:faultDetection" />
+                                <xs:element ref="hd:alarmSpeaker" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceHomeCCTVAnnc" type="hd:deviceHomeCCTVAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceHomeCCTVAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:sessionDescription" />
+                                <xs:element ref="hd:sessionDescriptionAnnc" />
+                                <xs:element ref="hd:playerControl" />
+                                <xs:element ref="hd:playerControlAnnc" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:motionSensor" />
+                                <xs:element ref="hd:motionSensorAnnc" />
+                                <xs:element ref="hd:airQualitySensor" />
+                                <xs:element ref="hd:airQualitySensorAnnc" />
+                                <xs:element ref="hd:ozoneMeter" />
+                                <xs:element ref="hd:ozoneMeterAnnc" />
+                                <xs:element ref="hd:smokeSensor" />
+                                <xs:element ref="hd:smokeSensorAnnc" />
+                                <xs:element ref="hd:acousticSensor" />
+                                <xs:element ref="hd:acousticSensorAnnc" />
+                                <xs:element ref="hd:impactSensor" />
+                                <xs:element ref="hd:impactSensorAnnc" />
+                                <xs:element ref="hd:faultDetection" />
+                                <xs:element ref="hd:faultDetectionAnnc" />
+                                <xs:element ref="hd:alarmSpeaker" />
+                                <xs:element ref="hd:alarmSpeakerAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceHumidifier-v3_7_0.xsd b/3.7.0/xsd/HD-deviceHumidifier-v3_7_0.xsd
new file mode 100644
index 0000000..db2241e
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceHumidifier-v3_7_0.xsd
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceHumidifier" type="hd:deviceHumidifier" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceHumidifier">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceHumidifierAnnc" type="hd:deviceHumidifierAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceHumidifierAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceKettle-v3_7_0.xsd b/3.7.0/xsd/HD-deviceKettle-v3_7_0.xsd
new file mode 100644
index 0000000..fd90409
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceKettle-v3_7_0.xsd
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-faultDetection-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-temperature-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-keepWarm-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceKettle" type="hd:deviceKettle" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceKettle">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:faultDetection" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:waterStatus" />
+                                <xs:element ref="hd:boilingSwitch" />
+                                <xs:element ref="hd:temperature" />
+                                <xs:element ref="hd:keepWarm" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceKettleAnnc" type="hd:deviceKettleAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceKettleAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:faultDetection" />
+                                <xs:element ref="hd:faultDetectionAnnc" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:waterStatus" />
+                                <xs:element ref="hd:waterStatusAnnc" />
+                                <xs:element ref="hd:boilingSwitch" />
+                                <xs:element ref="hd:boilingSwitchAnnc" />
+                                <xs:element ref="hd:temperature" />
+                                <xs:element ref="hd:temperatureAnnc" />
+                                <xs:element ref="hd:keepWarm" />
+                                <xs:element ref="hd:keepWarmAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceLight-v3_7_0.xsd b/3.7.0/xsd/HD-deviceLight-v3_7_0.xsd
new file mode 100644
index 0000000..02519e8
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceLight-v3_7_0.xsd
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-faultDetection-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-colour-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-colourSaturation-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-brightness-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceLight" type="hd:deviceLight" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceLight">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:faultDetection" />
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:colour" />
+                                <xs:element ref="hd:colourSaturation" />
+                                <xs:element ref="hd:brightness" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceLightAnnc" type="hd:deviceLightAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceLightAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:faultDetection" />
+                                <xs:element ref="hd:faultDetectionAnnc" />
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:colour" />
+                                <xs:element ref="hd:colourAnnc" />
+                                <xs:element ref="hd:colourSaturation" />
+                                <xs:element ref="hd:colourSaturationAnnc" />
+                                <xs:element ref="hd:brightness" />
+                                <xs:element ref="hd:brightnessAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceMicrogeneration-v3_7_0.xsd b/3.7.0/xsd/HD-deviceMicrogeneration-v3_7_0.xsd
new file mode 100644
index 0000000..84a7033
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceMicrogeneration-v3_7_0.xsd
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-faultDetection-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-energyGeneration-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceMicrogeneration" type="hd:deviceMicrogeneration" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceMicrogeneration">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:faultDetection" />
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:energyGeneration" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceMicrogenerationAnnc" type="hd:deviceMicrogenerationAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceMicrogenerationAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:faultDetection" />
+                                <xs:element ref="hd:faultDetectionAnnc" />
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:energyGeneration" />
+                                <xs:element ref="hd:energyGenerationAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceMultiFunctionPrinter-v3_7_0.xsd b/3.7.0/xsd/HD-deviceMultiFunctionPrinter-v3_7_0.xsd
new file mode 100644
index 0000000..a681623
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceMultiFunctionPrinter-v3_7_0.xsd
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-autoDocumentFeeder-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-printQueue-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceMultiFunctionPrinter" type="hd:deviceMultiFunctionPrinter" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceMultiFunctionPrinter">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:printerRunState" />
+                                <xs:element ref="hd:scannerRunState" />
+                                <xs:element ref="hd:autoDocumentFeeder" />
+                                <xs:element ref="hd:printQueue" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceMultiFunctionPrinterAnnc" type="hd:deviceMultiFunctionPrinterAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceMultiFunctionPrinterAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:printerRunState" />
+                                <xs:element ref="hd:printerRunStateAnnc" />
+                                <xs:element ref="hd:scannerRunState" />
+                                <xs:element ref="hd:scannerRunStateAnnc" />
+                                <xs:element ref="hd:autoDocumentFeeder" />
+                                <xs:element ref="hd:autoDocumentFeederAnnc" />
+                                <xs:element ref="hd:printQueue" />
+                                <xs:element ref="hd:printQueueAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceOutdoorLamp-v3_7_0.xsd b/3.7.0/xsd/HD-deviceOutdoorLamp-v3_7_0.xsd
new file mode 100644
index 0000000..cf3998c
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceOutdoorLamp-v3_7_0.xsd
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-brightness-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-motionSensor-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-airQualitySensor-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-uvSensor-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-timer-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-faultDetection-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceOutdoorLamp" type="hd:deviceOutdoorLamp" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceOutdoorLamp">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:brightness" />
+                                <xs:element ref="hd:motionSensor" />
+                                <xs:element ref="hd:airQualitySensor" />
+                                <xs:element ref="hd:uvSensor" />
+                                <xs:element ref="hd:timer" />
+                                <xs:element ref="hd:faultDetection" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceOutdoorLampAnnc" type="hd:deviceOutdoorLampAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceOutdoorLampAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:brightness" />
+                                <xs:element ref="hd:brightnessAnnc" />
+                                <xs:element ref="hd:motionSensor" />
+                                <xs:element ref="hd:motionSensorAnnc" />
+                                <xs:element ref="hd:airQualitySensor" />
+                                <xs:element ref="hd:airQualitySensorAnnc" />
+                                <xs:element ref="hd:uvSensor" />
+                                <xs:element ref="hd:uvSensorAnnc" />
+                                <xs:element ref="hd:timer" />
+                                <xs:element ref="hd:timerAnnc" />
+                                <xs:element ref="hd:faultDetection" />
+                                <xs:element ref="hd:faultDetectionAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceOven-v3_7_0.xsd b/3.7.0/xsd/HD-deviceOven-v3_7_0.xsd
new file mode 100644
index 0000000..90f5f68
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceOven-v3_7_0.xsd
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-timer-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-temperature-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceOven" type="hd:deviceOven" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceOven">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:timer" />
+                                <xs:element ref="hd:temperature" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceOvenAnnc" type="hd:deviceOvenAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceOvenAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:timer" />
+                                <xs:element ref="hd:timerAnnc" />
+                                <xs:element ref="hd:temperature" />
+                                <xs:element ref="hd:temperatureAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-devicePrinter-v3_7_0.xsd b/3.7.0/xsd/HD-devicePrinter-v3_7_0.xsd
new file mode 100644
index 0000000..a095e4a
--- /dev/null
+++ b/3.7.0/xsd/HD-devicePrinter-v3_7_0.xsd
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-printQueue-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="devicePrinter" type="hd:devicePrinter" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="devicePrinter">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:printQueue" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="devicePrinterAnnc" type="hd:devicePrinterAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="devicePrinterAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:printQueue" />
+                                <xs:element ref="hd:printQueueAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-devicePulseOximeter-v3_7_0.xsd b/3.7.0/xsd/HD-devicePulseOximeter-v3_7_0.xsd
new file mode 100644
index 0000000..131b1d9
--- /dev/null
+++ b/3.7.0/xsd/HD-devicePulseOximeter-v3_7_0.xsd
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-pulsemeter-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-oximeter-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-battery-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="devicePulseOximeter" type="hd:devicePulseOximeter" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="devicePulseOximeter">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:pulsemeter" />
+                                <xs:element ref="hd:oximeter" />
+                                <xs:element ref="hd:battery" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="devicePulseOximeterAnnc" type="hd:devicePulseOximeterAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="devicePulseOximeterAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:pulsemeter" />
+                                <xs:element ref="hd:pulsemeterAnnc" />
+                                <xs:element ref="hd:oximeter" />
+                                <xs:element ref="hd:oximeterAnnc" />
+                                <xs:element ref="hd:battery" />
+                                <xs:element ref="hd:batteryAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceRefrigerator-v3_7_0.xsd b/3.7.0/xsd/HD-deviceRefrigerator-v3_7_0.xsd
new file mode 100644
index 0000000..d9979a9
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceRefrigerator-v3_7_0.xsd
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-powerSave-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-doorStatus-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-refrigeration-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceRefrigerator" type="hd:deviceRefrigerator" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceRefrigerator">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:powerSave" />
+                                <xs:element ref="hd:doorStatus" />
+                                <xs:element ref="hd:frozenTemperature" />
+                                <xs:element ref="hd:fridgeTemperature" />
+                                <xs:element ref="hd:customTemperature" />
+                                <xs:element ref="hd:refrigeration" />
+                                <xs:element ref="hd:controlPanelLock" />
+                                <xs:element ref="hd:waterFilterInfo" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceRefrigeratorAnnc" type="hd:deviceRefrigeratorAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceRefrigeratorAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:powerSave" />
+                                <xs:element ref="hd:powerSaveAnnc" />
+                                <xs:element ref="hd:doorStatus" />
+                                <xs:element ref="hd:doorStatusAnnc" />
+                                <xs:element ref="hd:frozenTemperature" />
+                                <xs:element ref="hd:frozenTemperatureAnnc" />
+                                <xs:element ref="hd:fridgeTemperature" />
+                                <xs:element ref="hd:fridgeTemperatureAnnc" />
+                                <xs:element ref="hd:customTemperature" />
+                                <xs:element ref="hd:customTemperatureAnnc" />
+                                <xs:element ref="hd:refrigeration" />
+                                <xs:element ref="hd:refrigerationAnnc" />
+                                <xs:element ref="hd:controlPanelLock" />
+                                <xs:element ref="hd:controlPanelLockAnnc" />
+                                <xs:element ref="hd:waterFilterInfo" />
+                                <xs:element ref="hd:waterFilterInfoAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceRobotCleaner-v3_7_0.xsd b/3.7.0/xsd/HD-deviceRobotCleaner-v3_7_0.xsd
new file mode 100644
index 0000000..9c3675d
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceRobotCleaner-v3_7_0.xsd
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-robotCleanerJobMode-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-battery-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-timer-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceRobotCleaner" type="hd:deviceRobotCleaner" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceRobotCleaner">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:robotCleanerJobMode" />
+                                <xs:element ref="hd:robotCleanerOperationMode" />
+                                <xs:element ref="hd:battery" />
+                                <xs:element ref="hd:timer" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceRobotCleanerAnnc" type="hd:deviceRobotCleanerAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceRobotCleanerAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:robotCleanerJobMode" />
+                                <xs:element ref="hd:robotCleanerJobModeAnnc" />
+                                <xs:element ref="hd:robotCleanerOperationMode" />
+                                <xs:element ref="hd:robotCleanerOperationModeAnnc" />
+                                <xs:element ref="hd:battery" />
+                                <xs:element ref="hd:batteryAnnc" />
+                                <xs:element ref="hd:timer" />
+                                <xs:element ref="hd:timerAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceScanner-v3_7_0.xsd b/3.7.0/xsd/HD-deviceScanner-v3_7_0.xsd
new file mode 100644
index 0000000..fa7c78e
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceScanner-v3_7_0.xsd
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-autoDocumentFeeder-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceScanner" type="hd:deviceScanner" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceScanner">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:autoDocumentFeeder" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceScannerAnnc" type="hd:deviceScannerAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceScannerAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:autoDocumentFeeder" />
+                                <xs:element ref="hd:autoDocumentFeederAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceSecurityPanel-v3_7_0.xsd b/3.7.0/xsd/HD-deviceSecurityPanel-v3_7_0.xsd
new file mode 100644
index 0000000..cd7c97a
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceSecurityPanel-v3_7_0.xsd
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-securityMode-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceSecurityPanel" type="hd:deviceSecurityPanel" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceSecurityPanel">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:securityMode" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceSecurityPanelAnnc" type="hd:deviceSecurityPanelAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceSecurityPanelAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:securityMode" />
+                                <xs:element ref="hd:securityModeAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceSetTopBox-v3_7_0.xsd b/3.7.0/xsd/HD-deviceSetTopBox-v3_7_0.xsd
new file mode 100644
index 0000000..b48d2d3
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceSetTopBox-v3_7_0.xsd
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-audioVolume-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceSetTopBox" type="hd:deviceSetTopBox" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceSetTopBox">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:audioVolume" />
+                                <xs:element ref="hd:channel" />
+                                <xs:element ref="hd:mediaInput" />
+                                <xs:element ref="hd:mediaOutput" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceSetTopBoxAnnc" type="hd:deviceSetTopBoxAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceSetTopBoxAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:audioVolume" />
+                                <xs:element ref="hd:audioVolumeAnnc" />
+                                <xs:element ref="hd:channel" />
+                                <xs:element ref="hd:channelAnnc" />
+                                <xs:element ref="hd:mediaInput" />
+                                <xs:element ref="hd:mediaInputAnnc" />
+                                <xs:element ref="hd:mediaOutput" />
+                                <xs:element ref="hd:mediaOutputAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceSmartElectricMeter-v3_7_0.xsd b/3.7.0/xsd/HD-deviceSmartElectricMeter-v3_7_0.xsd
new file mode 100644
index 0000000..f73f7d2
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceSmartElectricMeter-v3_7_0.xsd
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-faultDetection-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-clock-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-energyConsumption-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-energyGeneration-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceSmartElectricMeter" type="hd:deviceSmartElectricMeter" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceSmartElectricMeter">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:faultDetection" />
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:clock" />
+                                <xs:element ref="hd:energyConsumption" />
+                                <xs:element ref="hd:energyGeneration" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceSmartElectricMeterAnnc" type="hd:deviceSmartElectricMeterAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceSmartElectricMeterAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:faultDetection" />
+                                <xs:element ref="hd:faultDetectionAnnc" />
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:clock" />
+                                <xs:element ref="hd:clockAnnc" />
+                                <xs:element ref="hd:energyConsumption" />
+                                <xs:element ref="hd:energyConsumptionAnnc" />
+                                <xs:element ref="hd:energyGeneration" />
+                                <xs:element ref="hd:energyGenerationAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceSmartPlug-v3_7_0.xsd b/3.7.0/xsd/HD-deviceSmartPlug-v3_7_0.xsd
new file mode 100644
index 0000000..66410ba
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceSmartPlug-v3_7_0.xsd
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-faultDetection-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-remoteControlEnable-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-subDevicePowerOutlet-v3_7_0.xsd" />
+
+
+
+    <xs:element name="deviceSmartPlug" type="hd:deviceSmartPlug" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceSmartPlug">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:faultDetection" />
+                                <xs:element ref="hd:remoteControlEnable" />
+
+                                <xs:element ref="hd:powerOutlet0" />
+                                <xs:element ref="hd:powerOutlet1" />
+                                <xs:element ref="hd:powerOutlet2" />
+                                <xs:element ref="hd:powerOutlet3" />
+                                <xs:element ref="hd:powerOutlet4" />
+                                <xs:element ref="hd:powerOutlet5" />
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceSmartPlugAnnc" type="hd:deviceSmartPlugAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceSmartPlugAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:faultDetection" />
+                                <xs:element ref="hd:faultDetectionAnnc" />
+                                <xs:element ref="hd:remoteControlEnable" />
+                                <xs:element ref="hd:remoteControlEnableAnnc" />
+
+                                <xs:element ref="hd:powerOutlet0" />
+                                <xs:element ref="hd:powerOutlet0Annc" />
+                                <xs:element ref="hd:powerOutlet1" />
+                                <xs:element ref="hd:powerOutlet1Annc" />
+                                <xs:element ref="hd:powerOutlet2" />
+                                <xs:element ref="hd:powerOutlet2Annc" />
+                                <xs:element ref="hd:powerOutlet3" />
+                                <xs:element ref="hd:powerOutlet3Annc" />
+                                <xs:element ref="hd:powerOutlet4" />
+                                <xs:element ref="hd:powerOutlet4Annc" />
+                                <xs:element ref="hd:powerOutlet5" />
+                                <xs:element ref="hd:powerOutlet5Annc" />
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceSteamCloset-v3_7_0.xsd b/3.7.0/xsd/HD-deviceSteamCloset-v3_7_0.xsd
new file mode 100644
index 0000000..4127976
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceSteamCloset-v3_7_0.xsd
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-steamClosetJobMode-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceSteamCloset" type="hd:deviceSteamCloset" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceSteamCloset">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:steamClosetJobMode" />
+                                <xs:element ref="hd:steamClosetOperationMode" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceSteamClosetAnnc" type="hd:deviceSteamClosetAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceSteamClosetAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:steamClosetJobMode" />
+                                <xs:element ref="hd:steamClosetJobModeAnnc" />
+                                <xs:element ref="hd:steamClosetOperationMode" />
+                                <xs:element ref="hd:steamClosetOperationModeAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceStorageBattery-v3_7_0.xsd b/3.7.0/xsd/HD-deviceStorageBattery-v3_7_0.xsd
new file mode 100644
index 0000000..40b388b
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceStorageBattery-v3_7_0.xsd
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-faultDetection-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-battery-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceStorageBattery" type="hd:deviceStorageBattery" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceStorageBattery">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:faultDetection" />
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:battery" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceStorageBatteryAnnc" type="hd:deviceStorageBatteryAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceStorageBatteryAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:faultDetection" />
+                                <xs:element ref="hd:faultDetectionAnnc" />
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:battery" />
+                                <xs:element ref="hd:batteryAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceSwitch-v3_7_0.xsd b/3.7.0/xsd/HD-deviceSwitch-v3_7_0.xsd
new file mode 100644
index 0000000..31658f0
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceSwitch-v3_7_0.xsd
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceSwitch" type="hd:deviceSwitch" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceSwitch">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceSwitchAnnc" type="hd:deviceSwitchAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceSwitchAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceTelevision-v3_7_0.xsd b/3.7.0/xsd/HD-deviceTelevision-v3_7_0.xsd
new file mode 100644
index 0000000..ba3fe33
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceTelevision-v3_7_0.xsd
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-audioVolume-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-televisionChannel-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-playerControl-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceTelevision" type="hd:deviceTelevision" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceTelevision">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:audioVolume" />
+                                <xs:element ref="hd:televisionChannel" />
+                                <xs:element ref="hd:playerControl" />
+                                <xs:element ref="hd:mediaInput" />
+                                <xs:element ref="hd:mediaOutput" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceTelevisionAnnc" type="hd:deviceTelevisionAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceTelevisionAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:audioVolume" />
+                                <xs:element ref="hd:audioVolumeAnnc" />
+                                <xs:element ref="hd:televisionChannel" />
+                                <xs:element ref="hd:televisionChannelAnnc" />
+                                <xs:element ref="hd:playerControl" />
+                                <xs:element ref="hd:playerControlAnnc" />
+                                <xs:element ref="hd:mediaInput" />
+                                <xs:element ref="hd:mediaInputAnnc" />
+                                <xs:element ref="hd:mediaOutput" />
+                                <xs:element ref="hd:mediaOutputAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceThermometer-v3_7_0.xsd b/3.7.0/xsd/HD-deviceThermometer-v3_7_0.xsd
new file mode 100644
index 0000000..42a7ed7
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceThermometer-v3_7_0.xsd
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-temperature-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-battery-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceThermometer" type="hd:deviceThermometer" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceThermometer">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:temperature" />
+                                <xs:element ref="hd:battery" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceThermometerAnnc" type="hd:deviceThermometerAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceThermometerAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:temperature" />
+                                <xs:element ref="hd:temperatureAnnc" />
+                                <xs:element ref="hd:battery" />
+                                <xs:element ref="hd:batteryAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceThermostat-v3_7_0.xsd b/3.7.0/xsd/HD-deviceThermostat-v3_7_0.xsd
new file mode 100644
index 0000000..4fa23e4
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceThermostat-v3_7_0.xsd
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-timer-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-temperature-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceThermostat" type="hd:deviceThermostat" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceThermostat">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:timer" />
+                                <xs:element ref="hd:temperature" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceThermostatAnnc" type="hd:deviceThermostatAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceThermostatAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:timer" />
+                                <xs:element ref="hd:timerAnnc" />
+                                <xs:element ref="hd:temperature" />
+                                <xs:element ref="hd:temperatureAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceThreeDPrinter-v3_7_0.xsd b/3.7.0/xsd/HD-deviceThreeDPrinter-v3_7_0.xsd
new file mode 100644
index 0000000..b20da3e
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceThreeDPrinter-v3_7_0.xsd
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-faultDetection-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-threeDPrinter-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-temperature-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-printQueue-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceThreeDPrinter" type="hd:deviceThreeDPrinter" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceThreeDPrinter">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:faultDetection" />
+                                <xs:element ref="hd:threeDPrinter" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:temperature" />
+                                <xs:element ref="hd:printQueue" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceThreeDPrinterAnnc" type="hd:deviceThreeDPrinterAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceThreeDPrinterAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:faultDetection" />
+                                <xs:element ref="hd:faultDetectionAnnc" />
+                                <xs:element ref="hd:threeDPrinter" />
+                                <xs:element ref="hd:threeDPrinterAnnc" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:temperature" />
+                                <xs:element ref="hd:temperatureAnnc" />
+                                <xs:element ref="hd:printQueue" />
+                                <xs:element ref="hd:printQueueAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceWaterHeater-v3_7_0.xsd b/3.7.0/xsd/HD-deviceWaterHeater-v3_7_0.xsd
new file mode 100644
index 0000000..bc5a38f
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceWaterHeater-v3_7_0.xsd
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-faultDetection-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-runState-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-clock-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-boiler-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-hotWaterSupply-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceWaterHeater" type="hd:deviceWaterHeater" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceWaterHeater">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:faultDetection" />
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:clock" />
+                                <xs:element ref="hd:boiler" />
+                                <xs:element ref="hd:hotWaterSupply" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceWaterHeaterAnnc" type="hd:deviceWaterHeaterAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceWaterHeaterAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:faultDetection" />
+                                <xs:element ref="hd:faultDetectionAnnc" />
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:runState" />
+                                <xs:element ref="hd:runStateAnnc" />
+                                <xs:element ref="hd:clock" />
+                                <xs:element ref="hd:clockAnnc" />
+                                <xs:element ref="hd:boiler" />
+                                <xs:element ref="hd:boilerAnnc" />
+                                <xs:element ref="hd:hotWaterSupply" />
+                                <xs:element ref="hd:hotWaterSupplyAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceWaterValve-v3_7_0.xsd b/3.7.0/xsd/HD-deviceWaterValve-v3_7_0.xsd
new file mode 100644
index 0000000..acf8cb3
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceWaterValve-v3_7_0.xsd
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-openLevel-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceWaterValve" type="hd:deviceWaterValve" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceWaterValve">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:openLevel" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceWaterValveAnnc" type="hd:deviceWaterValveAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceWaterValveAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:openLevel" />
+                                <xs:element ref="hd:openLevelAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceWeightScaleAndBodyCompositionAnalyser-v3_7_0.xsd b/3.7.0/xsd/HD-deviceWeightScaleAndBodyCompositionAnalyser-v3_7_0.xsd
new file mode 100644
index 0000000..55b7ae3
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceWeightScaleAndBodyCompositionAnalyser-v3_7_0.xsd
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-weight-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-bodyCompositionAnalyser-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-bioElectricalImpedanceAnalysis-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-battery-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceWeightScaleAndBodyCompositionAnalyser" type="hd:deviceWeightScaleAndBodyCompositionAnalyser" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceWeightScaleAndBodyCompositionAnalyser">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:weight" />
+                                <xs:element ref="hd:bodyCompositionAnalyser" />
+                                <xs:element ref="hd:bioElectricalImpedanceAnalysis" />
+                                <xs:element ref="hd:battery" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceWeightScaleAndBodyCompositionAnalyserAnnc" type="hd:deviceWeightScaleAndBodyCompositionAnalyserAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceWeightScaleAndBodyCompositionAnalyserAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:weight" />
+                                <xs:element ref="hd:weightAnnc" />
+                                <xs:element ref="hd:bodyCompositionAnalyser" />
+                                <xs:element ref="hd:bodyCompositionAnalyserAnnc" />
+                                <xs:element ref="hd:bioElectricalImpedanceAnalysis" />
+                                <xs:element ref="hd:bioElectricalImpedanceAnalysisAnnc" />
+                                <xs:element ref="hd:battery" />
+                                <xs:element ref="hd:batteryAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-deviceWindowShade-v3_7_0.xsd b/3.7.0/xsd/HD-deviceWindowShade-v3_7_0.xsd
new file mode 100644
index 0000000..08ab587
--- /dev/null
+++ b/3.7.0/xsd/HD-deviceWindowShade-v3_7_0.xsd
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-openLevel-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-battery-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="deviceWindowShade" type="hd:deviceWindowShade" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="deviceWindowShade">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:openLevel" />
+                                <xs:element ref="hd:battery" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="deviceWindowShadeAnnc" type="hd:deviceWindowShadeAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="deviceWindowShadeAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:openLevel" />
+                                <xs:element ref="hd:openLevelAnnc" />
+                                <xs:element ref="hd:battery" />
+                                <xs:element ref="hd:batteryAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-enumerationTypes-v3_7_0.xsd b/3.7.0/xsd/HD-enumerationTypes-v3_7_0.xsd
new file mode 100644
index 0000000..37974c0
--- /dev/null
+++ b/3.7.0/xsd/HD-enumerationTypes-v3_7_0.xsd
@@ -0,0 +1,716 @@
+<?xml version="1.0" ?>
+<!-- 
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices 
+contained in the original materials on any copies of the materials and that you comply strictly with these terms. 
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of 
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. 
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+
+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. 
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, 
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY 
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. 
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO 
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. 
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+ -->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain"
+     xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified">
+
+    <xs:simpleType name="enum3DPrinterTechnology">
+        <xs:annotation>
+            <xs:documentation>Used for the "printType" data point of the "ThreeDPrinter" ModuleClass.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- Fused Filament Fabrication -->
+            <xs:enumeration value="1" />
+            <!-- Fused Deposition Modeling -->
+            <xs:enumeration value="2" />
+            <!-- Digital Light Processing -->
+            <xs:enumeration value="3" />
+            <!-- Powder Bed & inkjet head 3D Printing -->
+            <xs:enumeration value="4" />
+            <!-- Photopolymer Jetting Technology PolyJet -->
+            <xs:enumeration value="5" />
+            <!-- Photopolymer Jetting Technology PolyJet -->
+            <xs:enumeration value="6" />
+            <!-- Stereolithography Apparatus -->
+            <xs:enumeration value="7" />
+            <!-- Selective Laser Sintering -->
+            <xs:enumeration value="8" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumAdfState">
+        <xs:annotation>
+            <xs:documentation>Used for the "currentAdfState" and "adfStates" data points of the "autoDocumentFeeder" ModuleClass.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- processing -->
+            <xs:enumeration value="1" />
+            <!-- empty -->
+            <xs:enumeration value="2" />
+            <!-- jam -->
+            <xs:enumeration value="3" />
+            <!-- loaded -->
+            <xs:enumeration value="4" />
+            <!-- mispick -->
+            <xs:enumeration value="5" />
+            <!-- hatchOpen -->
+            <xs:enumeration value="6" />
+            <!-- duplexPageTooShort -->
+            <xs:enumeration value="7" />
+            <!-- duplexPageTooLong -->
+            <xs:enumeration value="8" />
+            <!-- multipickDetected -->
+            <xs:enumeration value="9" />
+            <!-- inputTrayFailed -->
+            <xs:enumeration value="10" />
+            <!-- inputTrayOverloaded -->
+            <xs:enumeration value="11" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumAirConJobMode">
+        <xs:annotation>
+            <xs:documentation>Used for the "currentJobMode" and "jobModes" data point of the "airConJobMode" ModuleClass.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- cool -->
+            <xs:enumeration value="1" />
+            <!-- airDry -->
+            <xs:enumeration value="2" />
+            <!-- fan -->
+            <xs:enumeration value="3" />
+            <!-- AI -->
+            <xs:enumeration value="4" />
+            <!-- heat -->
+            <xs:enumeration value="5" />
+            <!-- airClean -->
+            <xs:enumeration value="6" />
+            <!-- ACO -->
+            <xs:enumeration value="7" />
+            <!-- aroma -->
+            <xs:enumeration value="8" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumAirPurifierJobMode">
+        <xs:annotation>
+            <xs:documentation>Used for the "currentJobMode" and "jobModes" data points of the "airPurifierJobMode" ModuleClass.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- normalClean -->
+            <xs:enumeration value="1" />
+            <!-- sleep -->
+            <xs:enumeration value="2" />
+            <!-- silent -->
+            <xs:enumeration value="3" />
+            <!-- wet -->
+            <xs:enumeration value="4" />
+            <!-- circulate -->
+            <xs:enumeration value="5" />
+            <!-- dual -->
+            <xs:enumeration value="6" />
+            <!-- auto -->
+            <xs:enumeration value="7" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumAlertColourCode">
+        <xs:annotation>
+            <xs:documentation>Used for the "light" data point of the "alarmSpeaker" ModuleClass.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- red -->
+            <xs:enumeration value="1" />
+            <!-- green -->
+            <xs:enumeration value="2" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumCallState">
+        <xs:annotation>
+            <xs:documentation>Used for the callState" data point in the "phoneCall" ModuleClass.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- hangup -->
+            <xs:enumeration value="1" />
+            <!-- calling -->
+            <xs:enumeration value="2" />
+            <!-- ringing -->
+            <xs:enumeration value="3" />
+            <!-- busy -->
+            <xs:enumeration value="4" />
+            <!-- answered -->
+            <xs:enumeration value="5" />
+            <!-- noline -->
+            <xs:enumeration value="6" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumClothesDryerJobMode">
+        <xs:annotation>
+            <xs:documentation>Used for the "currentJobMode" and "jobModes" data points of the "clothesDryerJobMode" ModuleClass.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- normal -->
+            <xs:enumeration value="1" />
+            <!-- quickDry -->
+            <xs:enumeration value="2" />
+            <!-- permanentPress -->
+            <xs:enumeration value="3" />
+            <!-- heavyDuty -->
+            <xs:enumeration value="4" />
+            <!-- delicates -->
+            <xs:enumeration value="5" />
+            <!-- airDry -->
+            <xs:enumeration value="6" />
+            <!-- extendedTumble -->
+            <xs:enumeration value="7" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumClothesWasherDryerJobMode">
+        <xs:annotation>
+            <xs:documentation>Used for "currentJobModes" and "jobModes" data points of "clothesWasherDryerJobMode" ModuleClass. Manufacturers can define their own courses by setting this value to negative values.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- normal -->
+            <xs:enumeration value="1" />
+            <!-- quick -->
+            <xs:enumeration value="2" />
+            <!-- auto -->
+            <xs:enumeration value="3" />
+            <!-- delicates -->
+            <xs:enumeration value="4" />
+            <!-- heavy duty -->
+            <xs:enumeration value="5" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumClothesWasherJobMode">
+        <xs:annotation>
+            <xs:documentation>Used for the "currentJobModes" and "jobModes" data points of the 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.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- normal -->
+            <xs:enumeration value="1" />
+            <!-- smallLoad -->
+            <xs:enumeration value="2" />
+            <!-- delicate -->
+            <xs:enumeration value="3" />
+            <!-- comforter -->
+            <xs:enumeration value="4" />
+            <!-- expressWash -->
+            <xs:enumeration value="5" />
+            <!-- cleanWash -->
+            <xs:enumeration value="6" />
+            <!-- kidsWear -->
+            <xs:enumeration value="7" />
+            <!-- workoutWears -->
+            <xs:enumeration value="8" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumCookerHoodJobMode">
+        <xs:annotation>
+            <xs:documentation>Used for the "currentJobMode" and "jobModes" DataPoints of the cookerHoodJobMode ModuleClass.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- Always-on -->
+            <xs:enumeration value="1" />
+            <!-- Intensive -->
+            <xs:enumeration value="2" />
+            <!-- Sensor -->
+            <xs:enumeration value="3" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumDehumidifierJobMode">
+        <xs:annotation>
+            <xs:documentation>Used for "currentJobMode" and "jobModes" data points of the "dehumidifierJobMode" ModuleClass.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- smart -->
+            <xs:enumeration value="1" />
+            <!-- fast -->
+            <xs:enumeration value="2" />
+            <!-- fast -->
+            <xs:enumeration value="3" />
+            <!-- focus -->
+            <xs:enumeration value="4" />
+            <!-- clothes -->
+            <xs:enumeration value="5" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumDishWasherJobMode">
+        <xs:annotation>
+            <xs:documentation>Used for the "currentJobMode" and "jobModes" DataPoints of the "dishWasherJobMode" ModuleClass.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- Normal wash -->
+            <xs:enumeration value="1" />
+            <!-- Normal wash -->
+            <xs:enumeration value="2" />
+            <!-- Quick wash -->
+            <xs:enumeration value="3" />
+            <!-- Sensor wash -->
+            <xs:enumeration value="4" />
+            <!-- Eco wash -->
+            <xs:enumeration value="5" />
+            <!-- Quiet wash -->
+            <xs:enumeration value="6" />
+            <!-- Maintenance wash -->
+            <xs:enumeration value="7" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumDoorState">
+        <xs:annotation>
+            <xs:documentation>Used for the “doorState” DataPoint of “doorStatus” ModuleClass.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- closed -->
+            <xs:enumeration value="1" />
+            <!-- open -->
+            <xs:enumeration value="2" />
+            <!-- opening -->
+            <xs:enumeration value="3" />
+            <!-- closing -->
+            <xs:enumeration value="4" />
+            <!-- stopped -->
+            <xs:enumeration value="5" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumFoamStrength">
+        <xs:annotation>
+            <xs:documentation>Used for data points indicating the strength of a foam, for example, foaming milk from a coffee machine.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- zero -->
+            <xs:enumeration value="1" />
+            <!-- low -->
+            <xs:enumeration value="2" />
+            <!-- medium -->
+            <xs:enumeration value="3" />
+            <!-- high -->
+            <xs:enumeration value="4" />
+            <!-- maximum -->
+            <xs:enumeration value="5" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumGeneralLevel">
+        <xs:annotation>
+            <xs:documentation>Used for the "soilLevel" data point of the "washingCourseOption" ModuleClass.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- light -->
+            <xs:enumeration value="1" />
+            <!-- normal -->
+            <xs:enumeration value="2" />
+            <!-- heavy -->
+            <xs:enumeration value="3" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumGeneralSpeed">
+        <xs:annotation>
+            <xs:documentation>Used for the "spinSpeed" data point of the "washingCourseOption" ModuleClass.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- low -->
+            <xs:enumeration value="1" />
+            <!-- medium -->
+            <xs:enumeration value="2" />
+            <!-- high -->
+            <xs:enumeration value="3" />
+            <!-- extraHigh -->
+            <xs:enumeration value="4" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumGeneralTemperature">
+        <xs:annotation>
+            <xs:documentation>Used for the "washTemp" data point of the "washingCourseOption" ModuleClass.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- cold -->
+            <xs:enumeration value="1" />
+            <!-- warm -->
+            <xs:enumeration value="2" />
+            <!-- hot -->
+            <xs:enumeration value="3" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumGrainsLevel">
+        <xs:annotation>
+            <xs:documentation>Used for the "grainsRemaining" data point of the "grinder" ModuleClss.  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.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- zero -->
+            <xs:enumeration value="1" />
+            <!-- low -->
+            <xs:enumeration value="2" />
+            <!-- medium -->
+            <xs:enumeration value="3" />
+            <!-- high -->
+            <xs:enumeration value="4" />
+            <!-- maximum -->
+            <xs:enumeration value="5" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumGrindCoarseness">
+        <xs:annotation>
+            <xs:documentation>Used for the coarseness data points of the "grinder" ModuleClass. This type specifies the level of coarseness of a solid after grinding, for example grinded coffee beans.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- ultrafine -->
+            <xs:enumeration value="1" />
+            <!-- fine -->
+            <xs:enumeration value="2" />
+            <!-- medium -->
+            <xs:enumeration value="3" />
+            <!-- coarse -->
+            <xs:enumeration value="4" />
+            <!-- coarsest -->
+            <xs:enumeration value="5" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumHorizontalDirection">
+        <xs:annotation>
+            <xs:documentation>Used for the "horizontalDirection" and "supportedHorizontalDirection" of the "airflow" ModuleClass, indicating horizontal directions.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- auto -->
+            <xs:enumeration value="1" />
+            <!-- center -->
+            <xs:enumeration value="2" />
+            <!-- left -->
+            <xs:enumeration value="3" />
+            <!-- right -->
+            <xs:enumeration value="4" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumJobState">
+        <xs:annotation>
+            <xs:documentation>Used for the "currentJobState" and "jobStates" data points of the "runState" ModuleClass.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- aborted -->
+            <xs:enumeration value="1" />
+            <!-- cancelled -->
+            <xs:enumeration value="2" />
+            <!-- completed -->
+            <xs:enumeration value="3" />
+            <!-- paused -->
+            <xs:enumeration value="4" />
+            <!-- pending -->
+            <xs:enumeration value="5" />
+            <!-- processing -->
+            <xs:enumeration value="6" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumLiquidLevel">
+        <xs:annotation>
+            <xs:documentation>Used for the "liquidLevel" and "liquidRemaining" data points in the  respective "liquidLevel" and "liquidRemaining" ModuleClasses.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- zero -->
+            <xs:enumeration value="1" />
+            <!-- low -->
+            <xs:enumeration value="2" />
+            <!-- medium -->
+            <xs:enumeration value="3" />
+            <!-- high -->
+            <xs:enumeration value="4" />
+            <!-- maximum -->
+            <xs:enumeration value="5" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumMachineState">
+        <xs:annotation>
+            <xs:documentation>Used for the "currentMachineState" and "machineStates" data points of the "runState" ModuleClass.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- idle -->
+            <xs:enumeration value="1" />
+            <!-- preActive -->
+            <xs:enumeration value="2" />
+            <!-- active -->
+            <xs:enumeration value="3" />
+            <!-- reserved -->
+            <xs:enumeration value="4" />
+            <!-- stopped -->
+            <xs:enumeration value="5" />
+            <!-- error -->
+            <xs:enumeration value="6" />
+            <!-- diagnostic -->
+            <xs:enumeration value="7" />
+            <!-- test -->
+            <xs:enumeration value="8" />
+            <!-- maintenance -->
+            <xs:enumeration value="9" />
+            <!-- clear -->
+            <xs:enumeration value="10" />
+            <!-- charging -->
+            <xs:enumeration value="11" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumOzoneStatus">
+        <xs:annotation>
+            <xs:documentation>Used for the "ozoneStatus" property of the "ozoneMeter" ModuleClass.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- Good -->
+            <xs:enumeration value="1" />
+            <!-- Normal -->
+            <xs:enumeration value="2" />
+            <!-- Bad -->
+            <xs:enumeration value="3" />
+            <!-- Very bad -->
+            <xs:enumeration value="4" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumPlayerMode">
+        <xs:annotation>
+            <xs:documentation>Used for the "currentMode" and "supportedModes" data points in the "playerControl" ModuleClass.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- stop -->
+            <xs:enumeration value="1" />
+            <!-- play -->
+            <xs:enumeration value="2" />
+            <!-- pause -->
+            <xs:enumeration value="3" />
+            <!-- resume -->
+            <xs:enumeration value="4" />
+            <!-- record -->
+            <xs:enumeration value="5" />
+            <!-- rewind -->
+            <xs:enumeration value="6" />
+            <!-- fast-rewind -->
+            <xs:enumeration value="7" />
+            <!-- forward -->
+            <xs:enumeration value="8" />
+            <!-- fast-forward -->
+            <xs:enumeration value="9" />
+            <!-- searchPrevious -->
+            <xs:enumeration value="10" />
+            <!-- searchNext -->
+            <xs:enumeration value="11" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumRobotCleanerJobMode">
+        <xs:annotation>
+            <xs:documentation>Used for the "currentJobMode" and "jobModes" data points of the "robotCleanerJobMode" ModuleClass.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- zigzag -->
+            <xs:enumeration value="1" />
+            <!-- sectorBase -->
+            <xs:enumeration value="2" />
+            <!-- spot -->
+            <xs:enumeration value="3" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumSecurityMode">
+        <xs:annotation>
+            <xs:documentation>Used for the "currentSecurityMode" and "securityMode" data points of the "securityStatus" ModuleClass. </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- active -->
+            <xs:enumeration value="1" />
+            <!-- armedAway -->
+            <xs:enumeration value="2" />
+            <!-- armedInstant -->
+            <xs:enumeration value="3" />
+            <!-- armedMaximum -->
+            <xs:enumeration value="4" />
+            <!-- armedNightStay -->
+            <xs:enumeration value="5" />
+            <!-- armedStay -->
+            <xs:enumeration value="6" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumSpinLevelStrength">
+        <xs:annotation>
+            <xs:documentation>Used for the "spinLevelStrength" data points of the "spinLevel" ModuleClass, indicating the strength of a spinLevel.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- zero -->
+            <xs:enumeration value="1" />
+            <!-- sensitive -->
+            <xs:enumeration value="2" />
+            <!-- weak -->
+            <xs:enumeration value="3" />
+            <!-- medium -->
+            <xs:enumeration value="4" />
+            <!-- strong -->
+            <xs:enumeration value="5" />
+            <!-- maximum -->
+            <xs:enumeration value="6" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumSteamClosetJobMode">
+        <xs:annotation>
+            <xs:documentation>Used for "currentJobMode" and "jobModes" data points of the "steamClosetJobMode" ModuleClass.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- reduceOdor -->
+            <xs:enumeration value="1" />
+            <!-- steamWrinkle -->
+            <xs:enumeration value="2" />
+            <!-- helpClean -->
+            <xs:enumeration value="3" />
+            <!-- gentleDry -->
+            <xs:enumeration value="4" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumSupportedMediaSource">
+        <xs:annotation>
+            <xs:documentation>Used for the "supportedMediaSources" data point of the "mediaSelect" ModuleClass.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- tuner -->
+            <xs:enumeration value="1" />
+            <!-- component -->
+            <xs:enumeration value="2" />
+            <!-- composite -->
+            <xs:enumeration value="3" />
+            <!-- svideo -->
+            <xs:enumeration value="4" />
+            <!-- rgb -->
+            <xs:enumeration value="5" />
+            <!-- dvi -->
+            <xs:enumeration value="6" />
+            <!-- hdmi -->
+            <xs:enumeration value="7" />
+            <!-- displayPort -->
+            <xs:enumeration value="8" />
+            <!-- scart -->
+            <xs:enumeration value="9" />
+            <!-- externalStorage -->
+            <xs:enumeration value="10" />
+            <!-- network -->
+            <xs:enumeration value="11" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumTasteStrength">
+        <xs:annotation>
+            <xs:documentation>Used for the "strength" data point of the "brewing" ModuleClass, indicating strength of a drink taste, for example coffee strength.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- zero -->
+            <xs:enumeration value="1" />
+            <!-- sensitive -->
+            <xs:enumeration value="2" />
+            <!-- medium -->
+            <xs:enumeration value="3" />
+            <!-- strong -->
+            <xs:enumeration value="4" />
+            <!-- maximum -->
+            <xs:enumeration value="5" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumTone">
+        <xs:annotation>
+            <xs:documentation>Used for the "tone" data point of the "alarmSpeaker" ModuleClass.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- fire -->
+            <xs:enumeration value="1" />
+            <!-- theft -->
+            <xs:enumeration value="2" />
+            <!-- emergency -->
+            <xs:enumeration value="3" />
+            <!-- doorbell -->
+            <xs:enumeration value="4" />
+            <!-- deviceFail -->
+            <xs:enumeration value="5" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumUvStatus">
+        <xs:annotation>
+            <xs:documentation>Used for the "uvStatus" data point of the "uvSensor" ModuleClass.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- Good -->
+            <xs:enumeration value="1" />
+            <!-- Normal -->
+            <xs:enumeration value="2" />
+            <!-- Bad -->
+            <xs:enumeration value="3" />
+            <!-- Very Bad -->
+            <xs:enumeration value="4" />
+            <!-- Danger -->
+            <xs:enumeration value="5" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumVerticalDirection">
+        <xs:annotation>
+            <xs:documentation>Used for the "verticalDirection" and "supportedVerticalDirection" data points of the "airFlow" ModuleClass, indicating vertical direction.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- auto -->
+            <xs:enumeration value="1" />
+            <!-- center -->
+            <xs:enumeration value="2" />
+            <!-- up -->
+            <xs:enumeration value="3" />
+            <!-- down -->
+            <xs:enumeration value="4" />
+        </xs:restriction>
+    </xs:simpleType>
+
+    <xs:simpleType name="enumWaterFlowStrength">
+        <xs:annotation>
+            <xs:documentation>Used for the "waterLevelStrength" data point of the "waterFlow" ModuleClass,  indicating the strength of a waterflow.</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:integer">
+            <!-- zero -->
+            <xs:enumeration value="1" />
+            <!-- sensitive -->
+            <xs:enumeration value="2" />
+            <!-- weak -->
+            <xs:enumeration value="3" />
+            <!-- medium -->
+            <xs:enumeration value="4" />
+            <!-- strong -->
+            <xs:enumeration value="5" />
+            <!-- maximum -->
+            <xs:enumeration value="6" />
+        </xs:restriction>
+    </xs:simpleType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-acousticSensor-v3_7_0.xsd b/3.7.0/xsd/HD-mod-acousticSensor-v3_7_0.xsd
new file mode 100644
index 0000000..029b4b9
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-acousticSensor-v3_7_0.xsd
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="acousticSensor" type="hd:acousticSensor" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="acousticSensor" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="loudness" type="xs:float" />
+                        <xs:element name="acousticStatus" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="acousticSensorAnnc" type="hd:acousticSensorAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="acousticSensorAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="loudness" minOccurs="0" type="xs:float" />
+                        <xs:element name="acousticStatus" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-airConJobMode-v3_7_0.xsd b/3.7.0/xsd/HD-mod-airConJobMode-v3_7_0.xsd
new file mode 100644
index 0000000..4649c04
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-airConJobMode-v3_7_0.xsd
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="airConJobMode" type="hd:airConJobMode" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="airConJobMode" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentJobMode" type="hd:enumAirConJobMode" />
+                        <xs:element name="currentJobModeName" minOccurs="0" type="xs:string" />
+                        <xs:element name="jobModes">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumAirConJobMode" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="airConJobModeAnnc" type="hd:airConJobModeAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="airConJobModeAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentJobMode" minOccurs="0" type="hd:enumAirConJobMode" />
+                        <xs:element name="currentJobModeName" minOccurs="0" type="xs:string" />
+                        <xs:element name="jobModes" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumAirConJobMode" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-airFlow-v3_7_0.xsd b/3.7.0/xsd/HD-mod-airFlow-v3_7_0.xsd
new file mode 100644
index 0000000..0d5fa4b
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-airFlow-v3_7_0.xsd
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="airFlow" type="hd:airFlow" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="airFlow" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="speed" type="xs:integer" />
+                        <xs:element name="minSpeed" minOccurs="0" type="xs:integer" />
+                        <xs:element name="maxSpeed" minOccurs="0" type="xs:integer" />
+                        <xs:element name="verticalDirection" minOccurs="0" type="hd:enumVerticalDirection" />
+                        <xs:element name="supportedVerticalDirection" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumVerticalDirection" />
+                        </xs:simpleType>
+                    </xs:element>
+                        <xs:element name="horizontalDirection" minOccurs="0" type="hd:enumHorizontalDirection" />
+                        <xs:element name="supportedHorizontalDirection" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumHorizontalDirection" />
+                        </xs:simpleType>
+                    </xs:element>
+                        <xs:element name="automode" minOccurs="0" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="airFlowAnnc" type="hd:airFlowAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="airFlowAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="speed" minOccurs="0" type="xs:integer" />
+                        <xs:element name="minSpeed" minOccurs="0" type="xs:integer" />
+                        <xs:element name="maxSpeed" minOccurs="0" type="xs:integer" />
+                        <xs:element name="verticalDirection" minOccurs="0" type="hd:enumVerticalDirection" />
+                        <xs:element name="supportedVerticalDirection" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumVerticalDirection" />
+                        </xs:simpleType>
+                    </xs:element>
+                        <xs:element name="horizontalDirection" minOccurs="0" type="hd:enumHorizontalDirection" />
+                        <xs:element name="supportedHorizontalDirection" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumHorizontalDirection" />
+                        </xs:simpleType>
+                    </xs:element>
+                        <xs:element name="automode" minOccurs="0" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-airPurifierJobMode-v3_7_0.xsd b/3.7.0/xsd/HD-mod-airPurifierJobMode-v3_7_0.xsd
new file mode 100644
index 0000000..af8d7e1
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-airPurifierJobMode-v3_7_0.xsd
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="airPurifierJobMode" type="hd:airPurifierJobMode" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="airPurifierJobMode" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentJobMode" type="hd:enumAirPurifierJobMode" />
+                        <xs:element name="currentJobModeName" minOccurs="0" type="xs:string" />
+                        <xs:element name="jobModes">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumAirPurifierJobMode" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="airPurifierJobModeAnnc" type="hd:airPurifierJobModeAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="airPurifierJobModeAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentJobMode" minOccurs="0" type="hd:enumAirPurifierJobMode" />
+                        <xs:element name="currentJobModeName" minOccurs="0" type="xs:string" />
+                        <xs:element name="jobModes" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumAirPurifierJobMode" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-airQualitySensor-v3_7_0.xsd b/3.7.0/xsd/HD-mod-airQualitySensor-v3_7_0.xsd
new file mode 100644
index 0000000..32df361
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-airQualitySensor-v3_7_0.xsd
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="airQualitySensor" type="hd:airQualitySensor" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="airQualitySensor" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="sensorPM1" minOccurs="0" type="xs:integer" />
+                        <xs:element name="sensorPM2" minOccurs="0" type="xs:integer" />
+                        <xs:element name="sensorPM10" minOccurs="0" type="xs:integer" />
+                        <xs:element name="sensorOdor" minOccurs="0" type="xs:integer" />
+                        <xs:element name="sensorHumidity" minOccurs="0" type="xs:integer" />
+                        <xs:element name="monitoringEnabled" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="co2" minOccurs="0" type="xs:integer" />
+                        <xs:element name="co" minOccurs="0" type="xs:integer" />
+                        <xs:element name="ch2o" minOccurs="0" type="xs:integer" />
+                        <xs:element name="voc" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="airQualitySensorAnnc" type="hd:airQualitySensorAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="airQualitySensorAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="sensorPM1" minOccurs="0" type="xs:integer" />
+                        <xs:element name="sensorPM2" minOccurs="0" type="xs:integer" />
+                        <xs:element name="sensorPM10" minOccurs="0" type="xs:integer" />
+                        <xs:element name="sensorOdor" minOccurs="0" type="xs:integer" />
+                        <xs:element name="sensorHumidity" minOccurs="0" type="xs:integer" />
+                        <xs:element name="monitoringEnabled" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="co2" minOccurs="0" type="xs:integer" />
+                        <xs:element name="co" minOccurs="0" type="xs:integer" />
+                        <xs:element name="ch2o" minOccurs="0" type="xs:integer" />
+                        <xs:element name="voc" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-alarmSpeaker-v3_7_0.xsd b/3.7.0/xsd/HD-mod-alarmSpeaker-v3_7_0.xsd
new file mode 100644
index 0000000..62e3559
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-alarmSpeaker-v3_7_0.xsd
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="alarmSpeaker" type="hd:alarmSpeaker" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="alarmSpeaker" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="tone" minOccurs="0" type="hd:enumTone" />
+                        <xs:element name="light" minOccurs="0" type="hd:enumAlertColourCode" />
+                        <xs:element name="alarmStatus" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="alarmSpeakerAnnc" type="hd:alarmSpeakerAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="alarmSpeakerAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="tone" minOccurs="0" type="hd:enumTone" />
+                        <xs:element name="light" minOccurs="0" type="hd:enumAlertColourCode" />
+                        <xs:element name="alarmStatus" minOccurs="0" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-audioVolume-v3_7_0.xsd b/3.7.0/xsd/HD-mod-audioVolume-v3_7_0.xsd
new file mode 100644
index 0000000..acbf3c0
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-audioVolume-v3_7_0.xsd
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-act-upVolume-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-act-downVolume-v3_7_0.xsd" />
+
+
+    <xs:element name="audioVolume" type="hd:audioVolume" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="audioVolume" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="volumePercentage" type="xs:integer" />
+                        <xs:element name="stepValue" minOccurs="0" type="xs:integer" />
+                        <xs:element name="maxValue" minOccurs="0" type="xs:integer" />
+                        <xs:element name="muteEnabled" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="hd:upVolume" />
+                            <xs:element ref="hd:downVolume" />
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="audioVolumeAnnc" type="hd:audioVolumeAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="audioVolumeAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="volumePercentage" minOccurs="0" type="xs:integer" />
+                        <xs:element name="stepValue" minOccurs="0" type="xs:integer" />
+                        <xs:element name="maxValue" minOccurs="0" type="xs:integer" />
+                        <xs:element name="muteEnabled" minOccurs="0" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="hd:upVolume" />
+                            <xs:element ref="hd:downVolume" />
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-autoDocumentFeeder-v3_7_0.xsd b/3.7.0/xsd/HD-mod-autoDocumentFeeder-v3_7_0.xsd
new file mode 100644
index 0000000..b549a46
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-autoDocumentFeeder-v3_7_0.xsd
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="autoDocumentFeeder" type="hd:autoDocumentFeeder" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="autoDocumentFeeder" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentAdfState" type="hd:enumAdfState" />
+                        <xs:element name="adfStates">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumAdfState" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="autoDocumentFeederAnnc" type="hd:autoDocumentFeederAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="autoDocumentFeederAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentAdfState" minOccurs="0" type="hd:enumAdfState" />
+                        <xs:element name="adfStates" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumAdfState" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-battery-v3_7_0.xsd b/3.7.0/xsd/HD-mod-battery-v3_7_0.xsd
new file mode 100644
index 0000000..74f0291
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-battery-v3_7_0.xsd
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="battery" type="hd:battery" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="battery" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="level" type="xs:integer" />
+                        <xs:element name="capacity" minOccurs="0" type="xs:integer" />
+                        <xs:element name="charging" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="discharging" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="lowBattery" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="batteryThreshold" minOccurs="0" type="xs:integer" />
+                        <xs:element name="electricEnergy" minOccurs="0" type="xs:integer" />
+                        <xs:element name="voltage" minOccurs="0" type="xs:integer" />
+                        <xs:element name="material" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="batteryAnnc" type="hd:batteryAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="batteryAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="level" minOccurs="0" type="xs:integer" />
+                        <xs:element name="capacity" minOccurs="0" type="xs:integer" />
+                        <xs:element name="charging" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="discharging" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="lowBattery" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="batteryThreshold" minOccurs="0" type="xs:integer" />
+                        <xs:element name="electricEnergy" minOccurs="0" type="xs:integer" />
+                        <xs:element name="voltage" minOccurs="0" type="xs:integer" />
+                        <xs:element name="material" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-binaryObject-v3_7_0.xsd b/3.7.0/xsd/HD-mod-binaryObject-v3_7_0.xsd
new file mode 100644
index 0000000..ce54cbb
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-binaryObject-v3_7_0.xsd
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="binaryObject" type="hd:binaryObject" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="binaryObject" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="object" type="xs:string" />
+                        <xs:element name="objectType" type="xs:string" />
+                        <xs:element name="size" minOccurs="0" type="xs:integer" />
+                        <xs:element name="hash" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="binaryObjectAnnc" type="hd:binaryObjectAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="binaryObjectAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="object" minOccurs="0" type="xs:string" />
+                        <xs:element name="objectType" minOccurs="0" type="xs:string" />
+                        <xs:element name="size" minOccurs="0" type="xs:integer" />
+                        <xs:element name="hash" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-binarySwitch-v3_7_0.xsd b/3.7.0/xsd/HD-mod-binarySwitch-v3_7_0.xsd
new file mode 100644
index 0000000..c9ffad6
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-binarySwitch-v3_7_0.xsd
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-act-toggle-v3_7_0.xsd" />
+
+
+    <xs:element name="binarySwitch" type="hd:binarySwitch" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="binarySwitch" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="powerState" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="hd:toggle" />
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="binarySwitchAnnc" type="hd:binarySwitchAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="binarySwitchAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="powerState" minOccurs="0" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="hd:toggle" />
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-bioElectricalImpedanceAnalysis-v3_7_0.xsd b/3.7.0/xsd/HD-mod-bioElectricalImpedanceAnalysis-v3_7_0.xsd
new file mode 100644
index 0000000..86fca26
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-bioElectricalImpedanceAnalysis-v3_7_0.xsd
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="bioElectricalImpedanceAnalysis" type="hd:bioElectricalImpedanceAnalysis" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="bioElectricalImpedanceAnalysis" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="water" type="xs:float" />
+                        <xs:element name="fat" type="xs:float" />
+                        <xs:element name="muscle" type="xs:float" />
+                        <xs:element name="bone" type="xs:float" />
+                        <xs:element name="visceraFat" type="xs:float" />
+                        <xs:element name="kcal" type="xs:float" />
+                        <xs:element name="resistance" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="bioElectricalImpedanceAnalysisAnnc" type="hd:bioElectricalImpedanceAnalysisAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="bioElectricalImpedanceAnalysisAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="water" minOccurs="0" type="xs:float" />
+                        <xs:element name="fat" minOccurs="0" type="xs:float" />
+                        <xs:element name="muscle" minOccurs="0" type="xs:float" />
+                        <xs:element name="bone" minOccurs="0" type="xs:float" />
+                        <xs:element name="visceraFat" minOccurs="0" type="xs:float" />
+                        <xs:element name="kcal" minOccurs="0" type="xs:float" />
+                        <xs:element name="resistance" minOccurs="0" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-bodyCompositionAnalyser-v3_7_0.xsd b/3.7.0/xsd/HD-mod-bodyCompositionAnalyser-v3_7_0.xsd
new file mode 100644
index 0000000..09ba2b8
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-bodyCompositionAnalyser-v3_7_0.xsd
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="bodyCompositionAnalyser" type="hd:bodyCompositionAnalyser" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="bodyCompositionAnalyser" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="bodyLength" minOccurs="0" type="xs:float" />
+                        <xs:element name="bmi" minOccurs="0" type="xs:float" />
+                        <xs:element name="fatFreeMass" minOccurs="0" type="xs:float" />
+                        <xs:element name="softLeanMass" minOccurs="0" type="xs:float" />
+                        <xs:element name="muscleMass" minOccurs="0" type="xs:float" />
+                        <xs:element name="basalMetabolism" minOccurs="0" type="xs:float" />
+                        <xs:element name="impedance" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="bodyCompositionAnalyserAnnc" type="hd:bodyCompositionAnalyserAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="bodyCompositionAnalyserAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="bodyLength" minOccurs="0" type="xs:float" />
+                        <xs:element name="bmi" minOccurs="0" type="xs:float" />
+                        <xs:element name="fatFreeMass" minOccurs="0" type="xs:float" />
+                        <xs:element name="softLeanMass" minOccurs="0" type="xs:float" />
+                        <xs:element name="muscleMass" minOccurs="0" type="xs:float" />
+                        <xs:element name="basalMetabolism" minOccurs="0" type="xs:float" />
+                        <xs:element name="impedance" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-boiler-v3_7_0.xsd b/3.7.0/xsd/HD-mod-boiler-v3_7_0.xsd
new file mode 100644
index 0000000..acd2fd0
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-boiler-v3_7_0.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="boiler" type="hd:boiler" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="boiler" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="status" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="boilerAnnc" type="hd:boilerAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="boilerAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="status" minOccurs="0" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-brewing-v3_7_0.xsd b/3.7.0/xsd/HD-mod-brewing-v3_7_0.xsd
new file mode 100644
index 0000000..7347132
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-brewing-v3_7_0.xsd
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="brewing" type="hd:brewing" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="brewing" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="cupsNumber" type="xs:integer" />
+                        <xs:element name="strength" minOccurs="0" type="hd:enumTasteStrength" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="brewingAnnc" type="hd:brewingAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="brewingAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="cupsNumber" minOccurs="0" type="xs:integer" />
+                        <xs:element name="strength" minOccurs="0" type="hd:enumTasteStrength" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-brightness-v3_7_0.xsd b/3.7.0/xsd/HD-mod-brightness-v3_7_0.xsd
new file mode 100644
index 0000000..4a7a5c6
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-brightness-v3_7_0.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="brightness" type="hd:brightness" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="brightness" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="brightness" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="brightnessAnnc" type="hd:brightnessAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="brightnessAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="brightness" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-clock-v3_7_0.xsd b/3.7.0/xsd/HD-mod-clock-v3_7_0.xsd
new file mode 100644
index 0000000..854fce0
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-clock-v3_7_0.xsd
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="clock" type="hd:clock" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="clock" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentTime" type="m2m:timestamp" />
+                        <xs:element name="currentDate" type="m2m:timestamp" />
+                        <xs:element name="currentTimeZone" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="clockAnnc" type="hd:clockAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="clockAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentTime" minOccurs="0" type="m2m:timestamp" />
+                        <xs:element name="currentDate" minOccurs="0" type="m2m:timestamp" />
+                        <xs:element name="currentTimeZone" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-clothesDryerJobMode-v3_7_0.xsd b/3.7.0/xsd/HD-mod-clothesDryerJobMode-v3_7_0.xsd
new file mode 100644
index 0000000..7fecf58
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-clothesDryerJobMode-v3_7_0.xsd
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="clothesDryerJobMode" type="hd:clothesDryerJobMode" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="clothesDryerJobMode" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentJobMode" type="hd:enumClothesDryerJobMode" />
+                        <xs:element name="currentJobModeName" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="clothesDryerJobModeAnnc" type="hd:clothesDryerJobModeAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="clothesDryerJobModeAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentJobMode" minOccurs="0" type="hd:enumClothesDryerJobMode" />
+                        <xs:element name="currentJobModeName" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-clothesWasherDryerJobMode-v3_7_0.xsd b/3.7.0/xsd/HD-mod-clothesWasherDryerJobMode-v3_7_0.xsd
new file mode 100644
index 0000000..4399075
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-clothesWasherDryerJobMode-v3_7_0.xsd
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="clothesWasherDryerJobMode" type="hd:clothesWasherDryerJobMode" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="clothesWasherDryerJobMode" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentJobMode" type="hd:enumClothesWasherDryerJobMode" />
+                        <xs:element name="currentJobModeName" minOccurs="0" type="xs:string" />
+                        <xs:element name="jobModes">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumClothesWasherDryerJobMode" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="clothesWasherDryerJobModeAnnc" type="hd:clothesWasherDryerJobModeAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="clothesWasherDryerJobModeAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentJobMode" minOccurs="0" type="hd:enumClothesWasherDryerJobMode" />
+                        <xs:element name="currentJobModeName" minOccurs="0" type="xs:string" />
+                        <xs:element name="jobModes" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumClothesWasherDryerJobMode" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-clothesWasherJobMode-v3_7_0.xsd b/3.7.0/xsd/HD-mod-clothesWasherJobMode-v3_7_0.xsd
new file mode 100644
index 0000000..78404b2
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-clothesWasherJobMode-v3_7_0.xsd
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="clothesWasherJobMode" type="hd:clothesWasherJobMode" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="clothesWasherJobMode" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentJobMode" type="hd:enumClothesWasherJobMode" />
+                        <xs:element name="currentJobModeName" minOccurs="0" type="xs:string" />
+                        <xs:element name="jobModes">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumClothesWasherJobMode" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="clothesWasherJobModeAnnc" type="hd:clothesWasherJobModeAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="clothesWasherJobModeAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentJobMode" minOccurs="0" type="hd:enumClothesWasherJobMode" />
+                        <xs:element name="currentJobModeName" minOccurs="0" type="xs:string" />
+                        <xs:element name="jobModes" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumClothesWasherJobMode" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-clothesWasherJobModeOption-v3_7_0.xsd b/3.7.0/xsd/HD-mod-clothesWasherJobModeOption-v3_7_0.xsd
new file mode 100644
index 0000000..71a9d98
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-clothesWasherJobModeOption-v3_7_0.xsd
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="clothesWasherJobModeOption" type="hd:clothesWasherJobModeOption" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="clothesWasherJobModeOption" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="washTemp" minOccurs="0" type="hd:enumGeneralTemperature" />
+                        <xs:element name="soilLevel" minOccurs="0" type="hd:enumGeneralLevel" />
+                        <xs:element name="spinSpeed" minOccurs="0" type="hd:enumGeneralSpeed" />
+                        <xs:element name="preWash" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="speedWash" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="steamTreat" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="coldWash" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="extraRinse" minOccurs="0" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="clothesWasherJobModeOptionAnnc" type="hd:clothesWasherJobModeOptionAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="clothesWasherJobModeOptionAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="washTemp" minOccurs="0" type="hd:enumGeneralTemperature" />
+                        <xs:element name="soilLevel" minOccurs="0" type="hd:enumGeneralLevel" />
+                        <xs:element name="spinSpeed" minOccurs="0" type="hd:enumGeneralSpeed" />
+                        <xs:element name="preWash" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="speedWash" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="steamTreat" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="coldWash" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="extraRinse" minOccurs="0" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-colour-v3_7_0.xsd b/3.7.0/xsd/HD-mod-colour-v3_7_0.xsd
new file mode 100644
index 0000000..917f5bb
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-colour-v3_7_0.xsd
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="colour" type="hd:colour" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="colour" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="red" type="xs:integer" />
+                        <xs:element name="green" type="xs:integer" />
+                        <xs:element name="blue" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="colourAnnc" type="hd:colourAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="colourAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="red" minOccurs="0" type="xs:integer" />
+                        <xs:element name="green" minOccurs="0" type="xs:integer" />
+                        <xs:element name="blue" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-colourSaturation-v3_7_0.xsd b/3.7.0/xsd/HD-mod-colourSaturation-v3_7_0.xsd
new file mode 100644
index 0000000..f7173db
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-colourSaturation-v3_7_0.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="colourSaturation" type="hd:colourSaturation" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="colourSaturation" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="colourSaturation" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="colourSaturationAnnc" type="hd:colourSaturationAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="colourSaturationAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="colourSaturation" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-cookerHoodJobMode-v3_7_0.xsd b/3.7.0/xsd/HD-mod-cookerHoodJobMode-v3_7_0.xsd
new file mode 100644
index 0000000..3d1f297
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-cookerHoodJobMode-v3_7_0.xsd
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="cookerHoodJobMode" type="hd:cookerHoodJobMode" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="cookerHoodJobMode" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentJobMode" type="hd:enumCookerHoodJobMode" />
+                        <xs:element name="currentJobModeName" minOccurs="0" type="xs:string" />
+                        <xs:element name="jobModes">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumCookerHoodJobMode" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="cookerHoodJobModeAnnc" type="hd:cookerHoodJobModeAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="cookerHoodJobModeAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentJobMode" minOccurs="0" type="hd:enumCookerHoodJobMode" />
+                        <xs:element name="currentJobModeName" minOccurs="0" type="xs:string" />
+                        <xs:element name="jobModes" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumCookerHoodJobMode" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-credentials-v3_7_0.xsd b/3.7.0/xsd/HD-mod-credentials-v3_7_0.xsd
new file mode 100644
index 0000000..b33524d
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-credentials-v3_7_0.xsd
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="credentials" type="hd:credentials" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="credentials" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="loginName" minOccurs="0" type="xs:string" />
+                        <xs:element name="password" minOccurs="0" type="xs:string" />
+                        <xs:element name="token" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="credentialsAnnc" type="hd:credentialsAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="credentialsAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="loginName" minOccurs="0" type="xs:string" />
+                        <xs:element name="password" minOccurs="0" type="xs:string" />
+                        <xs:element name="token" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-dehumidifierJobMode-v3_7_0.xsd b/3.7.0/xsd/HD-mod-dehumidifierJobMode-v3_7_0.xsd
new file mode 100644
index 0000000..2ef0137
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-dehumidifierJobMode-v3_7_0.xsd
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="dehumidifierJobMode" type="hd:dehumidifierJobMode" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="dehumidifierJobMode" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentJobMode" type="hd:enumDehumidifierJobMode" />
+                        <xs:element name="currentJobModeName" minOccurs="0" type="xs:string" />
+                        <xs:element name="jobModes">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumDehumidifierJobMode" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="dehumidifierJobModeAnnc" type="hd:dehumidifierJobModeAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="dehumidifierJobModeAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentJobMode" minOccurs="0" type="hd:enumDehumidifierJobMode" />
+                        <xs:element name="currentJobModeName" minOccurs="0" type="xs:string" />
+                        <xs:element name="jobModes" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumDehumidifierJobMode" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-dishWasherJobMode-v3_7_0.xsd b/3.7.0/xsd/HD-mod-dishWasherJobMode-v3_7_0.xsd
new file mode 100644
index 0000000..90f872d
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-dishWasherJobMode-v3_7_0.xsd
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="dishWasherJobMode" type="hd:dishWasherJobMode" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="dishWasherJobMode" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentJobMode" type="hd:enumDishWasherJobMode" />
+                        <xs:element name="currentJobModeName" minOccurs="0" type="xs:string" />
+                        <xs:element name="jobModes">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumDishWasherJobMode" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="dishWasherJobModeAnnc" type="hd:dishWasherJobModeAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="dishWasherJobModeAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentJobMode" minOccurs="0" type="hd:enumDishWasherJobMode" />
+                        <xs:element name="currentJobModeName" minOccurs="0" type="xs:string" />
+                        <xs:element name="jobModes" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumDishWasherJobMode" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-doorStatus-v3_7_0.xsd b/3.7.0/xsd/HD-mod-doorStatus-v3_7_0.xsd
new file mode 100644
index 0000000..8d4505d
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-doorStatus-v3_7_0.xsd
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="doorStatus" type="hd:doorStatus" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="doorStatus" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="doorState" type="hd:enumDoorState" />
+                        <xs:element name="openDuration" minOccurs="0" type="m2m:timestamp" />
+                        <xs:element name="openAlarm" minOccurs="0" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="doorStatusAnnc" type="hd:doorStatusAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="doorStatusAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="doorState" minOccurs="0" type="hd:enumDoorState" />
+                        <xs:element name="openDuration" minOccurs="0" type="m2m:timestamp" />
+                        <xs:element name="openAlarm" minOccurs="0" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-electricVehicleConnector-v3_7_0.xsd b/3.7.0/xsd/HD-mod-electricVehicleConnector-v3_7_0.xsd
new file mode 100644
index 0000000..fd490f3
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-electricVehicleConnector-v3_7_0.xsd
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="electricVehicleConnector" type="hd:electricVehicleConnector" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="electricVehicleConnector" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="status" type="xs:boolean" />
+                        <xs:element name="chargingCapacity" minOccurs="0" type="xs:integer" />
+                        <xs:element name="dischargingCapacity" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="electricVehicleConnectorAnnc" type="hd:electricVehicleConnectorAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="electricVehicleConnectorAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="status" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="chargingCapacity" minOccurs="0" type="xs:integer" />
+                        <xs:element name="dischargingCapacity" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-energyConsumption-v3_7_0.xsd b/3.7.0/xsd/HD-mod-energyConsumption-v3_7_0.xsd
new file mode 100644
index 0000000..b9403b2
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-energyConsumption-v3_7_0.xsd
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="energyConsumption" type="hd:energyConsumption" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="energyConsumption" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="power" type="xs:float" />
+                        <xs:element name="absoluteEnergyConsumption" minOccurs="0" type="xs:float" />
+                        <xs:element name="roundingEnergyConsumption" minOccurs="0" type="xs:integer" />
+                        <xs:element name="significantDigits" minOccurs="0" type="xs:integer" />
+                        <xs:element name="multiplyingFactors" minOccurs="0" type="xs:integer" />
+                        <xs:element name="voltage" minOccurs="0" type="xs:float" />
+                        <xs:element name="current" minOccurs="0" type="xs:float" />
+                        <xs:element name="frequency" minOccurs="0" type="xs:float" />
+                        <xs:element name="measuringScope" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="energyConsumptionAnnc" type="hd:energyConsumptionAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="energyConsumptionAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="power" minOccurs="0" type="xs:float" />
+                        <xs:element name="absoluteEnergyConsumption" minOccurs="0" type="xs:float" />
+                        <xs:element name="roundingEnergyConsumption" minOccurs="0" type="xs:integer" />
+                        <xs:element name="significantDigits" minOccurs="0" type="xs:integer" />
+                        <xs:element name="multiplyingFactors" minOccurs="0" type="xs:integer" />
+                        <xs:element name="voltage" minOccurs="0" type="xs:float" />
+                        <xs:element name="current" minOccurs="0" type="xs:float" />
+                        <xs:element name="frequency" minOccurs="0" type="xs:float" />
+                        <xs:element name="measuringScope" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-energyGeneration-v3_7_0.xsd b/3.7.0/xsd/HD-mod-energyGeneration-v3_7_0.xsd
new file mode 100644
index 0000000..09edde6
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-energyGeneration-v3_7_0.xsd
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="energyGeneration" type="hd:energyGeneration" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="energyGeneration" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="powerGenerationData" minOccurs="0" type="xs:float" />
+                        <xs:element name="roundingEnergyGeneration" minOccurs="0" type="xs:integer" />
+                        <xs:element name="significantDigits" minOccurs="0" type="xs:integer" />
+                        <xs:element name="multiplyingFactors" minOccurs="0" type="xs:integer" />
+                        <xs:element name="generationSource" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="energyGenerationAnnc" type="hd:energyGenerationAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="energyGenerationAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="powerGenerationData" minOccurs="0" type="xs:float" />
+                        <xs:element name="roundingEnergyGeneration" minOccurs="0" type="xs:integer" />
+                        <xs:element name="significantDigits" minOccurs="0" type="xs:integer" />
+                        <xs:element name="multiplyingFactors" minOccurs="0" type="xs:integer" />
+                        <xs:element name="generationSource" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-faultDetection-v3_7_0.xsd b/3.7.0/xsd/HD-mod-faultDetection-v3_7_0.xsd
new file mode 100644
index 0000000..4333c0a
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-faultDetection-v3_7_0.xsd
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="faultDetection" type="hd:faultDetection" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="faultDetection" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="status" type="xs:boolean" />
+                        <xs:element name="code" minOccurs="0" type="xs:integer" />
+                        <xs:element name="description" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="faultDetectionAnnc" type="hd:faultDetectionAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="faultDetectionAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="status" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="code" minOccurs="0" type="xs:integer" />
+                        <xs:element name="description" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-filterInfo-v3_7_0.xsd b/3.7.0/xsd/HD-mod-filterInfo-v3_7_0.xsd
new file mode 100644
index 0000000..eaf4cc2
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-filterInfo-v3_7_0.xsd
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="filterInfo" type="hd:filterInfo" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="filterInfo" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="status" type="xs:boolean" />
+                        <xs:element name="code" minOccurs="0" type="xs:integer" />
+                        <xs:element name="filterLifetime" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="filterInfoAnnc" type="hd:filterInfoAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="filterInfoAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="status" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="code" minOccurs="0" type="xs:integer" />
+                        <xs:element name="filterLifetime" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-foaming-v3_7_0.xsd b/3.7.0/xsd/HD-mod-foaming-v3_7_0.xsd
new file mode 100644
index 0000000..db626b3
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-foaming-v3_7_0.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="foaming" type="hd:foaming" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="foaming" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="foamingStrength" type="hd:enumFoamStrength" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="foamingAnnc" type="hd:foamingAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="foamingAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="foamingStrength" minOccurs="0" type="hd:enumFoamStrength" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-geoLocation-v3_7_0.xsd b/3.7.0/xsd/HD-mod-geoLocation-v3_7_0.xsd
new file mode 100644
index 0000000..df3ebae
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-geoLocation-v3_7_0.xsd
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="geoLocation" type="hd:geoLocation" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="geoLocation" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="latitude" type="xs:float" />
+                        <xs:element name="longitude" type="xs:float" />
+                        <xs:element name="altitude" minOccurs="0" type="xs:float" />
+                        <xs:element name="heading" minOccurs="0" type="xs:float" />
+                        <xs:element name="horizontalAccuracy" minOccurs="0" type="xs:float" />
+                        <xs:element name="verticalAccuracy" minOccurs="0" type="xs:float" />
+                        <xs:element name="headingAccuracy" minOccurs="0" type="xs:float" />
+                        <xs:element name="targetLatitude" minOccurs="0" type="xs:float" />
+                        <xs:element name="targetLongitude" minOccurs="0" type="xs:float" />
+                        <xs:element name="targetAltitude" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="geoLocationAnnc" type="hd:geoLocationAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="geoLocationAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="latitude" minOccurs="0" type="xs:float" />
+                        <xs:element name="longitude" minOccurs="0" type="xs:float" />
+                        <xs:element name="altitude" minOccurs="0" type="xs:float" />
+                        <xs:element name="heading" minOccurs="0" type="xs:float" />
+                        <xs:element name="horizontalAccuracy" minOccurs="0" type="xs:float" />
+                        <xs:element name="verticalAccuracy" minOccurs="0" type="xs:float" />
+                        <xs:element name="headingAccuracy" minOccurs="0" type="xs:float" />
+                        <xs:element name="targetLatitude" minOccurs="0" type="xs:float" />
+                        <xs:element name="targetLongitude" minOccurs="0" type="xs:float" />
+                        <xs:element name="targetAltitude" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-glucometer-v3_7_0.xsd b/3.7.0/xsd/HD-mod-glucometer-v3_7_0.xsd
new file mode 100644
index 0000000..c7f9a47
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-glucometer-v3_7_0.xsd
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="glucometer" type="hd:glucometer" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="glucometer" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="concentration" type="xs:float" />
+                        <xs:element name="hba1c" minOccurs="0" type="xs:float" />
+                        <xs:element name="contextExercise" minOccurs="0" type="xs:float" />
+                        <xs:element name="contextMedication" minOccurs="0" type="xs:float" />
+                        <xs:element name="contextCarbohydratesAmount" minOccurs="0" type="xs:float" />
+                        <xs:element name="contextCarbohydratesSource" minOccurs="0" type="xs:string" />
+                        <xs:element name="contextMeal" minOccurs="0" type="xs:string" />
+                        <xs:element name="contextLocation" minOccurs="0" type="xs:string" />
+                        <xs:element name="contextTester" minOccurs="0" type="xs:string" />
+                        <xs:element name="contextHealth" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="glucometerAnnc" type="hd:glucometerAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="glucometerAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="concentration" minOccurs="0" type="xs:float" />
+                        <xs:element name="hba1c" minOccurs="0" type="xs:float" />
+                        <xs:element name="contextExercise" minOccurs="0" type="xs:float" />
+                        <xs:element name="contextMedication" minOccurs="0" type="xs:float" />
+                        <xs:element name="contextCarbohydratesAmount" minOccurs="0" type="xs:float" />
+                        <xs:element name="contextCarbohydratesSource" minOccurs="0" type="xs:string" />
+                        <xs:element name="contextMeal" minOccurs="0" type="xs:string" />
+                        <xs:element name="contextLocation" minOccurs="0" type="xs:string" />
+                        <xs:element name="contextTester" minOccurs="0" type="xs:string" />
+                        <xs:element name="contextHealth" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-grinder-v3_7_0.xsd b/3.7.0/xsd/HD-mod-grinder-v3_7_0.xsd
new file mode 100644
index 0000000..be94f96
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-grinder-v3_7_0.xsd
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="grinder" type="hd:grinder" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="grinder" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="useGrinder" type="xs:boolean" />
+                        <xs:element name="coarseness" minOccurs="0" type="hd:enumGrindCoarseness" />
+                        <xs:element name="grainsRemaining" minOccurs="0" type="hd:enumGrainsLevel" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="grinderAnnc" type="hd:grinderAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="grinderAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="useGrinder" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="coarseness" minOccurs="0" type="hd:enumGrindCoarseness" />
+                        <xs:element name="grainsRemaining" minOccurs="0" type="hd:enumGrainsLevel" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-heatingZone-v3_7_0.xsd b/3.7.0/xsd/HD-mod-heatingZone-v3_7_0.xsd
new file mode 100644
index 0000000..a4fc1ca
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-heatingZone-v3_7_0.xsd
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="heatingZone" type="hd:heatingZone" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="heatingZone" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="heatingLevel" type="xs:integer" />
+                        <xs:element name="maxHeatingLevel" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="heatingZoneAnnc" type="hd:heatingZoneAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="heatingZoneAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="heatingLevel" minOccurs="0" type="xs:integer" />
+                        <xs:element name="maxHeatingLevel" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-height-v3_7_0.xsd b/3.7.0/xsd/HD-mod-height-v3_7_0.xsd
new file mode 100644
index 0000000..8dce8f9
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-height-v3_7_0.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="height" type="hd:height" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="height" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="height" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="heightAnnc" type="hd:heightAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="heightAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="height" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-hotWaterSupply-v3_7_0.xsd b/3.7.0/xsd/HD-mod-hotWaterSupply-v3_7_0.xsd
new file mode 100644
index 0000000..217bf34
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-hotWaterSupply-v3_7_0.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="hotWaterSupply" type="hd:hotWaterSupply" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="hotWaterSupply" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="bath" minOccurs="0" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="hotWaterSupplyAnnc" type="hd:hotWaterSupplyAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="hotWaterSupplyAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="bath" minOccurs="0" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-impactSensor-v3_7_0.xsd b/3.7.0/xsd/HD-mod-impactSensor-v3_7_0.xsd
new file mode 100644
index 0000000..987e19a
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-impactSensor-v3_7_0.xsd
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="impactSensor" type="hd:impactSensor" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="impactSensor" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="impactStatus" type="xs:boolean" />
+                        <xs:element name="impactLevel" type="xs:float" />
+                        <xs:element name="impactDirectionHorizontal" minOccurs="0" type="xs:float" />
+                        <xs:element name="impactDirectionVertical" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="impactSensorAnnc" type="hd:impactSensorAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="impactSensorAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="impactStatus" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="impactLevel" minOccurs="0" type="xs:float" />
+                        <xs:element name="impactDirectionHorizontal" minOccurs="0" type="xs:float" />
+                        <xs:element name="impactDirectionVertical" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-keepWarm-v3_7_0.xsd b/3.7.0/xsd/HD-mod-keepWarm-v3_7_0.xsd
new file mode 100644
index 0000000..6f812d8
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-keepWarm-v3_7_0.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="keepWarm" type="hd:keepWarm" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="keepWarm" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="time" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="keepWarmAnnc" type="hd:keepWarmAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="keepWarmAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="time" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-keypad-v3_7_0.xsd b/3.7.0/xsd/HD-mod-keypad-v3_7_0.xsd
new file mode 100644
index 0000000..ecd0ae0
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-keypad-v3_7_0.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="keypad" type="hd:keypad" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="keypad" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="keyNumber" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="keypadAnnc" type="hd:keypadAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="keypadAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="keyNumber" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-liquidLevel-v3_7_0.xsd b/3.7.0/xsd/HD-mod-liquidLevel-v3_7_0.xsd
new file mode 100644
index 0000000..fb7e747
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-liquidLevel-v3_7_0.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="liquidLevel" type="hd:liquidLevel" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="liquidLevel" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="liquidLevel" type="hd:enumLiquidLevel" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="liquidLevelAnnc" type="hd:liquidLevelAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="liquidLevelAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="liquidLevel" minOccurs="0" type="hd:enumLiquidLevel" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-liquidRemaining-v3_7_0.xsd b/3.7.0/xsd/HD-mod-liquidRemaining-v3_7_0.xsd
new file mode 100644
index 0000000..d3e9a61
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-liquidRemaining-v3_7_0.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="liquidRemaining" type="hd:liquidRemaining" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="liquidRemaining" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="liquidRemaining" type="hd:enumLiquidLevel" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="liquidRemainingAnnc" type="hd:liquidRemainingAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="liquidRemainingAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="liquidRemaining" minOccurs="0" type="hd:enumLiquidLevel" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-lock-v3_7_0.xsd b/3.7.0/xsd/HD-mod-lock-v3_7_0.xsd
new file mode 100644
index 0000000..aed042e
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-lock-v3_7_0.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="lock" type="hd:lock" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="lock" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="lock" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="lockAnnc" type="hd:lockAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="lockAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="lock" minOccurs="0" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-mediaSelect-v3_7_0.xsd b/3.7.0/xsd/HD-mod-mediaSelect-v3_7_0.xsd
new file mode 100644
index 0000000..0b94ca8
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-mediaSelect-v3_7_0.xsd
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="mediaSelect" type="hd:mediaSelect" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="mediaSelect" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="mediaID" type="xs:integer" />
+                        <xs:element name="supportedMediaSources">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumSupportedMediaSource" />
+                        </xs:simpleType>
+                    </xs:element>
+                        <xs:element name="mediaName" minOccurs="0" type="xs:string" />
+                        <xs:element name="status" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="mediaType" type="hd:enumSupportedMediaSource" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="mediaSelectAnnc" type="hd:mediaSelectAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="mediaSelectAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="mediaID" minOccurs="0" type="xs:integer" />
+                        <xs:element name="supportedMediaSources" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumSupportedMediaSource" />
+                        </xs:simpleType>
+                    </xs:element>
+                        <xs:element name="mediaName" minOccurs="0" type="xs:string" />
+                        <xs:element name="status" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="mediaType" minOccurs="0" type="hd:enumSupportedMediaSource" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-motionSensor-v3_7_0.xsd b/3.7.0/xsd/HD-mod-motionSensor-v3_7_0.xsd
new file mode 100644
index 0000000..1ed0c03
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-motionSensor-v3_7_0.xsd
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="motionSensor" type="hd:motionSensor" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="motionSensor" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="alarm" type="xs:boolean" />
+                        <xs:element name="silentTime" minOccurs="0" type="xs:integer" />
+                        <xs:element name="sensitivity" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="motionSensorAnnc" type="hd:motionSensorAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="motionSensorAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="alarm" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="silentTime" minOccurs="0" type="xs:integer" />
+                        <xs:element name="sensitivity" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-numberValue-v3_7_0.xsd b/3.7.0/xsd/HD-mod-numberValue-v3_7_0.xsd
new file mode 100644
index 0000000..b2edc9b
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-numberValue-v3_7_0.xsd
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-act-decrementNumberValue-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-act-incrementNumberValue-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-act-resetNumberValue-v3_7_0.xsd" />
+
+
+    <xs:element name="numberValue" type="hd:numberValue" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="numberValue" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="numberValue" type="xs:float" />
+                        <xs:element name="minValue" minOccurs="0" type="xs:float" />
+                        <xs:element name="maxValue" minOccurs="0" type="xs:float" />
+                        <xs:element name="defaultValue" minOccurs="0" type="xs:float" />
+                        <xs:element name="step" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="hd:decrementNumberValue" />
+                            <xs:element ref="hd:incrementNumberValue" />
+                            <xs:element ref="hd:resetNumberValue" />
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="numberValueAnnc" type="hd:numberValueAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="numberValueAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="numberValue" minOccurs="0" type="xs:float" />
+                        <xs:element name="minValue" minOccurs="0" type="xs:float" />
+                        <xs:element name="maxValue" minOccurs="0" type="xs:float" />
+                        <xs:element name="defaultValue" minOccurs="0" type="xs:float" />
+                        <xs:element name="step" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="hd:decrementNumberValue" />
+                            <xs:element ref="hd:incrementNumberValue" />
+                            <xs:element ref="hd:resetNumberValue" />
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-openLevel-v3_7_0.xsd b/3.7.0/xsd/HD-mod-openLevel-v3_7_0.xsd
new file mode 100644
index 0000000..14ddc8f
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-openLevel-v3_7_0.xsd
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-act-open-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-act-close-v3_7_0.xsd" />
+
+
+    <xs:element name="openLevel" type="hd:openLevel" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="openLevel" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="openLevel" type="xs:integer" />
+                        <xs:element name="stepValue" minOccurs="0" type="xs:integer" />
+                        <xs:element name="minLevel" minOccurs="0" type="xs:integer" />
+                        <xs:element name="maxLevel" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="hd:open" />
+                            <xs:element ref="hd:close" />
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="openLevelAnnc" type="hd:openLevelAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="openLevelAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="openLevel" minOccurs="0" type="xs:integer" />
+                        <xs:element name="stepValue" minOccurs="0" type="xs:integer" />
+                        <xs:element name="minLevel" minOccurs="0" type="xs:integer" />
+                        <xs:element name="maxLevel" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="hd:open" />
+                            <xs:element ref="hd:close" />
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-operationMode-v3_7_0.xsd b/3.7.0/xsd/HD-mod-operationMode-v3_7_0.xsd
new file mode 100644
index 0000000..1457b3b
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-operationMode-v3_7_0.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="operationMode" type="hd:operationMode" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="operationMode" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="startPause" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="operationModeAnnc" type="hd:operationModeAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="operationModeAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="startPause" minOccurs="0" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-overcurrentSensor-v3_7_0.xsd b/3.7.0/xsd/HD-mod-overcurrentSensor-v3_7_0.xsd
new file mode 100644
index 0000000..a3adad3
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-overcurrentSensor-v3_7_0.xsd
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="overcurrentSensor" type="hd:overcurrentSensor" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="overcurrentSensor" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="overcurrentStatus" type="xs:boolean" />
+                        <xs:element name="detectedTime" minOccurs="0" type="m2m:timestamp" />
+                        <xs:element name="duration" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="overcurrentSensorAnnc" type="hd:overcurrentSensorAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="overcurrentSensorAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="overcurrentStatus" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="detectedTime" minOccurs="0" type="m2m:timestamp" />
+                        <xs:element name="duration" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-oximeter-v3_7_0.xsd b/3.7.0/xsd/HD-mod-oximeter-v3_7_0.xsd
new file mode 100644
index 0000000..5c77561
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-oximeter-v3_7_0.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="oximeter" type="hd:oximeter" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="oximeter" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="oxygenSaturation" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="oximeterAnnc" type="hd:oximeterAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="oximeterAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="oxygenSaturation" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-ozoneMeter-v3_7_0.xsd b/3.7.0/xsd/HD-mod-ozoneMeter-v3_7_0.xsd
new file mode 100644
index 0000000..0168074
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-ozoneMeter-v3_7_0.xsd
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="ozoneMeter" type="hd:ozoneMeter" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="ozoneMeter" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="ozoneValuePPM" minOccurs="0" type="xs:float" />
+                        <xs:element name="ozoneValueMG" minOccurs="0" type="xs:float" />
+                        <xs:element name="ozoneStatus" minOccurs="0" type="hd:enumOzoneStatus" />
+                        <xs:element name="maxValue" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="ozoneMeterAnnc" type="hd:ozoneMeterAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="ozoneMeterAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="ozoneValuePPM" minOccurs="0" type="xs:float" />
+                        <xs:element name="ozoneValueMG" minOccurs="0" type="xs:float" />
+                        <xs:element name="ozoneStatus" minOccurs="0" type="hd:enumOzoneStatus" />
+                        <xs:element name="maxValue" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-phoneCall-v3_7_0.xsd b/3.7.0/xsd/HD-mod-phoneCall-v3_7_0.xsd
new file mode 100644
index 0000000..8443f2e
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-phoneCall-v3_7_0.xsd
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-act-call-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-act-answer-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-act-hangup-v3_7_0.xsd" />
+
+
+    <xs:element name="phoneCall" type="hd:phoneCall" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="phoneCall" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="callerID" type="xs:string" />
+                        <xs:element name="recipientID" type="xs:string" />
+                        <xs:element name="callState" minOccurs="0" type="hd:enumCallState" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="hd:call" />
+                            <xs:element ref="hd:answer" />
+                            <xs:element ref="hd:hangup" />
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="phoneCallAnnc" type="hd:phoneCallAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="phoneCallAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="callerID" minOccurs="0" type="xs:string" />
+                        <xs:element name="recipientID" minOccurs="0" type="xs:string" />
+                        <xs:element name="callState" minOccurs="0" type="hd:enumCallState" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="hd:call" />
+                            <xs:element ref="hd:answer" />
+                            <xs:element ref="hd:hangup" />
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-playerControl-v3_7_0.xsd b/3.7.0/xsd/HD-mod-playerControl-v3_7_0.xsd
new file mode 100644
index 0000000..cc7a2d6
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-playerControl-v3_7_0.xsd
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-act-nextTrack-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-act-previousTrack-v3_7_0.xsd" />
+
+
+    <xs:element name="playerControl" type="hd:playerControl" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="playerControl" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentPlayerMode" type="hd:enumPlayerMode" />
+                        <xs:element name="currentPlayerModeName" minOccurs="0" type="xs:string" />
+                        <xs:element name="supportedPlayerModes">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumPlayerMode" />
+                        </xs:simpleType>
+                    </xs:element>
+                        <xs:element name="speedFactor" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="hd:nextTrack" />
+                            <xs:element ref="hd:previousTrack" />
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="playerControlAnnc" type="hd:playerControlAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="playerControlAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentPlayerMode" minOccurs="0" type="hd:enumPlayerMode" />
+                        <xs:element name="currentPlayerModeName" minOccurs="0" type="xs:string" />
+                        <xs:element name="supportedPlayerModes" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumPlayerMode" />
+                        </xs:simpleType>
+                    </xs:element>
+                        <xs:element name="speedFactor" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="hd:nextTrack" />
+                            <xs:element ref="hd:previousTrack" />
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-powerSave-v3_7_0.xsd b/3.7.0/xsd/HD-mod-powerSave-v3_7_0.xsd
new file mode 100644
index 0000000..34d7f5f
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-powerSave-v3_7_0.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="powerSave" type="hd:powerSave" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="powerSave" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="powerSaveEnabled" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="powerSaveAnnc" type="hd:powerSaveAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="powerSaveAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="powerSaveEnabled" minOccurs="0" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-printQueue-v3_7_0.xsd b/3.7.0/xsd/HD-mod-printQueue-v3_7_0.xsd
new file mode 100644
index 0000000..5e0c4dd
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-printQueue-v3_7_0.xsd
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="printQueue" type="hd:printQueue" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="printQueue" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="uri">
+                        <xs:simpleType>
+                            <xs:list itemType="xs:anyURI" />
+                        </xs:simpleType>
+                    </xs:element>
+                        <xs:element name="printingState">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumJobState" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="printQueueAnnc" type="hd:printQueueAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="printQueueAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="uri" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="xs:anyURI" />
+                        </xs:simpleType>
+                    </xs:element>
+                        <xs:element name="printingState" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumJobState" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-pulsemeter-v3_7_0.xsd b/3.7.0/xsd/HD-mod-pulsemeter-v3_7_0.xsd
new file mode 100644
index 0000000..ef9d4ea
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-pulsemeter-v3_7_0.xsd
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="pulsemeter" type="hd:pulsemeter" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="pulsemeter" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="pulseRate" type="xs:float" />
+                        <xs:element name="rr" type="xs:float" />
+                        <xs:element name="energy" minOccurs="0" type="xs:float" />
+                        <xs:element name="modality" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="pulsemeterAnnc" type="hd:pulsemeterAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="pulsemeterAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="pulseRate" minOccurs="0" type="xs:float" />
+                        <xs:element name="rr" minOccurs="0" type="xs:float" />
+                        <xs:element name="energy" minOccurs="0" type="xs:float" />
+                        <xs:element name="modality" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-pushButton-v3_7_0.xsd b/3.7.0/xsd/HD-mod-pushButton-v3_7_0.xsd
new file mode 100644
index 0000000..866e8a7
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-pushButton-v3_7_0.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="pushButton" type="hd:pushButton" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="pushButton" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="pushed" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="pushButtonAnnc" type="hd:pushButtonAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="pushButtonAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="pushed" minOccurs="0" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-recorder-v3_7_0.xsd b/3.7.0/xsd/HD-mod-recorder-v3_7_0.xsd
new file mode 100644
index 0000000..e76c6b7
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-recorder-v3_7_0.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="recorder" type="hd:recorder" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="recorder" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="duration" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="recorderAnnc" type="hd:recorderAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="recorderAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="duration" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-refrigeration-v3_7_0.xsd b/3.7.0/xsd/HD-mod-refrigeration-v3_7_0.xsd
new file mode 100644
index 0000000..e770602
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-refrigeration-v3_7_0.xsd
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="refrigeration" type="hd:refrigeration" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="refrigeration" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="rapidFreeze" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="rapidCool" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="defrost" minOccurs="0" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="refrigerationAnnc" type="hd:refrigerationAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="refrigerationAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="rapidFreeze" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="rapidCool" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="defrost" minOccurs="0" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-relativeHumidity-v3_7_0.xsd b/3.7.0/xsd/HD-mod-relativeHumidity-v3_7_0.xsd
new file mode 100644
index 0000000..41a58fa
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-relativeHumidity-v3_7_0.xsd
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="relativeHumidity" type="hd:relativeHumidity" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="relativeHumidity" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="relativeHumidity" type="xs:float" />
+                        <xs:element name="desiredHumidity" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="relativeHumidityAnnc" type="hd:relativeHumidityAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="relativeHumidityAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="relativeHumidity" minOccurs="0" type="xs:float" />
+                        <xs:element name="desiredHumidity" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-remoteControlEnable-v3_7_0.xsd b/3.7.0/xsd/HD-mod-remoteControlEnable-v3_7_0.xsd
new file mode 100644
index 0000000..c1a776a
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-remoteControlEnable-v3_7_0.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="remoteControlEnable" type="hd:remoteControlEnable" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="remoteControlEnable" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="remoteControlEnabled" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="remoteControlEnableAnnc" type="hd:remoteControlEnableAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="remoteControlEnableAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="remoteControlEnabled" minOccurs="0" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-robotCleanerJobMode-v3_7_0.xsd b/3.7.0/xsd/HD-mod-robotCleanerJobMode-v3_7_0.xsd
new file mode 100644
index 0000000..642b2c7
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-robotCleanerJobMode-v3_7_0.xsd
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="robotCleanerJobMode" type="hd:robotCleanerJobMode" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="robotCleanerJobMode" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentJobMode" type="hd:enumRobotCleanerJobMode" />
+                        <xs:element name="currentJobModeName" minOccurs="0" type="xs:string" />
+                        <xs:element name="jobModes">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumRobotCleanerJobMode" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="robotCleanerJobModeAnnc" type="hd:robotCleanerJobModeAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="robotCleanerJobModeAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentJobMode" minOccurs="0" type="hd:enumRobotCleanerJobMode" />
+                        <xs:element name="currentJobModeName" minOccurs="0" type="xs:string" />
+                        <xs:element name="jobModes" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumRobotCleanerJobMode" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-runState-v3_7_0.xsd b/3.7.0/xsd/HD-mod-runState-v3_7_0.xsd
new file mode 100644
index 0000000..16812d5
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-runState-v3_7_0.xsd
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="runState" type="hd:runState" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="runState" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentMachineState" type="hd:enumMachineState" />
+                        <xs:element name="machineStates">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumMachineState" />
+                        </xs:simpleType>
+                    </xs:element>
+                        <xs:element name="currentJobState" minOccurs="0" type="hd:enumJobState" />
+                        <xs:element name="jobStates" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumJobState" />
+                        </xs:simpleType>
+                    </xs:element>
+                        <xs:element name="progressPercentage" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="runStateAnnc" type="hd:runStateAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="runStateAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentMachineState" minOccurs="0" type="hd:enumMachineState" />
+                        <xs:element name="machineStates" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumMachineState" />
+                        </xs:simpleType>
+                    </xs:element>
+                        <xs:element name="currentJobState" minOccurs="0" type="hd:enumJobState" />
+                        <xs:element name="jobStates" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumJobState" />
+                        </xs:simpleType>
+                    </xs:element>
+                        <xs:element name="progressPercentage" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-securityMode-v3_7_0.xsd b/3.7.0/xsd/HD-mod-securityMode-v3_7_0.xsd
new file mode 100644
index 0000000..d1803ce
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-securityMode-v3_7_0.xsd
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="securityMode" type="hd:securityMode" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="securityMode" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentSecurityMode" type="hd:enumSecurityMode" />
+                        <xs:element name="securityModes">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumSecurityMode" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="securityModeAnnc" type="hd:securityModeAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="securityModeAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentSecurityMode" minOccurs="0" type="hd:enumSecurityMode" />
+                        <xs:element name="securityModes" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumSecurityMode" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-sessionDescription-v3_7_0.xsd b/3.7.0/xsd/HD-mod-sessionDescription-v3_7_0.xsd
new file mode 100644
index 0000000..cdd0ad5
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-sessionDescription-v3_7_0.xsd
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="sessionDescription" type="hd:sessionDescription" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="sessionDescription" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="url" minOccurs="0" type="xs:anyURI" />
+                        <xs:element name="sdp" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="sessionDescriptionAnnc" type="hd:sessionDescriptionAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="sessionDescriptionAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="url" minOccurs="0" type="xs:anyURI" />
+                        <xs:element name="sdp" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-signalStrength-v3_7_0.xsd b/3.7.0/xsd/HD-mod-signalStrength-v3_7_0.xsd
new file mode 100644
index 0000000..3033665
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-signalStrength-v3_7_0.xsd
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="signalStrength" type="hd:signalStrength" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="signalStrength" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="lqi" type="xs:integer" />
+                        <xs:element name="rssi" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="signalStrengthAnnc" type="hd:signalStrengthAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="signalStrengthAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="lqi" minOccurs="0" type="xs:integer" />
+                        <xs:element name="rssi" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-smokeSensor-v3_7_0.xsd b/3.7.0/xsd/HD-mod-smokeSensor-v3_7_0.xsd
new file mode 100644
index 0000000..63d3dd4
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-smokeSensor-v3_7_0.xsd
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="smokeSensor" type="hd:smokeSensor" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="smokeSensor" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="alarm" type="xs:boolean" />
+                        <xs:element name="detectedTime" minOccurs="0" type="m2m:timestamp" />
+                        <xs:element name="smokeThreshhold" minOccurs="0" type="xs:integer" />
+                        <xs:element name="currentValue" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="smokeSensorAnnc" type="hd:smokeSensorAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="smokeSensorAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="alarm" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="detectedTime" minOccurs="0" type="m2m:timestamp" />
+                        <xs:element name="smokeThreshhold" minOccurs="0" type="xs:integer" />
+                        <xs:element name="currentValue" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-sphygmomanometer-v3_7_0.xsd b/3.7.0/xsd/HD-mod-sphygmomanometer-v3_7_0.xsd
new file mode 100644
index 0000000..0bf656f
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-sphygmomanometer-v3_7_0.xsd
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="sphygmomanometer" type="hd:sphygmomanometer" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="sphygmomanometer" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="diastolicPressure" type="xs:float" />
+                        <xs:element name="systolicPressure" type="xs:float" />
+                        <xs:element name="meanPressure" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="sphygmomanometerAnnc" type="hd:sphygmomanometerAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="sphygmomanometerAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="diastolicPressure" minOccurs="0" type="xs:float" />
+                        <xs:element name="systolicPressure" minOccurs="0" type="xs:float" />
+                        <xs:element name="meanPressure" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-spinLevel-v3_7_0.xsd b/3.7.0/xsd/HD-mod-spinLevel-v3_7_0.xsd
new file mode 100644
index 0000000..02b6d62
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-spinLevel-v3_7_0.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="spinLevel" type="hd:spinLevel" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="spinLevel" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="spinLevelStrength" type="hd:enumSpinLevelStrength" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="spinLevelAnnc" type="hd:spinLevelAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="spinLevelAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="spinLevelStrength" minOccurs="0" type="hd:enumSpinLevelStrength" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-steamClosetJobMode-v3_7_0.xsd b/3.7.0/xsd/HD-mod-steamClosetJobMode-v3_7_0.xsd
new file mode 100644
index 0000000..7b0ba8c
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-steamClosetJobMode-v3_7_0.xsd
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="steamClosetJobMode" type="hd:steamClosetJobMode" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="steamClosetJobMode" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentJobMode" type="hd:enumSteamClosetJobMode" />
+                        <xs:element name="currentJobModeName" type="xs:string" />
+                        <xs:element name="jobModes">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumSteamClosetJobMode" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="steamClosetJobModeAnnc" type="hd:steamClosetJobModeAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="steamClosetJobModeAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentJobMode" minOccurs="0" type="hd:enumSteamClosetJobMode" />
+                        <xs:element name="currentJobModeName" minOccurs="0" type="xs:string" />
+                        <xs:element name="jobModes" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="hd:enumSteamClosetJobMode" />
+                        </xs:simpleType>
+                    </xs:element>
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-televisionChannel-v3_7_0.xsd b/3.7.0/xsd/HD-mod-televisionChannel-v3_7_0.xsd
new file mode 100644
index 0000000..93bfe26
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-televisionChannel-v3_7_0.xsd
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-act-upChannel-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-act-downChannel-v3_7_0.xsd" />
+
+
+    <xs:element name="televisionChannel" type="hd:televisionChannel" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="televisionChannel" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="channelId" type="xs:integer" />
+                        <xs:element name="availableChannels" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="xs:integer" />
+                        </xs:simpleType>
+                    </xs:element>
+                        <xs:element name="previousChannel" minOccurs="0" type="xs:integer" />
+                        <xs:element name="channelName" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="hd:upChannel" />
+                            <xs:element ref="hd:downChannel" />
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="televisionChannelAnnc" type="hd:televisionChannelAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="televisionChannelAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="channelId" minOccurs="0" type="xs:integer" />
+                        <xs:element name="availableChannels" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="xs:integer" />
+                        </xs:simpleType>
+                    </xs:element>
+                        <xs:element name="previousChannel" minOccurs="0" type="xs:integer" />
+                        <xs:element name="channelName" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="hd:upChannel" />
+                            <xs:element ref="hd:downChannel" />
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-temperature-v3_7_0.xsd b/3.7.0/xsd/HD-mod-temperature-v3_7_0.xsd
new file mode 100644
index 0000000..6ad6bd5
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-temperature-v3_7_0.xsd
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="temperature" type="hd:temperature" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="temperature" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentTemperature" type="xs:float" />
+                        <xs:element name="targetTemperature" minOccurs="0" type="xs:float" />
+                        <xs:element name="unit" minOccurs="0" type="xs:string" />
+                        <xs:element name="minValue" minOccurs="0" type="xs:float" />
+                        <xs:element name="maxValue" minOccurs="0" type="xs:float" />
+                        <xs:element name="stepValue" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="temperatureAnnc" type="hd:temperatureAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="temperatureAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="currentTemperature" minOccurs="0" type="xs:float" />
+                        <xs:element name="targetTemperature" minOccurs="0" type="xs:float" />
+                        <xs:element name="unit" minOccurs="0" type="xs:string" />
+                        <xs:element name="minValue" minOccurs="0" type="xs:float" />
+                        <xs:element name="maxValue" minOccurs="0" type="xs:float" />
+                        <xs:element name="stepValue" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-temperatureAlarm-v3_7_0.xsd b/3.7.0/xsd/HD-mod-temperatureAlarm-v3_7_0.xsd
new file mode 100644
index 0000000..098e92c
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-temperatureAlarm-v3_7_0.xsd
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="temperatureAlarm" type="hd:temperatureAlarm" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="temperatureAlarm" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="alarm" type="xs:boolean" />
+                        <xs:element name="temperature" minOccurs="0" type="xs:float" />
+                        <xs:element name="temperatureThreshhold" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="temperatureAlarmAnnc" type="hd:temperatureAlarmAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="temperatureAlarmAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="alarm" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="temperature" minOccurs="0" type="xs:float" />
+                        <xs:element name="temperatureThreshhold" minOccurs="0" type="xs:integer" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-textMessage-v3_7_0.xsd b/3.7.0/xsd/HD-mod-textMessage-v3_7_0.xsd
new file mode 100644
index 0000000..954353c
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-textMessage-v3_7_0.xsd
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-act-resetTextMessage-v3_7_0.xsd" />
+
+
+    <xs:element name="textMessage" type="hd:textMessage" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="textMessage" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="textMessage" type="xs:string" />
+                        <xs:element name="supportedMessageValues" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="xs:string" />
+                        </xs:simpleType>
+                    </xs:element>
+                        <xs:element name="minLength" minOccurs="0" type="xs:integer" />
+                        <xs:element name="maxLength" minOccurs="0" type="xs:integer" />
+                        <xs:element name="messageEncoding" minOccurs="0" type="xs:string" />
+                        <xs:element name="defaultValue" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="hd:resetTextMessage" />
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="textMessageAnnc" type="hd:textMessageAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="textMessageAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="textMessage" minOccurs="0" type="xs:string" />
+                        <xs:element name="supportedMessageValues" minOccurs="0">
+                        <xs:simpleType>
+                            <xs:list itemType="xs:string" />
+                        </xs:simpleType>
+                    </xs:element>
+                        <xs:element name="minLength" minOccurs="0" type="xs:integer" />
+                        <xs:element name="maxLength" minOccurs="0" type="xs:integer" />
+                        <xs:element name="messageEncoding" minOccurs="0" type="xs:string" />
+                        <xs:element name="defaultValue" minOccurs="0" type="xs:string" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="hd:resetTextMessage" />
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-threeDPrinter-v3_7_0.xsd b/3.7.0/xsd/HD-mod-threeDPrinter-v3_7_0.xsd
new file mode 100644
index 0000000..06299e0
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-threeDPrinter-v3_7_0.xsd
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-act-start3Dprint-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-act-stop3Dprint-v3_7_0.xsd" />
+
+
+    <xs:element name="threeDPrinter" type="hd:threeDPrinter" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="threeDPrinter" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="printType" type="hd:enum3DPrinterTechnology" />
+                        <xs:element name="printSizeX" type="xs:float" />
+                        <xs:element name="printSizeY" type="xs:float" />
+                        <xs:element name="printSizeZ" type="xs:float" />
+                        <xs:element name="network" type="xs:boolean" />
+                        <xs:element name="memorySize" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="hd:start3Dprint" />
+                            <xs:element ref="hd:stop3Dprint" />
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="threeDPrinterAnnc" type="hd:threeDPrinterAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="threeDPrinterAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="printType" minOccurs="0" type="hd:enum3DPrinterTechnology" />
+                        <xs:element name="printSizeX" minOccurs="0" type="xs:float" />
+                        <xs:element name="printSizeY" minOccurs="0" type="xs:float" />
+                        <xs:element name="printSizeZ" minOccurs="0" type="xs:float" />
+                        <xs:element name="network" minOccurs="0" type="xs:boolean" />
+                        <xs:element name="memorySize" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="hd:start3Dprint" />
+                            <xs:element ref="hd:stop3Dprint" />
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-timer-v3_7_0.xsd b/3.7.0/xsd/HD-mod-timer-v3_7_0.xsd
new file mode 100644
index 0000000..ea7ab79
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-timer-v3_7_0.xsd
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-act-activateClockTimer-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-act-deactivateClockTimer-v3_7_0.xsd" />
+
+
+    <xs:element name="timer" type="hd:timer" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="timer" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="referenceTimer" minOccurs="0" type="xs:integer" />
+                        <xs:element name="targetTimeToStart" minOccurs="0" type="xs:integer" />
+                        <xs:element name="targetTimeToStop" minOccurs="0" type="xs:integer" />
+                        <xs:element name="estimatedTimeToEnd" minOccurs="0" type="xs:integer" />
+                        <xs:element name="runningTime" minOccurs="0" type="xs:integer" />
+                        <xs:element name="targetDuration" minOccurs="0" type="xs:integer" />
+                        <xs:element name="absoluteStartTime" minOccurs="0" type="m2m:timestamp" />
+                        <xs:element name="absoluteStopTime" minOccurs="0" type="m2m:timestamp" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="hd:activateClockTimer" />
+                            <xs:element ref="hd:deactivateClockTimer" />
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="timerAnnc" type="hd:timerAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="timerAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="referenceTimer" minOccurs="0" type="xs:integer" />
+                        <xs:element name="targetTimeToStart" minOccurs="0" type="xs:integer" />
+                        <xs:element name="targetTimeToStop" minOccurs="0" type="xs:integer" />
+                        <xs:element name="estimatedTimeToEnd" minOccurs="0" type="xs:integer" />
+                        <xs:element name="runningTime" minOccurs="0" type="xs:integer" />
+                        <xs:element name="targetDuration" minOccurs="0" type="xs:integer" />
+                        <xs:element name="absoluteStartTime" minOccurs="0" type="m2m:timestamp" />
+                        <xs:element name="absoluteStopTime" minOccurs="0" type="m2m:timestamp" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                            <xs:element ref="hd:activateClockTimer" />
+                            <xs:element ref="hd:deactivateClockTimer" />
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-turbo-v3_7_0.xsd b/3.7.0/xsd/HD-mod-turbo-v3_7_0.xsd
new file mode 100644
index 0000000..5241618
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-turbo-v3_7_0.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="turbo" type="hd:turbo" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="turbo" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="turboEnabled" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="turboAnnc" type="hd:turboAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="turboAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="turboEnabled" minOccurs="0" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-uvSensor-v3_7_0.xsd b/3.7.0/xsd/HD-mod-uvSensor-v3_7_0.xsd
new file mode 100644
index 0000000..1e9692f
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-uvSensor-v3_7_0.xsd
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="uvSensor" type="hd:uvSensor" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="uvSensor" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="uvValue" type="xs:float" />
+                        <xs:element name="uvStatus" minOccurs="0" type="hd:enumUvStatus" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="uvSensorAnnc" type="hd:uvSensorAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="uvSensorAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="uvValue" minOccurs="0" type="xs:float" />
+                        <xs:element name="uvStatus" minOccurs="0" type="hd:enumUvStatus" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-waterFlow-v3_7_0.xsd b/3.7.0/xsd/HD-mod-waterFlow-v3_7_0.xsd
new file mode 100644
index 0000000..54c1c7b
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-waterFlow-v3_7_0.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="waterFlow" type="hd:waterFlow" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="waterFlow" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="waterFlowStrength" type="hd:enumWaterFlowStrength" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="waterFlowAnnc" type="hd:waterFlowAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="waterFlowAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="waterFlowStrength" minOccurs="0" type="hd:enumWaterFlowStrength" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-waterSensor-v3_7_0.xsd b/3.7.0/xsd/HD-mod-waterSensor-v3_7_0.xsd
new file mode 100644
index 0000000..3542440
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-waterSensor-v3_7_0.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="waterSensor" type="hd:waterSensor" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="waterSensor" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="alarm" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="waterSensorAnnc" type="hd:waterSensorAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="waterSensorAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="alarm" minOccurs="0" type="xs:boolean" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-mod-weight-v3_7_0.xsd b/3.7.0/xsd/HD-mod-weight-v3_7_0.xsd
new file mode 100644
index 0000000..3fed3a4
--- /dev/null
+++ b/3.7.0/xsd/HD-mod-weight-v3_7_0.xsd
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+
+
+    <xs:element name="weight" type="hd:weight" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="weight" >
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="weight" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="weightAnnc" type="hd:weightAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="weightAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                        <xs:element name="weight" minOccurs="0" type="xs:float" />
+
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+
+                            <xs:element ref="m2m:subscription" />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-subDeviceCuff-v3_7_0.xsd b/3.7.0/xsd/HD-subDeviceCuff-v3_7_0.xsd
new file mode 100644
index 0000000..131e4ef
--- /dev/null
+++ b/3.7.0/xsd/HD-subDeviceCuff-v3_7_0.xsd
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-sphygmomanometer-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-pulsemeter-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="subDeviceCuff" type="hd:subDeviceCuff" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="subDeviceCuff">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:sphygmomanometer" />
+                                <xs:element ref="hd:pulsemeter" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="subDeviceCuffAnnc" type="hd:subDeviceCuffAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="subDeviceCuffAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:sphygmomanometer" />
+                                <xs:element ref="hd:sphygmomanometerAnnc" />
+                                <xs:element ref="hd:pulsemeter" />
+                                <xs:element ref="hd:pulsemeterAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
diff --git a/3.7.0/xsd/HD-subDevicePowerOutlet-v3_7_0.xsd b/3.7.0/xsd/HD-subDevicePowerOutlet-v3_7_0.xsd
new file mode 100644
index 0000000..405f05b
--- /dev/null
+++ b/3.7.0/xsd/HD-subDevicePowerOutlet-v3_7_0.xsd
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+
+(c) 2018, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
+
+
+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.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols/homedomain"
+    xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:hd="http://www.onem2m.org/xml/protocols/homedomain" elementFormDefault="unqualified" attributeFormDefault="unqualified"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-subscription-v3_7_0.xsd" />
+    <xs:import namespace="http://www.onem2m.org/xml/protocols" schemaLocation="CDT-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-enumerationTypes-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-commonTypes-v3_7_0.xsd" />
+
+    <xs:include schemaLocation="HD-mod-binarySwitch-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-energyConsumption-v3_7_0.xsd" />
+    <xs:include schemaLocation="HD-mod-overcurrentSensor-v3_7_0.xsd" />
+
+
+
+
+    <xs:element name="subDevicePowerOutlet" type="hd:subDevicePowerOutlet" substitutionGroup="m2m:sg_flexContainerResource" />
+    <xs:complexType name="subDevicePowerOutlet">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "flexContainerResource" -->
+            <xs:extension base="m2m:flexContainerResource">
+                <xs:sequence>
+                
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+                    
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:energyConsumption" />
+                                <xs:element ref="hd:overcurrentSensor" />
+                                <xs:element ref="hd:dimmingLevel" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+    <xs:element name="subDevicePowerOutletAnnc" type="hd:subDevicePowerOutletAnnc" substitutionGroup="m2m:sg_announcedFlexContainerResource" />
+    <xs:complexType name="subDevicePowerOutletAnnc">
+        <xs:complexContent>
+            <!-- Inherit Common Attributes from data type "announcedFlexContainerResource" -->
+            <xs:extension base="m2m:announcedFlexContainerResource">
+                <xs:sequence>
+
+                    <!-- Resource Specific Attributes -->
+
+                    <!-- Child Resources -->
+
+                    <xs:choice minOccurs="0" maxOccurs="1">
+                        <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+                        <xs:choice minOccurs="1" maxOccurs="unbounded">
+                                <xs:element ref="hd:binarySwitch" />
+                                <xs:element ref="hd:binarySwitchAnnc" />
+                                <xs:element ref="hd:energyConsumption" />
+                                <xs:element ref="hd:energyConsumptionAnnc" />
+                                <xs:element ref="hd:overcurrentSensor" />
+                                <xs:element ref="hd:overcurrentSensorAnnc" />
+                                <xs:element ref="hd:dimmingLevel" />
+                                <xs:element ref="hd:dimmingLevelAnnc" />
+
+
+                            <xs:element ref="m2m:subscription"  />
+                        </xs:choice>
+                    </xs:choice>
+
+                </xs:sequence>
+            </xs:extension>
+        </xs:complexContent>
+    </xs:complexType>
+
+</xs:schema>
-- 
GitLab