Repository: plugwise/python-plugwise (language: python)

Issue:
Bug-fix and testing: make it possible to emulate binary_sensors, climates, numbers, sensors, switches, etc., updating.
All changesd:
- Testing: make it possible to emulate binary_sensors, climates, numbers, sensors, switches, etc., updating.
- Fix a bug which prevents the updating of the available-state of zigbee devices.


Discussion / hints:
## [Codecov](https://app.codecov.io/gh/plugwise/python-plugwise/pull/391?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=plugwise) Report
> Merging [#391](https://app.codecov.io/gh/plugwise/python-plugwise/pull/391?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=plugwise) (fa5efb2) into [main](https://app.codecov.io/gh/plugwise/python-plugwise/commit/7719d7f6416c834e87a4c22ec98837e8e964ef4f?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=plugwise) (7719d7f) will **not change** coverage.
> The diff coverage is `100.00%`.

```diff
@@            Coverage Diff            @@
##              main      #391   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files            6         6           
  Lines         2680      2698   +18     
=========================================
+ Hits          2680      2698   +18     
```


| [Files Changed](https://app.codecov.io/gh/plugwise/python-plugwise/pull/391?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=plugwise) | Coverage Δ | |
|---|---|---|
| [plugwise/\_\_init\_\_.py](https://app.codecov.io/gh/plugwise/python-plugwise/pull/391?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=plugwise#diff-cGx1Z3dpc2UvX19pbml0X18ucHk=) | `100.00% <100.00%> (ø)` | |
| [tests/test\_smile.py](https://app.codecov.io/gh/plugwise/python-plugwise/pull/391?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=plugwise#diff-dGVzdHMvdGVzdF9zbWlsZS5weQ==) | `100.00% <100.00%> (ø)` | |

:mega: We’re building smart automated test selection to slash your CI/CD build times. [Learn more](https://about.codecov.io/iterative-testing/?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=plugwise)

Let's review and merge before this PR becomes too large :)

Fix patch:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 583e40e98..a85529522 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,12 @@
 # Changelog
 
-## Ongoing
+## v0.32.3 Improve quality by extended testing, bugfix
 
 - Testing: make it possible to emulate binary_sensors, climates, numbers, sensors, switches, etc., updating.
-- Fix a bug which prevents the updating of the available-state of zigbee devices.
-- Modify the added P1 Plugwise notification so that it does not impact the device-availability
+- Add extra updated-testcases for each platform.
+- Fix a bug which prevents the updating of the available-state of zigbee devices (correct data-collection at updating).
+- Optimize first-time data-collection at initialization.
+- Modify the added P1 Plugwise notification so that it does not impact the device-availability.
 
 ## v0.32.2 Continuous improvements, bugfix
 
diff --git a/plugwise/__init__.py b/plugwise/__init__.py
index 71a963c44..9518878cd 100644
--- a/plugwise/__init__.py
+++ b/plugwise/__init__.py
@@ -25,6 +25,7 @@
     MIN_SETPOINT,
     MODULES,
     NOTIFICATIONS,
+    REQUIRE_APPLIANCES,
     RULES,
     SMILES,
     STATUS,
@@ -474,13 +475,12 @@ async def _smile_detect(self, result: etree, dsmrmain: etree) -> None:
 
     async def _full_update_device(self) -> None:
         """Perform a first fetch of all XML data, needed for initialization."""
+        await self._update_domain_objects()
         self._locations = await self._request(LOCATIONS)
         self._modules = await self._request(MODULES)
-
-        # P1 legacy has no appliances and nothing of interest in domain_objects
+        # P1 legacy has no appliances
         if not (self.smile_type == "power" and self._smile_legacy):
             self._appliances = await self._request(APPLIANCES)
-            await self._update_domain_objects()
 
     async def _update_domain_objects(self) -> None:
         """Helper-function for smile.py: full_update_device() and async_update().
@@ -506,19 +506,16 @@ async def _update_domain_objects(self) -> None:
 
     async def async_update(self) -> PlugwiseData:
         """Perform an incremental update for updating the various device states."""
+        await self._update_domain_objects()
         match self._target_smile:
             case "smile_v2":
                 self._modules = await self._request(MODULES)
             case "smile_v3" | "smile_v4":
                 self._locations = await self._request(LOCATIONS)
-            case "smile_thermo_v1" | "smile_thermo_v3" | "smile_thermo_v4":
-                self._appliances = await self._request(APPLIANCES)
-                await self._update_domain_objects()
             case "smile_open_therm_v2" | "smile_open_therm_v3":
                 self._appliances = await self._request(APPLIANCES)
-                await self._update_domain_objects()
                 self._modules = await self._request(MODULES)
-            case "stretch_v2" | "stretch_v3":
+            case self._target_smile if self._target_smile in REQUIRE_APPLIANCES:
                 self._appliances = await self._request(APPLIANCES)
 
         self.gw_data["notifications"] = self._notifications
diff --git a/plugwise/constants.py b/plugwise/constants.py
index b6762183a..8cfc1b8d0 100644
--- a/plugwise/constants.py
+++ b/plugwise/constants.py
@@ -200,6 +200,13 @@
     "stretch_v2": SMILE("stretch", "Stretch"),
     "stretch_v3": SMILE("stretch", "Stretch"),
 }
+REQUIRE_APPLIANCES: Final[list[str]] = [
+    "smile_thermo_v1",
+    "smile_thermo_v3",
+    "smile_thermo_v4",
+    "stretch_v2",
+    "stretch_v3",
+]
 
 # Class, Literal and related tuple-definitions
 
diff --git a/pyproject.toml b/pyproject.toml
index 5148045f4..e88351c6d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "plugwise"
-version         = "0.32.2"
+version         = "0.32.3"
 license         = {file = "LICENSE"}
 description     = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3."
 readme          = "README.md"
diff --git a/userdata/updated/p1v4_442_single/core.appliances.xml b/userdata/updated/p1v4_442_single/core.appliances.xml
new file mode 100644
index 000000000..8e344a4fc
--- /dev/null
+++ b/userdata/updated/p1v4_442_single/core.appliances.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<appliances>
+	<appliance id='ba4de7613517478da82dd9b6abea36af'>
+		<name>Gateway</name>
+		<description>Container for variables logged about the Gateway in general.</description>
+		<type>gateway</type>
+		<created_date>2019-11-19T10:21:26.199+01:00</created_date>
+		<modified_date>2022-12-24T10:15:43.205+01:00</modified_date>
+		<deleted_date></deleted_date>
+		<groups/>
+		<logs>
+			<point_log id='400e04683dd94718ada7ff8a8c1d7466'>
+				<type>signal_strength</type>
+				<unit>dBm</unit>
+				<updated_date>2022-12-24T10:15:43.164+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T10:15:43.164+01:00</last_consecutive_log_date>
+				<interval/>
+				<signal_strength id='cb6934a63ceb43be9fb69db78f2065d0'/>
+				<period start_date="2022-12-24T10:15:43.164+01:00" end_date="2022-12-24T10:15:43.164+01:00">
+					<measurement log_date="2022-12-24T10:15:43.164+01:00">-71.00</measurement>
+				</period>
+			</point_log>
+			<point_log id='4de35aefb34f498caf5cc595fc6df60b'>
+				<type>link_quality</type>
+				<unit></unit>
+				<updated_date>2022-12-24T10:15:43.164+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T10:15:43.164+01:00</last_consecutive_log_date>
+				<interval/>
+				<link_quality id='332138ddfe334e4397b9523d67c05a56'/>
+				<period start_date="2022-12-24T10:15:43.164+01:00" end_date="2022-12-24T10:15:43.164+01:00">
+					<measurement log_date="2022-12-24T10:15:43.164+01:00">39</measurement>
+				</period>
+			</point_log>
+			<point_log id='7c4e66de4d234a3ab161280d8d7e9ab3'>
+				<type>wlan_state</type>
+				<unit></unit>
+				<updated_date>2022-12-24T10:15:43.165+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T10:15:43.165+01:00</last_consecutive_log_date>
+				<interval/>
+				<network_state id='4e078f2fae014cbab9f067ca66e80d55'/>
+				<period start_date="2022-12-24T10:15:43.165+01:00" end_date="2022-12-24T10:15:43.165+01:00">
+					<measurement log_date="2022-12-24T10:15:43.165+01:00">up</measurement>
+				</period>
+			</point_log>
+			<point_log id='8032d845eee04dffab189be92589af0c'>
+				<type>lan_state</type>
+				<unit></unit>
+				<updated_date>2022-12-24T10:15:37.058+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T10:15:37.058+01:00</last_consecutive_log_date>
+				<interval/>
+				<network_state id='11622002070241b088be817459e6180f'/>
+				<period start_date="2022-12-24T10:15:37.058+01:00" end_date="2022-12-24T10:15:37.058+01:00">
+					<measurement log_date="2022-12-24T10:15:37.058+01:00">down</measurement>
+				</period>
+			</point_log>
+			<point_log id='ca05724c5fd14d8b8b07acc71331689b'>
+				<type>lan_ip_address</type>
+				<unit></unit>
+				<updated_date>2022-12-24T10:15:37+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T10:15:37+01:00</last_consecutive_log_date>
+				<interval/>
+				<network_address id='f494dafd525a469b8e8da82ce8a34240'/>
+				<period start_date="2022-12-24T10:15:37+01:00" end_date="2022-12-24T10:15:37+01:00">
+					<measurement log_date="2022-12-24T10:15:37+01:00">0.0.0.0</measurement>
+				</period>
+			</point_log>
+			<point_log id='d4524db60fee4a13b70c8c29f3b04b92'>
+				<type>wlan_ip_address</type>
+				<unit></unit>
+				<updated_date>2022-12-24T10:15:43+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T10:15:43+01:00</last_consecutive_log_date>
+				<interval/>
+				<network_address id='cc36809b562c419686ebcaee95f36c7a'/>
+				<period start_date="2022-12-24T10:15:43+01:00" end_date="2022-12-24T10:15:43+01:00">
+					<measurement log_date="2022-12-24T10:15:43+01:00">127.0.0.1</measurement>
+				</period>
+			</point_log>
+		</logs>
+		<actuator_functionalities/>
+	</appliance>
+</appliances>
diff --git a/userdata/updated/p1v4_442_single/core.domain_objects.xml b/userdata/updated/p1v4_442_single/core.domain_objects.xml
new file mode 100644
index 000000000..d598bc539
--- /dev/null
+++ b/userdata/updated/p1v4_442_single/core.domain_objects.xml
@@ -0,0 +1,497 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<domain_objects>
+	<template id='b0d0a9c787f64ccaba48018f317fc94f' tag="relay_state_based_on_time_preset_temperature_and_humidity">
+		<name>Relay schedule template</name>
+		<description>Template for scheduling relays on a time, solar time, preset, temperature and humidity basis.</description>
+		<single_actor>false</single_actor>
+		<created_date>2022-10-07T03:40:17.054+02:00</created_date>
+		<modified_date>2022-12-23T20:00:30.557+01:00</modified_date>
+		<deleted_date></deleted_date>
+		<objects>
+			<object name="zone" type="Location"/>
+			<object name="direct_object" type="DirectObject"/>
+		</objects>
+		<parameters>
+			<parameter name="preset" source="zone.preset" type="Preset"/>
+			<parameter name="temperature" source="zone.temperature" type="Number"/>
+			<parameter name="humidity" source="zone.humidity" type="Number"/>
+			<parameter name="time" source="clock.weekTime" type="WeekTime"/>
+		</parameters>
+		<results>
+			<result name="state" action="direct_object.iterateFunctionalities('RelayFunctionality')().state = state" type="OnOff"/>
+		</results>
+	</template>
+	<module id='84cbd085b6b74c3d8fe8881f22d23693'>
+		<vendor_name>Plugwise</vendor_name>
+		<vendor_model>Gateway</vendor_model>
+		<hardware_version>AME Smile 2.0 board</hardware_version>
+		<firmware_version></firmware_version>
+		<created_date>2019-11-19T10:21:25.346+01:00</created_date>
+		<modified_date>2021-04-10T01:39:26.828+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<network_state id='11622002070241b088be817459e6180f' log_type='lan_state'>
+				<functionalities><point_log id='8032d845eee04dffab189be92589af0c'/></functionalities>
+			</network_state>
+			<link_quality id='332138ddfe334e4397b9523d67c05a56' log_type='link_quality'>
+				<functionalities><point_log id='4de35aefb34f498caf5cc595fc6df60b'/></functionalities>
+			</link_quality>
+			<network_state id='4e078f2fae014cbab9f067ca66e80d55' log_type='wlan_state'>
+				<functionalities><point_log id='7c4e66de4d234a3ab161280d8d7e9ab3'/></functionalities>
+			</network_state>
+			<signal_strength id='cb6934a63ceb43be9fb69db78f2065d0' log_type='signal_strength'>
+				<functionalities><point_log id='400e04683dd94718ada7ff8a8c1d7466'/></functionalities>
+			</signal_strength>
+			<network_address id='cc36809b562c419686ebcaee95f36c7a' log_type='wlan_ip_address'>
+				<functionalities><point_log id='d4524db60fee4a13b70c8c29f3b04b92'/></functionalities>
+			</network_address>
+			<network_address id='f494dafd525a469b8e8da82ce8a34240' log_type='lan_ip_address'>
+				<functionalities><point_log id='ca05724c5fd14d8b8b07acc71331689b'/></functionalities>
+			</network_address>
+		</services>
+		<protocols>
+			<local_area_network id='1c8ada11b4dd4d669a5752a6885c247f'/>
+			<wireless_local_area_network id='59d6797fe8bd436caa626f9c5387e3e3'/>
+		</protocols>
+	</module>
+	<module id='f2f7c257a0c8405f9a56582d3a22982d'>
+		<vendor_name>SHENZHEN KAIFA TECHNOLOGY （CHENGDU） CO., LTD.</vendor_name>
+		<vendor_model>KFM5KAIFA-METER</vendor_model>
+		<hardware_version></hardware_version>
+		<firmware_version></firmware_version>
+		<created_date>2020-03-12T16:41:36.010+01:00</created_date>
+		<modified_date>2022-12-07T15:59:23.409+01:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_cumulative_meter id='1fa5f5772e464e5cbcb595101adaf8e5' log_type='electricity'>
+				<functionalities><cumulative_log id='32b0afe1dd324aea87f46d2e699dbd56'/><cumulative_log id='7b7ad634b0b647f0bbf848ac5657ea8f'/></functionalities>
+			</electricity_cumulative_meter>
+			<electricity_point_meter id='b0618815236d47a2b093a1a7ba83991d' log_type='electricity'>
+				<functionalities><point_log id='104e84a3e0364545a889270deee21e94'/><point_log id='6b58aa7f2cd0406bacdc53ac7ecae168'/></functionalities>
+			</electricity_point_meter>
+			<electricity_interval_meter id='b3e07d45b7354d189cd0d5d41a4f80d7' log_type='electricity'>
+				<functionalities><interval_log id='859d091cb8e444b5bc084a41a9fd401c'/><interval_log id='babf35c6d9c746179475a6c0ce086f37'/></functionalities>
+			</electricity_interval_meter>
+			<electricity_point_meter id='ea1bf1abc10d434da54dd9e528d6cc97' log_type='electricity_phase_one'>
+				<functionalities><point_log id='0b7f59abfd35452f825dbf9daebf2cc5'/><point_log id='5a61bcd0bcdf442a993444c51c0c6f26'/></functionalities>
+			</electricity_point_meter>
+		</services>
+		<protocols>
+			<dsmr_main id='8bc4c6e311e44afcb1c6e2c1245545f1'>
+				<serial>E0025100029832815</serial>
+				<version>42</version>
+				<dsmr_mbuses/>
+			</dsmr_main>
+		</protocols>
+	</module>
+	<gateway id='a45a31b78c9c40ca8361a0c7d210fc10'>
+		<created_date>2019-11-19T10:21:25.294+01:00</created_date>
+		<modified_date>2022-12-23T20:01:21.226+01:00</modified_date>
+		<deleted_date/>
+		<name></name>
+		<description></description>
+		<enabled>true</enabled>
+		<firmware_locked>false</firmware_locked>
+		<prevent_default_update>false</prevent_default_update>
+		<last_reset_date>2019-11-19T10:21:25.294+01:00</last_reset_date>
+		<last_boot_date>2022-12-23T19:59:10.097+01:00</last_boot_date>
+		<vendor_name>Plugwise</vendor_name>
+		<vendor_model>smile</vendor_model>
+		<hardware_version>AME Smile 2.0 board</hardware_version>
+		<firmware_version>4.4.2</firmware_version>
+		<mac_address>012345670001</mac_address>
+		<wifi_mac_address>012345670002</wifi_mac_address>
+		<short_id>abcdefgh</short_id>
+		<send_data>true</send_data>
+		<anonymous>false</anonymous>
+		<lan_ip></lan_ip>
+		<wifi_ip>127.0.0.1</wifi_ip>
+		<hostname>smile000000</hostname>
+		<time>2022-12-24T09:57:30+01:00</time>
+		<timezone>Europe/Amsterdam</timezone>
+		<ssh_relay>disabled</ssh_relay>
+		<project id='13520e2c995b4857b711f325b05691b3'>
+			<description>Voor externe mensen die graag de beta tester willen zijn.</description>
+			<visible_in_production>false</visible_in_production>
+			<name>RnD - Beta - Extern</name>
+			<is_default>false</is_default>
+			<modified_date>2022-11-21T23:24:39.550+01:00</modified_date>
+			<deleted_date></deleted_date>
+			<created_date>2020-11-04T09:06:03+01:00</created_date>
+		</project>
+		<gateway_environment id='5147f51e11bd4ac9be35caadd0305057'>
+			<electricity_consumption_tariff_structure>double</electricity_consumption_tariff_structure>
+			<longitude/>
+			<gas_consumption_tariff>0.24</gas_consumption_tariff>
+			<electricity_consumption_single_tariff>0.24</electricity_consumption_single_tariff>
+			<electricity_consumption_peak_tariff>0.237</electricity_consumption_peak_tariff>
+			<electricity_consumption_off_peak_tariff>0.222</electricity_consumption_off_peak_tariff>
+			<electricity_production_single_tariff>0.22</electricity_production_single_tariff>
+			<electricity_production_peak_tariff>0.237</electricity_production_peak_tariff>
+			<country/>
+			<modified_date>2020-03-12T19:35:45.644+01:00</modified_date>
+			<electricity_production_tariff_structure>double</electricity_production_tariff_structure>
+			<tariff_region>NL</tariff_region>
+			<electricity_production_off_peak_tariff>0.222</electricity_production_off_peak_tariff>
+			<housing_type>apartment</housing_type>
+			<housing_construction_period>unknown</housing_construction_period>
+			<household_adults>0</household_adults>
+			<household_children>0</household_children>
+			<currency>EUR</currency>
+			<savings_result_unit/>
+			<savings_result_value/>
+			<central_heating_brand/>
+			<central_heating_model/>
+			<central_heating_year_of_manufacture/>
+			<central_heating_installation_date/>
+			<thermostat_brand/>
+			<thermostat_model/>
+			<postal_code/>
+			<city/>
+			<latitude/>
+			<modified_date>2020-03-12T19:35:45.644+01:00</modified_date>
+			<deleted_date></deleted_date>
+			<created_date>2022-12-22T19:41:41+01:00</created_date>
+		</gateway_environment>
+		<features>
+			<remote_control id='5f89589ecee442b0b0410064d62f66a5'>
+				<valid_from></valid_from>
+				<valid_to></valid_to>
+				<activation_date>2019-11-21T16:49:43+01:00</activation_date>
+				<expiration_date>2038-01-19T04:14:07+01:00</expiration_date>
+				<grace_period/>
+				<validity_period/>
+				<modified_date>2020-03-12T16:54:47.440+01:00</modified_date>
+				<deleted_date></deleted_date>
+				<created_date>2019-11-21T16:49:43+01:00</created_date>
+			</remote_control>
+		</features>
+	</gateway>
+	<location id='a455b61e52394b2db5081ce025a430f3'>
+		<name>Home</name>
+		<description>A building with a smart meter.</description>
+		<type>building</type>
+		<created_date>2020-03-12T16:41:36.227+01:00</created_date>
+		<modified_date>2022-12-24T09:57:25.601+01:00</modified_date>
+		<deleted_date></deleted_date>
+		<preset>home</preset>
+		<clients/>
+		<appliances/>
+		<logs>
+			<point_log id='0b7f59abfd35452f825dbf9daebf2cc5'>
+				<type>electricity_phase_one_produced</type>
+				<unit>W</unit>
+				<updated_date>2022-12-24T09:57:20+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T09:57:20+01:00</last_consecutive_log_date>
+				<interval/>
+				<electricity_point_meter id='ea1bf1abc10d434da54dd9e528d6cc97'/>
+				<period start_date="2022-12-24T09:57:20+01:00" end_date="2022-12-24T09:57:20+01:00">
+					<measurement log_date="2022-12-24T09:57:20+01:00">0.00</measurement>
+				</period>
+			</point_log>
+			<point_log id='104e84a3e0364545a889270deee21e94'>
+				<type>electricity_consumed</type>
+				<unit>W</unit>
+				<updated_date>2022-12-24T09:57:20+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T09:57:20+01:00</last_consecutive_log_date>
+				<interval/>
+				<electricity_point_meter id='b0618815236d47a2b093a1a7ba83991d'/>
+				<period start_date="2022-12-24T09:57:20+01:00" end_date="2022-12-24T09:57:20+01:00">
+					<measurement log_date="2022-12-24T09:57:20+01:00" tariff="nl_peak">0.00</measurement>
+					<measurement log_date="2022-12-24T09:57:20+01:00" tariff="nl_offpeak">486.00</measurement>
+				</period>
+			</point_log>
+			<cumulative_log id='32b0afe1dd324aea87f46d2e699dbd56'>
+				<type>electricity_produced</type>
+				<unit>Wh</unit>
+				<updated_date>2022-12-24T09:57:00+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T09:57:00+01:00</last_consecutive_log_date>
+				<interval/>
+				<electricity_cumulative_meter id='1fa5f5772e464e5cbcb595101adaf8e5'/>
+				<period start_date="2022-12-24T09:57:00+01:00" end_date="2022-12-24T09:57:00+01:00">
+					<measurement log_date="2022-12-24T09:57:00+01:00" tariff="nl_peak">0.00</measurement>
+					<measurement log_date="2022-12-24T09:57:00+01:00" tariff="nl_offpeak">0.00</measurement>
+				</period>
+			</cumulative_log>
+			<point_log id='5a61bcd0bcdf442a993444c51c0c6f26'>
+				<type>electricity_phase_one_consumed</type>
+				<unit>W</unit>
+				<updated_date>2022-12-24T09:57:20+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T09:57:20+01:00</last_consecutive_log_date>
+				<interval/>
+				<electricity_point_meter id='ea1bf1abc10d434da54dd9e528d6cc97'/>
+				<period start_date="2022-12-24T09:57:20+01:00" end_date="2022-12-24T09:57:20+01:00">
+					<measurement log_date="2022-12-24T09:57:20+01:00">486.00</measurement>
+				</period>
+			</point_log>
+			<point_log id='6b58aa7f2cd0406bacdc53ac7ecae168'>
+				<type>electricity_produced</type>
+				<unit>W</unit>
+				<updated_date>2022-12-24T09:57:20+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T09:57:20+01:00</last_consecutive_log_date>
+				<interval/>
+				<electricity_point_meter id='b0618815236d47a2b093a1a7ba83991d'/>
+				<period start_date="2022-12-24T09:57:20+01:00" end_date="2022-12-24T09:57:20+01:00">
+					<measurement log_date="2022-12-24T09:57:20+01:00" tariff="nl_peak">0.00</measurement>
+					<measurement log_date="2022-12-24T09:57:20+01:00" tariff="nl_offpeak">0.00</measurement>
+				</period>
+			</point_log>
+			<cumulative_log id='7b7ad634b0b647f0bbf848ac5657ea8f'>
+				<type>electricity_consumed</type>
+				<unit>Wh</unit>
+				<updated_date>2022-12-24T09:57:00+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T09:57:00+01:00</last_consecutive_log_date>
+				<interval/>
+				<electricity_cumulative_meter id='1fa5f5772e464e5cbcb595101adaf8e5'/>
+				<period start_date="2022-12-24T09:57:00+01:00" end_date="2022-12-24T09:57:00+01:00">
+					<measurement log_date="2022-12-24T09:57:00+01:00" tariff="nl_peak">13966608.00</measurement>
+					<measurement log_date="2022-12-24T09:57:00+01:00" tariff="nl_offpeak">17643423.00</measurement>
+				</period>
+			</cumulative_log>
+			<interval_log id='859d091cb8e444b5bc084a41a9fd401c'>
+				<type>electricity_produced</type>
+				<unit>Wh</unit>
+				<updated_date>2022-12-24T09:55:00+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T09:50:00+01:00</last_consecutive_log_date>
+				<interval>PT5M</interval>
+				<electricity_interval_meter id='b3e07d45b7354d189cd0d5d41a4f80d7'/>
+				<period start_date="2022-12-24T09:55:00+01:00" end_date="2022-12-24T09:55:00+01:00" interval="PT5M">
+					<measurement log_date="2022-12-24T09:55:00+01:00" tariff="nl_peak">0.00</measurement>
+					<measurement log_date="2022-12-24T09:55:00+01:00" tariff="nl_offpeak">0.00</measurement>
+				</period>
+			</interval_log>
+			<interval_log id='babf35c6d9c746179475a6c0ce086f37'>
+				<type>electricity_consumed</type>
+				<unit>Wh</unit>
+				<updated_date>2022-12-24T09:55:00+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T09:50:00+01:00</last_consecutive_log_date>
+				<interval>PT5M</interval>
+				<electricity_interval_meter id='b3e07d45b7354d189cd0d5d41a4f80d7'/>
+				<period start_date="2022-12-24T09:55:00+01:00" end_date="2022-12-24T09:55:00+01:00" interval="PT5M">
+					<measurement log_date="2022-12-24T09:55:00+01:00" tariff="nl_peak">0.00</measurement>
+					<measurement log_date="2022-12-24T09:55:00+01:00" tariff="nl_offpeak">15.00</measurement>
+				</period>
+			</interval_log>
+		</logs>
+		<actuator_functionalities/>
+	</location>
+	<template id='c965ac3d9dc1467a947ee2087cbf543f' tag="domestic_hot_water_based_on_time">
+		<name>DHW schedule template</name>
+		<description>Template for scheduling DHW mode and state on a time basis.</description>
+		<single_actor>true</single_actor>
+		<created_date>2022-10-11T15:20:41.565+02:00</created_date>
+		<modified_date>2022-12-23T20:00:30.620+01:00</modified_date>
+		<deleted_date></deleted_date>
+		<objects>
+			<object name="direct_object" type="DirectObject"/>
+		</objects>
+		<parameters>
+			<parameter name="time" source="clock.weekTime" type="WeekTime"/>
+		</parameters>
+		<results>
+			<result name="domestic_hot_water_mode" action="direct_object.iterateFunctionalities('DomesticHotWaterModeControlFunctionality', 'domestic_hot_water_mode')().setMode(clock.addSeconds(null, 1), domestic_hot_water_mode)" type="DomesticHotWaterMode"/>
+			<result name="domestic_hot_water_setpoint" action="direct_object.iterateFunctionalities('ThermostatFunctionality', 'domestic_hot_water_setpoint')().setSetpoint(clock.addSeconds(null, 1), domestic_hot_water_setpoint)" type="Number"/>
+			<result name="domestic_hot_water_comfort_mode" action="direct_object.iterateFunctionalities('ToggleFunctionality', 'domestic_hot_water_comfort_mode')().setState(clock.addSeconds(null, 1), domestic_hot_water_comfort_mode)" type="OnOff"/>
+		</results>
+	</template>
+	<template id='c005af33c33b4450980b3da1df93b201' tag="relay_state_based_on_time">
+		<name>Relay schedule template</name>
+		<description>Template for scheduling relays on a time basis.</description>
+		<single_actor>true</single_actor>
+		<created_date>2022-10-07T03:40:17.080+02:00</created_date>
+		<modified_date>2022-12-23T20:00:30.560+01:00</modified_date>
+		<deleted_date></deleted_date>
+		<objects>
+			<object name="direct_object" type="DirectObject"/>
+		</objects>
+		<parameters>
+			<parameter name="time" source="clock.weekTime" type="WeekTime"/>
+		</parameters>
+		<results>
+			<result name="state" action="direct_object.iterateFunctionalities('RelayFunctionality')().state = state" type="OnOff"/>
+		</results>
+	</template>
+	<template id='e092517b1919469b8d6da3dc8e0180ef' tag="default_client_presence_based_on_pointlog">
+		<name>Client, Pointlog presence template</name>
+		<description>Template for setting default client presence based on point_logs</description>
+		<single_actor>false</single_actor>
+		<created_date>2022-10-07T03:40:17.160+02:00</created_date>
+		<modified_date>2022-12-23T20:00:30.590+01:00</modified_date>
+		<deleted_date></deleted_date>
+		<objects>
+			<object name="client" type="Client"/>
+			<object name="point_log" type="PointLogFunctionality"/>
+		</objects>
+		<parameters>
+			<parameter name="point_log_recently_used" source="point_log.wasRecentlyOn(null, 1800)" type="Boolean"/>
+		</parameters>
+		<results>
+			<result name="presence" action="client.setPresence(presence, 'rule')" type="Boolean"/>
+		</results>
+	</template>
+	<template id='cc48483d95274aafb17e5ecc2cf8aec9' tag="zone_setpoint_and_state_based_on_preset">
+		<name>Zone preset template</name>
+		<description>Template for actuating thermostats and relays on a preset basis.</description>
+		<single_actor>true</single_actor>
+		<created_date>2022-10-07T03:40:17.105+02:00</created_date>
+		<modified_date>2022-12-23T20:00:30.572+01:00</modified_date>
+		<deleted_date></deleted_date>
+		<objects>
+			<object name="zone" type="Location"/>
+		</objects>
+		<parameters>
+			<parameter name="preset" source="zone.preset" type="Preset"/>
+		</parameters>
+		<results>
+			<result name="state" action="zone.iterateFunctionalities('RelayFunctionality')().state = state" type="OnOff"/>
+			<result name="cooling_setpoint" action="zone.iterateFunctionalities('ThermostatFunctionality', 'thermostat')().setSetpoint(null, null, cooling_setpoint)" type="Number"/>
+			<result name="domestic_hot_water_state" action="zone.iterateFunctionalities('ToggleFunctionality', 'domestic_hot_water_state')().state = domestic_hot_water_state" type="OnOff"/>
+			<result name="heating_setpoint" action="zone.iterateFunctionalities('ThermostatFunctionality', 'thermostat')().setSetpoint(null, heating_setpoint, null)" type="Number"/>
+		</results>
+	</template>
+	<template id='ade1f30e7ce84ca7929a740bb2f2e208' tag="relay_state_based_on_time_and_preset">
+		<name>Relay schedule template</name>
+		<description>Template for scheduling relays on a time and preset basis.</description>
+		<single_actor>false</single_actor>
+		<created_date>2022-10-07T03:40:17.027+02:00</created_date>
+		<modified_date>2022-12-23T20:00:30.552+01:00</modified_date>
+		<deleted_date></deleted_date>
+		<objects>
+			<object name="zone" type="Location"/>
+			<object name="direct_object" type="DirectObject"/>
+		</objects>
+		<parameters>
+			<parameter name="time" source="clock.weekTime" type="WeekTime"/>
+			<parameter name="preset" source="zone.preset" type="Preset"/>
+		</parameters>
+		<results>
+			<result name="state" action="direct_object.iterateFunctionalities('RelayFunctionality')().state = state" type="OnOff"/>
+		</results>
+	</template>
+	<appliance id='ba4de7613517478da82dd9b6abea36af'>
+		<name>Gateway</name>
+		<description>Container for variables logged about the Gateway in general.</description>
+		<type>gateway</type>
+		<created_date>2019-11-19T10:21:26.199+01:00</created_date>
+		<modified_date>2022-12-24T09:55:43.024+01:00</modified_date>
+		<deleted_date></deleted_date>
+		<groups/>
+		<logs>
+			<point_log id='400e04683dd94718ada7ff8a8c1d7466'>
+				<type>signal_strength</type>
+				<unit>dBm</unit>
+				<updated_date>2022-12-24T09:55:42.985+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T09:55:42.985+01:00</last_consecutive_log_date>
+				<interval/>
+				<signal_strength id='cb6934a63ceb43be9fb69db78f2065d0'/>
+				<period start_date="2022-12-24T09:55:42.985+01:00" end_date="2022-12-24T09:55:42.985+01:00">
+					<measurement log_date="2022-12-24T09:55:42.985+01:00">-74.00</measurement>
+				</period>
+			</point_log>
+			<point_log id='4de35aefb34f498caf5cc595fc6df60b'>
+				<type>link_quality</type>
+				<unit></unit>
+				<updated_date>2022-12-24T09:55:42.985+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T09:55:42.985+01:00</last_consecutive_log_date>
+				<interval/>
+				<link_quality id='332138ddfe334e4397b9523d67c05a56'/>
+				<period start_date="2022-12-24T09:55:42.985+01:00" end_date="2022-12-24T09:55:42.985+01:00">
+					<measurement log_date="2022-12-24T09:55:42.985+01:00">36</measurement>
+				</period>
+			</point_log>
+			<point_log id='7c4e66de4d234a3ab161280d8d7e9ab3'>
+				<type>wlan_state</type>
+				<unit></unit>
+				<updated_date>2022-12-24T09:55:42.986+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T09:55:42.986+01:00</last_consecutive_log_date>
+				<interval/>
+				<network_state id='4e078f2fae014cbab9f067ca66e80d55'/>
+				<period start_date="2022-12-24T09:55:42.986+01:00" end_date="2022-12-24T09:55:42.986+01:00">
+					<measurement log_date="2022-12-24T09:55:42.986+01:00">up</measurement>
+				</period>
+			</point_log>
+			<point_log id='8032d845eee04dffab189be92589af0c'>
+				<type>lan_state</type>
+				<unit></unit>
+				<updated_date>2022-12-24T09:55:36.949+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T09:55:36.949+01:00</last_consecutive_log_date>
+				<interval/>
+				<network_state id='11622002070241b088be817459e6180f'/>
+				<period start_date="2022-12-24T09:55:36.949+01:00" end_date="2022-12-24T09:55:36.949+01:00">
+					<measurement log_date="2022-12-24T09:55:36.949+01:00">down</measurement>
+				</period>
+			</point_log>
+			<point_log id='ca05724c5fd14d8b8b07acc71331689b'>
+				<type>lan_ip_address</type>
+				<unit></unit>
+				<updated_date>2022-12-24T09:55:36+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T09:55:36+01:00</last_consecutive_log_date>
+				<interval/>
+				<network_address id='f494dafd525a469b8e8da82ce8a34240'/>
+				<period start_date="2022-12-24T09:55:36+01:00" end_date="2022-12-24T09:55:36+01:00">
+					<measurement log_date="2022-12-24T09:55:36+01:00">0.0.0.0</measurement>
+				</period>
+			</point_log>
+			<point_log id='d4524db60fee4a13b70c8c29f3b04b92'>
+				<type>wlan_ip_address</type>
+				<unit></unit>
+				<updated_date>2022-12-24T09:55:42+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T09:55:42+01:00</last_consecutive_log_date>
+				<interval/>
+				<network_address id='cc36809b562c419686ebcaee95f36c7a'/>
+				<period start_date="2022-12-24T09:55:42+01:00" end_date="2022-12-24T09:55:42+01:00">
+					<measurement log_date="2022-12-24T09:55:42+01:00">127.0.0.1</measurement>
+				</period>
+			</point_log>
+		</logs>
+		<actuator_functionalities/>
+	</appliance>
+	<template id='388aa451da3c49d8b68f535da70e1063' tag="zone_preset_based_on_time_and_presence_with_override">
+		<name>Zone preset schedule template</name>
+		<description>Template for scheduling presets on a presence or time basis with the option to override the preset&apos;s setpoint/state.</description>
+		<single_actor>true</single_actor>
+		<created_date>2022-10-07T03:40:17.132+02:00</created_date>
+		<modified_date>2022-12-23T20:00:30.584+01:00</modified_date>
+		<deleted_date></deleted_date>
+		<objects>
+			<object name="zone" type="Location"/>
+		</objects>
+		<parameters>
+			<parameter name="time" source="clock.weekTime" type="WeekTime"/>
+			<parameter name="presence" source="zone.presence" type="Boolean"/>
+		</parameters>
+		<results>
+			<result name="state" action="zone.iterateFunctionalities('RelayFunctionality')().switch(clock.addSeconds(null, 1), state)" type="OnOff"/>
+			<result name="preset" action="zone.preset = preset" type="Preset"/>
+			<result name="domestic_hot_water_state" action="zone.iterateFunctionalities('ToggleFunctionality', 'domestic_hot_water_state')().switch(clock.addSeconds(null, 1), domestic_hot_water_state)" type="OnOff"/>
+			<result name="setpoint" action="zone.iterateFunctionalities('ThermostatFunctionality', 'thermostat')().setSetpoint(clock.addSeconds(null, 1), setpoint, setpoint)" type="Number"/>
+		</results>
+	</template>
+	<template id='da18bb41e4e64d0d85d8aec11fb564b0' tag="electricity_triggered_actions">
+		<name>Electricity action trigger template</name>
+		<description>Template for triggering actions based on time and electricity production or consumption.</description>
+		<single_actor>true</single_actor>
+		<created_date>2022-10-11T15:20:41.536+02:00</created_date>
+		<modified_date>2022-12-23T20:00:30.606+01:00</modified_date>
+		<deleted_date></deleted_date>
+		<objects>
+			<object name="direct_object" type="DirectObject"/>
+			<object name="meter" type="DirectObject"/>
+		</objects>
+		<parameters>
+			<parameter name="averaged_electricity_produced" source="meter.averaged_electricity_produced" type="Number"/>
+			<parameter name="averaged_electricity_consumed" source="meter.averaged_electricity_consumed" type="Number"/>
+			<parameter name="electricity_produced" source="meter.electricity_produced" type="Number"/>
+			<parameter name="electricity_consumed" source="meter.electricity_consumed" type="Number"/>
+			<parameter name="time" source="clock.weekTime" type="WeekTime"/>
+		</parameters>
+		<results>
+			<result name="domestic_hot_water_mode" action="direct_object.iterateFunctionalities('DomesticHotWaterModeControlFunctionality', 'domestic_hot_water_mode')().setMode(clock.addSeconds(null, 1), domestic_hot_water_mode)" type="DomesticHotWaterMode"/>
+			<result name="preset" action="direct_object.preset = preset" type="Preset"/>
+			<result name="domestic_hot_water_comfort_mode" action="direct_object.iterateFunctionalities('ToggleFunctionality', 'domestic_hot_water_comfort_mode')().setState(clock.addSeconds(null, 1), domestic_hot_water_comfort_mode)" type="OnOff"/>
+			<result name="state" action="direct_object.iterateFunctionalities('RelayFunctionality')().switch(clock.addSeconds(null, 1), state)" type="OnOff"/>
+			<result name="domestic_hot_water_setpoint" action="direct_object.iterateFunctionalities('ThermostatFunctionality', 'domestic_hot_water_setpoint')().setSetpoint(clock.addSeconds(null, 1), domestic_hot_water_setpoint)" type="Number"/>
+			<result name="setpoint" action="direct_object.iterateFunctionalities('ThermostatFunctionality', 'thermostat')().setSetpoint(clock.addSeconds(null, 1), setpoint, setpoint)" type="Number"/>
+		</results>
+	</template>
+</domain_objects>
diff --git a/userdata/updated/p1v4_442_single/core.locations.xml b/userdata/updated/p1v4_442_single/core.locations.xml
new file mode 100644
index 000000000..1a69348af
--- /dev/null
+++ b/userdata/updated/p1v4_442_single/core.locations.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<locations>
+	<location id='a455b61e52394b2db5081ce025a430f3'>
+		<name>Home</name>
+		<description>A building with a smart meter.</description>
+		<type>building</type>
+		<created_date>2020-03-12T16:41:36.227+01:00</created_date>
+		<modified_date>2022-12-24T10:08:10.823+01:00</modified_date>
+		<deleted_date></deleted_date>
+		<preset>home</preset>
+		<clients/>
+		<appliances/>
+		<logs>
+			<point_log id='0b7f59abfd35452f825dbf9daebf2cc5'>
+				<type>electricity_phase_one_produced</type>
+				<unit>W</unit>
+				<updated_date>2022-12-24T10:08:05+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T10:08:05+01:00</last_consecutive_log_date>
+				<interval/>
+				<electricity_point_meter id='ea1bf1abc10d434da54dd9e528d6cc97'/>
+				<period start_date="2022-12-24T10:08:05+01:00" end_date="2022-12-24T10:08:05+01:00">
+					<measurement log_date="2022-12-24T10:08:05+01:00">1998.00</measurement>
+				</period>
+			</point_log>
+			<point_log id='104e84a3e0364545a889270deee21e94'>
+				<type>electricity_consumed</type>
+				<unit>W</unit>
+				<updated_date>2022-12-24T10:08:05+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T10:08:05+01:00</last_consecutive_log_date>
+				<interval/>
+				<electricity_point_meter id='b0618815236d47a2b093a1a7ba83991d'/>
+				<period start_date="2022-12-24T10:08:05+01:00" end_date="2022-12-24T10:08:05+01:00">
+					<measurement log_date="2022-12-24T10:08:05+01:00" tariff="nl_peak">0.00</measurement>
+					<measurement log_date="2022-12-24T10:08:05+01:00" tariff="nl_offpeak">0.00</measurement>
+				</period>
+			</point_log>
+			<cumulative_log id='32b0afe1dd324aea87f46d2e699dbd56'>
+				<type>electricity_produced</type>
+				<unit>Wh</unit>
+				<updated_date>2022-12-24T10:08:00+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T10:08:00+01:00</last_consecutive_log_date>
+				<interval/>
+				<electricity_cumulative_meter id='1fa5f5772e464e5cbcb595101adaf8e5'/>
+				<period start_date="2022-12-24T10:08:00+01:00" end_date="2022-12-24T10:08:00+01:00">
+					<measurement log_date="2022-12-24T10:08:00+01:00" tariff="nl_peak">6543.00</measurement>
+					<measurement log_date="2022-12-24T10:08:00+01:00" tariff="nl_offpeak">0.00</measurement>
+				</period>
+			</cumulative_log>
+			<point_log id='5a61bcd0bcdf442a993444c51c0c6f26'>
+				<type>electricity_phase_one_consumed</type>
+				<unit>W</unit>
+				<updated_date>2022-12-24T10:08:05+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T10:08:05+01:00</last_consecutive_log_date>
+				<interval/>
+				<electricity_point_meter id='ea1bf1abc10d434da54dd9e528d6cc97'/>
+				<period start_date="2022-12-24T10:08:05+01:00" end_date="2022-12-24T10:08:05+01:00">
+					<measurement log_date="2022-12-24T10:08:05+01:00">0.00</measurement>
+				</period>
+			</point_log>
+			<point_log id='6b58aa7f2cd0406bacdc53ac7ecae168'>
+				<type>electricity_produced</type>
+				<unit>W</unit>
+				<updated_date>2022-12-24T10:08:05+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T10:08:05+01:00</last_consecutive_log_date>
+				<interval/>
+				<electricity_point_meter id='b0618815236d47a2b093a1a7ba83991d'/>
+				<period start_date="2022-12-24T10:08:05+01:00" end_date="2022-12-24T10:08:05+01:00">
+					<measurement log_date="2022-12-24T10:08:05+01:00" tariff="nl_peak">2248.00</measurement>
+					<measurement log_date="2022-12-24T10:08:05+01:00" tariff="nl_offpeak">0.00</measurement>
+				</period>
+			</point_log>
+			<cumulative_log id='7b7ad634b0b647f0bbf848ac5657ea8f'>
+				<type>electricity_consumed</type>
+				<unit>Wh</unit>
+				<updated_date>2022-12-24T10:08:00+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T10:08:00+01:00</last_consecutive_log_date>
+				<interval/>
+				<electricity_cumulative_meter id='1fa5f5772e464e5cbcb595101adaf8e5'/>
+				<period start_date="2022-12-24T10:08:00+01:00" end_date="2022-12-24T10:08:00+01:00">
+					<measurement log_date="2022-12-24T10:08:00+01:00" tariff="nl_peak">13966608.00</measurement>
+					<measurement log_date="2022-12-24T10:08:00+01:00" tariff="nl_offpeak">17643505.00</measurement>
+				</period>
+			</cumulative_log>
+			<interval_log id='859d091cb8e444b5bc084a41a9fd401c'>
+				<type>electricity_produced</type>
+				<unit>Wh</unit>
+				<updated_date>2022-12-24T10:05:00+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T10:00:00+01:00</last_consecutive_log_date>
+				<interval>PT5M</interval>
+				<electricity_interval_meter id='b3e07d45b7354d189cd0d5d41a4f80d7'/>
+				<period start_date="2022-12-24T10:05:00+01:00" end_date="2022-12-24T10:05:00+01:00" interval="PT5M">
+					<measurement log_date="2022-12-24T10:05:00+01:00" tariff="nl_peak">1345.00</measurement>
+					<measurement log_date="2022-12-24T10:05:00+01:00" tariff="nl_offpeak">0.00</measurement>
+				</period>
+			</interval_log>
+			<interval_log id='babf35c6d9c746179475a6c0ce086f37'>
+				<type>electricity_consumed</type>
+				<unit>Wh</unit>
+				<updated_date>2022-12-24T10:05:00+01:00</updated_date>
+				<last_consecutive_log_date>2022-12-24T10:00:00+01:00</last_consecutive_log_date>
+				<interval>PT5M</interval>
+				<electricity_interval_meter id='b3e07d45b7354d189cd0d5d41a4f80d7'/>
+				<period start_date="2022-12-24T10:05:00+01:00" end_date="2022-12-24T10:05:00+01:00" interval="PT5M">
+					<measurement log_date="2022-12-24T10:05:00+01:00" tariff="nl_peak">0.00</measurement>
+					<measurement log_date="2022-12-24T10:05:00+01:00" tariff="nl_offpeak">0.00</measurement>
+				</period>
+			</interval_log>
+		</logs>
+		<actuator_functionalities/>
+	</location>
+</locations>
diff --git a/userdata/updated/p1v4_442_single/core.modules.xml b/userdata/updated/p1v4_442_single/core.modules.xml
new file mode 100644
index 000000000..142220804
--- /dev/null
+++ b/userdata/updated/p1v4_442_single/core.modules.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<modules>
+	<module id='f2f7c257a0c8405f9a56582d3a22982d'>
+		<vendor_name>SHENZHEN KAIFA TECHNOLOGY （CHENGDU） CO., LTD.</vendor_name>
+		<vendor_model>KFM5KAIFA-METER</vendor_model>
+		<hardware_version></hardware_version>
+		<firmware_version></firmware_version>
+		<created_date>2020-03-12T16:41:36.010+01:00</created_date>
+		<modified_date>2022-12-07T15:59:23.409+01:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_cumulative_meter id='1fa5f5772e464e5cbcb595101adaf8e5' log_type='electricity'>
+				<functionalities><cumulative_log id='32b0afe1dd324aea87f46d2e699dbd56'/><cumulative_log id='7b7ad634b0b647f0bbf848ac5657ea8f'/></functionalities>
+			</electricity_cumulative_meter>
+			<electricity_point_meter id='b0618815236d47a2b093a1a7ba83991d' log_type='electricity'>
+				<functionalities><point_log id='104e84a3e0364545a889270deee21e94'/><point_log id='6b58aa7f2cd0406bacdc53ac7ecae168'/></functionalities>
+			</electricity_point_meter>
+			<electricity_interval_meter id='b3e07d45b7354d189cd0d5d41a4f80d7' log_type='electricity'>
+				<functionalities><interval_log id='859d091cb8e444b5bc084a41a9fd401c'/><interval_log id='babf35c6d9c746179475a6c0ce086f37'/></functionalities>
+			</electricity_interval_meter>
+			<electricity_point_meter id='ea1bf1abc10d434da54dd9e528d6cc97' log_type='electricity_phase_one'>
+				<functionalities><point_log id='0b7f59abfd35452f825dbf9daebf2cc5'/><point_log id='5a61bcd0bcdf442a993444c51c0c6f26'/></functionalities>
+			</electricity_point_meter>
+		</services>
+		<protocols>
+			<dsmr_main id='8bc4c6e311e44afcb1c6e2c1245545f1'>
+				<serial>E0025100029832815</serial>
+				<version>42</version>
+				<dsmr_mbuses/>
+			</dsmr_main>
+		</protocols>
+	</module>
+	<module id='84cbd085b6b74c3d8fe8881f22d23693'>
+		<vendor_name>Plugwise</vendor_name>
+		<vendor_model>Gateway</vendor_model>
+		<hardware_version>AME Smile 2.0 board</hardware_version>
+		<firmware_version></firmware_version>
+		<created_date>2019-11-19T10:21:25.346+01:00</created_date>
+		<modified_date>2021-04-10T01:39:26.828+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<network_state id='11622002070241b088be817459e6180f' log_type='lan_state'>
+				<functionalities><point_log id='8032d845eee04dffab189be92589af0c'/></functionalities>
+			</network_state>
+			<link_quality id='332138ddfe334e4397b9523d67c05a56' log_type='link_quality'>
+				<functionalities><point_log id='4de35aefb34f498caf5cc595fc6df60b'/></functionalities>
+			</link_quality>
+			<network_state id='4e078f2fae014cbab9f067ca66e80d55' log_type='wlan_state'>
+				<functionalities><point_log id='7c4e66de4d234a3ab161280d8d7e9ab3'/></functionalities>
+			</network_state>
+			<signal_strength id='cb6934a63ceb43be9fb69db78f2065d0' log_type='signal_strength'>
+				<functionalities><point_log id='400e04683dd94718ada7ff8a8c1d7466'/></functionalities>
+			</signal_strength>
+			<network_address id='cc36809b562c419686ebcaee95f36c7a' log_type='wlan_ip_address'>
+				<functionalities><point_log id='d4524db60fee4a13b70c8c29f3b04b92'/></functionalities>
+			</network_address>
+			<network_address id='f494dafd525a469b8e8da82ce8a34240' log_type='lan_ip_address'>
+				<functionalities><point_log id='ca05724c5fd14d8b8b07acc71331689b'/></functionalities>
+			</network_address>
+		</services>
+		<protocols>
+			<local_area_network id='1c8ada11b4dd4d669a5752a6885c247f'/>
+			<wireless_local_area_network id='59d6797fe8bd436caa626f9c5387e3e3'/>
+		</protocols>
+	</module>
+</modules>
diff --git a/userdata/updated/smile_p1_v2_2/core.domain_objects.xml b/userdata/updated/smile_p1_v2_2/core.domain_objects.xml
new file mode 100644
index 000000000..2d63e1df4
--- /dev/null
+++ b/userdata/updated/smile_p1_v2_2/core.domain_objects.xml
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<domain_objects>
+	<location id="921fee9421c241f884bad5f8cc708f25">
+		<name>Meterkast</name>
+		<description/>
+		<type>building</type>
+		<created_date>2018-05-16T14:06:50.993+02:00</created_date>
+		<modified_date>2018-05-16T14:06:52+02:00</modified_date>
+		<deleted_date/>
+		<actuators/>
+		<locations/>
+		<appliances/>
+		<services>
+		</services>
+		<logs>
+			<interval_log id="327e0406712c4437b350d66ac1cd19b2">
+				<unit>Wh</unit>
+				<type>electricity_consumed</type>
+				<last_consecutive_log_date>2018-06-01T08:00:00+02:00</last_consecutive_log_date>
+				<updated_date>2018-06-01T09:00:00+02:00</updated_date>
+				<interval>PT5M</interval>
+				<period start_date="2018-05-16T15:00:00+02:00" end_date="2018-06-01T09:00:00+02:00" interval="PT1H">
+					<measurement log_date="2018-06-01T09:00:00+02:00" tariff_indicator="nl_offpeak">0.000</measurement>
+					<measurement log_date="2018-06-01T09:00:00+02:00" tariff_indicator="nl_peak">113.000</measurement>
+				</period>
+			</interval_log>
+			<point_log id="56d895b5794343e0ad6972fb10ad1488">
+				<unit>W</unit>
+				<type>electricity_produced</type>
+				<last_consecutive_log_date>2018-06-01T09:28:29+02:00</last_consecutive_log_date>
+				<updated_date>2018-06-01T09:28:29+02:00</updated_date>
+				<period start_date="2018-05-16T14:06:49+02:00" end_date="2018-06-01T09:28:29+02:00">
+					<measurement log_date="2018-06-01T09:28:29+02:00">0.000</measurement>
+				</period>
+			</point_log>
+			<cumulative_log id="e567a8549dba4ee084f11e29adeaaf96">
+				<unit>m3</unit>
+				<type>gas_consumed</type>
+				<last_consecutive_log_date>2018-05-22T09:25:10+02:00</last_consecutive_log_date>
+				<updated_date>2018-05-22T09:25:10+02:00</updated_date>
+				<period start_date="2018-05-16T14:10:07+02:00" end_date="2018-05-22T09:25:10+02:00">
+					<measurement log_date="2018-05-22T09:25:10+02:00">0.768</measurement>
+				</period>
+			</cumulative_log>
+			<interval_log id="b53b80fd5c98431aa5cf25b63bcec1aa">
+				<unit>m3</unit>
+				<type>gas_consumed</type>
+				<last_consecutive_log_date>2018-05-22T08:00:00+02:00</last_consecutive_log_date>
+				<updated_date>2018-05-22T09:00:00+02:00</updated_date>
+				<interval>PT1H</interval>
+				<period start_date="2018-05-16T15:00:00+02:00" end_date="2018-05-22T09:00:00+02:00" interval="PT1H">
+					<measurement log_date="2018-05-22T09:00:00+02:00">0.000</measurement>
+				</period>
+			</interval_log>
+			<cumulative_log id="bc39b3d792974406823e99248af34dde">
+				<unit>Wh</unit>
+				<type>electricity_consumed</type>
+				<last_consecutive_log_date>2018-06-01T09:25:00+02:00</last_consecutive_log_date>
+				<updated_date>2018-06-01T09:25:00+02:00</updated_date>
+				<period start_date="2018-05-16T14:10:00+02:00" end_date="2018-06-01T09:25:00+02:00">
+					<measurement log_date="2018-06-01T09:25:00+02:00" tariff_indicator="nl_offpeak">218652.000</measurement>
+					<measurement log_date="2018-06-01T09:25:00+02:00" tariff_indicator="nl_peak">153713.000</measurement>
+				</period>
+			</cumulative_log>
+			<interval_log id="c068ea4b705f4cada02d65e6c9b761e9">
+				<unit>Wh</unit>
+				<type>electricity_produced</type>
+				<last_consecutive_log_date>2018-06-01T08:00:00+02:00</last_consecutive_log_date>
+				<updated_date>2018-06-01T09:00:00+02:00</updated_date>
+				<interval>PT5M</interval>
+				<period start_date="2018-05-16T15:00:00+02:00" end_date="2018-06-01T09:00:00+02:00" interval="PT1H">
+					<measurement log_date="2018-06-01T09:00:00+02:00" tariff_indicator="nl_offpeak">0.000</measurement>
+					<measurement log_date="2018-06-01T09:00:00+02:00" tariff_indicator="nl_peak">0.000</measurement>
+				</period>
+			</interval_log>
+			<cumulative_log id="2593ad51e410475d9c8e4e9f269e87ef">
+				<unit>Wh</unit>
+				<type>electricity_produced</type>
+				<last_consecutive_log_date>2018-06-01T09:25:00+02:00</last_consecutive_log_date>
+				<updated_date>2018-06-01T09:25:00+02:00</updated_date>
+				<period start_date="2018-05-16T14:10:00+02:00" end_date="2018-06-01T09:25:00+02:00">
+					<measurement log_date="2018-06-01T09:25:00+02:00" tariff_indicator="nl_offpeak">0.000</measurement>
+					<measurement log_date="2018-06-01T09:25:00+02:00" tariff_indicator="nl_peak">0.000</measurement>
+				</period>
+			</cumulative_log>
+			<point_log id="9c880a9545ee44e7adc7a67aeff216a7">
+				<unit>W</unit>
+				<type>electricity_consumed</type>
+				<last_consecutive_log_date>2018-06-01T09:28:29+02:00</last_consecutive_log_date>
+				<updated_date>2018-06-01T09:28:29+02:00</updated_date>
+				<period start_date="2018-05-16T14:06:49+02:00" end_date="2018-06-01T09:28:29+02:00">
+					<measurement log_date="2018-06-01T09:28:29+02:00">207.000</measurement>
+				</period>
+			</point_log>
+		</logs>
+	</location>
+	<module id="99a2312f56b84002b4b2513f7c125f0a">
+		<vendor_name/>
+		<vendor_model/>
+		<hardware_version/>
+		<firmware_version/>
+		<created_date>2019-12-19T08:04:54.963+01:00</created_date>
+		<modified_date>2020-03-30T15:55:50.952+02:00</modified_date>
+		<deleted_date/>
+		<services>
+			<gas_interval_meter id="5c37aedddc984cb0972ce32295a20e05">
+				<measurement log_date="2020-03-30T15:00:00+02:00" unit="m3" interval="PT1H" directionality="consumed">0.232</measurement>
+			</gas_interval_meter>
+			<gas_cumulative_meter id="104aafdd3bba43abb2150af082294066">
+				<measurement log_date="2020-03-30T15:50:10+02:00" unit="m3" directionality="consumed">2637.993</measurement>
+			</gas_cumulative_meter>
+		</services>
+		<protocols>
+			<dsmrgas id="5a898d5aa9d042ce89bd5d6ea47b3315">
+				<serial>G0032565558076518</serial>
+					<dsmrmain id="b0eea7aae5244946b41846b13c7f6121"/>
+			</dsmrgas>
+		</protocols>
+	</module>
+	<module id="7e47fc2c113149d588099feb9657d7ad">
+		<vendor_name>Xemex</vendor_name>
+		<vendor_model>XMX5LGBBLA4415567118</vendor_model>
+		<hardware_version/>
+		<firmware_version/>
+		<created_date>2019-12-19T08:04:54.948+01:00</created_date>
+		<modified_date>2020-03-30T15:55:50.953+02:00</modified_date>
+		<deleted_date/>
+		<services>
+			<electricity_point_meter id="b0f3b3b41f9449ab86ffce8ec6679b50">
+				<measurement log_date="2020-03-30T15:55:45+02:00" unit="W" directionality="produced">0.000</measurement>
+				<measurement log_date="2020-03-30T15:55:45+02:00" unit="W" directionality="consumed">368.000</measurement>
+			</electricity_point_meter>
+			<electricity_interval_meter id="95005af3f29844d594ce1b55b844f100">
+				<measurement log_date="2020-03-30T15:00:00+02:00" unit="Wh" interval="PT5M" directionality="produced" tariff_indicator="nl_offpeak">0.000</measurement>
+				<measurement log_date="2020-03-30T15:00:00+02:00" unit="Wh" interval="PT5M" directionality="produced" tariff_indicator="nl_peak">0.000</measurement>
+				<measurement log_date="2020-03-30T15:00:00+02:00" unit="Wh" interval="PT5M" directionality="consumed" tariff_indicator="nl_offpeak">0.000</measurement>
+				<measurement log_date="2020-03-30T15:00:00+02:00" unit="Wh" interval="PT5M" directionality="consumed" tariff_indicator="nl_peak">422.000</measurement>
+			</electricity_interval_meter>
+			<electricity_cumulative_meter id="e058e86ba0594f4180cee9ae40210965">
+				<measurement log_date="2020-03-30T15:50:00+02:00" unit="Wh" directionality="produced" tariff_indicator="nl_offpeak">0.000</measurement>
+				<measurement log_date="2020-03-30T15:50:00+02:00" unit="Wh" directionality="produced" tariff_indicator="nl_peak">0.000</measurement>
+				<measurement log_date="2020-03-30T15:50:00+02:00" unit="Wh" directionality="consumed" tariff_indicator="nl_offpeak">2361517.000</measurement>
+				<measurement log_date="2020-03-30T15:50:00+02:00" unit="Wh" directionality="consumed" tariff_indicator="nl_peak">2693248.000</measurement>
+			</electricity_cumulative_meter>
+		</services>
+		<protocols>
+			<dsmrmain id="b0eea7aae5244946b41846b13c7f6121">
+				<serial>E0045004213806418</serial>
+				<dsmrmbuses>
+					<dsmrgas id="5a898d5aa9d042ce89bd5d6ea47b3315"/>
+				</dsmrmbuses>
+			</dsmrmain>
+		</protocols>
+	</module>
+	<location id="199aa40f126840f392983d171374ab0b">
+		<name>Stroommeter</name>
+		<description/>
+		<type>building</type>
+		<created_date>2018-05-16T14:05:10.753+02:00</created_date>
+		<modified_date>2018-05-16T14:06:38.996+02:00</modified_date>
+		<deleted_date/>
+		<actuators/>
+		<locations/>
+		<appliances/>
+		<services>
+			<gas_cumulative_meter id="104aafdd3bba43abb2150af082294066"/>
+			<electricity_point_meter id="b0f3b3b41f9449ab86ffce8ec6679b50"/>
+			<gas_interval_meter id="5c37aedddc984cb0972ce32295a20e05"/>
+			<electricity_cumulative_meter id="e058e86ba0594f4180cee9ae40210965"/>
+			<electricity_interval_meter id="95005af3f29844d594ce1b55b844f100"/>
+		</services>
+		<logs>
+			<cumulative_log id="69589b303fd743209d24ceac8b196b6f">
+				<unit>m3</unit>
+				<type>gas_consumed</type>
+				<last_consecutive_log_date>2020-03-30T15:50:10+02:00</last_consecutive_log_date>
+				<updated_date>2020-03-30T15:50:10+02:00</updated_date>
+				<period start_date="2018-05-16T14:05:12+02:00" end_date="2020-03-30T15:50:10+02:00">
+					<measurement log_date="2020-03-30T15:50:10+02:00">2637.993</measurement>
+				</period>
+			</cumulative_log>
+			<point_log id="ba27076534244365816b7f35d377fb02">
+				<unit>W</unit>
+				<type>electricity_produced</type>
+				<last_consecutive_log_date>2020-03-30T15:55:45+02:00</last_consecutive_log_date>
+				<updated_date>2020-03-30T15:55:45+02:00</updated_date>
+				<period start_date="2018-05-16T14:05:07+02:00" end_date="2020-03-30T15:55:45+02:00">
+					<measurement log_date="2020-03-30T15:55:45+02:00">0.000</measurement>
+				</period>
+			</point_log>
+			<interval_log id="880b20fe09c0428d909ed7c39ae2d676">
+				<unit>m3</unit>
+				<type>gas_consumed</type>
+				<last_consecutive_log_date>2020-03-30T14:00:00+02:00</last_consecutive_log_date>
+				<updated_date>2020-03-30T15:00:00+02:00</updated_date>
+				<interval>PT1H</interval>
+				<period start_date="2018-06-01T09:00:00+02:00" end_date="2020-03-30T15:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-03-30T15:00:00+02:00">0.232</measurement>
+				</period>
+			</interval_log>
+			<cumulative_log id="b8cfdb50cbad4ed79d729c631a3a06dd">
+				<unit>Wh</unit>
+				<type>electricity_consumed</type>
+				<last_consecutive_log_date>2020-03-30T15:50:00+02:00</last_consecutive_log_date>
+				<updated_date>2020-03-30T15:50:00+02:00</updated_date>
+				<period start_date="2018-05-16T14:05:00+02:00" end_date="2020-03-30T15:50:00+02:00">
+					<measurement log_date="2020-03-30T15:50:00+02:00" tariff_indicator="nl_offpeak">2361517.000</measurement>
+					<measurement log_date="2020-03-30T15:50:00+02:00" tariff_indicator="nl_peak">2693248.000</measurement>
+				</period>
+			</cumulative_log>
+			<interval_log id="a9f046e0c98c4aab9e1c44664979c2b7">
+				<unit>Wh</unit>
+				<type>electricity_consumed</type>
+				<last_consecutive_log_date>2020-03-30T14:00:00+02:00</last_consecutive_log_date>
+				<updated_date>2020-03-30T15:00:00+02:00</updated_date>
+				<interval>PT5M</interval>
+				<period start_date="2018-06-01T09:00:00+02:00" end_date="2020-03-30T15:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-03-30T15:00:00+02:00" tariff_indicator="nl_offpeak">0.000</measurement>
+					<measurement log_date="2020-03-30T15:00:00+02:00" tariff_indicator="nl_peak">422.000</measurement>
+				</period>
+			</interval_log>
+			<interval_log id="47f33b961278414aad7eb626ff3a3b42">
+				<unit>Wh</unit>
+				<type>electricity_produced</type>
+				<last_consecutive_log_date>2020-03-30T14:00:00+02:00</last_consecutive_log_date>
+				<updated_date>2020-03-30T15:00:00+02:00</updated_date>
+				<interval>PT5M</interval>
+				<period start_date="2018-06-01T09:00:00+02:00" end_date="2020-03-30T15:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-03-30T15:00:00+02:00" tariff_indicator="nl_offpeak">0.000</measurement>
+					<measurement log_date="2020-03-30T15:00:00+02:00" tariff_indicator="nl_peak">0.000</measurement>
+				</period>
+			</interval_log>
+			<cumulative_log id="5824b1213eb249e5a58fdd18ce34e8ad">
+				<unit>Wh</unit>
+				<type>electricity_produced</type>
+				<last_consecutive_log_date>2020-03-30T15:50:00+02:00</last_consecutive_log_date>
+				<updated_date>2020-03-30T15:50:00+02:00</updated_date>
+				<period start_date="2018-05-16T14:05:00+02:00" end_date="2020-03-30T15:50:00+02:00">
+					<measurement log_date="2020-03-30T15:50:00+02:00" tariff_indicator="nl_offpeak">0.000</measurement>
+					<measurement log_date="2020-03-30T15:50:00+02:00" tariff_indicator="nl_peak">0.000</measurement>
+				</period>
+			</cumulative_log>
+			<point_log id="b9c1b8f148fa418093ddee8a24290e29">
+				<unit>W</unit>
+				<type>electricity_consumed</type>
+				<last_consecutive_log_date>2020-03-30T15:55:45+02:00</last_consecutive_log_date>
+				<updated_date>2020-03-30T15:55:45+02:00</updated_date>
+				<period start_date="2018-05-16T14:05:07+02:00" end_date="2020-03-30T15:55:45+02:00">
+					<measurement log_date="2020-03-30T15:55:45+02:00">368.000</measurement>
+				</period>
+			</point_log>
+		</logs>
+	</location>
+</domain_objects>
diff --git a/userdata/updated/smile_p1_v2_2/core.locations.xml b/userdata/updated/smile_p1_v2_2/core.locations.xml
new file mode 100644
index 000000000..33dc4c5dc
--- /dev/null
+++ b/userdata/updated/smile_p1_v2_2/core.locations.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<locations>
+	<location id='199aa40f126840f392983d171374ab0b'>
+		<name>WillSol</name>
+		<description></description>
+		<type>building</type>
+		<created_date>2019-03-15T14:25:44.171+01:00</created_date>
+		<modified_date>2019-11-08T11:19:57+01:00</modified_date>
+		<deleted_date></deleted_date>
+		<actuators/>
+		<locations/>
+		<appliances/>
+		<services>
+			<gas_interval_meter id='7df1571450814d8495e2d21a20f382ef'/>
+			<electricity_cumulative_meter id='34494826ac91454b9a52565079816c42'/>
+			<electricity_point_meter id='954b543356184d3198616251130ea6fb'/>
+			<gas_cumulative_meter id='18434cd441344195acad25d314c08121'/>
+			<electricity_interval_meter id='5bf96af3657544c1b7d74602bebc11a5'/>
+		</services>
+		<logs>
+			<cumulative_log id='a8c83ff40d5c498d908334a5e8ed1747'>
+				<unit>m3</unit>
+				<type>gas_consumed</type>
+				<last_consecutive_log_date>2020-03-11T21:25:00+01:00</last_consecutive_log_date>
+				<updated_date>2020-03-11T21:25:00+01:00</updated_date>
+				<period start_date='2019-11-08T11:25:00+01:00' end_date='2020-03-11T21:25:00+01:00'>
+					<measurement log_date='2020-03-11T21:25:00+01:00'>584.431</measurement>
+				</period>
+			</cumulative_log>
+			<cumulative_log id='d97196ad4d2f45deb07cb93b566cda1d'>
+				<unit>Wh</unit>
+				<type>electricity_consumed</type>
+				<last_consecutive_log_date>2020-03-11T21:25:00+01:00</last_consecutive_log_date>
+				<updated_date>2020-03-11T21:25:00+01:00</updated_date>
+				<period start_date='2019-03-15T14:25:00+01:00' end_date='2020-03-11T21:25:00+01:00'>
+					<measurement log_date='2020-03-11T21:25:00+01:00' tariff_indicator='nl_offpeak'>1642740.000</measurement>
+					<measurement log_date='2020-03-11T21:25:00+01:00' tariff_indicator='nl_peak'>1155155.000</measurement>
+				</period>
+			</cumulative_log>
+			<interval_log id='f5a7aa48e13947ab8d9dcd4dcaa339bc'>
+				<unit>m3</unit>
+				<type>gas_consumed</type>
+				<last_consecutive_log_date>2020-03-11T20:00:00+01:00</last_consecutive_log_date>
+				<updated_date>2020-03-11T21:00:00+01:00</updated_date>
+				<interval>PT1H</interval>
+				<period start_date='2019-11-08T12:00:00+01:00' end_date='2020-03-11T21:00:00+01:00' interval='PT1H' >
+					<measurement log_date='2020-03-11T21:00:00+01:00'>0.014</measurement>
+				</period>
+			</interval_log>
+			<interval_log id='11e9beed64a541309a138aa168b04ad5'>
+				<unit>Wh</unit>
+				<type>electricity_produced</type>
+				<last_consecutive_log_date>2020-03-11T20:00:00+01:00</last_consecutive_log_date>
+				<updated_date>2020-03-11T21:00:00+01:00</updated_date>
+				<interval>PT5M</interval>
+				<period start_date='2019-03-15T15:00:00+01:00' end_date='2020-03-11T21:00:00+01:00' interval='PT1H' >
+					<measurement log_date='2020-03-11T21:00:00+01:00' tariff_indicator='nl_offpeak'>0.000</measurement>
+					<measurement log_date='2020-03-11T21:00:00+01:00' tariff_indicator='nl_peak'>0.000</measurement>
+				</period>
+			</interval_log>
+			<interval_log id='9eb38db883324f10ba5a43c343604cb5'>
+				<unit>Wh</unit>
+				<type>electricity_consumed</type>
+				<last_consecutive_log_date>2020-03-11T20:00:00+01:00</last_consecutive_log_date>
+				<updated_date>2020-03-11T21:00:00+01:00</updated_date>
+				<interval>PT5M</interval>
+				<period start_date='2019-03-15T15:00:00+01:00' end_date='2020-03-11T21:00:00+01:00' interval='PT1H' >
+					<measurement log_date='2020-03-11T21:00:00+01:00' tariff_indicator='nl_offpeak'>0.000</measurement>
+					<measurement log_date='2020-03-11T21:00:00+01:00' tariff_indicator='nl_peak'>210.000</measurement>
+				</period>
+			</interval_log>
+			<cumulative_log id='ad7ee8687a174a7181727c44dced0cd9'>
+				<unit>Wh</unit>
+				<type>electricity_produced</type>
+				<last_consecutive_log_date>2020-03-11T21:25:00+01:00</last_consecutive_log_date>
+				<updated_date>2020-03-11T21:25:00+01:00</updated_date>
+				<period start_date='2019-03-15T14:25:00+01:00' end_date='2020-03-11T21:25:00+01:00'>
+					<measurement log_date='2020-03-11T21:25:00+01:00' tariff_indicator='nl_offpeak'>482598.000</measurement>
+					<measurement log_date='2020-03-11T21:25:00+01:00' tariff_indicator='nl_peak'>1296136.000</measurement>
+				</period>
+			</cumulative_log>
+			<point_log id='7698f3869b854a0a855a4edf0c7bfc2e'>
+				<unit>W</unit>
+				<type>electricity_produced</type>
+				<last_consecutive_log_date>2020-03-11T21:30:51+01:00</last_consecutive_log_date>
+				<updated_date>2020-03-11T21:30:51+01:00</updated_date>
+				<period start_date='2019-03-15T14:25:43+01:00' end_date='2020-03-11T21:30:51+01:00'>
+					<measurement log_date='2020-03-11T21:30:51+01:00'>0.000</measurement>
+				</period>
+			</point_log>
+			<point_log id='c2c0ecc94ae34d9f8f9698312430b4a9'>
+				<unit>W</unit>
+				<type>electricity_consumed</type>
+				<last_consecutive_log_date>2020-03-11T21:30:51+01:00</last_consecutive_log_date>
+				<updated_date>2020-03-11T21:30:51+01:00</updated_date>
+				<period start_date='2019-03-15T14:25:43+01:00' end_date='2020-03-11T21:30:51+01:00'>
+					<measurement log_date='2020-03-11T21:30:51+01:00'>456.000</measurement>
+				</period>
+			</point_log>
+		</logs>
+	</location>
+	<location id='3e38f8df2fd84359b5df3e716376fb65'>
+		<name>WillSol</name>
+		<description></description>
+		<type>building</type>
+		<created_date>2019-03-15T14:24:43.253+01:00</created_date>
+		<modified_date>2019-03-15T20:02:06.328+01:00</modified_date>
+		<deleted_date></deleted_date>
+		<actuators/>
+		<locations/>
+		<appliances/>
+		<services>
+		</services>
+		<logs>
+			<cumulative_log id='5f72964f06754d52ac443c038f352429'>
+				<unit>Wh</unit>
+				<type>electricity_consumed</type>
+				<last_consecutive_log_date>2019-03-15T20:10:00+01:00</last_consecutive_log_date>
+				<updated_date>2019-03-15T20:10:00+01:00</updated_date>
+				<period start_date='2019-03-15T20:05:00+01:00' end_date='2019-03-15T20:10:00+01:00'>
+					<measurement log_date='2019-03-15T20:10:00+01:00' tariff_indicator='nl_offpeak'>39083.000</measurement>
+					<measurement log_date='2019-03-15T20:10:00+01:00' tariff_indicator='nl_peak'>37231.000</measurement>
+				</period>
+			</cumulative_log>
+			<interval_log id='78e5a5fb652a41e58ead2cdb8fbb93cc'>
+				<unit>Wh</unit>
+				<type>electricity_consumed</type>
+				<last_consecutive_log_date>2019-03-15T19:00:00+01:00</last_consecutive_log_date>
+				<updated_date>2019-03-15T20:00:00+01:00</updated_date>
+				<interval>PT5M</interval>
+				<period start_date='2019-03-15T20:00:00+01:00' end_date='2019-03-15T20:00:00+01:00' interval='PT1H' >
+					<measurement log_date='2019-03-15T20:00:00+01:00' tariff_indicator='nl_offpeak'>0.000</measurement>
+					<measurement log_date='2019-03-15T20:00:00+01:00' tariff_indicator='nl_peak'>107.000</measurement>
+				</period>
+			</interval_log>
+			<interval_log id='843e46198c4e40dfb81184d351fd13f8'>
+				<unit>Wh</unit>
+				<type>electricity_produced</type>
+				<last_consecutive_log_date>2019-03-15T19:00:00+01:00</last_consecutive_log_date>
+				<updated_date>2019-03-15T20:00:00+01:00</updated_date>
+				<interval>PT5M</interval>
+				<period start_date='2019-03-15T20:00:00+01:00' end_date='2019-03-15T20:00:00+01:00' interval='PT1H' >
+					<measurement log_date='2019-03-15T20:00:00+01:00' tariff_indicator='nl_offpeak'>0.000</measurement>
+					<measurement log_date='2019-03-15T20:00:00+01:00' tariff_indicator='nl_peak'>0.000</measurement>
+				</period>
+			</interval_log>
+			<point_log id='fb68436fc2c8483f8359ddd150ba7d04'>
+				<unit>W</unit>
+				<type>electricity_consumed</type>
+				<last_consecutive_log_date>2019-03-15T20:11:28+01:00</last_consecutive_log_date>
+				<updated_date>2019-03-15T20:11:28+01:00</updated_date>
+				<period start_date='2019-03-15T14:24:41+01:00' end_date='2019-03-15T20:11:28+01:00'>
+					<measurement log_date='2019-03-15T20:11:28+01:00'>518.000</measurement>
+				</period>
+			</point_log>
+			<cumulative_log id='3ae3288b43f44e658116cc4e5ec5c15c'>
+				<unit>Wh</unit>
+				<type>electricity_produced</type>
+				<last_consecutive_log_date>2019-03-15T20:10:00+01:00</last_consecutive_log_date>
+				<updated_date>2019-03-15T20:10:00+01:00</updated_date>
+				<period start_date='2019-03-15T20:05:00+01:00' end_date='2019-03-15T20:10:00+01:00'>
+					<measurement log_date='2019-03-15T20:10:00+01:00' tariff_indicator='nl_offpeak'>1515.000</measurement>
+					<measurement log_date='2019-03-15T20:10:00+01:00' tariff_indicator='nl_peak'>17313.000</measurement>
+				</period>
+			</cumulative_log>
+			<point_log id='395427ecf5d7454a975e011e765f8d65'>
+				<unit>W</unit>
+				<type>electricity_produced</type>
+				<last_consecutive_log_date>2019-03-15T20:11:28+01:00</last_consecutive_log_date>
+				<updated_date>2019-03-15T20:11:28+01:00</updated_date>
+				<period start_date='2019-03-15T14:24:41+01:00' end_date='2019-03-15T20:11:28+01:00'>
+					<measurement log_date='2019-03-15T20:11:28+01:00'>0.000</measurement>
+				</period>
+			</point_log>
+		</logs>
+	</location>
+</locations>
diff --git a/userdata/updated/smile_p1_v2_2/core.modules.xml b/userdata/updated/smile_p1_v2_2/core.modules.xml
new file mode 100644
index 000000000..06e7b7f63
--- /dev/null
+++ b/userdata/updated/smile_p1_v2_2/core.modules.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<modules>
+	<module id='1e4783850f4c4595b5be8c9cf3462f56'>
+		<vendor_name>Ene5\T210-DESMR5.0</vendor_name>
+		<vendor_model>Ene5\T210-DESMR5.0</vendor_model>
+		<hardware_version></hardware_version>
+		<firmware_version></firmware_version>
+		<created_date>2019-03-15T14:24:43.239+01:00</created_date>
+		<modified_date>2020-03-11T21:31:54.422+01:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_interval_meter id='5bf96af3657544c1b7d74602bebc11a5'>
+				<measurement log_date='2020-03-11T21:00:00+01:00' unit='Wh' interval='PT5M' directionality='produced' tariff_indicator='nl_offpeak'>0.000</measurement>
+				<measurement log_date='2020-03-11T21:00:00+01:00' unit='Wh' interval='PT5M' directionality='produced' tariff_indicator='nl_peak'>0.000</measurement>
+				<measurement log_date='2020-03-11T21:00:00+01:00' unit='Wh' interval='PT5M' directionality='consumed' tariff_indicator='nl_offpeak'>0.000</measurement>
+				<measurement log_date='2020-03-11T21:00:00+01:00' unit='Wh' interval='PT5M' directionality='consumed' tariff_indicator='nl_peak'>250.000</measurement>
+			</electricity_interval_meter>
+			<electricity_cumulative_meter id='34494826ac91454b9a52565079816c42'>
+				<measurement log_date='2020-03-11T21:30:00+01:00' unit='Wh' directionality='produced' tariff_indicator='nl_offpeak'>482698.000</measurement>
+				<measurement log_date='2020-03-11T21:30:00+01:00' unit='Wh' directionality='produced' tariff_indicator='nl_peak'>1296336.000</measurement>
+				<measurement log_date='2020-03-11T21:30:00+01:00' unit='Wh' directionality='consumed' tariff_indicator='nl_offpeak'>1642840.000</measurement>
+				<measurement log_date='2020-03-11T21:30:00+01:00' unit='Wh' directionality='consumed' tariff_indicator='nl_peak'>1155295.000</measurement>
+			</electricity_cumulative_meter>
+			<electricity_point_meter id='954b543356184d3198616251130ea6fb'>
+				<measurement log_date='2020-03-11T21:31:44+01:00' unit='W' directionality='produced'>2248.000</measurement>
+				<measurement log_date='2020-03-11T21:31:44+01:00' unit='W' directionality='consumed'>0.000</measurement>
+			</electricity_point_meter>
+		</services>
+		<protocols>
+			<dsmrmain id='9a68dc0c267444ba8769b3fb5e2ad35e'>
+				<serial>E0048000028931118</serial>
+				<dsmrmbuses>
+					<dsmrgas id='971a1b3112c34ab795c4f0ef911b8ef4'/>
+				</dsmrmbuses>
+			</dsmrmain>
+		</protocols>
+	</module>
+	<module id='3582b41427e2417a8f6a10fe412cc95c'>
+		<vendor_name></vendor_name>
+		<vendor_model></vendor_model>
+		<hardware_version></hardware_version>
+		<firmware_version></firmware_version>
+		<created_date>2019-11-08T11:19:56.987+01:00</created_date>
+		<modified_date>2020-03-11T21:31:54.422+01:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<gas_interval_meter id='7df1571450814d8495e2d21a20f382ef'>
+				<measurement log_date='2020-03-11T21:00:00+01:00' unit='m3' interval='PT1H' directionality='consumed'>0.000</measurement>
+			</gas_interval_meter>
+			<gas_cumulative_meter id='18434cd441344195acad25d314c08121'>
+				<measurement log_date='2020-03-11T21:30:00+01:00' unit='m3' directionality='consumed'>585.433</measurement>
+			</gas_cumulative_meter>
+		</services>
+		<protocols>
+			<dsmrgas id='971a1b3112c34ab795c4f0ef911b8ef4'>
+				<serial>G000000000000001</serial>
+					<dsmrmain id='9a68dc0c267444ba8769b3fb5e2ad35e'/>
+			</dsmrgas>
+		</protocols>
+	</module>
+</modules>
diff --git a/userdata/updated/smile_p1_v2_2/system_status_xml.xml b/userdata/updated/smile_p1_v2_2/system_status_xml.xml
new file mode 100644
index 000000000..127f3f13e
--- /dev/null
+++ b/userdata/updated/smile_p1_v2_2/system_status_xml.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<status>
+<system>
+<product>smile</product>
+<mode>p1</mode>
+<version>2.5.9</version>
+<short_id>abcdefgh</short_id>
+<kernel>Linux 4.4.92, Apr 4 07:25:22 2018</kernel>
+<date>2020-03-11T21:36:36+0100</date>
+<uptime>10 days, 16:46,  load average: 0.23, 0.51, 0.49</uptime>
+</system>
+<application>
+<p1_logger>running</p1_logger>
+<last_telegram>2020-03-11 21:36:35</last_telegram>
+<last_parse_time>2020-03-11 21:32:35</last_parse_time>
+</application>
+<network>
+<hostname>smile000000</hostname>
+<type>LAN (cable)</type>
+<ip_address>127.0.0.1</ip_address>
+<mac_address>012345670001</mac_address>
+</network>
+</status>
diff --git a/userdata/updated/stretch_v31/core.appliances.xml b/userdata/updated/stretch_v31/core.appliances.xml
new file mode 100644
index 000000000..d941dd327
--- /dev/null
+++ b/userdata/updated/stretch_v31/core.appliances.xml
@@ -0,0 +1,708 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<appliances>
+	<appliance id='5ca521ac179d468e91d772eeeb8a2117'>
+		<name>Oven (793F84)</name>
+		<description>Circle</description>
+		<type>zz_misc</type>
+		<created_date>2020-09-05T23:16:30.711+02:00</created_date>
+		<modified_date>2020-09-07T10:06:37.553+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<relay id='336503aebde74f9cb6c70b18dfe417a0' log_type='relay'>
+				<functionalities>
+					<point_log id='2e31a0934e154533aa79949039d93422'/>
+					<relay_functionality id='b361610c300c4b16ba72a8a815810f16'/>
+				</functionalities>
+			</relay>
+			<electricity_interval_meter id='7ee606c608dc45f1b1b617014d0be787' log_type='electricity'>
+				<functionalities>
+					<interval_log id='563a254e300a4630a38bbeb7cacf0920'/>
+					<interval_log id='92e9d199ea1a4846b33a38407237c3c5'/>
+				</functionalities>
+			</electricity_interval_meter>
+			<electricity_point_meter id='dd448d68248840de862bc5d6a92fd983' log_type='electricity'>
+				<functionalities>
+					<point_log id='6f1a380a505344f3a9cc641637b1114b'/>
+					<point_log id='f7ce7c263175435ab4b3325205f1f499'/>
+				</functionalities>
+			</electricity_point_meter>
+		</services>
+		<logs>
+			<point_log id='2e31a0934e154533aa79949039d93422'>
+				<updated_date>2020-09-07T10:06:37.551+02:00</updated_date>
+				<type>relay</type>
+				<unit></unit>
+				<last_consecutive_log_date>2020-09-06T20:28:02.851+02:00</last_consecutive_log_date>
+				<relay id='336503aebde74f9cb6c70b18dfe417a0'/>
+				<period start_date="2020-09-07T10:06:37.551+02:00" end_date="2020-09-07T10:06:37.551+02:00">
+					<measurement log_date="2020-09-07T10:06:37.551+02:00">on</measurement>
+				</period>
+			</point_log>
+			<interval_log id='563a254e300a4630a38bbeb7cacf0920'>
+				<updated_date>2020-09-07T09:00:00+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date>2020-09-07T09:00:00+02:00</last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='7ee606c608dc45f1b1b617014d0be787'/>
+				<period start_date="2020-09-07T09:00:00+02:00" end_date="2020-09-07T09:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-09-07T09:00:00+02:00">0.00</measurement>
+				</period>
+			</interval_log>
+			<point_log id='6f1a380a505344f3a9cc641637b1114b'>
+				<updated_date>2020-09-07T10:06:37.568+02:00</updated_date>
+				<type>electricity_produced</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-09-05T23:16:33.969+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='dd448d68248840de862bc5d6a92fd983'/>
+				<period start_date="2020-09-07T10:06:37.568+02:00" end_date="2020-09-07T10:06:37.568+02:00">
+					<measurement log_date="2020-09-07T10:06:37.568+02:00">0.00</measurement>
+				</period>
+			</point_log>
+			<interval_log id='92e9d199ea1a4846b33a38407237c3c5'>
+				<updated_date>2020-09-07T09:00:00+02:00</updated_date>
+				<type>electricity_produced</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date>2020-09-07T09:00:00+02:00</last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='7ee606c608dc45f1b1b617014d0be787'/>
+				<period start_date="2020-09-07T09:00:00+02:00" end_date="2020-09-07T09:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-09-07T09:00:00+02:00">0.00</measurement>
+				</period>
+			</interval_log>
+			<point_log id='f7ce7c263175435ab4b3325205f1f499'>
+				<updated_date>2020-09-07T10:06:37.568+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-09-05T23:16:33.969+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='dd448d68248840de862bc5d6a92fd983'/>
+				<period start_date="2020-09-07T10:06:37.568+02:00" end_date="2020-09-07T10:06:37.568+02:00">
+					<measurement log_date="2020-09-07T10:06:37.568+02:00">0.00</measurement>
+				</period>
+			</point_log>
+		</logs>
+		<actuator_functionalities>
+			<relay_functionality id='b361610c300c4b16ba72a8a815810f16'>
+				<updated_date>2020-09-07T10:06:37.551+02:00</updated_date>
+				<state>on</state>
+				<lock>false</lock>
+				<relay id='336503aebde74f9cb6c70b18dfe417a0'/>
+			</relay_functionality>
+		</actuator_functionalities>
+	</appliance>
+	<appliance id='5871317346d045bc9f6b987ef25ee638'>
+		<name>Boiler (1EB31)</name>
+		<description>Circle</description>
+		<type>water_heater_vessel</type>
+		<created_date>2020-08-27T14:21:59.591+02:00</created_date>
+		<modified_date>2020-09-07T10:06:37.605+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_point_meter id='7d8c67d064b14134b287ea72ed9ffa08' log_type='electricity'>
+				<functionalities>
+					<point_log id='168967cf45954a8d8ab8300d6355c9aa'/>
+					<point_log id='d9e53a813e77496ea4e5aca366e559c7'/>
+				</functionalities>
+			</electricity_point_meter>
+			<electricity_interval_meter id='8bd7d604c9204b7eadbbb1304021fe7f' log_type='electricity'>
+				<functionalities>
+					<interval_log id='3ca803bd59a6498099d1b0db46615fbb'/>
+					<interval_log id='40a1f923280542279225e0d395882b5c'/>
+				</functionalities>
+			</electricity_interval_meter>
+			<relay id='cf98b4da8977490eab723e25dac88d5b' log_type='relay'>
+				<functionalities>
+					<point_log id='865ced94bfd846a5be4f2ede5807269c'/>
+					<relay_functionality id='92cf4999ca764bacb4d766f112083231'/>
+				</functionalities>
+			</relay>
+		</services>
+		<logs>
+			<point_log id='168967cf45954a8d8ab8300d6355c9aa'>
+				<updated_date>2020-09-07T10:06:33.671+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-09-07T09:48:56.034+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='7d8c67d064b14134b287ea72ed9ffa08'/>
+				<period start_date="2020-09-07T10:06:33.671+02:00" end_date="2020-09-07T10:06:33.671+02:00">
+					<measurement log_date="2020-09-07T10:06:33.671+02:00">1.19</measurement>
+				</period>
+			</point_log>
+			<interval_log id='3ca803bd59a6498099d1b0db46615fbb'>
+				<updated_date>2020-09-07T02:00:00+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='8bd7d604c9204b7eadbbb1304021fe7f'/>
+				<period start_date="2020-09-07T02:00:00+02:00" end_date="2020-09-07T02:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-09-07T02:00:00+02:00">0.00</measurement>
+				</period>
+			</interval_log>
+			<interval_log id='40a1f923280542279225e0d395882b5c'>
+				<updated_date></updated_date>
+				<type>electricity_produced</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='8bd7d604c9204b7eadbbb1304021fe7f'/>
+			</interval_log>
+			<point_log id='865ced94bfd846a5be4f2ede5807269c'>
+				<updated_date>2020-09-07T10:06:37.603+02:00</updated_date>
+				<type>relay</type>
+				<unit></unit>
+				<last_consecutive_log_date>2020-08-28T09:10:22.349+02:00</last_consecutive_log_date>
+				<relay id='cf98b4da8977490eab723e25dac88d5b'/>
+				<period start_date="2020-09-07T10:06:37.603+02:00" end_date="2020-09-07T10:06:37.603+02:00">
+					<measurement log_date="2020-09-07T10:06:37.603+02:00">on</measurement>
+				</period>
+			</point_log>
+			<point_log id='d9e53a813e77496ea4e5aca366e559c7'>
+				<updated_date>2020-09-07T10:06:33.671+02:00</updated_date>
+				<type>electricity_produced</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-08-27T14:22:04.076+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='7d8c67d064b14134b287ea72ed9ffa08'/>
+				<period start_date="2020-09-07T10:06:33.671+02:00" end_date="2020-09-07T10:06:33.671+02:00">
+					<measurement log_date="2020-09-07T10:06:33.671+02:00">0.00</measurement>
+				</period>
+			</point_log>
+		</logs>
+		<actuator_functionalities>
+			<relay_functionality id='92cf4999ca764bacb4d766f112083231'>
+				<updated_date>2020-09-07T10:06:37.603+02:00</updated_date>
+				<state>on</state>
+				<lock>false</lock>
+				<relay id='cf98b4da8977490eab723e25dac88d5b'/>
+			</relay_functionality>
+		</actuator_functionalities>
+	</appliance>
+	<appliance id='e1c884e7dede431dadee09506ec4f859'>
+		<name>Koelkast (92C4A)</name>
+		<description>Circle+</description>
+		<type>refrigerator</type>
+		<created_date>2020-08-27T14:31:15.313+02:00</created_date>
+		<modified_date>2020-09-07T10:06:37.333+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<relay id='fabe6c3a2d124c7e94915cb259feed4d' log_type='relay'>
+				<functionalities>
+					<point_log id='33c53b5e24674f37807255a1d64bf37a'/>
+					<relay_functionality id='d8a4c97cc446436490cbfca09eabe4eb'/>
+				</functionalities>
+			</relay>
+			<electricity_interval_meter id='b842f3e4ff204edfa2c598bbf468b0b7' log_type='electricity'>
+				<functionalities>
+					<interval_log id='34fc1e0a494241ebb83ec207ed8b4b6c'/>
+					<interval_log id='ddcff75f511d4ccb9b9854ced7418991'/>
+				</functionalities>
+			</electricity_interval_meter>
+			<electricity_point_meter id='5aa4714df14a42508fb1f3ccd58559d7' log_type='electricity'>
+				<functionalities>
+					<point_log id='4cfd0f7e64474226815f17efaaf01753'/>
+					<point_log id='88a00d3a0c0646e782060be68e8e1777'/>
+				</functionalities>
+			</electricity_point_meter>
+		</services>
+		<logs>
+			<point_log id='33c53b5e24674f37807255a1d64bf37a'>
+				<updated_date>2020-09-07T10:06:37.330+02:00</updated_date>
+				<type>relay</type>
+				<unit></unit>
+				<last_consecutive_log_date>2020-08-28T09:10:29.097+02:00</last_consecutive_log_date>
+				<relay id='fabe6c3a2d124c7e94915cb259feed4d'/>
+				<period start_date="2020-09-07T10:06:37.330+02:00" end_date="2020-09-07T10:06:37.330+02:00">
+					<measurement log_date="2020-09-07T10:06:37.330+02:00">on</measurement>
+				</period>
+			</point_log>
+			<interval_log id='34fc1e0a494241ebb83ec207ed8b4b6c'>
+				<updated_date>2020-09-07T02:00:00+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='b842f3e4ff204edfa2c598bbf468b0b7'/>
+				<period start_date="2020-09-07T02:00:00+02:00" end_date="2020-09-07T02:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-09-07T02:00:00+02:00">0.08</measurement>
+				</period>
+			</interval_log>
+			<point_log id='4cfd0f7e64474226815f17efaaf01753'>
+				<updated_date>2020-09-07T10:06:34.023+02:00</updated_date>
+				<type>electricity_produced</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-08-27T14:34:43.329+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='5aa4714df14a42508fb1f3ccd58559d7'/>
+				<period start_date="2020-09-07T10:06:34.023+02:00" end_date="2020-09-07T10:06:34.023+02:00">
+					<measurement log_date="2020-09-07T10:06:34.023+02:00">0.00</measurement>
+				</period>
+			</point_log>
+			<point_log id='88a00d3a0c0646e782060be68e8e1777'>
+				<updated_date>2020-09-07T10:06:34.023+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-09-07T09:55:49.685+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='5aa4714df14a42508fb1f3ccd58559d7'/>
+				<period start_date="2020-09-07T10:06:34.023+02:00" end_date="2020-09-07T10:06:34.023+02:00">
+					<measurement log_date="2020-09-07T10:06:34.023+02:00">50.50</measurement>
+				</period>
+			</point_log>
+			<interval_log id='ddcff75f511d4ccb9b9854ced7418991'>
+				<updated_date></updated_date>
+				<type>electricity_produced</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='b842f3e4ff204edfa2c598bbf468b0b7'/>
+			</interval_log>
+		</logs>
+		<actuator_functionalities>
+			<relay_functionality id='d8a4c97cc446436490cbfca09eabe4eb'>
+				<updated_date>2020-09-07T10:06:37.330+02:00</updated_date>
+				<state>on</state>
+				<lock>false</lock>
+				<relay id='fabe6c3a2d124c7e94915cb259feed4d'/>
+			</relay_functionality>
+		</actuator_functionalities>
+	</appliance>
+	<appliance id='aac7b735042c4832ac9ff33aae4f453b'>
+		<name>Vaatwasser (2a1ab)</name>
+		<description>Circle</description>
+		<type>dishwasher</type>
+		<created_date>2020-08-27T14:20:39.292+02:00</created_date>
+		<modified_date>2020-09-07T10:06:37.181+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_point_meter id='3559cbf27edd485895e683c8317eff04' log_type='electricity'>
+				<functionalities>
+					<point_log id='07e4f3a66ff14cdf94d502cb5fbc0a29'/>
+					<point_log id='818c30ebedde478f874e303696b8677d'/>
+				</functionalities>
+			</electricity_point_meter>
+			<electricity_interval_meter id='05f5f58c4a5a4c939bfbbbcd5144842e' log_type='electricity'>
+				<functionalities>
+					<interval_log id='513de6a2c2024df9b1beb27280b9a945'/>
+					<interval_log id='cdf56515336346e6bbfdbed8d0596f6a'/>
+				</functionalities>
+			</electricity_interval_meter>
+			<relay id='1d4c937af1454f2da5e3f165fb84d67e' log_type='relay'>
+				<functionalities>
+					<relay_functionality id='7775d580a620439f8519802942d99e3c'/>
+					<point_log id='aa819a65085247f687a93f53ae573719'/>
+				</functionalities>
+			</relay>
+		</services>
+		<logs>
+			<point_log id='07e4f3a66ff14cdf94d502cb5fbc0a29'>
+				<updated_date>2020-09-07T10:06:34.134+02:00</updated_date>
+				<type>electricity_produced</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-08-27T14:20:45.904+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='3559cbf27edd485895e683c8317eff04'/>
+				<period start_date="2020-09-07T10:06:34.134+02:00" end_date="2020-09-07T10:06:34.134+02:00">
+					<measurement log_date="2020-09-07T10:06:34.134+02:00">0.00</measurement>
+				</period>
+			</point_log>
+			<interval_log id='513de6a2c2024df9b1beb27280b9a945'>
+				<updated_date></updated_date>
+				<type>electricity_produced</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='05f5f58c4a5a4c939bfbbbcd5144842e'/>
+			</interval_log>
+			<point_log id='818c30ebedde478f874e303696b8677d'>
+				<updated_date>2020-09-07T10:06:34.134+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-09-06T19:01:53.489+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='3559cbf27edd485895e683c8317eff04'/>
+				<period start_date="2020-09-07T10:06:34.134+02:00" end_date="2020-09-07T10:06:34.134+02:00">
+					<measurement log_date="2020-09-07T10:06:34.134+02:00">1000.00</measurement>
+				</period>
+			</point_log>
+			<point_log id='aa819a65085247f687a93f53ae573719'>
+				<updated_date>2020-09-07T10:06:37.179+02:00</updated_date>
+				<type>relay</type>
+				<unit></unit>
+				<last_consecutive_log_date>2020-08-28T09:10:26.719+02:00</last_consecutive_log_date>
+				<relay id='1d4c937af1454f2da5e3f165fb84d67e'/>
+				<period start_date="2020-09-07T10:06:37.179+02:00" end_date="2020-09-07T10:06:37.179+02:00">
+					<measurement log_date="2020-09-07T10:06:37.179+02:00">on</measurement>
+				</period>
+			</point_log>
+			<interval_log id='cdf56515336346e6bbfdbed8d0596f6a'>
+				<updated_date>2020-09-06T14:00:00+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='05f5f58c4a5a4c939bfbbbcd5144842e'/>
+				<period start_date="2020-09-06T14:00:00+02:00" end_date="2020-09-06T14:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-09-06T14:00:00+02:00">20.71</measurement>
+				</period>
+			</interval_log>
+		</logs>
+		<actuator_functionalities>
+			<relay_functionality id='7775d580a620439f8519802942d99e3c'>
+				<updated_date>2020-09-07T10:06:37.179+02:00</updated_date>
+				<state>on</state>
+				<lock>true</lock>
+				<relay id='1d4c937af1454f2da5e3f165fb84d67e'/>
+			</relay_functionality>
+		</actuator_functionalities>
+	</appliance>
+	<appliance id='cfe95cf3de1948c0b8955125bf754614'>
+		<name>Droger (52559)</name>
+		<description>Circle</description>
+		<type>dryer</type>
+		<created_date>2020-08-27T13:25:19.442+02:00</created_date>
+		<modified_date>2020-09-06T14:20:56.972+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_interval_meter id='c49f750389d140b3be760bae79c3da2c' log_type='electricity'>
+				<functionalities>
+					<interval_log id='00ee2a7716ef478f97c50e523c1bc7b5'/>
+					<interval_log id='3c689589cf7e4b5c91b52bee5fb7038c'/>
+				</functionalities>
+			</electricity_interval_meter>
+			<relay id='910973e4e86b4a99863a5d5beb0920cb' log_type='relay'>
+				<functionalities>
+					<point_log id='3d6b62ff759b4051ae9314aa86b7ceec'/>
+					<relay_functionality id='eed0efe44c3a4b9782d8a4e862714915'/>
+				</functionalities>
+			</relay>
+			<electricity_point_meter id='831c88a189ba439cb97ce0fe2db44f10' log_type='electricity'>
+				<functionalities>
+					<point_log id='5633114b41ca44b8a3de3bdd46ccb809'/>
+					<point_log id='b81e52e6a97c4a7abdf073cb511b716d'/>
+				</functionalities>
+			</electricity_point_meter>
+		</services>
+		<logs>
+			<interval_log id='00ee2a7716ef478f97c50e523c1bc7b5'>
+				<updated_date></updated_date>
+				<type>electricity_produced</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='c49f750389d140b3be760bae79c3da2c'/>
+			</interval_log>
+			<interval_log id='3c689589cf7e4b5c91b52bee5fb7038c'>
+				<updated_date>2020-09-06T12:00:00+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date>2020-09-06T12:00:00+02:00</last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='c49f750389d140b3be760bae79c3da2c'/>
+				<period start_date="2020-09-06T12:00:00+02:00" end_date="2020-09-06T12:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-09-06T12:00:00+02:00">0.00</measurement>
+				</period>
+			</interval_log>
+			<point_log id='3d6b62ff759b4051ae9314aa86b7ceec'>
+				<updated_date>2020-09-06T14:20:56.969+02:00</updated_date>
+				<type>relay</type>
+				<unit></unit>
+				<last_consecutive_log_date>2020-08-28T22:41:46.967+02:00</last_consecutive_log_date>
+				<relay id='910973e4e86b4a99863a5d5beb0920cb'/>
+				<period start_date="2020-09-06T14:20:56.969+02:00" end_date="2020-09-06T14:20:56.969+02:00">
+					<measurement log_date="2020-09-06T14:20:56.969+02:00">off</measurement>
+				</period>
+			</point_log>
+			<point_log id='5633114b41ca44b8a3de3bdd46ccb809'>
+				<updated_date>2020-09-06T14:20:57.496+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-09-06T09:48:51.929+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='831c88a189ba439cb97ce0fe2db44f10'/>
+				<period start_date="2020-09-06T14:20:57.496+02:00" end_date="2020-09-06T14:20:57.496+02:00">
+					<measurement log_date="2020-09-06T14:20:57.496+02:00">0.00</measurement>
+				</period>
+			</point_log>
+			<point_log id='b81e52e6a97c4a7abdf073cb511b716d'>
+				<updated_date>2020-09-06T14:20:57.496+02:00</updated_date>
+				<type>electricity_produced</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-08-27T13:25:23.135+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='831c88a189ba439cb97ce0fe2db44f10'/>
+				<period start_date="2020-09-06T14:20:57.496+02:00" end_date="2020-09-06T14:20:57.496+02:00">
+					<measurement log_date="2020-09-06T14:20:57.496+02:00">0.00</measurement>
+				</period>
+			</point_log>
+		</logs>
+		<actuator_functionalities>
+			<relay_functionality id='eed0efe44c3a4b9782d8a4e862714915'>
+				<updated_date>2020-09-06T14:20:56.969+02:00</updated_date>
+				<state>off</state>
+				<lock>false</lock>
+				<relay id='910973e4e86b4a99863a5d5beb0920cb'/>
+			</relay_functionality>
+		</actuator_functionalities>
+	</appliance>
+	<appliance id='99f89d097be34fca88d8598c6dbc18ea'>
+		<name>Meterkast (787BFB)</name>
+		<description>Circle</description>
+		<type>router</type>
+		<created_date>2020-09-05T23:19:28.751+02:00</created_date>
+		<modified_date>2020-09-07T10:06:37.683+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_interval_meter id='380c611d89b74344a87de45186f083a6' log_type='electricity'>
+				<functionalities>
+					<interval_log id='0f23c5a5f1034a55aa4eb210e540136c'/>
+					<interval_log id='88190a5fa1444d5399d9ca021f5c4397'/>
+				</functionalities>
+			</electricity_interval_meter>
+			<electricity_point_meter id='37842e718ed94125b3933648df51431d' log_type='electricity'>
+				<functionalities>
+					<point_log id='b6b881c24e104e9abe6c4f0e64402b69'/>
+					<point_log id='fbbb149444ba4a2f9780b9470f91cd71'/>
+				</functionalities>
+			</electricity_point_meter>
+			<relay id='5ecd67f7115043e69e29b39bef1632f5' log_type='relay'>
+				<functionalities>
+					<relay_functionality id='e2e0c9bf582145f6b79cd7ffc0cb77e8'/>
+					<point_log id='ead9ea1a76b7412aa62268b174d0926b'/>
+				</functionalities>
+			</relay>
+		</services>
+		<logs>
+			<interval_log id='0f23c5a5f1034a55aa4eb210e540136c'>
+				<updated_date>2020-09-07T09:00:00+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date>2020-09-07T08:00:00+02:00</last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='380c611d89b74344a87de45186f083a6'/>
+				<period start_date="2020-09-07T09:00:00+02:00" end_date="2020-09-07T09:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-09-07T09:00:00+02:00">28.18</measurement>
+				</period>
+			</interval_log>
+			<interval_log id='88190a5fa1444d5399d9ca021f5c4397'>
+				<updated_date>2020-09-07T09:00:00+02:00</updated_date>
+				<type>electricity_produced</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date>2020-09-07T08:00:00+02:00</last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='380c611d89b74344a87de45186f083a6'/>
+				<period start_date="2020-09-07T09:00:00+02:00" end_date="2020-09-07T09:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-09-07T09:00:00+02:00">0.00</measurement>
+				</period>
+			</interval_log>
+			<point_log id='b6b881c24e104e9abe6c4f0e64402b69'>
+				<updated_date>2020-09-07T10:06:36.885+02:00</updated_date>
+				<type>electricity_produced</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-09-05T23:19:31.403+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='37842e718ed94125b3933648df51431d'/>
+				<period start_date="2020-09-07T10:06:36.885+02:00" end_date="2020-09-07T10:06:36.885+02:00">
+					<measurement log_date="2020-09-07T10:06:36.885+02:00">0.00</measurement>
+				</period>
+			</point_log>
+			<point_log id='ead9ea1a76b7412aa62268b174d0926b'>
+				<updated_date>2020-09-07T10:06:37.681+02:00</updated_date>
+				<type>relay</type>
+				<unit></unit>
+				<last_consecutive_log_date>2020-09-05T23:42:03.809+02:00</last_consecutive_log_date>
+				<relay id='5ecd67f7115043e69e29b39bef1632f5'/>
+				<period start_date="2020-09-07T10:06:37.681+02:00" end_date="2020-09-07T10:06:37.681+02:00">
+					<measurement log_date="2020-09-07T10:06:37.681+02:00">on</measurement>
+				</period>
+			</point_log>
+			<point_log id='fbbb149444ba4a2f9780b9470f91cd71'>
+				<updated_date>2020-09-07T10:06:36.885+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-09-07T09:51:40.534+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='37842e718ed94125b3933648df51431d'/>
+				<period start_date="2020-09-07T10:06:36.885+02:00" end_date="2020-09-07T10:06:36.885+02:00">
+					<measurement log_date="2020-09-07T10:06:36.885+02:00">27.56</measurement>
+				</period>
+			</point_log>
+		</logs>
+		<actuator_functionalities>
+			<relay_functionality id='e2e0c9bf582145f6b79cd7ffc0cb77e8'>
+				<updated_date>2020-09-07T10:06:37.681+02:00</updated_date>
+				<state>on</state>
+				<lock>true</lock>
+				<relay id='5ecd67f7115043e69e29b39bef1632f5'/>
+			</relay_functionality>
+		</actuator_functionalities>
+	</appliance>
+	<appliance id='059e4d03c7a34d278add5c7a4a781d19'>
+		<name>Wasmachine (52AC1)</name>
+		<description>Circle</description>
+		<type>washingmachine</type>
+		<created_date>2020-08-27T13:33:45.153+02:00</created_date>
+		<modified_date>2020-09-06T14:20:56.244+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<relay id='7beee08f9e4a46cc8e7a7df399e693dd' log_type='relay'>
+				<functionalities>
+					<relay_functionality id='0eff576e00c245c288aa9492ff4a9115'/>
+					<point_log id='bfb530ed44bc4bb4be4994f2fc9267a1'/>
+				</functionalities>
+			</relay>
+			<electricity_point_meter id='93922bdbe6ad4f63b80f361365cde36a' log_type='electricity'>
+				<functionalities>
+					<point_log id='17fa51101034474498512445f69d6751'/>
+					<point_log id='495a4f00cc8647a3aa64af5e697ab958'/>
+				</functionalities>
+			</electricity_point_meter>
+			<electricity_interval_meter id='0896f3ccf45f4a478055ee0587105458' log_type='electricity'>
+				<functionalities>
+					<interval_log id='2cbc98743d2341f59759d89b4c1bb0ec'/>
+					<interval_log id='bace9baca78447b4a384e4157b6cb0fd'/>
+				</functionalities>
+			</electricity_interval_meter>
+		</services>
+		<logs>
+			<point_log id='17fa51101034474498512445f69d6751'>
+				<updated_date>2020-09-06T14:20:57.068+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-09-06T11:17:06.573+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='93922bdbe6ad4f63b80f361365cde36a'/>
+				<period start_date="2020-09-06T14:20:57.068+02:00" end_date="2020-09-06T14:20:57.068+02:00">
+					<measurement log_date="2020-09-06T14:20:57.068+02:00">0.00</measurement>
+				</period>
+			</point_log>
+			<interval_log id='2cbc98743d2341f59759d89b4c1bb0ec'>
+				<updated_date></updated_date>
+				<type>electricity_produced</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='0896f3ccf45f4a478055ee0587105458'/>
+			</interval_log>
+			<point_log id='495a4f00cc8647a3aa64af5e697ab958'>
+				<updated_date>2020-09-06T14:20:57.068+02:00</updated_date>
+				<type>electricity_produced</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-08-27T13:33:48.643+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='93922bdbe6ad4f63b80f361365cde36a'/>
+				<period start_date="2020-09-06T14:20:57.068+02:00" end_date="2020-09-06T14:20:57.068+02:00">
+					<measurement log_date="2020-09-06T14:20:57.068+02:00">0.00</measurement>
+				</period>
+			</point_log>
+			<interval_log id='bace9baca78447b4a384e4157b6cb0fd'>
+				<updated_date>2020-09-06T12:00:00+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date>2020-09-06T12:00:00+02:00</last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='0896f3ccf45f4a478055ee0587105458'/>
+				<period start_date="2020-09-06T12:00:00+02:00" end_date="2020-09-06T12:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-09-06T12:00:00+02:00">0.00</measurement>
+				</period>
+			</interval_log>
+			<point_log id='bfb530ed44bc4bb4be4994f2fc9267a1'>
+				<updated_date>2020-09-06T14:20:56.241+02:00</updated_date>
+				<type>relay</type>
+				<unit></unit>
+				<last_consecutive_log_date>2020-09-05T23:14:22.832+02:00</last_consecutive_log_date>
+				<relay id='7beee08f9e4a46cc8e7a7df399e693dd'/>
+				<period start_date="2020-09-06T14:20:56.241+02:00" end_date="2020-09-06T14:20:56.241+02:00">
+					<measurement log_date="2020-09-06T14:20:56.241+02:00">off</measurement>
+				</period>
+			</point_log>
+		</logs>
+		<actuator_functionalities>
+			<relay_functionality id='0eff576e00c245c288aa9492ff4a9115'>
+				<updated_date>2020-09-06T14:20:56.241+02:00</updated_date>
+				<state>off</state>
+				<lock>false</lock>
+				<relay id='7beee08f9e4a46cc8e7a7df399e693dd'/>
+			</relay_functionality>
+		</actuator_functionalities>
+	</appliance>
+	<appliance id='e309b52ea5684cf1a22f30cf0cd15051'>
+		<name>Computer (788618)</name>
+		<description>Circle</description>
+		<type>computer_desktop</type>
+		<created_date>2020-09-05T23:18:15.432+02:00</created_date>
+		<modified_date>2020-09-07T10:06:37.062+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_interval_meter id='77f399e714964b6598bb430974a9739d' log_type='electricity'>
+				<functionalities>
+					<interval_log id='3c87d40f3c564d0db1a84e0d265fc10a'/>
+					<interval_log id='f54548f284144f1f8dcd0adba1129b61'/>
+				</functionalities>
+			</electricity_interval_meter>
+			<relay id='c0a356ebb4e148fb9d0ec463baa06616' log_type='relay'>
+				<functionalities>
+					<relay_functionality id='4939624d93f44c51826ddc1e2c230fd8'/>
+					<point_log id='9e7ff72f9d0240e3a0ed7bf569c203ad'/>
+				</functionalities>
+			</relay>
+			<electricity_point_meter id='5ace622621374ff4b3ca68682436d99f' log_type='electricity'>
+				<functionalities>
+					<point_log id='be5beb8a9fe749af9dd5b449795f16b2'/>
+					<point_log id='e5afafea11214a26947590666b8d496c'/>
+				</functionalities>
+			</electricity_point_meter>
+		</services>
+		<logs>
+			<interval_log id='3c87d40f3c564d0db1a84e0d265fc10a'>
+				<updated_date>2020-09-07T09:00:00+02:00</updated_date>
+				<type>electricity_produced</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date>2020-09-07T09:00:00+02:00</last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='77f399e714964b6598bb430974a9739d'/>
+				<period start_date="2020-09-07T09:00:00+02:00" end_date="2020-09-07T09:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-09-07T09:00:00+02:00">0.00</measurement>
+				</period>
+			</interval_log>
+			<point_log id='9e7ff72f9d0240e3a0ed7bf569c203ad'>
+				<updated_date>2020-09-07T10:06:37.060+02:00</updated_date>
+				<type>relay</type>
+				<unit></unit>
+				<last_consecutive_log_date>2020-09-05T23:50:51.307+02:00</last_consecutive_log_date>
+				<relay id='c0a356ebb4e148fb9d0ec463baa06616'/>
+				<period start_date="2020-09-07T10:06:37.060+02:00" end_date="2020-09-07T10:06:37.060+02:00">
+					<measurement log_date="2020-09-07T10:06:37.060+02:00">on</measurement>
+				</period>
+			</point_log>
+			<point_log id='be5beb8a9fe749af9dd5b449795f16b2'>
+				<updated_date>2020-09-07T10:01:37.812+02:00</updated_date>
+				<type>electricity_produced</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-09-05T23:18:18.870+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='5ace622621374ff4b3ca68682436d99f'/>
+				<period start_date="2020-09-07T10:01:37.812+02:00" end_date="2020-09-07T10:01:37.812+02:00">
+					<measurement log_date="2020-09-07T10:01:37.812+02:00">0.00</measurement>
+				</period>
+			</point_log>
+			<point_log id='e5afafea11214a26947590666b8d496c'>
+				<updated_date>2020-09-07T10:01:37.812+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-09-07T10:01:37.811+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='5ace622621374ff4b3ca68682436d99f'/>
+				<period start_date="2020-09-07T10:01:37.812+02:00" end_date="2020-09-07T10:01:37.812+02:00">
+					<measurement log_date="2020-09-07T10:01:37.812+02:00">156.25</measurement>
+				</period>
+			</point_log>
+			<interval_log id='f54548f284144f1f8dcd0adba1129b61'>
+				<updated_date>2020-09-07T09:00:00+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date>2020-09-07T09:00:00+02:00</last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='77f399e714964b6598bb430974a9739d'/>
+				<period start_date="2020-09-07T09:00:00+02:00" end_date="2020-09-07T09:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-09-07T09:00:00+02:00">162.63</measurement>
+				</period>
+			</interval_log>
+		</logs>
+		<actuator_functionalities>
+			<relay_functionality id='4939624d93f44c51826ddc1e2c230fd8'>
+				<updated_date>2020-09-07T10:06:37.060+02:00</updated_date>
+				<state>on</state>
+				<lock>true</lock>
+				<relay id='c0a356ebb4e148fb9d0ec463baa06616'/>
+			</relay_functionality>
+		</actuator_functionalities>
+	</appliance>
+</appliances>
diff --git a/userdata/updated/stretch_v31/core.domain_objects.xml b/userdata/updated/stretch_v31/core.domain_objects.xml
new file mode 100644
index 000000000..188467128
--- /dev/null
+++ b/userdata/updated/stretch_v31/core.domain_objects.xml
@@ -0,0 +1,1335 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<domain_objects>
+	<appliance id='5871317346d045bc9f6b987ef25ee638'>
+		<name>Boiler (1EB31)</name>
+		<description>Circle</description>
+		<type>water_heater_vessel</type>
+		<created_date>2020-08-27T14:21:59.591+02:00</created_date>
+		<modified_date>2020-09-07T10:08:13.385+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_point_meter id='7d8c67d064b14134b287ea72ed9ffa08' log_type='electricity'>
+				<functionalities>
+					<point_log id='168967cf45954a8d8ab8300d6355c9aa'/>
+					<point_log id='d9e53a813e77496ea4e5aca366e559c7'/>
+				</functionalities>
+			</electricity_point_meter>
+			<electricity_interval_meter id='8bd7d604c9204b7eadbbb1304021fe7f' log_type='electricity'>
+				<functionalities>
+					<interval_log id='3ca803bd59a6498099d1b0db46615fbb'/>
+					<interval_log id='40a1f923280542279225e0d395882b5c'/>
+				</functionalities>
+			</electricity_interval_meter>
+			<relay id='cf98b4da8977490eab723e25dac88d5b' log_type='relay'>
+				<functionalities>
+					<point_log id='865ced94bfd846a5be4f2ede5807269c'/>
+					<relay_functionality id='92cf4999ca764bacb4d766f112083231'/>
+				</functionalities>
+			</relay>
+		</services>
+		<logs>
+			<point_log id='168967cf45954a8d8ab8300d6355c9aa'>
+				<updated_date>2020-09-07T10:08:13.794+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-09-07T09:48:56.034+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='7d8c67d064b14134b287ea72ed9ffa08'/>
+				<period start_date="2020-09-07T10:08:13.794+02:00" end_date="2020-09-07T10:08:13.794+02:00">
+					<measurement log_date="2020-09-07T10:08:13.794+02:00">1.19</measurement>
+				</period>
+			</point_log>
+			<interval_log id='3ca803bd59a6498099d1b0db46615fbb'>
+				<updated_date>2020-09-07T02:00:00+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='8bd7d604c9204b7eadbbb1304021fe7f'/>
+				<period start_date="2020-09-07T02:00:00+02:00" end_date="2020-09-07T02:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-09-07T02:00:00+02:00">0.00</measurement>
+				</period>
+			</interval_log>
+			<interval_log id='40a1f923280542279225e0d395882b5c'>
+				<updated_date></updated_date>
+				<type>electricity_produced</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='8bd7d604c9204b7eadbbb1304021fe7f'/>
+			</interval_log>
+			<point_log id='865ced94bfd846a5be4f2ede5807269c'>
+				<updated_date>2020-09-07T10:08:13.382+02:00</updated_date>
+				<type>relay</type>
+				<unit></unit>
+				<last_consecutive_log_date>2020-08-28T09:10:22.349+02:00</last_consecutive_log_date>
+				<relay id='cf98b4da8977490eab723e25dac88d5b'/>
+				<period start_date="2020-09-07T10:08:13.382+02:00" end_date="2020-09-07T10:08:13.382+02:00">
+					<measurement log_date="2020-09-07T10:08:13.382+02:00">on</measurement>
+				</period>
+			</point_log>
+			<point_log id='d9e53a813e77496ea4e5aca366e559c7'>
+				<updated_date>2020-09-07T10:08:13.794+02:00</updated_date>
+				<type>electricity_produced</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-08-27T14:22:04.076+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='7d8c67d064b14134b287ea72ed9ffa08'/>
+				<period start_date="2020-09-07T10:08:13.794+02:00" end_date="2020-09-07T10:08:13.794+02:00">
+					<measurement log_date="2020-09-07T10:08:13.794+02:00">0.00</measurement>
+				</period>
+			</point_log>
+		</logs>
+		<actuator_functionalities>
+			<relay_functionality id='92cf4999ca764bacb4d766f112083231'>
+				<updated_date>2020-09-07T10:08:13.382+02:00</updated_date>
+				<state>on</state>
+				<lock>false</lock>
+				<relay id='cf98b4da8977490eab723e25dac88d5b'/>
+			</relay_functionality>
+		</actuator_functionalities>
+	</appliance>
+	<appliance id='059e4d03c7a34d278add5c7a4a781d19'>
+		<name>Wasmachine (52AC1)</name>
+		<description>Circle</description>
+		<type>washingmachine</type>
+		<created_date>2020-08-27T13:33:45.153+02:00</created_date>
+		<modified_date>2020-09-06T14:20:56.244+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<relay id='7beee08f9e4a46cc8e7a7df399e693dd' log_type='relay'>
+				<functionalities>
+					<relay_functionality id='0eff576e00c245c288aa9492ff4a9115'/>
+					<point_log id='bfb530ed44bc4bb4be4994f2fc9267a1'/>
+				</functionalities>
+			</relay>
+			<electricity_point_meter id='93922bdbe6ad4f63b80f361365cde36a' log_type='electricity'>
+				<functionalities>
+					<point_log id='17fa51101034474498512445f69d6751'/>
+					<point_log id='495a4f00cc8647a3aa64af5e697ab958'/>
+				</functionalities>
+			</electricity_point_meter>
+			<electricity_interval_meter id='0896f3ccf45f4a478055ee0587105458' log_type='electricity'>
+				<functionalities>
+					<interval_log id='2cbc98743d2341f59759d89b4c1bb0ec'/>
+					<interval_log id='bace9baca78447b4a384e4157b6cb0fd'/>
+				</functionalities>
+			</electricity_interval_meter>
+		</services>
+		<logs>
+			<point_log id='17fa51101034474498512445f69d6751'>
+				<updated_date>2020-09-06T14:20:57.068+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-09-06T11:17:06.573+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='93922bdbe6ad4f63b80f361365cde36a'/>
+				<period start_date="2020-09-06T14:20:57.068+02:00" end_date="2020-09-06T14:20:57.068+02:00">
+					<measurement log_date="2020-09-06T14:20:57.068+02:00">0.00</measurement>
+				</period>
+			</point_log>
+			<interval_log id='2cbc98743d2341f59759d89b4c1bb0ec'>
+				<updated_date></updated_date>
+				<type>electricity_produced</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='0896f3ccf45f4a478055ee0587105458'/>
+			</interval_log>
+			<point_log id='495a4f00cc8647a3aa64af5e697ab958'>
+				<updated_date>2020-09-06T14:20:57.068+02:00</updated_date>
+				<type>electricity_produced</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-08-27T13:33:48.643+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='93922bdbe6ad4f63b80f361365cde36a'/>
+				<period start_date="2020-09-06T14:20:57.068+02:00" end_date="2020-09-06T14:20:57.068+02:00">
+					<measurement log_date="2020-09-06T14:20:57.068+02:00">0.00</measurement>
+				</period>
+			</point_log>
+			<interval_log id='bace9baca78447b4a384e4157b6cb0fd'>
+				<updated_date>2020-09-06T12:00:00+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date>2020-09-06T12:00:00+02:00</last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='0896f3ccf45f4a478055ee0587105458'/>
+				<period start_date="2020-09-06T12:00:00+02:00" end_date="2020-09-06T12:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-09-06T12:00:00+02:00">0.00</measurement>
+				</period>
+			</interval_log>
+			<point_log id='bfb530ed44bc4bb4be4994f2fc9267a1'>
+				<updated_date>2020-09-06T14:20:56.241+02:00</updated_date>
+				<type>relay</type>
+				<unit></unit>
+				<last_consecutive_log_date>2020-09-05T23:14:22.832+02:00</last_consecutive_log_date>
+				<relay id='7beee08f9e4a46cc8e7a7df399e693dd'/>
+				<period start_date="2020-09-06T14:20:56.241+02:00" end_date="2020-09-06T14:20:56.241+02:00">
+					<measurement log_date="2020-09-06T14:20:56.241+02:00">on</measurement>
+				</period>
+			</point_log>
+		</logs>
+		<actuator_functionalities>
+			<relay_functionality id='0eff576e00c245c288aa9492ff4a9115'>
+				<updated_date>2020-09-06T14:20:56.241+02:00</updated_date>
+				<state>on</state>
+				<lock>false</lock>
+				<relay id='7beee08f9e4a46cc8e7a7df399e693dd'/>
+			</relay_functionality>
+		</actuator_functionalities>
+	</appliance>
+	<group id='71e1944f2a944b26ad73323e399efef0'>
+		<name>Test</name>
+		<description>Test Groep</description>
+		<type>switching</type>
+		<created_date>2020-09-06T20:04:02.302+02:00</created_date>
+		<modified_date>2020-09-06T20:04:03.319+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+		</services>
+		<appliances>
+			<appliance id='5ca521ac179d468e91d772eeeb8a2117'/>
+		</appliances>
+		<logs>
+			<interval_log id='1cb46e1a01c34e3fb24e63cd5aab4821'>
+				<updated_date></updated_date>
+				<type>electricity_consumed</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+			</interval_log>
+			<point_log id='8e3671be62c5450693bdb22067564aa8'>
+				<updated_date></updated_date>
+				<type>electricity_consumed</type>
+				<unit>W</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+			</point_log>
+			<point_log id='ac8651ada2234a769ff248792be805ac'>
+				<updated_date></updated_date>
+				<type>electricity_produced</type>
+				<unit>W</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+			</point_log>
+			<interval_log id='b160edaac5c3473a800bc42609edc37c'>
+				<updated_date></updated_date>
+				<type>electricity_produced</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+			</interval_log>
+			<point_log id='c46530cf8a724ffe95cce8553a9723c3'>
+				<updated_date></updated_date>
+				<type>relay</type>
+				<unit></unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+			</point_log>
+		</logs>
+		<actuator_functionalities>
+			<relay_functionality id='b26d34918ba74431847d13dd88aaefec'>
+				<updated_date></updated_date>
+				<state>off</state>
+				<lock>false</lock>
+				<delegation_strategy>single</delegation_strategy>
+			</relay_functionality>
+		</actuator_functionalities>
+	</group>
+	<appliance id='e1c884e7dede431dadee09506ec4f859'>
+		<name>Koelkast (92C4A)</name>
+		<description>Circle+</description>
+		<type>refrigerator</type>
+		<created_date>2020-08-27T14:31:15.313+02:00</created_date>
+		<modified_date>2020-09-07T10:08:13.246+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<relay id='fabe6c3a2d124c7e94915cb259feed4d' log_type='relay'>
+				<functionalities>
+					<point_log id='33c53b5e24674f37807255a1d64bf37a'/>
+					<relay_functionality id='d8a4c97cc446436490cbfca09eabe4eb'/>
+				</functionalities>
+			</relay>
+			<electricity_interval_meter id='b842f3e4ff204edfa2c598bbf468b0b7' log_type='electricity'>
+				<functionalities>
+					<interval_log id='34fc1e0a494241ebb83ec207ed8b4b6c'/>
+					<interval_log id='ddcff75f511d4ccb9b9854ced7418991'/>
+				</functionalities>
+			</electricity_interval_meter>
+			<electricity_point_meter id='5aa4714df14a42508fb1f3ccd58559d7' log_type='electricity'>
+				<functionalities>
+					<point_log id='4cfd0f7e64474226815f17efaaf01753'/>
+					<point_log id='88a00d3a0c0646e782060be68e8e1777'/>
+				</functionalities>
+			</electricity_point_meter>
+		</services>
+		<logs>
+			<point_log id='33c53b5e24674f37807255a1d64bf37a'>
+				<updated_date>2020-09-07T10:08:13.244+02:00</updated_date>
+				<type>relay</type>
+				<unit></unit>
+				<last_consecutive_log_date>2020-08-28T09:10:29.097+02:00</last_consecutive_log_date>
+				<relay id='fabe6c3a2d124c7e94915cb259feed4d'/>
+				<period start_date="2020-09-07T10:08:13.244+02:00" end_date="2020-09-07T10:08:13.244+02:00">
+					<measurement log_date="2020-09-07T10:08:13.244+02:00">on</measurement>
+				</period>
+			</point_log>
+			<interval_log id='34fc1e0a494241ebb83ec207ed8b4b6c'>
+				<updated_date>2020-09-07T02:00:00+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='b842f3e4ff204edfa2c598bbf468b0b7'/>
+				<period start_date="2020-09-07T02:00:00+02:00" end_date="2020-09-07T02:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-09-07T02:00:00+02:00">0.08</measurement>
+				</period>
+			</interval_log>
+			<point_log id='4cfd0f7e64474226815f17efaaf01753'>
+				<updated_date>2020-09-07T10:08:13.732+02:00</updated_date>
+				<type>electricity_produced</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-08-27T14:34:43.329+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='5aa4714df14a42508fb1f3ccd58559d7'/>
+				<period start_date="2020-09-07T10:08:13.732+02:00" end_date="2020-09-07T10:08:13.732+02:00">
+					<measurement log_date="2020-09-07T10:08:13.732+02:00">0.00</measurement>
+				</period>
+			</point_log>
+			<point_log id='88a00d3a0c0646e782060be68e8e1777'>
+				<updated_date>2020-09-07T10:08:13.732+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-09-07T09:55:49.685+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='5aa4714df14a42508fb1f3ccd58559d7'/>
+				<period start_date="2020-09-07T10:08:13.732+02:00" end_date="2020-09-07T10:08:13.732+02:00">
+					<measurement log_date="2020-09-07T10:08:13.732+02:00">50.50</measurement>
+				</period>
+			</point_log>
+			<interval_log id='ddcff75f511d4ccb9b9854ced7418991'>
+				<updated_date></updated_date>
+				<type>electricity_produced</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='b842f3e4ff204edfa2c598bbf468b0b7'/>
+			</interval_log>
+		</logs>
+		<actuator_functionalities>
+			<relay_functionality id='d8a4c97cc446436490cbfca09eabe4eb'>
+				<updated_date>2020-09-07T10:08:13.244+02:00</updated_date>
+				<state>on</state>
+				<lock>false</lock>
+				<relay id='fabe6c3a2d124c7e94915cb259feed4d'/>
+			</relay_functionality>
+		</actuator_functionalities>
+	</appliance>
+	<appliance id='cfe95cf3de1948c0b8955125bf754614'>
+		<name>Droger (52559)</name>
+		<description>Circle</description>
+		<type>dryer</type>
+		<created_date>2020-08-27T13:25:19.442+02:00</created_date>
+		<modified_date>2020-09-06T14:20:56.972+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_interval_meter id='c49f750389d140b3be760bae79c3da2c' log_type='electricity'>
+				<functionalities>
+					<interval_log id='00ee2a7716ef478f97c50e523c1bc7b5'/>
+					<interval_log id='3c689589cf7e4b5c91b52bee5fb7038c'/>
+				</functionalities>
+			</electricity_interval_meter>
+			<relay id='910973e4e86b4a99863a5d5beb0920cb' log_type='relay'>
+				<functionalities>
+					<point_log id='3d6b62ff759b4051ae9314aa86b7ceec'/>
+					<relay_functionality id='eed0efe44c3a4b9782d8a4e862714915'/>
+				</functionalities>
+			</relay>
+			<electricity_point_meter id='831c88a189ba439cb97ce0fe2db44f10' log_type='electricity'>
+				<functionalities>
+					<point_log id='5633114b41ca44b8a3de3bdd46ccb809'/>
+					<point_log id='b81e52e6a97c4a7abdf073cb511b716d'/>
+				</functionalities>
+			</electricity_point_meter>
+		</services>
+		<logs>
+			<interval_log id='00ee2a7716ef478f97c50e523c1bc7b5'>
+				<updated_date></updated_date>
+				<type>electricity_produced</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='c49f750389d140b3be760bae79c3da2c'/>
+			</interval_log>
+			<interval_log id='3c689589cf7e4b5c91b52bee5fb7038c'>
+				<updated_date>2020-09-06T12:00:00+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date>2020-09-06T12:00:00+02:00</last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='c49f750389d140b3be760bae79c3da2c'/>
+				<period start_date="2020-09-06T12:00:00+02:00" end_date="2020-09-06T12:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-09-06T12:00:00+02:00">0.00</measurement>
+				</period>
+			</interval_log>
+			<point_log id='3d6b62ff759b4051ae9314aa86b7ceec'>
+				<updated_date>2020-09-06T14:20:56.969+02:00</updated_date>
+				<type>relay</type>
+				<unit></unit>
+				<last_consecutive_log_date>2020-08-28T22:41:46.967+02:00</last_consecutive_log_date>
+				<relay id='910973e4e86b4a99863a5d5beb0920cb'/>
+				<period start_date="2020-09-06T14:20:56.969+02:00" end_date="2020-09-06T14:20:56.969+02:00">
+					<measurement log_date="2020-09-06T14:20:56.969+02:00">on</measurement>
+				</period>
+			</point_log>
+			<point_log id='5633114b41ca44b8a3de3bdd46ccb809'>
+				<updated_date>2020-09-06T14:20:57.496+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-09-06T09:48:51.929+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='831c88a189ba439cb97ce0fe2db44f10'/>
+				<period start_date="2020-09-06T14:20:57.496+02:00" end_date="2020-09-06T14:20:57.496+02:00">
+					<measurement log_date="2020-09-06T14:20:57.496+02:00">0.00</measurement>
+				</period>
+			</point_log>
+			<point_log id='b81e52e6a97c4a7abdf073cb511b716d'>
+				<updated_date>2020-09-06T14:20:57.496+02:00</updated_date>
+				<type>electricity_produced</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-08-27T13:25:23.135+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='831c88a189ba439cb97ce0fe2db44f10'/>
+				<period start_date="2020-09-06T14:20:57.496+02:00" end_date="2020-09-06T14:20:57.496+02:00">
+					<measurement log_date="2020-09-06T14:20:57.496+02:00">0.00</measurement>
+				</period>
+			</point_log>
+		</logs>
+		<actuator_functionalities>
+			<relay_functionality id='eed0efe44c3a4b9782d8a4e862714915'>
+				<updated_date>2020-09-06T14:20:56.969+02:00</updated_date>
+				<state>on</state>
+				<lock>false</lock>
+				<relay id='910973e4e86b4a99863a5d5beb0920cb'/>
+			</relay_functionality>
+		</actuator_functionalities>
+	</appliance>
+	<appliance id='99f89d097be34fca88d8598c6dbc18ea'>
+		<name>Meterkast (787BFB)</name>
+		<description>Circle</description>
+		<type>router</type>
+		<created_date>2020-09-05T23:19:28.751+02:00</created_date>
+		<modified_date>2020-09-07T10:08:13.485+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_interval_meter id='380c611d89b74344a87de45186f083a6' log_type='electricity'>
+				<functionalities>
+					<interval_log id='0f23c5a5f1034a55aa4eb210e540136c'/>
+					<interval_log id='88190a5fa1444d5399d9ca021f5c4397'/>
+				</functionalities>
+			</electricity_interval_meter>
+			<electricity_point_meter id='37842e718ed94125b3933648df51431d' log_type='electricity'>
+				<functionalities>
+					<point_log id='b6b881c24e104e9abe6c4f0e64402b69'/>
+					<point_log id='fbbb149444ba4a2f9780b9470f91cd71'/>
+				</functionalities>
+			</electricity_point_meter>
+			<relay id='5ecd67f7115043e69e29b39bef1632f5' log_type='relay'>
+				<functionalities>
+					<relay_functionality id='e2e0c9bf582145f6b79cd7ffc0cb77e8'/>
+					<point_log id='ead9ea1a76b7412aa62268b174d0926b'/>
+				</functionalities>
+			</relay>
+		</services>
+		<logs>
+			<interval_log id='0f23c5a5f1034a55aa4eb210e540136c'>
+				<updated_date>2020-09-07T09:00:00+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date>2020-09-07T08:00:00+02:00</last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='380c611d89b74344a87de45186f083a6'/>
+				<period start_date="2020-09-07T09:00:00+02:00" end_date="2020-09-07T09:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-09-07T09:00:00+02:00">28.18</measurement>
+				</period>
+			</interval_log>
+			<interval_log id='88190a5fa1444d5399d9ca021f5c4397'>
+				<updated_date>2020-09-07T09:00:00+02:00</updated_date>
+				<type>electricity_produced</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date>2020-09-07T08:00:00+02:00</last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='380c611d89b74344a87de45186f083a6'/>
+				<period start_date="2020-09-07T09:00:00+02:00" end_date="2020-09-07T09:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-09-07T09:00:00+02:00">0.00</measurement>
+				</period>
+			</interval_log>
+			<point_log id='b6b881c24e104e9abe6c4f0e64402b69'>
+				<updated_date>2020-09-07T10:08:13.581+02:00</updated_date>
+				<type>electricity_produced</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-09-05T23:19:31.403+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='37842e718ed94125b3933648df51431d'/>
+				<period start_date="2020-09-07T10:08:13.581+02:00" end_date="2020-09-07T10:08:13.581+02:00">
+					<measurement log_date="2020-09-07T10:08:13.581+02:00">0.00</measurement>
+				</period>
+			</point_log>
+			<point_log id='ead9ea1a76b7412aa62268b174d0926b'>
+				<updated_date>2020-09-07T10:08:13.483+02:00</updated_date>
+				<type>relay</type>
+				<unit></unit>
+				<last_consecutive_log_date>2020-09-05T23:42:03.809+02:00</last_consecutive_log_date>
+				<relay id='5ecd67f7115043e69e29b39bef1632f5'/>
+				<period start_date="2020-09-07T10:08:13.483+02:00" end_date="2020-09-07T10:08:13.483+02:00">
+					<measurement log_date="2020-09-07T10:08:13.483+02:00">on</measurement>
+				</period>
+			</point_log>
+			<point_log id='fbbb149444ba4a2f9780b9470f91cd71'>
+				<updated_date>2020-09-07T10:08:13.581+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-09-07T09:51:40.534+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='37842e718ed94125b3933648df51431d'/>
+				<period start_date="2020-09-07T10:08:13.581+02:00" end_date="2020-09-07T10:08:13.581+02:00">
+					<measurement log_date="2020-09-07T10:08:13.581+02:00">27.56</measurement>
+				</period>
+			</point_log>
+		</logs>
+		<actuator_functionalities>
+			<relay_functionality id='e2e0c9bf582145f6b79cd7ffc0cb77e8'>
+				<updated_date>2020-09-07T10:08:13.483+02:00</updated_date>
+				<state>on</state>
+				<lock>true</lock>
+				<relay id='5ecd67f7115043e69e29b39bef1632f5'/>
+			</relay_functionality>
+		</actuator_functionalities>
+	</appliance>
+	<module id='5d0dfedb743447b0ada65b3c07185abe'>
+		<vendor_name>Plugwise</vendor_name>
+		<vendor_model model_number='0473-00' model_name='Circle+'>NC</vendor_model>
+		<hardware_version>0000-0473-0007</hardware_version>
+		<firmware_version>2011-06-27T10:47:37+02:00</firmware_version>
+		<upgrade/>
+		<created_date>2020-07-26T18:32:42.146+02:00</created_date>
+		<modified_date>2020-08-27T14:36:06.987+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_interval_meter id='7823b65512cd44f3a13ea5429cdc1f35' log_type='electricity'>
+				<functionalities/>
+				<measurement log_date="2020-08-27T12:00:00+02:00" unit="Wh" directionality="consumed" interval="PT1H">0.00</measurement>
+			</electricity_interval_meter>
+			<relay id='7b2f084f084f43efbd1780ef4d19f9fb' log_type='relay'>
+				<functionalities/>
+				<measurement log_date="2020-08-27T13:21:13.496+02:00">on</measurement>
+			</relay>
+			<electricity_point_meter id='91631e06bffe415d97e4ca9d88798b0d' log_type='electricity'>
+				<functionalities/>
+				<measurement log_date="2020-08-27T13:21:13.999+02:00" unit="W" directionality="consumed">1.91</measurement>
+				<measurement log_date="2020-08-27T13:21:13.999+02:00" unit="W" directionality="produced">0.00</measurement>
+			</electricity_point_meter>
+		</services>
+		<protocols>
+			<network_coordinator id='ffda6867864248a89dfa2f8e0c3e67e8'>
+				<mac_address>0123456789AB</mac_address><network id='56de2443c34743c799353c3cedbff0eb'/>
+			</network_coordinator>
+		</protocols>
+	</module>
+	<module id='3a65097960694644ac8f56e192cbe980'>
+		<vendor_name>Plugwise</vendor_name>
+		<vendor_model model_number='0385-00' model_name='Stick'>MC</vendor_model>
+		<hardware_version>0000-0385-0007</hardware_version>
+		<firmware_version>2011-06-27T10:43:39+02:00</firmware_version>
+		<upgrade/>
+		<created_date>2020-07-26T18:32:41.861+02:00</created_date>
+		<modified_date>2020-08-27T13:21:14.408+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+		</services>
+		<protocols>
+			<master_controller id='fee80187abd54cc5982f7503b4c7c17f'>
+				<mac_address>ABCD012345670101</mac_address>
+				<network id='56de2443c34743c799353c3cedbff0eb'/><network id='56de2443c34743c799353c3cedbff0eb'/>
+			</master_controller>
+		</protocols>
+	</module>
+	<module id='b09d787ee9a247ed9efcd9ad865b13ad'>
+		<vendor_name>Plugwise</vendor_name>
+		<vendor_model model_number='0700-73' model_name='Circle+ type F'>NC</vendor_model>
+		<hardware_version>6539-0700-7330</hardware_version>
+		<firmware_version>2011-06-27T10:47:37+02:00</firmware_version>
+		<upgrade/>
+		<created_date>2019-05-06T19:50:35.529+02:00</created_date>
+		<modified_date>2020-09-07T10:08:13.739+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_point_meter id='5aa4714df14a42508fb1f3ccd58559d7' log_type='electricity'>
+				<functionalities>
+					<point_log id='4cfd0f7e64474226815f17efaaf01753'/>
+					<point_log id='88a00d3a0c0646e782060be68e8e1777'/>
+				</functionalities>
+				<measurement log_date="2020-09-07T10:08:13.732+02:00" unit="W" directionality="consumed">50.52</measurement>
+				<measurement log_date="2020-09-07T10:08:13.732+02:00" unit="W" directionality="produced">0.00</measurement>
+			</electricity_point_meter>
+			<electricity_interval_meter id='b842f3e4ff204edfa2c598bbf468b0b7' log_type='electricity'>
+				<functionalities>
+					<interval_log id='34fc1e0a494241ebb83ec207ed8b4b6c'/>
+					<interval_log id='ddcff75f511d4ccb9b9854ced7418991'/>
+				</functionalities>
+				<measurement log_date="2020-07-26T19:00:00+02:00" unit="Wh" directionality="produced" interval="PT1H">0.00</measurement>
+				<measurement log_date="2020-09-07T02:00:00+02:00" unit="Wh" directionality="consumed" interval="PT1H">0.08</measurement>
+			</electricity_interval_meter>
+			<relay id='fabe6c3a2d124c7e94915cb259feed4d' log_type='relay'>
+				<functionalities>
+					<point_log id='33c53b5e24674f37807255a1d64bf37a'/>
+					<relay_functionality id='d8a4c97cc446436490cbfca09eabe4eb'/>
+				</functionalities>
+				<measurement log_date="2020-09-07T10:08:13.244+02:00">on</measurement>
+			</relay>
+		</services>
+		<protocols>
+			<network_coordinator id='6f0db124f7c6429ea2721d61e5d62f93'>
+				<mac_address>0123456789AB</mac_address><network id='259882df3c05415b99c2d962534ce820'/>
+			</network_coordinator>
+		</protocols>
+	</module>
+	<network id='56de2443c34743c799353c3cedbff0eb'>
+		<master_controller id='fee80187abd54cc5982f7503b4c7c17f'>
+			<mac_address>ABCD012345670101</mac_address>
+			<module id='3a65097960694644ac8f56e192cbe980'/>
+			<upgrade/>
+		</master_controller>
+		<network_coordinator id='ffda6867864248a89dfa2f8e0c3e67e8'>
+			<mac_address>ABCD012345670102</mac_address>
+			<module id='5d0dfedb743447b0ada65b3c07185abe'/>
+			<upgrade/>
+			<search_nodes>false</search_nodes>
+		</network_coordinator>
+		<nodes>
+		</nodes>
+		<to_add/>
+		<to_remove/>
+		<available/>
+	</network>
+	<module id='b7f5a95616cf450da237c008143ee062'>
+		<vendor_name>Plugwise</vendor_name>
+		<vendor_model model_number='0440-01' model_name='Circle'>NR</vendor_model>
+		<hardware_version>0000-0440-0107</hardware_version>
+		<firmware_version>2011-06-27T10:52:18+02:00</firmware_version>
+		<upgrade/>
+		<created_date>2020-08-27T13:33:44.656+02:00</created_date>
+		<modified_date>2020-09-06T14:20:57.076+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_interval_meter id='0896f3ccf45f4a478055ee0587105458' log_type='electricity'>
+				<functionalities>
+					<interval_log id='2cbc98743d2341f59759d89b4c1bb0ec'/>
+					<interval_log id='bace9baca78447b4a384e4157b6cb0fd'/>
+				</functionalities>
+				<measurement log_date="2020-09-06T12:00:00+02:00" unit="Wh" directionality="consumed" interval="PT1H">0.00</measurement>
+			</electricity_interval_meter>
+			<relay id='7beee08f9e4a46cc8e7a7df399e693dd' log_type='relay'>
+				<functionalities>
+					<relay_functionality id='0eff576e00c245c288aa9492ff4a9115'/>
+					<point_log id='bfb530ed44bc4bb4be4994f2fc9267a1'/>
+				</functionalities>
+				<measurement log_date="2020-09-06T14:20:56.241+02:00">on</measurement>
+			</relay>
+			<electricity_point_meter id='93922bdbe6ad4f63b80f361365cde36a' log_type='electricity'>
+				<functionalities>
+					<point_log id='17fa51101034474498512445f69d6751'/>
+					<point_log id='495a4f00cc8647a3aa64af5e697ab958'/>
+				</functionalities>
+				<measurement log_date="2020-09-06T14:20:57.068+02:00" unit="W" directionality="consumed">0.00</measurement>
+				<measurement log_date="2020-09-06T14:20:57.068+02:00" unit="W" directionality="produced">0.00</measurement>
+			</electricity_point_meter>
+		</services>
+		<protocols>
+			<network_router id='51408e71a38745c98c9fe992412bc6e0'>
+				<mac_address>ABCD012345670A01</mac_address><network id='259882df3c05415b99c2d962534ce820'/>
+			</network_router>
+		</protocols>
+	</module>
+	<appliance id='aac7b735042c4832ac9ff33aae4f453b'>
+		<name>Vaatwasser (2a1ab)</name>
+		<description>Circle</description>
+		<type>dishwasher</type>
+		<created_date>2020-08-27T14:20:39.292+02:00</created_date>
+		<modified_date>2020-09-07T10:08:13.079+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_point_meter id='3559cbf27edd485895e683c8317eff04' log_type='electricity'>
+				<functionalities>
+					<point_log id='07e4f3a66ff14cdf94d502cb5fbc0a29'/>
+					<point_log id='818c30ebedde478f874e303696b8677d'/>
+				</functionalities>
+			</electricity_point_meter>
+			<electricity_interval_meter id='05f5f58c4a5a4c939bfbbbcd5144842e' log_type='electricity'>
+				<functionalities>
+					<interval_log id='513de6a2c2024df9b1beb27280b9a945'/>
+					<interval_log id='cdf56515336346e6bbfdbed8d0596f6a'/>
+				</functionalities>
+			</electricity_interval_meter>
+			<relay id='1d4c937af1454f2da5e3f165fb84d67e' log_type='relay'>
+				<functionalities>
+					<relay_functionality id='7775d580a620439f8519802942d99e3c'/>
+					<point_log id='aa819a65085247f687a93f53ae573719'/>
+				</functionalities>
+			</relay>
+		</services>
+		<logs>
+			<point_log id='07e4f3a66ff14cdf94d502cb5fbc0a29'>
+				<updated_date>2020-09-07T10:08:13.920+02:00</updated_date>
+				<type>electricity_produced</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-08-27T14:20:45.904+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='3559cbf27edd485895e683c8317eff04'/>
+				<period start_date="2020-09-07T10:08:13.920+02:00" end_date="2020-09-07T10:08:13.920+02:00">
+					<measurement log_date="2020-09-07T10:08:13.920+02:00">0.00</measurement>
+				</period>
+			</point_log>
+			<interval_log id='513de6a2c2024df9b1beb27280b9a945'>
+				<updated_date></updated_date>
+				<type>electricity_produced</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='05f5f58c4a5a4c939bfbbbcd5144842e'/>
+			</interval_log>
+			<point_log id='818c30ebedde478f874e303696b8677d'>
+				<updated_date>2020-09-07T10:08:13.920+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-09-06T19:01:53.489+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='3559cbf27edd485895e683c8317eff04'/>
+				<period start_date="2020-09-07T10:08:13.920+02:00" end_date="2020-09-07T10:08:13.920+02:00">
+					<measurement log_date="2020-09-07T10:08:13.920+02:00">0.00</measurement>
+				</period>
+			</point_log>
+			<point_log id='aa819a65085247f687a93f53ae573719'>
+				<updated_date>2020-09-07T10:08:13.077+02:00</updated_date>
+				<type>relay</type>
+				<unit></unit>
+				<last_consecutive_log_date>2020-08-28T09:10:26.719+02:00</last_consecutive_log_date>
+				<relay id='1d4c937af1454f2da5e3f165fb84d67e'/>
+				<period start_date="2020-09-07T10:08:13.077+02:00" end_date="2020-09-07T10:08:13.077+02:00">
+					<measurement log_date="2020-09-07T10:08:13.077+02:00">on</measurement>
+				</period>
+			</point_log>
+			<interval_log id='cdf56515336346e6bbfdbed8d0596f6a'>
+				<updated_date>2020-09-06T14:00:00+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='05f5f58c4a5a4c939bfbbbcd5144842e'/>
+				<period start_date="2020-09-06T14:00:00+02:00" end_date="2020-09-06T14:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-09-06T14:00:00+02:00">0.71</measurement>
+				</period>
+			</interval_log>
+		</logs>
+		<actuator_functionalities>
+			<relay_functionality id='7775d580a620439f8519802942d99e3c'>
+				<updated_date>2020-09-07T10:08:13.077+02:00</updated_date>
+				<state>on</state>
+				<lock>false</lock>
+				<relay id='1d4c937af1454f2da5e3f165fb84d67e'/>
+			</relay_functionality>
+		</actuator_functionalities>
+	</appliance>
+	<module id='5db2e050da204f97a6a132e4267c6f7f'>
+		<vendor_name>Plugwise</vendor_name>
+		<vendor_model model_number='0701-40' model_name='Circle type F'>NR</vendor_model>
+		<hardware_version>6539-0701-4022</hardware_version>
+		<firmware_version>2011-06-27T10:52:18+02:00</firmware_version>
+		<upgrade/>
+		<created_date>2019-05-06T20:04:21.601+02:00</created_date>
+		<modified_date>2020-09-07T10:08:13.929+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_interval_meter id='05f5f58c4a5a4c939bfbbbcd5144842e' log_type='electricity'>
+				<functionalities>
+					<interval_log id='513de6a2c2024df9b1beb27280b9a945'/>
+					<interval_log id='cdf56515336346e6bbfdbed8d0596f6a'/>
+				</functionalities>
+				<measurement log_date="2020-07-26T19:00:00+02:00" unit="Wh" directionality="produced" interval="PT1H">0.00</measurement>
+				<measurement log_date="2020-09-06T14:00:00+02:00" unit="Wh" directionality="consumed" interval="PT1H">0.71</measurement>
+			</electricity_interval_meter>
+			<relay id='1d4c937af1454f2da5e3f165fb84d67e' log_type='relay'>
+				<functionalities>
+					<relay_functionality id='7775d580a620439f8519802942d99e3c'/>
+					<point_log id='aa819a65085247f687a93f53ae573719'/>
+				</functionalities>
+				<measurement log_date="2020-09-07T10:08:13.077+02:00">on</measurement>
+			</relay>
+			<electricity_point_meter id='3559cbf27edd485895e683c8317eff04' log_type='electricity'>
+				<functionalities>
+					<point_log id='07e4f3a66ff14cdf94d502cb5fbc0a29'/>
+					<point_log id='818c30ebedde478f874e303696b8677d'/>
+				</functionalities>
+				<measurement log_date="2020-09-07T10:08:13.920+02:00" unit="W" directionality="consumed">0.00</measurement>
+				<measurement log_date="2020-09-07T10:08:13.920+02:00" unit="W" directionality="produced">0.00</measurement>
+			</electricity_point_meter>
+		</services>
+		<protocols>
+			<network_router id='57b6184bdc5140898eb8c53462589097'>
+				<mac_address>ABCD012345670A02</mac_address><network id='259882df3c05415b99c2d962534ce820'/>
+			</network_router>
+		</protocols>
+	</module>
+	<group id='d950b314e9d8499f968e6db8d82ef78c'>
+		<name>Stroomvreters</name>
+		<description>Stroomvreters</description>
+		<type>report</type>
+		<created_date>2019-05-06T20:38:01.665+02:00</created_date>
+		<modified_date>2020-08-28T10:09:10.097+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+		</services>
+		<appliances>
+			<appliance id='059e4d03c7a34d278add5c7a4a781d19'/>
+			<appliance id='5871317346d045bc9f6b987ef25ee638'/>
+			<appliance id='aac7b735042c4832ac9ff33aae4f453b'/>
+			<appliance id='cfe95cf3de1948c0b8955125bf754614'/>
+			<appliance id='e1c884e7dede431dadee09506ec4f859'/>
+		</appliances>
+		<logs>
+			<interval_log id='2d7ca46e1e0346b79d9c1d982d1be029'>
+				<updated_date></updated_date>
+				<type>electricity_consumed</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+			</interval_log>
+			<point_log id='80185ceeb7f64708a6d834f2550e5282'>
+				<updated_date></updated_date>
+				<type>electricity_consumed</type>
+				<unit>W</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+			</point_log>
+			<point_log id='e275dcd09f0a4fa0adbbdf76dc97c30b'>
+				<updated_date></updated_date>
+				<type>relay</type>
+				<unit></unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+			</point_log>
+			<point_log id='ecf14be7ed5442deb414514982c63278'>
+				<updated_date></updated_date>
+				<type>electricity_produced</type>
+				<unit>W</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+			</point_log>
+			<interval_log id='fa25189ec0e74606a524cf20dbd2ea6c'>
+				<updated_date></updated_date>
+				<type>electricity_produced</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+			</interval_log>
+		</logs>
+		<actuator_functionalities>
+			<relay_functionality id='2c9208a7ee9946839def46061afbe7ba'>
+				<updated_date></updated_date>
+				<state>off</state>
+				<lock>false</lock>
+				<delegation_strategy>single</delegation_strategy>
+			</relay_functionality>
+		</actuator_functionalities>
+	</group>
+	<module id='cbb07250ec324d9eb0a51c92ebf73c83'>
+		<vendor_name>Plugwise</vendor_name>
+		<vendor_model model_number='0701-40' model_name='Circle type F'>NR</vendor_model>
+		<hardware_version>6539-0701-4026</hardware_version>
+		<firmware_version>2011-06-27T10:52:18+02:00</firmware_version>
+		<upgrade/>
+		<created_date>2020-09-05T23:18:14.967+02:00</created_date>
+		<modified_date>2020-09-07T10:08:12.975+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_point_meter id='5ace622621374ff4b3ca68682436d99f' log_type='electricity'>
+				<functionalities>
+					<point_log id='be5beb8a9fe749af9dd5b449795f16b2'/>
+					<point_log id='e5afafea11214a26947590666b8d496c'/>
+				</functionalities>
+				<measurement log_date="2020-09-07T10:08:12.869+02:00" unit="W" directionality="consumed">162.41</measurement>
+				<measurement log_date="2020-09-07T10:08:12.869+02:00" unit="W" directionality="produced">0.00</measurement>
+			</electricity_point_meter>
+			<electricity_interval_meter id='77f399e714964b6598bb430974a9739d' log_type='electricity'>
+				<functionalities>
+					<interval_log id='3c87d40f3c564d0db1a84e0d265fc10a'/>
+					<interval_log id='f54548f284144f1f8dcd0adba1129b61'/>
+				</functionalities>
+				<measurement log_date="2020-09-07T09:00:00+02:00" unit="Wh" directionality="consumed" interval="PT1H">162.63</measurement>
+				<measurement log_date="2020-09-07T09:00:00+02:00" unit="Wh" directionality="produced" interval="PT1H">0.00</measurement>
+			</electricity_interval_meter>
+			<relay id='c0a356ebb4e148fb9d0ec463baa06616' log_type='relay'>
+				<functionalities>
+					<relay_functionality id='4939624d93f44c51826ddc1e2c230fd8'/>
+					<point_log id='9e7ff72f9d0240e3a0ed7bf569c203ad'/>
+				</functionalities>
+				<measurement log_date="2020-09-07T10:08:12.969+02:00">on</measurement>
+			</relay>
+		</services>
+		<protocols>
+			<network_router id='9c2dadabf7324fae81bc00742ddb2e9a'>
+				<mac_address>ABCD012345670A03</mac_address><network id='259882df3c05415b99c2d962534ce820'/>
+			</network_router>
+		</protocols>
+	</module>
+	<appliance id='e309b52ea5684cf1a22f30cf0cd15051'>
+		<name>Computer (788618)</name>
+		<description>Circle</description>
+		<type>computer_desktop</type>
+		<created_date>2020-09-05T23:18:15.432+02:00</created_date>
+		<modified_date>2020-09-07T10:08:12.971+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_interval_meter id='77f399e714964b6598bb430974a9739d' log_type='electricity'>
+				<functionalities>
+					<interval_log id='3c87d40f3c564d0db1a84e0d265fc10a'/>
+					<interval_log id='f54548f284144f1f8dcd0adba1129b61'/>
+				</functionalities>
+			</electricity_interval_meter>
+			<relay id='c0a356ebb4e148fb9d0ec463baa06616' log_type='relay'>
+				<functionalities>
+					<relay_functionality id='4939624d93f44c51826ddc1e2c230fd8'/>
+					<point_log id='9e7ff72f9d0240e3a0ed7bf569c203ad'/>
+				</functionalities>
+			</relay>
+			<electricity_point_meter id='5ace622621374ff4b3ca68682436d99f' log_type='electricity'>
+				<functionalities>
+					<point_log id='be5beb8a9fe749af9dd5b449795f16b2'/>
+					<point_log id='e5afafea11214a26947590666b8d496c'/>
+				</functionalities>
+			</electricity_point_meter>
+		</services>
+		<logs>
+			<interval_log id='3c87d40f3c564d0db1a84e0d265fc10a'>
+				<updated_date>2020-09-07T09:00:00+02:00</updated_date>
+				<type>electricity_produced</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date>2020-09-07T09:00:00+02:00</last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='77f399e714964b6598bb430974a9739d'/>
+				<period start_date="2020-09-07T09:00:00+02:00" end_date="2020-09-07T09:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-09-07T09:00:00+02:00">0.00</measurement>
+				</period>
+			</interval_log>
+			<point_log id='9e7ff72f9d0240e3a0ed7bf569c203ad'>
+				<updated_date>2020-09-07T10:08:12.969+02:00</updated_date>
+				<type>relay</type>
+				<unit></unit>
+				<last_consecutive_log_date>2020-09-05T23:50:51.307+02:00</last_consecutive_log_date>
+				<relay id='c0a356ebb4e148fb9d0ec463baa06616'/>
+				<period start_date="2020-09-07T10:08:12.969+02:00" end_date="2020-09-07T10:08:12.969+02:00">
+					<measurement log_date="2020-09-07T10:08:12.969+02:00">on</measurement>
+				</period>
+			</point_log>
+			<point_log id='be5beb8a9fe749af9dd5b449795f16b2'>
+				<updated_date>2020-09-07T10:08:12.869+02:00</updated_date>
+				<type>electricity_produced</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-09-05T23:18:18.870+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='5ace622621374ff4b3ca68682436d99f'/>
+				<period start_date="2020-09-07T10:08:12.869+02:00" end_date="2020-09-07T10:08:12.869+02:00">
+					<measurement log_date="2020-09-07T10:08:12.869+02:00">0.00</measurement>
+				</period>
+			</point_log>
+			<point_log id='e5afafea11214a26947590666b8d496c'>
+				<updated_date>2020-09-07T10:08:12.869+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-09-07T10:08:12.868+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='5ace622621374ff4b3ca68682436d99f'/>
+				<period start_date="2020-09-07T10:08:12.869+02:00" end_date="2020-09-07T10:08:12.869+02:00">
+					<measurement log_date="2020-09-07T10:08:12.869+02:00">162.44</measurement>
+				</period>
+			</point_log>
+			<interval_log id='f54548f284144f1f8dcd0adba1129b61'>
+				<updated_date>2020-09-07T09:00:00+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date>2020-09-07T09:00:00+02:00</last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='77f399e714964b6598bb430974a9739d'/>
+				<period start_date="2020-09-07T09:00:00+02:00" end_date="2020-09-07T09:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-09-07T09:00:00+02:00">162.63</measurement>
+				</period>
+			</interval_log>
+		</logs>
+		<actuator_functionalities>
+			<relay_functionality id='4939624d93f44c51826ddc1e2c230fd8'>
+				<updated_date>2020-09-07T10:08:12.969+02:00</updated_date>
+				<state>on</state>
+				<lock>true</lock>
+				<relay id='c0a356ebb4e148fb9d0ec463baa06616'/>
+			</relay_functionality>
+		</actuator_functionalities>
+	</appliance>
+	<network id='259882df3c05415b99c2d962534ce820'>
+		<master_controller id='f0bcf042cad9418ea65ecf0bf6133250'>
+			<mac_address>ABCD012345670101</mac_address>
+			<module id='cd197a863b6b4f319fd03a9ed8cb8416'/>
+			<upgrade/>
+		</master_controller>
+		<network_coordinator id='6f0db124f7c6429ea2721d61e5d62f93'>
+			<mac_address>ABCD012345670102</mac_address>
+			<module id='b09d787ee9a247ed9efcd9ad865b13ad'/>
+			<upgrade/>
+			<search_nodes>false</search_nodes>
+		</network_coordinator>
+		<nodes>
+			<network_router id='f323d992f1c44ec880386c568d809645'>
+				<mac_address>ABCD012345670A04</mac_address>
+				<module id='7d29adfb8361415b877bfcd1d56d8de2'/>
+				<upgrade/>
+			</network_router>
+			<network_router id='51408e71a38745c98c9fe992412bc6e0'>
+				<mac_address>ABCD012345670A01</mac_address>
+				<module id='b7f5a95616cf450da237c008143ee062'/>
+				<upgrade/>
+			</network_router>
+			<network_router id='63a2b496da94454a9e62b93e5ede27f4'>
+				<mac_address>ABCD012345670A06</mac_address>
+				<module id='8e951f7a71b041d3a13915e25123b79e'/>
+				<upgrade/>
+			</network_router>
+			<network_router id='af7ebe75a9aa47d9b3ae26297be742d7'>
+				<mac_address>ABCD012345670A07</mac_address>
+				<module id='3b52239a9160497ebeb2164d07d3d399'/>
+				<upgrade/>
+			</network_router>
+			<network_router id='82949565aa9b46eebf2b28889917e082'>
+				<mac_address>ABCD012345670A08</mac_address>
+				<module id='359b5e2ee8444c4faec6b2ecc00e17ff'/>
+				<upgrade/>
+			</network_router>
+			<network_router id='9c2dadabf7324fae81bc00742ddb2e9a'>
+				<mac_address>ABCD012345670A03</mac_address>
+				<module id='cbb07250ec324d9eb0a51c92ebf73c83'/>
+				<upgrade/>
+			</network_router>
+			<network_router id='57b6184bdc5140898eb8c53462589097'>
+				<mac_address>ABCD012345670A02</mac_address>
+				<module id='5db2e050da204f97a6a132e4267c6f7f'/>
+				<upgrade/>
+			</network_router>
+		</nodes>
+		<to_add>
+			<node><mac_address>0123456789AB</mac_address></node>
+		</to_add>
+		<to_remove/>
+		<available/>
+	</network>
+	<group id='d03738edfcc947f7b8f4573571d90d2d'>
+		<name>Schakel</name>
+		<description>Schakel</description>
+		<type>switching</type>
+		<created_date>2020-08-28T10:14:55.371+02:00</created_date>
+		<modified_date>2020-08-28T10:16:11.163+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+		</services>
+		<appliances>
+			<appliance id='059e4d03c7a34d278add5c7a4a781d19'/>
+			<appliance id='cfe95cf3de1948c0b8955125bf754614'/>
+		</appliances>
+		<logs>
+			<point_log id='0c9f2dc0a0b84a28bf08db286b41eb4b'>
+				<updated_date></updated_date>
+				<type>relay</type>
+				<unit></unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+			</point_log>
+			<interval_log id='8c76be6a15574db99bf5f5f0d5e1a8c2'>
+				<updated_date></updated_date>
+				<type>electricity_consumed</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+			</interval_log>
+			<interval_log id='a9b75069878348d4baab4daa2d24789c'>
+				<updated_date></updated_date>
+				<type>electricity_produced</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+				<interval>PT1H</interval>
+			</interval_log>
+			<point_log id='ae70e9cabe8842c19cd84292a8f5735c'>
+				<updated_date></updated_date>
+				<type>electricity_consumed</type>
+				<unit>W</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+			</point_log>
+			<point_log id='d33a4e5ed9454dd3b52c0803b52b2793'>
+				<updated_date></updated_date>
+				<type>electricity_produced</type>
+				<unit>W</unit>
+				<last_consecutive_log_date></last_consecutive_log_date>
+			</point_log>
+		</logs>
+		<actuator_functionalities>
+			<relay_functionality id='18bfbc8ca7c445719631e0867c3cf37a'>
+				<updated_date></updated_date>
+				<state>off</state>
+				<lock>false</lock>
+				<delegation_strategy>single</delegation_strategy>
+			</relay_functionality>
+		</actuator_functionalities>
+	</group>
+	<module id='3b52239a9160497ebeb2164d07d3d399'>
+		<vendor_name>Plugwise</vendor_name>
+		<vendor_model model_number='0701-40' model_name='Circle type F'>NR</vendor_model>
+		<hardware_version>6539-0701-4028</hardware_version>
+		<firmware_version>2011-06-27T10:52:18+02:00</firmware_version>
+		<upgrade/>
+		<created_date>2019-05-06T19:53:39.316+02:00</created_date>
+		<modified_date>2020-09-07T10:08:13.804+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_point_meter id='7d8c67d064b14134b287ea72ed9ffa08' log_type='electricity'>
+				<functionalities>
+					<point_log id='168967cf45954a8d8ab8300d6355c9aa'/>
+					<point_log id='d9e53a813e77496ea4e5aca366e559c7'/>
+				</functionalities>
+				<measurement log_date="2020-09-07T10:08:13.794+02:00" unit="W" directionality="consumed">1.20</measurement>
+				<measurement log_date="2020-09-07T10:08:13.794+02:00" unit="W" directionality="produced">0.00</measurement>
+			</electricity_point_meter>
+			<electricity_interval_meter id='8bd7d604c9204b7eadbbb1304021fe7f' log_type='electricity'>
+				<functionalities>
+					<interval_log id='3ca803bd59a6498099d1b0db46615fbb'/>
+					<interval_log id='40a1f923280542279225e0d395882b5c'/>
+				</functionalities>
+				<measurement log_date="2020-07-26T19:00:00+02:00" unit="Wh" directionality="produced" interval="PT1H">0.00</measurement>
+				<measurement log_date="2020-09-07T02:00:00+02:00" unit="Wh" directionality="consumed" interval="PT1H">0.00</measurement>
+			</electricity_interval_meter>
+			<relay id='cf98b4da8977490eab723e25dac88d5b' log_type='relay'>
+				<functionalities>
+					<point_log id='865ced94bfd846a5be4f2ede5807269c'/>
+					<relay_functionality id='92cf4999ca764bacb4d766f112083231'/>
+				</functionalities>
+				<measurement log_date="2020-09-07T10:08:13.382+02:00">on</measurement>
+			</relay>
+		</services>
+		<protocols>
+			<network_router id='af7ebe75a9aa47d9b3ae26297be742d7'>
+				<mac_address>ABCD012345670A07</mac_address><network id='259882df3c05415b99c2d962534ce820'/>
+			</network_router>
+		</protocols>
+	</module>
+	<module id='7d29adfb8361415b877bfcd1d56d8de2'>
+		<vendor_name>Plugwise</vendor_name>
+		<vendor_model model_number='0440-01' model_name='Circle'>NR</vendor_model>
+		<hardware_version>0000-0440-0107</hardware_version>
+		<firmware_version>2011-06-27T10:52:18+02:00</firmware_version>
+		<upgrade/>
+		<created_date>2020-08-27T13:25:18.941+02:00</created_date>
+		<modified_date>2020-09-06T14:20:57.503+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_point_meter id='831c88a189ba439cb97ce0fe2db44f10' log_type='electricity'>
+				<functionalities>
+					<point_log id='5633114b41ca44b8a3de3bdd46ccb809'/>
+					<point_log id='b81e52e6a97c4a7abdf073cb511b716d'/>
+				</functionalities>
+				<measurement log_date="2020-09-06T14:20:57.496+02:00" unit="W" directionality="consumed">0.00</measurement>
+				<measurement log_date="2020-09-06T14:20:57.496+02:00" unit="W" directionality="produced">0.00</measurement>
+			</electricity_point_meter>
+			<relay id='910973e4e86b4a99863a5d5beb0920cb' log_type='relay'>
+				<functionalities>
+					<point_log id='3d6b62ff759b4051ae9314aa86b7ceec'/>
+					<relay_functionality id='eed0efe44c3a4b9782d8a4e862714915'/>
+				</functionalities>
+				<measurement log_date="2020-09-06T14:20:56.969+02:00">on</measurement>
+			</relay>
+			<electricity_interval_meter id='c49f750389d140b3be760bae79c3da2c' log_type='electricity'>
+				<functionalities>
+					<interval_log id='00ee2a7716ef478f97c50e523c1bc7b5'/>
+					<interval_log id='3c689589cf7e4b5c91b52bee5fb7038c'/>
+				</functionalities>
+				<measurement log_date="2020-09-06T12:00:00+02:00" unit="Wh" directionality="consumed" interval="PT1H">0.00</measurement>
+			</electricity_interval_meter>
+		</services>
+		<protocols>
+			<network_router id='f323d992f1c44ec880386c568d809645'>
+				<mac_address>ABCD012345670A04</mac_address><network id='259882df3c05415b99c2d962534ce820'/>
+			</network_router>
+		</protocols>
+	</module>
+	<module id='cd197a863b6b4f319fd03a9ed8cb8416'>
+		<vendor_name>Plugwise</vendor_name>
+		<vendor_model model_number='0700-85' model_name='Stick'>MC</vendor_model>
+		<hardware_version>6539-0700-8514</hardware_version>
+		<firmware_version>2017-07-11T18:03:53+02:00</firmware_version>
+		<upgrade/>
+		<created_date>2019-05-04T09:21:00.761+02:00</created_date>
+		<modified_date>2020-09-07T10:08:16.093+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+		</services>
+		<protocols>
+			<master_controller id='f0bcf042cad9418ea65ecf0bf6133250'>
+				<mac_address>ABCD012345670101</mac_address>
+				<network id='259882df3c05415b99c2d962534ce820'/><network id='259882df3c05415b99c2d962534ce820'/>
+			</master_controller>
+		</protocols>
+	</module>
+	<module id='8e951f7a71b041d3a13915e25123b79e'>
+		<vendor_name>Plugwise</vendor_name>
+		<vendor_model model_number='0701-40' model_name='Circle type F'>NR</vendor_model>
+		<hardware_version>6539-0701-4026</hardware_version>
+		<firmware_version>2011-06-27T10:52:18+02:00</firmware_version>
+		<upgrade/>
+		<created_date>2020-09-05T23:19:28.291+02:00</created_date>
+		<modified_date>2020-09-07T10:08:13.587+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_point_meter id='37842e718ed94125b3933648df51431d' log_type='electricity'>
+				<functionalities>
+					<point_log id='b6b881c24e104e9abe6c4f0e64402b69'/>
+					<point_log id='fbbb149444ba4a2f9780b9470f91cd71'/>
+				</functionalities>
+				<measurement log_date="2020-09-07T10:08:13.581+02:00" unit="W" directionality="consumed">27.58</measurement>
+				<measurement log_date="2020-09-07T10:08:13.581+02:00" unit="W" directionality="produced">0.00</measurement>
+			</electricity_point_meter>
+			<electricity_interval_meter id='380c611d89b74344a87de45186f083a6' log_type='electricity'>
+				<functionalities>
+					<interval_log id='0f23c5a5f1034a55aa4eb210e540136c'/>
+					<interval_log id='88190a5fa1444d5399d9ca021f5c4397'/>
+				</functionalities>
+				<measurement log_date="2020-09-07T09:00:00+02:00" unit="Wh" directionality="consumed" interval="PT1H">28.18</measurement>
+				<measurement log_date="2020-09-07T09:00:00+02:00" unit="Wh" directionality="produced" interval="PT1H">0.00</measurement>
+			</electricity_interval_meter>
+			<relay id='5ecd67f7115043e69e29b39bef1632f5' log_type='relay'>
+				<functionalities>
+					<relay_functionality id='e2e0c9bf582145f6b79cd7ffc0cb77e8'/>
+					<point_log id='ead9ea1a76b7412aa62268b174d0926b'/>
+				</functionalities>
+				<measurement log_date="2020-09-07T10:08:13.483+02:00">on</measurement>
+			</relay>
+		</services>
+		<protocols>
+			<network_router id='63a2b496da94454a9e62b93e5ede27f4'>
+				<mac_address>ABCD012345670A06</mac_address><network id='259882df3c05415b99c2d962534ce820'/>
+			</network_router>
+		</protocols>
+	</module>
+	<module id='359b5e2ee8444c4faec6b2ecc00e17ff'>
+		<vendor_name>Plugwise</vendor_name>
+		<vendor_model model_number='0701-40' model_name='Circle type F'>NR</vendor_model>
+		<hardware_version>6539-0701-4026</hardware_version>
+		<firmware_version>2011-06-27T10:52:18+02:00</firmware_version>
+		<upgrade/>
+		<created_date>2020-09-05T23:15:19.898+02:00</created_date>
+		<modified_date>2020-09-07T10:08:16.093+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<relay id='336503aebde74f9cb6c70b18dfe417a0' log_type='relay'>
+				<functionalities>
+					<point_log id='2e31a0934e154533aa79949039d93422'/>
+					<relay_functionality id='b361610c300c4b16ba72a8a815810f16'/>
+				</functionalities>
+				<measurement log_date="2020-09-07T10:08:13.564+02:00">on</measurement>
+			</relay>
+			<electricity_interval_meter id='7ee606c608dc45f1b1b617014d0be787' log_type='electricity'>
+				<functionalities>
+					<interval_log id='563a254e300a4630a38bbeb7cacf0920'/>
+					<interval_log id='92e9d199ea1a4846b33a38407237c3c5'/>
+				</functionalities>
+				<measurement log_date="2020-09-07T09:00:00+02:00" unit="Wh" directionality="consumed" interval="PT1H">0.00</measurement>
+				<measurement log_date="2020-09-07T09:00:00+02:00" unit="Wh" directionality="produced" interval="PT1H">0.00</measurement>
+			</electricity_interval_meter>
+			<electricity_point_meter id='dd448d68248840de862bc5d6a92fd983' log_type='electricity'>
+				<functionalities>
+					<point_log id='6f1a380a505344f3a9cc641637b1114b'/>
+					<point_log id='f7ce7c263175435ab4b3325205f1f499'/>
+				</functionalities>
+				<measurement log_date="2020-09-07T10:08:16.086+02:00" unit="W" directionality="consumed">0.00</measurement>
+				<measurement log_date="2020-09-07T10:08:16.086+02:00" unit="W" directionality="produced">0.00</measurement>
+			</electricity_point_meter>
+		</services>
+		<protocols>
+			<network_router id='82949565aa9b46eebf2b28889917e082'>
+				<mac_address>ABCD012345670A08</mac_address><network id='259882df3c05415b99c2d962534ce820'/>
+			</network_router>
+		</protocols>
+	</module>
+	<appliance id='5ca521ac179d468e91d772eeeb8a2117'>
+		<name>Oven (793F84)</name>
+		<description>Circle</description>
+		<type>zz_misc</type>
+		<created_date>2020-09-05T23:16:30.711+02:00</created_date>
+		<modified_date>2020-09-07T10:08:13.566+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<relay id='336503aebde74f9cb6c70b18dfe417a0' log_type='relay'>
+				<functionalities>
+					<point_log id='2e31a0934e154533aa79949039d93422'/>
+					<relay_functionality id='b361610c300c4b16ba72a8a815810f16'/>
+				</functionalities>
+			</relay>
+			<electricity_interval_meter id='7ee606c608dc45f1b1b617014d0be787' log_type='electricity'>
+				<functionalities>
+					<interval_log id='563a254e300a4630a38bbeb7cacf0920'/>
+					<interval_log id='92e9d199ea1a4846b33a38407237c3c5'/>
+				</functionalities>
+			</electricity_interval_meter>
+			<electricity_point_meter id='dd448d68248840de862bc5d6a92fd983' log_type='electricity'>
+				<functionalities>
+					<point_log id='6f1a380a505344f3a9cc641637b1114b'/>
+					<point_log id='f7ce7c263175435ab4b3325205f1f499'/>
+				</functionalities>
+			</electricity_point_meter>
+		</services>
+		<logs>
+			<point_log id='2e31a0934e154533aa79949039d93422'>
+				<updated_date>2020-09-07T10:08:13.564+02:00</updated_date>
+				<type>relay</type>
+				<unit></unit>
+				<last_consecutive_log_date>2020-09-06T20:28:02.851+02:00</last_consecutive_log_date>
+				<relay id='336503aebde74f9cb6c70b18dfe417a0'/>
+				<period start_date="2020-09-07T10:08:13.564+02:00" end_date="2020-09-07T10:08:13.564+02:00">
+					<measurement log_date="2020-09-07T10:08:13.564+02:00">on</measurement>
+				</period>
+			</point_log>
+			<interval_log id='563a254e300a4630a38bbeb7cacf0920'>
+				<updated_date>2020-09-07T09:00:00+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date>2020-09-07T09:00:00+02:00</last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='7ee606c608dc45f1b1b617014d0be787'/>
+				<period start_date="2020-09-07T09:00:00+02:00" end_date="2020-09-07T09:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-09-07T09:00:00+02:00">0.00</measurement>
+				</period>
+			</interval_log>
+			<point_log id='6f1a380a505344f3a9cc641637b1114b'>
+				<updated_date>2020-09-07T10:08:16.086+02:00</updated_date>
+				<type>electricity_produced</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-09-05T23:16:33.969+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='dd448d68248840de862bc5d6a92fd983'/>
+				<period start_date="2020-09-07T10:08:16.086+02:00" end_date="2020-09-07T10:08:16.086+02:00">
+					<measurement log_date="2020-09-07T10:08:16.086+02:00">0.00</measurement>
+				</period>
+			</point_log>
+			<interval_log id='92e9d199ea1a4846b33a38407237c3c5'>
+				<updated_date>2020-09-07T09:00:00+02:00</updated_date>
+				<type>electricity_produced</type>
+				<unit>Wh</unit>
+				<last_consecutive_log_date>2020-09-07T09:00:00+02:00</last_consecutive_log_date>
+				<interval>PT1H</interval>
+				<electricity_interval_meter id='7ee606c608dc45f1b1b617014d0be787'/>
+				<period start_date="2020-09-07T09:00:00+02:00" end_date="2020-09-07T09:00:00+02:00" interval="PT1H">
+					<measurement log_date="2020-09-07T09:00:00+02:00">0.00</measurement>
+				</period>
+			</interval_log>
+			<point_log id='f7ce7c263175435ab4b3325205f1f499'>
+				<updated_date>2020-09-07T10:08:16.086+02:00</updated_date>
+				<type>electricity_consumed</type>
+				<unit>W</unit>
+				<last_consecutive_log_date>2020-09-05T23:16:33.969+02:00</last_consecutive_log_date>
+				<electricity_point_meter id='dd448d68248840de862bc5d6a92fd983'/>
+				<period start_date="2020-09-07T10:08:16.086+02:00" end_date="2020-09-07T10:08:16.086+02:00">
+					<measurement log_date="2020-09-07T10:08:16.086+02:00">0.00</measurement>
+				</period>
+			</point_log>
+		</logs>
+		<actuator_functionalities>
+			<relay_functionality id='b361610c300c4b16ba72a8a815810f16'>
+				<updated_date>2020-09-07T10:08:13.564+02:00</updated_date>
+				<state>on</state>
+				<lock>false</lock>
+				<relay id='336503aebde74f9cb6c70b18dfe417a0'/>
+			</relay_functionality>
+		</actuator_functionalities>
+	</appliance>
+</domain_objects>
diff --git a/userdata/updated/stretch_v31/core.locations.xml b/userdata/updated/stretch_v31/core.locations.xml
new file mode 100644
index 000000000..6aeeb0d12
--- /dev/null
+++ b/userdata/updated/stretch_v31/core.locations.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<locations/>
diff --git a/userdata/updated/stretch_v31/core.modules.xml b/userdata/updated/stretch_v31/core.modules.xml
new file mode 100644
index 000000000..871462eff
--- /dev/null
+++ b/userdata/updated/stretch_v31/core.modules.xml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<modules>
+	<module id='cd197a863b6b4f319fd03a9ed8cb8416'>
+		<vendor_name>Plugwise</vendor_name>
+		<vendor_model model_number='0700-85' model_name='Stick'>MC</vendor_model>
+		<hardware_version>6539-0700-8514</hardware_version>
+		<firmware_version>2017-07-11T18:03:53+02:00</firmware_version>
+		<upgrade/>
+		<created_date>2019-05-04T09:21:00.761+02:00</created_date>
+		<modified_date>2020-08-27T20:18:44.253+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+		</services>
+		<protocols>
+			<master_controller id='f0bcf042cad9418ea65ecf0bf6133250'>
+				<mac_address>ABCD012345670101</mac_address>
+				<network id='259882df3c05415b99c2d962534ce820'/><network id='259882df3c05415b99c2d962534ce820'/>
+			</master_controller>
+		</protocols>
+	</module>
+	<module id='7d29adfb8361415b877bfcd1d56d8de2'>
+		<vendor_name>Plugwise</vendor_name>
+		<vendor_model model_number='0440-01' model_name='Circle'>NR</vendor_model>
+		<hardware_version>0000-0440-0107</hardware_version>
+		<firmware_version>2011-06-27T10:52:18+02:00</firmware_version>
+		<upgrade/>
+		<created_date>2020-08-27T13:25:18.941+02:00</created_date>
+		<modified_date>2020-08-27T20:18:41.828+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_point_meter id='831c88a189ba439cb97ce0fe2db44f10' log_type='electricity'>
+				<functionalities>
+					<point_log id='5633114b41ca44b8a3de3bdd46ccb809'/>
+					<point_log id='b81e52e6a97c4a7abdf073cb511b716d'/>
+				</functionalities>
+				<measurement log_date="2020-08-27T20:18:41.820+02:00" unit="W" directionality="consumed">0.00</measurement>
+				<measurement log_date="2020-08-27T20:18:41.820+02:00" unit="W" directionality="produced">0.00</measurement>
+			</electricity_point_meter>
+			<relay id='910973e4e86b4a99863a5d5beb0920cb' log_type='relay'>
+				<functionalities>
+					<point_log id='3d6b62ff759b4051ae9314aa86b7ceec'/>
+					<relay_functionality id='eed0efe44c3a4b9782d8a4e862714915'/>
+				</functionalities>
+				<measurement log_date="2020-08-27T20:18:26.967+02:00">on</measurement>
+			</relay>
+			<electricity_interval_meter id='c49f750389d140b3be760bae79c3da2c' log_type='electricity'>
+				<functionalities>
+					<interval_log id='00ee2a7716ef478f97c50e523c1bc7b5'/>
+					<interval_log id='3c689589cf7e4b5c91b52bee5fb7038c'/>
+				</functionalities>
+				<measurement log_date="2020-08-27T20:00:00+02:00" unit="Wh" directionality="consumed" interval="PT1H">1.06</measurement>
+			</electricity_interval_meter>
+		</services>
+		<protocols>
+			<network_router id='f323d992f1c44ec880386c568d809645'>
+				<mac_address>ABCD012345670A04</mac_address><network id='259882df3c05415b99c2d962534ce820'/>
+			</network_router>
+		</protocols>
+	</module>
+	<module id='b7f5a95616cf450da237c008143ee062'>
+		<vendor_name>Plugwise</vendor_name>
+		<vendor_model model_number='0440-01' model_name='Circle'>NR</vendor_model>
+		<hardware_version>0000-0440-0107</hardware_version>
+		<firmware_version>2011-06-27T10:52:18+02:00</firmware_version>
+		<upgrade/>
+		<created_date>2020-08-27T13:33:44.656+02:00</created_date>
+		<modified_date>2020-08-27T20:18:40.786+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_interval_meter id='0896f3ccf45f4a478055ee0587105458' log_type='electricity'>
+				<functionalities>
+					<interval_log id='2cbc98743d2341f59759d89b4c1bb0ec'/>
+					<interval_log id='bace9baca78447b4a384e4157b6cb0fd'/>
+				</functionalities>
+				<measurement log_date="2020-08-27T19:00:00+02:00" unit="Wh" directionality="consumed" interval="PT1H">0.00</measurement>
+			</electricity_interval_meter>
+			<relay id='7beee08f9e4a46cc8e7a7df399e693dd' log_type='relay'>
+				<functionalities>
+					<relay_functionality id='0eff576e00c245c288aa9492ff4a9115'/>
+					<point_log id='bfb530ed44bc4bb4be4994f2fc9267a1'/>
+				</functionalities>
+				<measurement log_date="2020-08-27T20:18:26.866+02:00">on</measurement>
+			</relay>
+			<electricity_point_meter id='93922bdbe6ad4f63b80f361365cde36a' log_type='electricity'>
+				<functionalities>
+					<point_log id='17fa51101034474498512445f69d6751'/>
+					<point_log id='495a4f00cc8647a3aa64af5e697ab958'/>
+				</functionalities>
+				<measurement log_date="2020-08-27T20:18:40.779+02:00" unit="W" directionality="consumed">0.00</measurement>
+				<measurement log_date="2020-08-27T20:18:40.779+02:00" unit="W" directionality="produced">0.00</measurement>
+			</electricity_point_meter>
+		</services>
+		<protocols>
+			<network_router id='51408e71a38745c98c9fe992412bc6e0'>
+				<mac_address>ABCD012345670A01</mac_address><network id='259882df3c05415b99c2d962534ce820'/>
+			</network_router>
+		</protocols>
+	</module>
+	<module id='3a65097960694644ac8f56e192cbe980'>
+		<vendor_name>Plugwise</vendor_name>
+		<vendor_model model_number='0385-00' model_name='Stick'>MC</vendor_model>
+		<hardware_version>0000-0385-0007</hardware_version>
+		<firmware_version>2011-06-27T10:43:39+02:00</firmware_version>
+		<upgrade/>
+		<created_date>2020-07-26T18:32:41.861+02:00</created_date>
+		<modified_date>2020-08-27T13:21:14.408+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+		</services>
+		<protocols>
+			<master_controller id='fee80187abd54cc5982f7503b4c7c17f'>
+				<mac_address>ABCD012345670101</mac_address>
+				<network id='56de2443c34743c799353c3cedbff0eb'/><network id='56de2443c34743c799353c3cedbff0eb'/>
+			</master_controller>
+		</protocols>
+	</module>
+	<module id='b09d787ee9a247ed9efcd9ad865b13ad'>
+		<vendor_name>Plugwise</vendor_name>
+		<vendor_model model_number='0700-73' model_name='Circle+ type F'>NC</vendor_model>
+		<hardware_version>6539-0700-7330</hardware_version>
+		<firmware_version>2011-06-27T10:47:37+02:00</firmware_version>
+		<upgrade/>
+		<created_date>2019-05-06T19:50:35.529+02:00</created_date>
+		<modified_date>2020-08-27T20:18:43.334+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_point_meter id='5aa4714df14a42508fb1f3ccd58559d7' log_type='electricity'>
+				<functionalities>
+					<point_log id='4cfd0f7e64474226815f17efaaf01753'/>
+					<point_log id='88a00d3a0c0646e782060be68e8e1777'/>
+				</functionalities>
+				<measurement log_date="2020-08-27T20:18:43.325+02:00" unit="W" directionality="consumed">56.87</measurement>
+				<measurement log_date="2020-08-27T20:18:43.325+02:00" unit="W" directionality="produced">0.00</measurement>
+			</electricity_point_meter>
+			<electricity_interval_meter id='b842f3e4ff204edfa2c598bbf468b0b7' log_type='electricity'>
+				<functionalities>
+					<interval_log id='34fc1e0a494241ebb83ec207ed8b4b6c'/>
+					<interval_log id='ddcff75f511d4ccb9b9854ced7418991'/>
+				</functionalities>
+				<measurement log_date="2020-07-26T19:00:00+02:00" unit="Wh" directionality="consumed" interval="PT1H">53.30</measurement>
+				<measurement log_date="2020-07-26T19:00:00+02:00" unit="Wh" directionality="produced" interval="PT1H">0.00</measurement>
+			</electricity_interval_meter>
+			<relay id='fabe6c3a2d124c7e94915cb259feed4d' log_type='relay'>
+				<functionalities>
+					<point_log id='33c53b5e24674f37807255a1d64bf37a'/>
+					<relay_functionality id='d8a4c97cc446436490cbfca09eabe4eb'/>
+				</functionalities>
+				<measurement log_date="2020-08-27T20:18:26.735+02:00">on</measurement>
+			</relay>
+		</services>
+		<protocols>
+			<network_coordinator id='6f0db124f7c6429ea2721d61e5d62f93'>
+				<mac_address>0123456789AB</mac_address><network id='259882df3c05415b99c2d962534ce820'/>
+			</network_coordinator>
+		</protocols>
+	</module>
+	<module id='5db2e050da204f97a6a132e4267c6f7f'>
+		<vendor_name>Plugwise</vendor_name>
+		<vendor_model model_number='0701-40' model_name='Circle type F'>NR</vendor_model>
+		<hardware_version>6539-0701-4022</hardware_version>
+		<firmware_version>2011-06-27T10:52:18+02:00</firmware_version>
+		<upgrade/>
+		<created_date>2019-05-06T20:04:21.601+02:00</created_date>
+		<modified_date>2020-08-27T20:18:39.736+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_interval_meter id='05f5f58c4a5a4c939bfbbbcd5144842e' log_type='electricity'>
+				<functionalities>
+					<interval_log id='513de6a2c2024df9b1beb27280b9a945'/>
+					<interval_log id='cdf56515336346e6bbfdbed8d0596f6a'/>
+				</functionalities>
+				<measurement log_date="2020-07-26T19:00:00+02:00" unit="Wh" directionality="consumed" interval="PT1H">789.49</measurement>
+				<measurement log_date="2020-07-26T19:00:00+02:00" unit="Wh" directionality="produced" interval="PT1H">0.00</measurement>
+			</electricity_interval_meter>
+			<relay id='1d4c937af1454f2da5e3f165fb84d67e' log_type='relay'>
+				<functionalities>
+					<relay_functionality id='7775d580a620439f8519802942d99e3c'/>
+					<point_log id='aa819a65085247f687a93f53ae573719'/>
+				</functionalities>
+				<measurement log_date="2020-08-27T20:18:27.081+02:00">on</measurement>
+			</relay>
+			<electricity_point_meter id='3559cbf27edd485895e683c8317eff04' log_type='electricity'>
+				<functionalities>
+					<point_log id='07e4f3a66ff14cdf94d502cb5fbc0a29'/>
+					<point_log id='818c30ebedde478f874e303696b8677d'/>
+				</functionalities>
+				<measurement log_date="2020-08-27T20:18:39.719+02:00" unit="W" directionality="consumed">0.00</measurement>
+				<measurement log_date="2020-08-27T20:18:39.719+02:00" unit="W" directionality="produced">0.00</measurement>
+			</electricity_point_meter>
+		</services>
+		<protocols>
+			<network_router id='57b6184bdc5140898eb8c53462589097'>
+				<mac_address>ABCD012345670A02</mac_address><network id='259882df3c05415b99c2d962534ce820'/>
+			</network_router>
+		</protocols>
+	</module>
+	<module id='5d0dfedb743447b0ada65b3c07185abe'>
+		<vendor_name>Plugwise</vendor_name>
+		<vendor_model model_number='0473-00' model_name='Circle+'>NC</vendor_model>
+		<hardware_version>0000-0473-0007</hardware_version>
+		<firmware_version>2011-06-27T10:47:37+02:00</firmware_version>
+		<upgrade/>
+		<created_date>2020-07-26T18:32:42.146+02:00</created_date>
+		<modified_date>2020-08-27T14:36:06.987+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_interval_meter id='7823b65512cd44f3a13ea5429cdc1f35' log_type='electricity'>
+				<functionalities/>
+				<measurement log_date="2020-08-27T12:00:00+02:00" unit="Wh" directionality="consumed" interval="PT1H">0.00</measurement>
+			</electricity_interval_meter>
+			<relay id='7b2f084f084f43efbd1780ef4d19f9fb' log_type='relay'>
+				<functionalities/>
+				<measurement log_date="2020-08-27T13:21:13.496+02:00">on</measurement>
+			</relay>
+			<electricity_point_meter id='91631e06bffe415d97e4ca9d88798b0d' log_type='electricity'>
+				<functionalities/>
+				<measurement log_date="2020-08-27T13:21:13.999+02:00" unit="W" directionality="consumed">1.91</measurement>
+				<measurement log_date="2020-08-27T13:21:13.999+02:00" unit="W" directionality="produced">0.00</measurement>
+			</electricity_point_meter>
+		</services>
+		<protocols>
+			<network_coordinator id='ffda6867864248a89dfa2f8e0c3e67e8'>
+				<mac_address>0123456789AB</mac_address><network id='56de2443c34743c799353c3cedbff0eb'/>
+			</network_coordinator>
+		</protocols>
+	</module>
+	<module id='3b52239a9160497ebeb2164d07d3d399'>
+		<vendor_name>Plugwise</vendor_name>
+		<vendor_model model_number='0701-40' model_name='Circle type F'>NR</vendor_model>
+		<hardware_version>6539-0701-4028</hardware_version>
+		<firmware_version>2011-06-27T10:52:18+02:00</firmware_version>
+		<upgrade/>
+		<created_date>2019-05-06T19:53:39.316+02:00</created_date>
+		<modified_date>2020-08-27T20:18:44.250+02:00</modified_date>
+		<deleted_date></deleted_date>
+		<services>
+			<electricity_point_meter id='7d8c67d064b14134b287ea72ed9ffa08' log_type='electricity'>
+				<functionalities>
+					<point_log id='168967cf45954a8d8ab8300d6355c9aa'/>
+					<point_log id='d9e53a813e77496ea4e5aca366e559c7'/>
+				</functionalities>
+				<measurement log_date="2020-08-27T20:18:40.051+02:00" unit="W" directionality="consumed">1.20</measurement>
+				<measurement log_date="2020-08-27T20:18:40.051+02:00" unit="W" directionality="produced">0.00</measurement>
+			</electricity_point_meter>
+			<electricity_interval_meter id='8bd7d604c9204b7eadbbb1304021fe7f' log_type='electricity'>
+				<functionalities>
+					<interval_log id='3ca803bd59a6498099d1b0db46615fbb'/>
+					<interval_log id='40a1f923280542279225e0d395882b5c'/>
+				</functionalities>
+				<measurement log_date="2020-07-26T19:00:00+02:00" unit="Wh" directionality="consumed" interval="PT1H">0.00</measurement>
+				<measurement log_date="2020-07-26T19:00:00+02:00" unit="Wh" directionality="produced" interval="PT1H">0.00</measurement>
+			</electricity_interval_meter>
+			<relay id='cf98b4da8977490eab723e25dac88d5b' log_type='relay'>
+				<functionalities>
+					<point_log id='865ced94bfd846a5be4f2ede5807269c'/>
+					<relay_functionality id='92cf4999ca764bacb4d766f112083231'/>
+				</functionalities>
+				<measurement log_date="2020-08-27T20:18:44.245+02:00">on</measurement>
+			</relay>
+		</services>
+		<protocols>
+			<network_router id='af7ebe75a9aa47d9b3ae26297be742d7'>
+				<mac_address>ABCD012345670A07</mac_address><network id='259882df3c05415b99c2d962534ce820'/>
+			</network_router>
+		</protocols>
+	</module>
+</modules>
diff --git a/userdata/updated/stretch_v31/system_status_xml.xml b/userdata/updated/stretch_v31/system_status_xml.xml
new file mode 100644
index 000000000..4748db535
--- /dev/null
+++ b/userdata/updated/stretch_v31/system_status_xml.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<system>
+	<gateway>
+		<product>stretch</product>
+		<hostname>stretch000000</hostname>
+		<firmware>3.1.11</firmware>
+		<upgrade/>
+	</gateway>
+	<wlan0>
+	</wlan0>
+	<eth0>
+		<mac>01:23:45:67:89:AB</mac>
+		<ip>127.0.0.1</ip>
+		<bcast>127.0.0.1</bcast>
+		<mask>127.0.0.1</mask>
+		<proto>static</proto>
+		<gateway>127.0.0.1</gateway>
+		<dns>127.0.0.1</dns>
+	</eth0>
+	<time>2020-08-27T23:10:09.994+02:00</time>
+	<timezone><![CDATA[Europe/Amsterdam]]></timezone>
+<remote_control origin='any'>not initialized</remote_control></system>


Test patch:
diff --git a/tests/test_smile.py b/tests/test_smile.py
index 450bb55d0..23c552a3d 100644
--- a/tests/test_smile.py
+++ b/tests/test_smile.py
@@ -977,6 +977,22 @@ async def test_connect_smile_p1_v2_2(self):
                 },
             },
         }
+        testdata_updated = {
+            "199aa40f126840f392983d171374ab0b": {
+                "sensors": {
+                    "net_electricity_point": -2248,
+                    "electricity_consumed_point": 0,
+                    "net_electricity_cumulative": 1019.101,
+                    "electricity_consumed_peak_cumulative": 1155.295,
+                    "electricity_consumed_off_peak_cumulative": 1642.84,
+                    "electricity_produced_point": 2248,
+                    "electricity_produced_peak_cumulative": 1296.336,
+                    "electricity_produced_off_peak_cumulative": 482.698,
+                    "gas_consumed_cumulative": 585.433,
+                    "gas_consumed_interval": 0,
+                },
+            },
+        }
 
         self.smile_setup = "smile_p1_v2_2"
         server, smile, client = await self.connect_wrapper()
@@ -994,6 +1010,11 @@ async def test_connect_smile_p1_v2_2(self):
         assert self.device_items == 26
         assert not self.notifications
 
+        # Now change some data and change directory reading xml from
+        # emulating reading newer dataset after an update_interval
+        self.smile_setup = "updated/smile_p1_v2_2"
+        await self.device_test(smile, testdata_updated, initialize=False)
+
         await smile.close_connection()
         await self.disconnect(server, client)
 
@@ -4740,6 +4761,39 @@ async def test_connect_stretch_v31(self):
                 "switches": {"relay": True},
             },
         }
+        testdata_updated = {
+            "aac7b735042c4832ac9ff33aae4f453b": {
+                "sensors": {
+                    "electricity_consumed": 1000.0,
+                    "electricity_consumed_interval": 20.7,
+                    "electricity_produced": 0.0,
+                },
+                "switches": {"relay": True, "lock": True},
+            },
+            "cfe95cf3de1948c0b8955125bf754614": {
+                "sensors": {
+                    "electricity_consumed": 0.0,
+                    "electricity_consumed_interval": 0.0,
+                    "electricity_produced": 0.0,
+                },
+                "switches": {"relay": False, "lock": False},
+            },
+            "059e4d03c7a34d278add5c7a4a781d19": {
+                "sensors": {
+                    "electricity_consumed": 0.0,
+                    "electricity_consumed_interval": 0.0,
+                    "electricity_produced": 0.0,
+                },
+                "switches": {"relay": False, "lock": False},
+            },
+            "d03738edfcc947f7b8f4573571d90d2d": {
+                "members": [
+                    "059e4d03c7a34d278add5c7a4a781d19",
+                    "cfe95cf3de1948c0b8955125bf754614",
+                ],
+                "switches": {"relay": False},
+            },
+        }
 
         self.smile_setup = "stretch_v31"
         server, smile, client = await self.connect_wrapper(stretch=True)
@@ -4757,6 +4811,11 @@ async def test_connect_stretch_v31(self):
         assert smile.gateway_id == "0000aaaa0000aaaa0000aaaa0000aa00"
         assert self.device_items == 83
 
+        # Now change some data and change directory reading xml from
+        # emulating reading newer dataset after an update_interval
+        self.smile_setup = "updated/stretch_v31"
+        await self.device_test(smile, testdata_updated, initialize=False)
+
         await smile.close_connection()
         await self.disconnect(server, client)
 
@@ -5237,6 +5296,25 @@ async def test_connect_p1v4_442_single(self):
                 },
             },
         }
+        testdata_updated = {
+            "ba4de7613517478da82dd9b6abea36af": {
+                "sensors": {
+                    "net_electricity_point": -2248,
+                    "electricity_consumed_peak_point": 0,
+                    "electricity_consumed_off_peak_point": 0,
+                    "electricity_consumed_peak_interval": 0,
+                    "electricity_consumed_off_peak_interval": 0,
+                    "electricity_produced_peak_point": 2248,
+                    "electricity_produced_off_peak_point": 0,
+                    "electricity_produced_peak_cumulative": 6.543,
+                    "electricity_produced_off_peak_cumulative": 0.0,
+                    "electricity_produced_peak_interval": 1345,
+                    "electricity_produced_off_peak_interval": 0,
+                    "electricity_phase_one_consumed": 0,
+                    "electricity_phase_one_produced": 1998,
+                },
+            },
+        }
 
         self.smile_setup = "p1v4_442_single"
         server, smile, client = await self.connect_wrapper()
@@ -5255,6 +5333,11 @@ async def test_connect_p1v4_442_single(self):
         assert self.device_items == 31
         assert not self.notifications
 
+        # Now change some data and change directory reading xml from
+        # emulating reading newer dataset after an update_interval
+        self.smile_setup = "updated/p1v4_442_single"
+        await self.device_test(smile, testdata_updated, initialize=False)
+
         await smile.close_connection()
         await self.disconnect(server, client)