diff --git a/userdata/p1v4/core.domain_objects.xml b/userdata/archive/p1v4/core.domain_objects.xml
similarity index 97%
rename from userdata/p1v4/core.domain_objects.xml
rename to userdata/archive/p1v4/core.domain_objects.xml
index ab0dcc93b..14659661b 100644
--- a/userdata/p1v4/core.domain_objects.xml
+++ b/userdata/archive/p1v4/core.domain_objects.xml
@@ -1,425 +1,425 @@
-
-
-
- Home
- A building with a smart meter.
- building
- 2020-03-12T16:41:36.227+01:00
- 2020-11-03T18:35:42.651+01:00
-
- home
-
-
-
-
- electricity_consumed
- W
- 2020-11-03T18:35:38+01:00
- 2020-11-03T18:35:38+01:00
-
-
-
- 0.00
- 571.00
-
-
-
- electricity_produced
- Wh
- 2020-11-03T18:35:00+01:00
- 2020-11-03T18:35:00+01:00
-
-
-
- 0.00
- 0.00
-
-
-
- electricity_produced
- W
- 2020-11-03T18:35:38+01:00
- 2020-11-03T07:00:00+01:00
-
-
-
- 0.00
- 0.00
-
-
-
- electricity_consumed
- Wh
- 2020-11-03T18:35:00+01:00
- 2020-11-03T18:35:00+01:00
-
-
-
- 9067554.00
- 11915899.00
-
-
-
- electricity_produced
- Wh
- 2020-11-03T18:00:00+01:00
- 2020-11-03T17:00:00+01:00
- PT1H
-
-
- 0.00
- 0.00
-
-
-
- electricity_consumed
- Wh
- 2020-11-03T18:00:00+01:00
- 2020-11-03T17:00:00+01:00
- PT1H
-
-
- 335.00
- 0.00
-
-
-
-
-
-
- Gateway
- Container for variables logged about the Gateway in general.
- gateway
- 2019-11-19T10:21:26.199+01:00
- 2020-11-03T18:32:55+01:00
-
-
-
-
- signal_strength
- dBm
- 2020-11-03T18:32:54.963+01:00
- 2020-11-03T18:32:54.963+01:00
-
-
-
- -73.00
-
-
-
- link_quality
-
- 2020-11-03T18:32:54.963+01:00
- 2020-11-03T18:32:54.963+01:00
-
-
-
- 37
-
-
-
- wlan_state
-
- 2020-11-03T18:32:54.964+01:00
- 2020-11-01T03:03:00.285+01:00
-
-
-
- up
-
-
-
- lan_state
-
- 2020-11-03T18:32:55+01:00
- 2020-03-12T16:40:25.650+01:00
-
-
-
- down
-
-
-
- wlan_ip_address
-
- 2020-11-03T18:32:54.964+01:00
- 2020-11-03T03:01:37+01:00
-
-
-
- 127.0.0.1
-
-
-
-
-
-
- Relay schedule template
- Template for scheduling relays on a time basis.
- true
- 2020-10-25T03:00:45.040+01:00
- 2020-10-25T03:00:45.057+01:00
-
-
-
-
-
-
-
-
-
-
-
-
- SHENZHEN KAIFA TECHNOLOGY CHENGDU CO.
- KFM5KAIFA-METER
-
-
- 2020-03-12T16:41:36.010+01:00
- 2020-08-10T09:32:42.108+02:00
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- E0025100029832815
- 42
-
-
-
-
-
- warning
- local
- Smart meter not found.
- The Smile P1 does not seem to be connected to a smart meter.
-
-
- 2020-01-23T10:54:59.710+01:00
- 2020-01-18T23:03:43.689+01:00
- 2020-01-18T23:03:43.749+01:00
-
-
-
- Plugwise
- Gateway
- AME Smile 2.0 board
-
- 2019-11-19T10:21:25.346+01:00
- 2020-03-12T16:45:21.960+01:00
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 2019-11-19T10:21:25.294+01:00
- 2020-11-03T12:15:46.431+01:00
-
-
-
- true
- false
- false
- 2019-11-19T10:21:25.294+01:00
- 2020-09-25T19:51:34.088+02:00
- Plugwise
- smile
- AME Smile 2.0 board
- 4.1.1
- 012345670001
- abcdefgh
- true
- false
-
- 127.0.0.1
- smile000000
-
- Europe/Amsterdam
- disabled
-
- -- Stock
- Stock which was previously called fulfillment
- false
- true
-
- 2020-03-12T16:54:47.400+01:00
- 2014-11-19T17:45:10+01:00
-
-
-
-
-
-
-
- double
- 0.237
-
- 0
-
- 0.222
-
-
- 0.222
-
- 0.24
- 2020-03-12T19:35:45.644+01:00
- double
- NL
- unknown
- 0.22
- 0.237
- 0.24
-
- apartment
- EUR
-
- 0
-
-
- 2020-03-12T19:35:45.644+01:00
- 2020-11-01T19:36:35+01:00
-
-
-
- 2019-11-21T16:49:43+01:00
- 2038-01-19T04:14:07+01:00
-
-
-
-
-
- 2020-03-12T16:54:47.440+01:00
- 2019-11-21T16:49:43+01:00
-
-
-
-
- Relay schedule template
- Template for scheduling relays on a time and preset basis.
- false
- 2020-10-25T03:00:44.983+01:00
- 2020-10-25T03:00:45.002+01:00
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Relay schedule template
- Template for scheduling relays on a time, solar time, preset, temperature and humidity basis.
- false
- 2020-10-25T03:00:45.013+01:00
- 2020-10-25T03:00:45.030+01:00
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Zone preset schedule template
- Template for scheduling presets on a presence or time basis with the option to override the preset's setpoint/state.
- true
- 2020-10-25T03:00:45.097+01:00
- 2020-10-25T03:00:45.117+01:00
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Client, Pointlog presence template
- Template for setting default client presence based on point_logs
- false
- 2020-10-25T03:00:45.126+01:00
- 2020-10-25T03:00:45.143+01:00
-
-
-
-
-
-
-
-
-
-
-
-
-
- Zone preset template
- Template for actuating thermostats and relays on a preset basis.
- true
- 2020-10-25T03:00:45.067+01:00
- 2020-10-25T03:00:45.087+01:00
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ Home
+ A building with a smart meter.
+ building
+ 2020-03-12T16:41:36.227+01:00
+ 2020-11-03T18:35:42.651+01:00
+
+ home
+
+
+
+
+ electricity_consumed
+ W
+ 2020-11-03T18:35:38+01:00
+ 2020-11-03T18:35:38+01:00
+
+
+
+ 0.00
+ 571.00
+
+
+
+ electricity_produced
+ Wh
+ 2020-11-03T18:35:00+01:00
+ 2020-11-03T18:35:00+01:00
+
+
+
+ 0.00
+ 0.00
+
+
+
+ electricity_produced
+ W
+ 2020-11-03T18:35:38+01:00
+ 2020-11-03T07:00:00+01:00
+
+
+
+ 0.00
+ 0.00
+
+
+
+ electricity_consumed
+ Wh
+ 2020-11-03T18:35:00+01:00
+ 2020-11-03T18:35:00+01:00
+
+
+
+ 9067554.00
+ 11915899.00
+
+
+
+ electricity_produced
+ Wh
+ 2020-11-03T18:00:00+01:00
+ 2020-11-03T17:00:00+01:00
+ PT1H
+
+
+ 0.00
+ 0.00
+
+
+
+ electricity_consumed
+ Wh
+ 2020-11-03T18:00:00+01:00
+ 2020-11-03T17:00:00+01:00
+ PT1H
+
+
+ 335.00
+ 0.00
+
+
+
+
+
+
+ Gateway
+ Container for variables logged about the Gateway in general.
+ gateway
+ 2019-11-19T10:21:26.199+01:00
+ 2020-11-03T18:32:55+01:00
+
+
+
+
+ signal_strength
+ dBm
+ 2020-11-03T18:32:54.963+01:00
+ 2020-11-03T18:32:54.963+01:00
+
+
+
+ -73.00
+
+
+
+ link_quality
+
+ 2020-11-03T18:32:54.963+01:00
+ 2020-11-03T18:32:54.963+01:00
+
+
+
+ 37
+
+
+
+ wlan_state
+
+ 2020-11-03T18:32:54.964+01:00
+ 2020-11-01T03:03:00.285+01:00
+
+
+
+ up
+
+
+
+ lan_state
+
+ 2020-11-03T18:32:55+01:00
+ 2020-03-12T16:40:25.650+01:00
+
+
+
+ down
+
+
+
+ wlan_ip_address
+
+ 2020-11-03T18:32:54.964+01:00
+ 2020-11-03T03:01:37+01:00
+
+
+
+ 127.0.0.1
+
+
+
+
+
+
+ Relay schedule template
+ Template for scheduling relays on a time basis.
+ true
+ 2020-10-25T03:00:45.040+01:00
+ 2020-10-25T03:00:45.057+01:00
+
+
+
+
+
+
+
+
+
+
+
+
+ SHENZHEN KAIFA TECHNOLOGY CHENGDU CO.
+ KFM5KAIFA-METER
+
+
+ 2020-03-12T16:41:36.010+01:00
+ 2020-08-10T09:32:42.108+02:00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ E0025100029832815
+ 42
+
+
+
+
+
+ warning
+ local
+ Smart meter not found.
+ The Smile P1 does not seem to be connected to a smart meter.
+
+
+ 2020-01-23T10:54:59.710+01:00
+ 2020-01-18T23:03:43.689+01:00
+ 2020-01-18T23:03:43.749+01:00
+
+
+
+ Plugwise
+ Gateway
+ AME Smile 2.0 board
+
+ 2019-11-19T10:21:25.346+01:00
+ 2020-03-12T16:45:21.960+01:00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 2019-11-19T10:21:25.294+01:00
+ 2020-11-03T12:15:46.431+01:00
+
+
+
+ true
+ false
+ false
+ 2019-11-19T10:21:25.294+01:00
+ 2020-09-25T19:51:34.088+02:00
+ Plugwise
+ smile
+ AME Smile 2.0 board
+ 4.1.1
+ 012345670001
+ abcdefgh
+ true
+ false
+
+ 127.0.0.1
+ smile000000
+
+ Europe/Amsterdam
+ disabled
+
+ -- Stock
+ Stock which was previously called fulfillment
+ false
+ true
+
+ 2020-03-12T16:54:47.400+01:00
+ 2014-11-19T17:45:10+01:00
+
+
+
+
+
+
+
+ double
+ 0.237
+
+ 0
+
+ 0.222
+
+
+ 0.222
+
+ 0.24
+ 2020-03-12T19:35:45.644+01:00
+ double
+ NL
+ unknown
+ 0.22
+ 0.237
+ 0.24
+
+ apartment
+ EUR
+
+ 0
+
+
+ 2020-03-12T19:35:45.644+01:00
+ 2020-11-01T19:36:35+01:00
+
+
+
+ 2019-11-21T16:49:43+01:00
+ 2038-01-19T04:14:07+01:00
+
+
+
+
+
+ 2020-03-12T16:54:47.440+01:00
+ 2019-11-21T16:49:43+01:00
+
+
+
+
+ Relay schedule template
+ Template for scheduling relays on a time and preset basis.
+ false
+ 2020-10-25T03:00:44.983+01:00
+ 2020-10-25T03:00:45.002+01:00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Relay schedule template
+ Template for scheduling relays on a time, solar time, preset, temperature and humidity basis.
+ false
+ 2020-10-25T03:00:45.013+01:00
+ 2020-10-25T03:00:45.030+01:00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Zone preset schedule template
+ Template for scheduling presets on a presence or time basis with the option to override the preset's setpoint/state.
+ true
+ 2020-10-25T03:00:45.097+01:00
+ 2020-10-25T03:00:45.117+01:00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Client, Pointlog presence template
+ Template for setting default client presence based on point_logs
+ false
+ 2020-10-25T03:00:45.126+01:00
+ 2020-10-25T03:00:45.143+01:00
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Zone preset template
+ Template for actuating thermostats and relays on a preset basis.
+ true
+ 2020-10-25T03:00:45.067+01:00
+ 2020-10-25T03:00:45.087+01:00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+