Merge pull request #853 from home-assistant/dev

Release 141
Update Panel for Home Assistant 0.84.0 (#852 )
2025-08-16 12:39:21 +00:00 · 2018-12-11 23:45:29 +01:00 · 2018-12-11 20:54:30 +01:00 · 2018-11-30 00:09:33 +01:00 · 2018-11-22 14:53:49 +01:00 · 2018-11-22 14:46:58 +01:00
153 changed files with 9800 additions and 3576 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -7,3 +7,7 @@

 # Temporary files
 **/__pycache__
+
+# virtualenv
+venv/
+ENV/
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,35 @@
+<!-- READ THIS FIRST:
+- If you need additional help with this template please refer to https://www.home-assistant.io/help/reporting_issues/
+- Make sure you are running the latest version of Home Assistant before reporting an issue: https://github.com/home-assistant/home-assistant/releases
+- Do not report issues for components here, plaese refer to https://github.com/home-assistant/home-assistant/issues
+- This is for bugs only. Feature and enhancement requests should go in our community forum: https://community.home-assistant.io/c/feature-requests
+- Provide as many details as possible. Paste logs, configuration sample and code into the backticks. Do not delete any text from this template!
+- If you have a problem with a Add-on, make a issue on there repository.
+-->
+
+**Home Assistant release with the issue:**
+<!--
+- Frontend -> Developer tools -> Info
+- Or use this command: hass --version
+-->
+
+**Home Assistant release with the issue:**
+<!--
+- Frontend -> Developer tools -> Info
+- Or use this command: hass --version
+-->
+
+**Operating environment (HassOS/Generic):**
+<!--
+Please provide details about your environment.
+-->
+
+**Supervisor logs:**
+<!--
+- Frontend -> Hass.io -> System
+- Or use this command: hassio su logs
+-->
+
+
+**Description of problem:**
+
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -0,0 +1,4 @@
+template: |
+  ## What's Changed
+
+  $CHANGES
--- a/.gitignore
+++ b/.gitignore
@@ -90,3 +90,6 @@ ENV/

 # pylint
 .pylint.d/
+
+# VS Code
+.vscode/
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "home-assistant-polymer"]
 	path = home-assistant-polymer
 	url = https://github.com/home-assistant/home-assistant-polymer
+	branch = dev
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,6 @@
-sudo: false
-matrix:
-  fast_finish: true
-  include:
-    - python: "3.6"
-
-cache:
-  directories:
-    - $HOME/.cache/pip
+sudo: true
+dist: xenial
 install: pip install -U tox
 language: python
+python: 3.7
 script: tox
--- a/API.md
+++ b/API.md
@@ -1,10 +1,10 @@
-# Hass.io Server
+# Hass.io

 ## Hass.io RESTful API

 Interface for Home Assistant to control things from supervisor.

-On error:
+On error / Code 400:

 ```json
 {
@@ -13,7 +13,7 @@ On error:
 }
 ```

-On success:
+On success / Code 200:

 ```json
 {
@@ -22,9 +22,14 @@ On success:
 }
 ```

+For access to API you need set the `X-HASSIO-KEY` they will be available for Add-ons/HomeAssistant with envoriment `HASSIO_TOKEN`.
+
 ### Hass.io

 - GET `/supervisor/ping`
+
+This API call don't need a token.
+
 - GET `/supervisor/info`

 The addons from `addons` are only installed one.
@@ -34,8 +39,9 @@ The addons from `addons` are only installed one.
    "version": "INSTALL_VERSION",
    "last_version": "LAST_VERSION",
    "arch": "armhf|aarch64|i386|amd64",
-    "beta_channel": "true|false",
+    "channel": "stable|beta|dev",
    "timezone": "TIMEZONE",
+    "wait_boot": "int",
    "addons": [
        {
            "name": "xy bla",
@@ -44,6 +50,7 @@ The addons from `addons` are only installed one.
            "repository": "12345678|null",
            "version": "LAST_VERSION",
            "installed": "INSTALL_VERSION",
+            "icon": "bool",
            "logo": "bool",
            "state": "started|stopped",
        }
@@ -68,8 +75,9 @@ Optional:

 ```json
 {
-    "beta_channel": "true|false",
+    "channel": "stable|beta|dev",
    "timezone": "TIMEZONE",
+    "wait_boot": "int",
    "addons_repositories": [
        "REPO_URL"
    ]
@@ -84,44 +92,20 @@ Reload addons/version.

 Output is the raw docker log.

-### Security
-
- GET `/security/info`
-
+- GET `/supervisor/stats`
 ```json
 {
-    "initialize": "bool",
-    "totp": "bool"
+    "cpu_percent": 0.0,
+    "memory_usage": 283123,
+    "memory_limit": 329392,
+    "network_tx": 0,
+    "network_rx": 0,
+    "blk_read": 0,
+    "blk_write": 0
 }
 ```

- POST `/security/options`
-
-```json
-{
-    "password": "xy"
-}
-```
-
- POST `/security/totp`
-
-```json
-{
-    "password": "xy"
-}
-```
-
-Return QR-Code
-
- POST `/security/session`
-```json
-{
-    "password": "xy",
-    "totp": "null|123456"
-}
-```
-
-### Backup/Snapshot
+### Snapshot

 - GET `/snapshots`

@@ -131,7 +115,9 @@ Return QR-Code
        {
            "slug": "SLUG",
            "date": "ISO",
-            "name": "Custom name"
+            "name": "Custom name",
+            "type": "full|partial",
+            "protected": "bool"
        }
    ]
 }
@@ -139,11 +125,28 @@ Return QR-Code

 - POST `/snapshots/reload`

+- POST `/snapshots/new/upload`
+
+return:
+```json
+{
+    "slug": ""
+}
+```
+
 - POST `/snapshots/new/full`

 ```json
 {
-    "name": "Optional"
+    "name": "Optional",
+    "password": "Optional"
+}
+```
+
+return:
+```json
+{
+    "slug": ""
 }
 ```

@@ -153,7 +156,15 @@ Return QR-Code
 {
    "name": "Optional",
    "addons": ["ADDON_SLUG"],
-    "folders": ["FOLDER_NAME"]
+    "folders": ["FOLDER_NAME"],
+    "password": "Optional"
+}
+```
+
+return:
+```json
+{
+    "slug": ""
 }
 ```

@@ -168,15 +179,14 @@ Return QR-Code
    "name": "custom snapshot name / description",
    "date": "ISO",
    "size": "SIZE_IN_MB",
-    "homeassistant": {
-      "version": "INSTALLED_HASS_VERSION",
-      "devices": []
-    },
+    "protected": "bool",
+    "homeassistant": "version",
    "addons": [
        {
            "slug": "ADDON_SLUG",
            "name": "NAME",
-            "version": "INSTALLED_VERSION"
+            "version": "INSTALLED_VERSION",
+            "size": "SIZE_IN_MB"
        }
    ],
    "repositories": ["URL"],
@@ -185,36 +195,47 @@ Return QR-Code
 ```

 - POST `/snapshots/{slug}/remove`
+
+- GET `/snapshots/{slug}/download`
+
 - POST `/snapshots/{slug}/restore/full`
+
+```json
+{
+    "password": "Optional"
+}
+```
+
 - POST `/snapshots/{slug}/restore/partial`

 ```json
 {
    "homeassistant": "bool",
    "addons": ["ADDON_SLUG"],
-    "folders": ["FOLDER_NAME"]
+    "folders": ["FOLDER_NAME"],
+    "password": "Optional"
 }
 ```

 ### Host

 - POST `/host/reload`
+
 - POST `/host/shutdown`
+
 - POST `/host/reboot`
+
 - GET `/host/info`

 ```json
 {
-    "type": "",
-    "version": "",
-    "last_version": "",
-    "features": ["shutdown", "reboot", "update", "hostname", "network_info", "network_control"],
-    "hostname": "",
-    "os": "",
-    "audio": {
-        "input": "0,0",
-        "output": "0,0"
-    }
+    "hostname": "hostname|null",
+    "features": ["shutdown", "reboot", "hostname", "services", "hassos"],
+    "operating_system": "HassOS XY|Ubuntu 16.4|null",
+    "kernel": "4.15.7|null",
+    "chassis": "specific|null",
+    "deployment": "stable|beta|dev|null",
+    "cpe": "xy|null",
 }
 ```

@@ -222,22 +243,67 @@ Return QR-Code

 ```json
 {
-    "audio_input": "0,0",
-    "audio_output": "0,0"
+    "hostname": "",
 }
 ```

- POST `/host/update`
+- POST `/host/reload`

-Optional:
+#### Services

+- GET `/host/services`
 ```json
 {
-    "version": "VERSION"
+    "services": [
+        {
+            "name": "xy.service",
+            "description": "XY ...",
+            "state": "active|"
+        }
+    ]
 }
 ```

- GET `/host/hardware`
+- POST `/host/service/{unit}/stop`
+
+- POST `/host/service/{unit}/start`
+
+- POST `/host/service/{unit}/reload`
+
+### HassOS
+
+- GET `/hassos/info`
+```json
+{
+    "version": "2.3",
+    "version_cli": "7",
+    "version_latest": "2.4",
+    "version_cli_latest": "8",
+    "board": "ova|rpi"
+}
+```
+
+- POST `/hassos/update`
+```json
+{
+    "version": "optional"
+}
+```
+
+- POST `/hassos/update/cli`
+```json
+{
+    "version": "optional"
+}
+```
+
+- POST `/hassos/config/sync`
+
+Load host configs from a USB stick.
+
+### Hardware
+
+- GET `/hardware/info`
 ```json
 {
    "serial": ["/dev/xy"],
@@ -256,21 +322,18 @@ Optional:
 }
 ```

-### Network
-
- GET `/network/info`
-
+- GET `/hardware/audio`
 ```json
 {
-    "hostname": ""
-}
-```
-
- POST `/network/options`
-
-```json
-{
-    "hostname": "",
+    "audio": {
+        "input": {
+            "0,0": "Mic"
+        },
+        "output": {
+            "1,0": "Jack",
+            "1,1": "HDMI"
+        }
+    }
 }
 ```

@@ -282,13 +345,14 @@ Optional:
 {
    "version": "INSTALL_VERSION",
    "last_version": "LAST_VERSION",
-    "devices": [""],
+    "machine": "Image machine type",
    "image": "str",
    "custom": "bool -> if custom image",
    "boot": "bool",
    "port": 8123,
    "ssl": "bool",
-    "watchdog": "bool"
+    "watchdog": "bool",
+    "startup_time": 600
 }
 ```

@@ -315,13 +379,14 @@ Output is the raw Docker log.

 ```json
 {
-    "devices": [],
    "image": "Optional|null",
    "last_version": "Optional for custom image|null",
    "port": "port for access hass",
    "ssl": "bool",
    "password": "",
-    "watchdog": "bool"
+    "refresh_token": "",
+    "watchdog": "bool",
+    "startup_time": 600
 }
 ```

@@ -331,8 +396,27 @@ Image with `null` and last_version with `null` reset this options.

 Proxy to real home-assistant instance.

+- GET `/homeassistant/websocket`
+
+Proxy to real websocket instance.
+
+- GET `/homeassistant/stats`
+```json
+{
+    "cpu_percent": 0.0,
+    "memory_usage": 283123,
+    "memory_limit": 329392,
+    "network_tx": 0,
+    "network_rx": 0,
+    "blk_read": 0,
+    "blk_write": 0
+}
+```
+
 ### RESTful for API addons

+If an add-on will call itself, you can use `/addons/self/...`.
+
 - GET `/addons`

 Get all available addons.
@@ -344,21 +428,15 @@ Get all available addons.
            "name": "xy bla",
            "slug": "xy",
            "description": "description",
-            "arch": ["armhf", "aarch64", "i386", "amd64"],
            "repository": "core|local|REP_ID",
            "version": "LAST_VERSION",
            "installed": "none|INSTALL_VERSION",
            "detached": "bool",
+            "available": "bool",
            "build": "bool",
-            "privileged": ["NET_ADMIN", "SYS_ADMIN"],
-            "devices": ["/dev/xy"],
            "url": "null|url",
-            "logo": "bool",
-            "audio": "bool",
-            "gpio": "bool",
-            "stdin": "bool",
-            "hassio_api": "bool",
-            "homeassistant_api": "bool"
+            "icon": "bool",
+            "logo": "bool"
        }
    ],
    "repositories": [
@@ -379,10 +457,15 @@ Get all available addons.
 ```json
 {
    "name": "xy bla",
+    "slug": "xdssd_xybla",
    "description": "description",
+    "long_description": "null|markdown",
    "auto_update": "bool",
    "url": "null|url of addon",
    "detached": "bool",
+    "available": "bool",
+    "arch": ["armhf", "aarch64", "i386", "amd64"],
+    "machine": "[raspberrypi2, tinker]",
    "repository": "12345678|null",
    "version": "null|VERSION_INSTALLED",
    "last_version": "LAST_VERSION",
@@ -392,22 +475,42 @@ Get all available addons.
    "options": "{}",
    "network": "{}|null",
    "host_network": "bool",
+    "host_pid": "bool",
+    "host_ipc": "bool",
+    "host_dbus": "bool",
    "privileged": ["NET_ADMIN", "SYS_ADMIN"],
+    "apparmor": "disable|default|profile",
    "devices": ["/dev/xy"],
+    "auto_uart": "bool",
+    "icon": "bool",
    "logo": "bool",
+    "changelog": "bool",
    "hassio_api": "bool",
+    "hassio_role": "default|homeassistant|manager|admin",
    "homeassistant_api": "bool",
+    "auth_api": "bool",
+    "full_access": "bool",
+    "protected": "bool",
+    "rating": "1-6",
    "stdin": "bool",
    "webui": "null|http(s)://[HOST]:port/xy/zx",
    "gpio": "bool",
+    "devicetree": "bool",
+    "docker_api": "bool",
    "audio": "bool",
    "audio_input": "null|0,0",
-    "audio_output": "null|0,0"
+    "audio_output": "null|0,0",
+    "services_role": "['service:access']",
+    "discovery": "['service']"
 }
 ```

+- GET `/addons/{addon}/icon`
+
 - GET `/addons/{addon}/logo`

+- GET `/addons/{addon}/changelog`
+
 - POST `/addons/{addon}/options`

 ```json
@@ -423,7 +526,17 @@ Get all available addons.
 }
 ```

-For reset custom network/audio settings, set it `null`.
+Reset custom network/audio/options, set it `null`.
+
+- POST `/addons/{addon}/security`
+
+This function is not callable by itself.
+
+```json
+{
+    "protected": "bool",
+}
+```

 - POST `/addons/{addon}/start`

@@ -449,45 +562,129 @@ Only supported for local build addons

 Write data to add-on stdin

-## Host Control
-
-Communicate over UNIX socket with a host daemon.
-
- commands
-
-```
-# info
-> {'type', 'version', 'last_version', 'features', 'hostname'}
-# reboot
-# shutdown
-# host-update [v]
-
-# hostname xy
-
-# network info
-> {}
-# network wlan ssd xy
-# network wlan password xy
-# network int ip xy
-# network int netmask xy
-# network int route xy
+- GET `/addons/{addon}/stats`
+```json
+{
+    "cpu_percent": 0.0,
+    "memory_usage": 283123,
+    "memory_limit": 329392,
+    "network_tx": 0,
+    "network_rx": 0,
+    "blk_read": 0,
+    "blk_write": 0
+}
 ```

-Features:
+### discovery

- shutdown
- reboot
- update
- hostname
- network_info
- network_control
-
-Answer:
-```
-{}|OK|ERROR|WRONG
+- GET `/discovery`
+```json
+{
+    "discovery": [
+        {
+            "addon": "slug",
+            "service": "name",
+            "uuid": "uuid",
+            "config": {}
+        }
+    ]
+}
 ```

- {}: json
- OK: call was successfully
- ERROR: error on call
- WRONG: not supported
+- GET `/discovery/{UUID}`
+```json
+{
+    "addon": "slug",
+    "service": "name",
+    "uuid": "uuid",
+    "config": {}
+}
+```
+
+- POST `/discovery`
+```json
+{
+    "service": "name",
+    "config": {}
+}
+```
+
+return:
+```json
+{
+    "uuid": "uuid"
+}
+```
+
+- DEL `/discovery/{UUID}`
+
+### Services
+
+- GET `/services`
+```json
+{
+    "services": [
+        {
+            "slug": "name",
+            "available": "bool",
+            "providers": "list"
+        }
+    ]
+}
+```
+
+#### MQTT
+
+- GET `/services/mqtt`
+```json
+{
+    "addon": "name",
+    "host": "xy",
+    "port": "8883",
+    "ssl": "bool",
+    "username": "optional",
+    "password": "optional",
+    "protocol": "3.1.1"
+}
+```
+
+- POST `/services/mqtt`
+```json
+{
+    "host": "xy",
+    "port": "8883",
+    "ssl": "bool|optional",
+    "username": "optional",
+    "password": "optional",
+    "protocol": "3.1.1"
+}
+```
+
+- DEL `/services/mqtt`
+
+### Misc
+
+- GET `/info`
+```json
+{
+    "supervisor": "version",
+    "homeassistant": "version",
+    "hassos": "null|version",
+    "hostname": "name",
+    "machine": "type",
+    "arch": "arch",
+    "channel": "stable|beta|dev"
+}
+```
+
+### Auth / SSO API
+
+You can use the user system on homeassistant. We handle this auth system on
+supervisor.
+
+You can call post `/auth`
+
+We support:
+- Json `{ "user|name": "...", "password": "..." }`
+- application/x-www-form-urlencoded `user|name=...&password=...`
+- BasicAuth
--- a/30
+++ b/30
@@ -1,21 +1,25 @@
 ARG BUILD_FROM
 FROM $BUILD_FROM

-# add env
-ENV LANG C.UTF-8
+# Install base
+RUN apk add --no-cache \
+    git \
+    socat \
+    glib \
+    libstdc++ \
+    eudev-libs

-# setup base
-RUN apk add --no-cache python3 python3-dev \
-        libressl libressl-dev \
-        libffi libffi-dev \
-        musl musl-dev \
-        gcc libstdc++ \
-        git socat \
-    && pip3 install --no-cache-dir --upgrade pip \
-    && pip3 install --no-cache-dir --upgrade cryptography jwcrypto \
-    && apk del python3-dev libressl-dev libffi-dev musl-dev gcc
+# Install requirements
+COPY requirements.txt /usr/src/
+RUN apk add --no-cache --virtual .build-dependencies \
+        make \
+        g++ \
+    && export MAKEFLAGS="-j$(nproc)" \
+    && pip3 install --no-cache-dir -r /usr/src/requirements.txt \
+    && apk del .build-dependencies \
+    && rm -f /usr/src/requirements.txt

-# install HassIO
+# Install HassIO
 COPY . /usr/src/hassio
 RUN pip3 install --no-cache-dir /usr/src/hassio \
    && rm -rf /usr/src/hassio
--- a/README.md
+++ b/README.md
@@ -1,14 +1,28 @@
 # Hass.io

-### First private cloud solution for home automation.
+## First private cloud solution for home automation

-Hass.io is a Docker based system for managing your Home Assistant installation and related applications. The system is controlled via Home Assistant which communicates with the supervisor. The supervisor provides an API to manage the installation. This includes changing network settings or installing and updating software.
+Hass.io is a Docker-based system for managing your Home Assistant installation
+and related applications. The system is controlled via Home Assistant which
+communicates with the Supervisor. The Supervisor provides an API to manage the
+installation. This includes changing network settings or installing
+and updating software.

 ![](misc/hassio.png?raw=true)

- [Hass.io Addons](https://github.com/home-assistant/hassio-addons)
- [Hass.io Build](https://github.com/home-assistant/hassio-build)
-
 ## Installation

-Installation instructions can be found at [https://home-assistant.io/hassio](https://home-assistant.io/hassio).
+Installation instructions can be found at <https://home-assistant.io/hassio>.
+
+## Development
+
+The development of the supervisor is a bit tricky. Not difficult but tricky.
+
+- You can use the builder to build your supervisor: https://github.com/home-assistant/hassio-build/tree/master/builder
+- Go into a HassOS device or VM and pull your supervisor.
+- Set the developer modus on updater.json
+- Tag it as `homeassistant/xy-hassio-supervisor:latest`
+- Restart the service like `systemctl restart hassos-supervisor | journalctl -fu hassos-supervisor`
+- Test your changes
+
+Small Bugfix or improvements, make a PR. Significant change makes first an RFC.
--- a/hassio/init.py
+++ b/hassio/init.py
@@ -1 +1 @@
-"""Init file for HassIO."""
+"""Init file for Hass.io."""
--- a/hassio/main.py
+++ b/hassio/main.py
@@ -1,18 +1,27 @@
-"""Main file for HassIO."""
+"""Main file for Hass.io."""
 import asyncio
 from concurrent.futures import ThreadPoolExecutor
 import logging
 import sys

-import hassio.bootstrap as bootstrap
-import hassio.core as core
+from hassio import bootstrap

 _LOGGER = logging.getLogger(__name__)


+def attempt_use_uvloop():
+    """Attempt to use uvloop."""
+    try:
+        import uvloop
+        asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
+    except ImportError:
+        pass
+
+
 # pylint: disable=invalid-name
 if __name__ == "__main__":
    bootstrap.initialize_logging()
+    attempt_use_uvloop()
    loop = asyncio.get_event_loop()

    if not bootstrap.check_environment():
@@ -22,26 +31,25 @@ if __name__ == "__main__":
    executor = ThreadPoolExecutor(thread_name_prefix="SyncWorker")
    loop.set_default_executor(executor)

-    _LOGGER.info("Initialize Hassio setup")
-    config = bootstrap.initialize_system_data()
-    hassio = core.HassIO(loop, config)
+    _LOGGER.info("Initialize Hass.io setup")
+    coresys = bootstrap.initialize_coresys(loop)

-    bootstrap.migrate_system_env(config)
+    bootstrap.migrate_system_env(coresys)

    _LOGGER.info("Setup HassIO")
-    loop.run_until_complete(hassio.setup())
+    loop.run_until_complete(coresys.core.setup())

-    loop.call_soon_threadsafe(loop.create_task, hassio.start())
+    loop.call_soon_threadsafe(loop.create_task, coresys.core.start())
    loop.call_soon_threadsafe(bootstrap.reg_signal, loop)

    try:
-        _LOGGER.info("Run HassIO")
+        _LOGGER.info("Run Hass.io")
        loop.run_forever()
    finally:
-        _LOGGER.info("Stopping HassIO")
-        loop.run_until_complete(hassio.stop())
+        _LOGGER.info("Stopping Hass.io")
+        loop.run_until_complete(coresys.core.stop())
        executor.shutdown(wait=False)
        loop.close()

-    _LOGGER.info("Close Hassio")
+    _LOGGER.info("Close Hass.io")
    sys.exit(0)
--- a/hassio/addons/init.py
+++ b/hassio/addons/init.py
@@ -1,60 +1,72 @@
-"""Init file for HassIO addons."""
+"""Init file for Hass.io add-ons."""
 import asyncio
 import logging

 from .addon import Addon
 from .repository import Repository
-from .data import Data
-from ..const import REPOSITORY_CORE, REPOSITORY_LOCAL, BOOT_AUTO
+from .data import AddonsData
+from ..const import REPOSITORY_CORE, REPOSITORY_LOCAL, BOOT_AUTO, STATE_STARTED
+from ..coresys import CoreSysAttributes

 _LOGGER = logging.getLogger(__name__)

 BUILTIN_REPOSITORIES = set((REPOSITORY_CORE, REPOSITORY_LOCAL))


-class AddonManager(object):
-    """Manage addons inside HassIO."""
+class AddonManager(CoreSysAttributes):
+    """Manage add-ons inside Hass.io."""

-    def __init__(self, config, loop, docker):
-        """Initialize docker base wrapper."""
-        self.loop = loop
-        self.config = config
-        self.docker = docker
-        self.data = Data(config)
-        self.addons = {}
-        self.repositories = {}
+    def __init__(self, coresys):
+        """Initialize Docker base wrapper."""
+        self.coresys = coresys
+        self.data = AddonsData(coresys)
+        self.addons_obj = {}
+        self.repositories_obj = {}

    @property
    def list_addons(self):
-        """Return a list of all addons."""
-        return list(self.addons.values())
+        """Return a list of all add-ons."""
+        return list(self.addons_obj.values())
+
+    @property
+    def list_installed(self):
+        """Return a list of installed add-ons."""
+        return [addon for addon in self.addons_obj.values()
+                if addon.is_installed]

    @property
    def list_repositories(self):
-        """Return list of addon repositories."""
-        return list(self.repositories.values())
+        """Return list of add-on repositories."""
+        return list(self.repositories_obj.values())

    def get(self, addon_slug):
-        """Return a adddon from slug."""
-        return self.addons.get(addon_slug)
+        """Return an add-on from slug."""
+        return self.addons_obj.get(addon_slug)

-    async def prepare(self):
-        """Startup addon management."""
+    def from_token(self, token):
+        """Return an add-on from Hass.io token."""
+        for addon in self.list_addons:
+            if addon.is_installed and token == addon.hassio_token:
+                return addon
+        return None
+
+    async def load(self):
+        """Start up add-on management."""
        self.data.reload()

-        # init hassio built-in repositories
+        # Init Hass.io built-in repositories
        repositories = \
-            set(self.config.addons_repositories) | BUILTIN_REPOSITORIES
+            set(self.sys_config.addons_repositories) | BUILTIN_REPOSITORIES

-        # init custom repositories & load addons
+        # Init custom repositories and load add-ons
        await self.load_repositories(repositories)

    async def reload(self):
-        """Update addons from repo and reload list."""
+        """Update add-ons from repository and reload list."""
        tasks = [repository.update() for repository in
-                 self.repositories.values()]
+                 self.repositories_obj.values()]
        if tasks:
-            await asyncio.wait(tasks, loop=self.loop)
+            await asyncio.wait(tasks)

        # read data from repositories
        self.data.reload()
@@ -65,69 +77,82 @@ class AddonManager(object):
    async def load_repositories(self, list_repositories):
        """Add a new custom repository."""
        new_rep = set(list_repositories)
-        old_rep = set(self.repositories)
+        old_rep = set(self.repositories_obj)

        # add new repository
        async def _add_repository(url):
            """Helper function to async add repository."""
-            repository = Repository(self.config, self.loop, self.data, url)
+            repository = Repository(self.coresys, url)
            if not await repository.load():
                _LOGGER.error("Can't load from repository %s", url)
                return
-            self.repositories[url] = repository
+            self.repositories_obj[url] = repository

            # don't add built-in repository to config
            if url not in BUILTIN_REPOSITORIES:
-                self.config.add_addon_repository(url)
+                self.sys_config.add_addon_repository(url)

        tasks = [_add_repository(url) for url in new_rep - old_rep]
        if tasks:
-            await asyncio.wait(tasks, loop=self.loop)
+            await asyncio.wait(tasks)

        # del new repository
        for url in old_rep - new_rep - BUILTIN_REPOSITORIES:
-            self.repositories.pop(url).remove()
-            self.config.drop_addon_repository(url)
+            self.repositories_obj.pop(url).remove()
+            self.sys_config.drop_addon_repository(url)

        # update data
        self.data.reload()
        await self.load_addons()

    async def load_addons(self):
-        """Update/add internal addon store."""
+        """Update/add internal add-on store."""
        all_addons = set(self.data.system) | set(self.data.cache)

        # calc diff
-        add_addons = all_addons - set(self.addons)
-        del_addons = set(self.addons) - all_addons
+        add_addons = all_addons - set(self.addons_obj)
+        del_addons = set(self.addons_obj) - all_addons

-        _LOGGER.info("Load addons: %d all - %d new - %d remove",
+        _LOGGER.info("Load add-ons: %d all - %d new - %d remove",
                     len(all_addons), len(add_addons), len(del_addons))

        # new addons
        tasks = []
        for addon_slug in add_addons:
-            addon = Addon(
-                self.config, self.loop, self.docker, self.data, addon_slug)
+            addon = Addon(self.coresys, addon_slug)

            tasks.append(addon.load())
-            self.addons[addon_slug] = addon
+            self.addons_obj[addon_slug] = addon

        if tasks:
-            await asyncio.wait(tasks, loop=self.loop)
+            await asyncio.wait(tasks)

        # remove
        for addon_slug in del_addons:
-            self.addons.pop(addon_slug)
+            self.addons_obj.pop(addon_slug)

-    async def auto_boot(self, stage):
-        """Boot addons with mode auto."""
+    async def boot(self, stage):
+        """Boot add-ons with mode auto."""
        tasks = []
-        for addon in self.addons.values():
+        for addon in self.addons_obj.values():
            if addon.is_installed and addon.boot == BOOT_AUTO and \
                    addon.startup == stage:
                tasks.append(addon.start())

-        _LOGGER.info("Startup %s run %d addons", stage, len(tasks))
+        _LOGGER.info("Startup %s run %d add-ons", stage, len(tasks))
        if tasks:
-            await asyncio.wait(tasks, loop=self.loop)
+            await asyncio.wait(tasks)
+            await asyncio.sleep(self.sys_config.wait_boot)
+
+    async def shutdown(self, stage):
+        """Shutdown addons."""
+        tasks = []
+        for addon in self.addons_obj.values():
+            if addon.is_installed and \
+                    await addon.state() == STATE_STARTED and \
+                    addon.startup == stage:
+                tasks.append(addon.stop())
+
+        _LOGGER.info("Shutdown %s stop %d add-ons", stage, len(tasks))
+        if tasks:
+            await asyncio.wait(tasks)
--- a/hassio/addons/addon.py
+++ b/hassio/addons/addon.py
--- a/hassio/addons/build.py
+++ b/hassio/addons/build.py
@@ -1,30 +1,37 @@
-"""HassIO addons build environment."""
+"""Hass.io add-on build environment."""
 from pathlib import Path

-from .validate import SCHEMA_BUILD_CONFIG
+from .validate import SCHEMA_BUILD_CONFIG, BASE_IMAGE
 from ..const import ATTR_SQUASH, ATTR_BUILD_FROM, ATTR_ARGS, META_ADDON
-from ..tools import JsonConfig
+from ..coresys import CoreSysAttributes
+from ..utils.json import JsonConfig


-class AddonBuild(JsonConfig):
-    """Handle build options for addons."""
+class AddonBuild(JsonConfig, CoreSysAttributes):
+    """Handle build options for add-ons."""

-    def __init__(self, config, addon):
-        """Initialize addon builder."""
-        self.config = config
-        self.addon = addon
+    def __init__(self, coresys, slug):
+        """Initialize Hass.io add-on builder."""
+        self.coresys = coresys
+        self._id = slug

        super().__init__(
-            Path(addon.path_location, 'build.json'), SCHEMA_BUILD_CONFIG)
+            Path(self.addon.path_location, 'build.json'), SCHEMA_BUILD_CONFIG)

-    def save(self):
+    def save_data(self):
        """Ignore save function."""
        pass

+    @property
+    def addon(self):
+        """Return add-on of build data."""
+        return self.sys_addons.get(self._id)
+
    @property
    def base_image(self):
-        """Base images for this addon."""
-        return self._data[ATTR_BUILD_FROM][self.config.arch]
+        """Base images for this add-on."""
+        return self._data[ATTR_BUILD_FROM].get(
+            self.sys_arch, BASE_IMAGE[self.sys_arch])

    @property
    def squash(self):
@@ -33,28 +40,28 @@ class AddonBuild(JsonConfig):

    @property
    def additional_args(self):
-        """Return additional docker build arguments."""
+        """Return additional Docker build arguments."""
        return self._data[ATTR_ARGS]

    def get_docker_args(self, version):
-        """Create a dict with docker build arguments."""
+        """Create a dict with Docker build arguments."""
        args = {
            'path': str(self.addon.path_location),
-            'tag': "{}:{}".format(self.addon.image, version),
+            'tag': f"{self.addon.image}:{version}",
            'pull': True,
            'forcerm': True,
            'squash': self.squash,
            'labels': {
                'io.hass.version': version,
-                'io.hass.arch': self.config.arch,
+                'io.hass.arch': self.sys_arch,
                'io.hass.type': META_ADDON,
-                'io.hass.name': self.addon.name,
-                'io.hass.description': self.addon.description,
+                'io.hass.name': self._fix_label('name'),
+                'io.hass.description': self._fix_label('description'),
            },
            'buildargs': {
                'BUILD_FROM': self.base_image,
                'BUILD_VERSION': version,
-                'BUILD_ARCH': self.config.arch,
+                'BUILD_ARCH': self.sys_arch,
                **self.additional_args,
            }
        }
@@ -63,3 +70,8 @@ class AddonBuild(JsonConfig):
            args['labels']['io.hass.url'] = self.addon.url

        return args
+
+    def _fix_label(self, label_name):
+        """Remove characters they are not supported."""
+        label = getattr(self.addon, label_name, "")
+        return label.replace("'", "")
--- a/hassio/addons/built-in.json
+++ b/hassio/addons/built-in.json
@@ -1,12 +1,12 @@
 {
    "local": {
-        "name": "Local Add-Ons",
+        "name": "Local add-ons",
        "url": "https://home-assistant.io/hassio",
-        "maintainer": "By our self"
+        "maintainer": "you"
    },
    "core": {
-        "name": "Built-in Add-Ons",
+        "name": "Official add-ons",
        "url": "https://home-assistant.io/addons",
-        "maintainer": "Home Assistant authors"
+        "maintainer": "Home Assistant"
    }
 }
--- a/hassio/addons/data.py
+++ b/hassio/addons/data.py
@@ -1,5 +1,4 @@
-"""Init file for HassIO addons."""
-import copy
+"""Init file for Hass.io add-on data."""
 import logging
 import json
 from pathlib import Path
@@ -7,71 +6,69 @@ from pathlib import Path
 import voluptuous as vol
 from voluptuous.humanize import humanize_error

-from .util import extract_hash_from_path
+from .utils import extract_hash_from_path
 from .validate import (
-    SCHEMA_ADDON_CONFIG, SCHEMA_ADDON_FILE, SCHEMA_REPOSITORY_CONFIG)
+    SCHEMA_ADDON_CONFIG, SCHEMA_ADDONS_FILE, SCHEMA_REPOSITORY_CONFIG)
 from ..const import (
-    FILE_HASSIO_ADDONS, ATTR_VERSION, ATTR_SLUG, ATTR_REPOSITORY, ATTR_LOCATON,
+    FILE_HASSIO_ADDONS, ATTR_SLUG, ATTR_REPOSITORY, ATTR_LOCATON,
    REPOSITORY_CORE, REPOSITORY_LOCAL, ATTR_USER, ATTR_SYSTEM)
-from ..tools import JsonConfig, read_json_file
+from ..coresys import CoreSysAttributes
+from ..utils.json import JsonConfig, read_json_file

 _LOGGER = logging.getLogger(__name__)


-class Data(JsonConfig):
-    """Hold data for addons inside HassIO."""
+class AddonsData(JsonConfig, CoreSysAttributes):
+    """Hold data for Add-ons inside Hass.io."""

-    def __init__(self, config):
+    def __init__(self, coresys):
        """Initialize data holder."""
-        super().__init__(FILE_HASSIO_ADDONS, SCHEMA_ADDON_FILE)
-        self.config = config
+        super().__init__(FILE_HASSIO_ADDONS, SCHEMA_ADDONS_FILE)
+        self.coresys = coresys
        self._repositories = {}
        self._cache = {}

    @property
    def user(self):
-        """Return local addon user data."""
+        """Return local add-on user data."""
        return self._data[ATTR_USER]

    @property
    def system(self):
-        """Return local addon data."""
+        """Return local add-on data."""
        return self._data[ATTR_SYSTEM]

    @property
    def cache(self):
-        """Return addon data from cache/repositories."""
+        """Return add-on data from cache/repositories."""
        return self._cache

    @property
    def repositories(self):
-        """Return addon data from repositories."""
+        """Return add-on data from repositories."""
        return self._repositories

    def reload(self):
-        """Read data from addons repository."""
+        """Read data from add-on repository."""
        self._cache = {}
        self._repositories = {}

        # read core repository
        self._read_addons_folder(
-            self.config.path_addons_core, REPOSITORY_CORE)
+            self.sys_config.path_addons_core, REPOSITORY_CORE)

        # read local repository
        self._read_addons_folder(
-            self.config.path_addons_local, REPOSITORY_LOCAL)
+            self.sys_config.path_addons_local, REPOSITORY_LOCAL)

        # add built-in repositories information
        self._set_builtin_repositories()

        # read custom git repositories
-        for repository_element in self.config.path_addons_git.iterdir():
+        for repository_element in self.sys_config.path_addons_git.iterdir():
            if repository_element.is_dir():
                self._read_git_repository(repository_element)

-        # update local data
-        self._merge_config()
-
    def _read_git_repository(self, path):
        """Process a custom repository folder."""
        slug = extract_hash_from_path(path)
@@ -83,7 +80,7 @@ class Data(JsonConfig):
                read_json_file(repository_file)
            )

-        except (OSError, json.JSONDecodeError):
+        except (OSError, json.JSONDecodeError, UnicodeDecodeError):
            _LOGGER.warning("Can't read repository information from %s",
                            repository_file)
            return
@@ -97,7 +94,7 @@ class Data(JsonConfig):
        self._read_addons_folder(path, slug)

    def _read_addons_folder(self, path, repository):
-        """Read data from addons folder."""
+        """Read data from add-ons folder."""
        for addon in path.glob("**/config.json"):
            try:
                addon_config = read_json_file(addon)
@@ -118,7 +115,7 @@ class Data(JsonConfig):
                _LOGGER.warning("Can't read %s", addon)

            except vol.Invalid as ex:
-                _LOGGER.warning("Can't read %s -> %s", addon,
+                _LOGGER.warning("Can't read %s: %s", addon,
                                humanize_error(addon_config, ex))

    def _set_builtin_repositories(self):
@@ -127,7 +124,7 @@ class Data(JsonConfig):
            builtin_file = Path(__file__).parent.joinpath('built-in.json')
            builtin_data = read_json_file(builtin_file)
        except (OSError, json.JSONDecodeError) as err:
-            _LOGGER.warning("Can't read built-in.json -> %s", err)
+            _LOGGER.warning("Can't read built-in json: %s", err)
            return

        # core repository
@@ -137,25 +134,3 @@ class Data(JsonConfig):
        # local repository
        self._repositories[REPOSITORY_LOCAL] = \
            builtin_data[REPOSITORY_LOCAL]
-
-    def _merge_config(self):
-        """Update local config if they have update.
-
-        It need to be the same version as the local version is for merge.
-        """
-        have_change = False
-
-        for addon in set(self.system):
-            # detached
-            if addon not in self._cache:
-                continue
-
-            cache = self._cache[addon]
-            data = self.system[addon]
-            if data[ATTR_VERSION] == cache[ATTR_VERSION]:
-                if data != cache:
-                    self.system[addon] = copy.deepcopy(cache)
-                    have_change = True
-
-        if have_change:
-            self.save()
--- a/hassio/addons/git.py
+++ b/hassio/addons/git.py
@@ -1,4 +1,4 @@
-"""Init file for HassIO addons git."""
+"""Init file for Hass.io add-on Git."""
 import asyncio
 import logging
 import functools as ft
@@ -7,104 +7,149 @@ import shutil

 import git

-from .util import get_hash_from_repository
-from ..const import URL_HASSIO_ADDONS
+from .utils import get_hash_from_repository
+from ..const import URL_HASSIO_ADDONS, ATTR_URL, ATTR_BRANCH
+from ..coresys import CoreSysAttributes
+from ..validate import RE_REPOSITORY

 _LOGGER = logging.getLogger(__name__)


-class GitRepo(object):
-    """Manage addons git repo."""
+class GitRepo(CoreSysAttributes):
+    """Manage Add-on Git repository."""

-    def __init__(self, config, loop, path, url):
-        """Initialize git base wrapper."""
-        self.config = config
-        self.loop = loop
+    def __init__(self, coresys, path, url):
+        """Initialize Git base wrapper."""
+        self.coresys = coresys
        self.repo = None
        self.path = path
-        self.url = url
-        self._lock = asyncio.Lock(loop=loop)
+        self.lock = asyncio.Lock(loop=coresys.loop)
+
+        self._data = RE_REPOSITORY.match(url).groupdict()
+
+    @property
+    def url(self):
+        """Return repository URL."""
+        return self._data[ATTR_URL]
+
+    @property
+    def branch(self):
+        """Return repository branch."""
+        return self._data[ATTR_BRANCH]

    async def load(self):
-        """Init git addon repo."""
+        """Init Git add-on repository."""
        if not self.path.is_dir():
            return await self.clone()

-        async with self._lock:
+        async with self.lock:
            try:
-                _LOGGER.info("Load addon %s repository", self.path)
-                self.repo = await self.loop.run_in_executor(
-                    None, git.Repo, str(self.path))
+                _LOGGER.info("Load add-on %s repository", self.path)
+                self.repo = await self.sys_run_in_executor(
+                    git.Repo, str(self.path))

            except (git.InvalidGitRepositoryError, git.NoSuchPathError,
                    git.GitCommandError) as err:
                _LOGGER.error("Can't load %s repo: %s.", self.path, err)
+                self._remove()
                return False

            return True

    async def clone(self):
-        """Clone git addon repo."""
-        async with self._lock:
+        """Clone git add-on repository."""
+        async with self.lock:
+            git_args = {
+                attribute: value
+                for attribute, value in (
+                    ('recursive', True),
+                    ('branch', self.branch),
+                    ('depth', 1),
+                    ('shallow-submodules', True)
+                ) if value is not None
+            }
+
            try:
-                _LOGGER.info("Clone addon %s repository", self.url)
-                self.repo = await self.loop.run_in_executor(
-                    None, ft.partial(
+                _LOGGER.info("Clone add-on %s repository", self.url)
+                self.repo = await self.sys_run_in_executor(ft.partial(
                    git.Repo.clone_from, self.url, str(self.path),
-                        recursive=True))
+                    **git_args
+                ))

            except (git.InvalidGitRepositoryError, git.NoSuchPathError,
                    git.GitCommandError) as err:
-                _LOGGER.error("Can't clone %s repo: %s.", self.url, err)
+                _LOGGER.error("Can't clone %s repository: %s.", self.url, err)
+                self._remove()
                return False

            return True

    async def pull(self):
-        """Pull git addon repo."""
-        if self._lock.locked():
-            _LOGGER.warning("It is already a task in progress.")
+        """Pull Git add-on repo."""
+        if self.lock.locked():
+            _LOGGER.warning("It is already a task in progress")
            return False

-        async with self._lock:
+        async with self.lock:
+            _LOGGER.info("Update add-on %s repository", self.url)
+            branch = self.repo.active_branch.name
+
            try:
-                _LOGGER.info("Pull addon %s repository", self.url)
-                await self.loop.run_in_executor(
-                    None, self.repo.remotes.origin.pull)
+                # Download data
+                await self.sys_run_in_executor(ft.partial(
+                    self.repo.remotes.origin.fetch, **{
+                        'update-shallow': True,
+                        'depth': 1,
+                    }))
+
+                # Jump on top of that
+                await self.sys_run_in_executor(ft.partial(
+                    self.repo.git.reset, f"origin/{branch}", hard=True))
+
+                # Cleanup old data
+                await self.sys_run_in_executor(ft.partial(
+                    self.repo.git.clean, "-xdf"))

            except (git.InvalidGitRepositoryError, git.NoSuchPathError,
                    git.GitCommandError) as err:
-                _LOGGER.error("Can't pull %s repo: %s.", self.url, err)
+                _LOGGER.error("Can't update %s repo: %s.", self.url, err)
                return False

            return True

-
-class GitRepoHassIO(GitRepo):
-    """HassIO addons repository."""
-
-    def __init__(self, config, loop):
-        """Initialize git hassio addon repository."""
-        super().__init__(
-            config, loop, config.path_addons_core, URL_HASSIO_ADDONS)
-
-
-class GitRepoCustom(GitRepo):
-    """Custom addons repository."""
-
-    def __init__(self, config, loop, url):
-        """Initialize git hassio addon repository."""
-        path = Path(config.path_addons_git, get_hash_from_repository(url))
-
-        super().__init__(config, loop, path, url)
-
-    def remove(self):
-        """Remove a custom addon."""
-        if self.path.is_dir():
-            _LOGGER.info("Remove custom addon repository %s", self.url)
+    def _remove(self):
+        """Remove a repository."""
+        if not self.path.is_dir():
+            return

        def log_err(funct, path, _):
            """Log error."""
            _LOGGER.warning("Can't remove %s", path)

        shutil.rmtree(str(self.path), onerror=log_err)
+
+
+class GitRepoHassIO(GitRepo):
+    """Hass.io add-ons repository."""
+
+    def __init__(self, coresys):
+        """Initialize Git Hass.io add-on repository."""
+        super().__init__(
+            coresys, coresys.config.path_addons_core, URL_HASSIO_ADDONS)
+
+
+class GitRepoCustom(GitRepo):
+    """Custom add-ons repository."""
+
+    def __init__(self, coresys, url):
+        """Initialize custom Git Hass.io addo-n repository."""
+        path = Path(
+            coresys.config.path_addons_git,
+            get_hash_from_repository(url))
+
+        super().__init__(coresys, path, url)
+
+    def remove(self):
+        """Remove a custom repository."""
+        _LOGGER.info("Remove custom add-on repository %s", self.url)
+        self._remove()
--- a/hassio/addons/repository.py
+++ b/hassio/addons/repository.py
@@ -1,18 +1,20 @@
-"""Represent a HassIO repository."""
+"""Represent a Hass.io repository."""
 from .git import GitRepoHassIO, GitRepoCustom
-from .util import get_hash_from_repository
+from .utils import get_hash_from_repository
 from ..const import (
    REPOSITORY_CORE, REPOSITORY_LOCAL, ATTR_NAME, ATTR_URL, ATTR_MAINTAINER)
+from ..coresys import CoreSysAttributes
+from ..exceptions import APIError

 UNKNOWN = 'unknown'


-class Repository(object):
-    """Repository in HassIO."""
+class Repository(CoreSysAttributes):
+    """Repository in Hass.io."""

-    def __init__(self, config, loop, data, repository):
+    def __init__(self, coresys, repository):
        """Initialize repository object."""
-        self.data = data
+        self.coresys = coresys
        self.source = None
        self.git = None

@@ -20,16 +22,16 @@ class Repository(object):
            self._id = repository
        elif repository == REPOSITORY_CORE:
            self._id = repository
-            self.git = GitRepoHassIO(config, loop)
+            self.git = GitRepoHassIO(coresys)
        else:
            self._id = get_hash_from_repository(repository)
-            self.git = GitRepoCustom(config, loop, repository)
+            self.git = GitRepoCustom(coresys, repository)
            self.source = repository

    @property
    def _mesh(self):
        """Return data struct repository."""
-        return self.data.repositories.get(self._id, {})
+        return self.sys_addons.data.repositories.get(self._id, {})

    @property
    def slug(self):
@@ -43,7 +45,7 @@ class Repository(object):

    @property
    def url(self):
-        """Return url of repository."""
+        """Return URL of repository."""
        return self._mesh.get(ATTR_URL, self.source)

    @property
@@ -58,14 +60,14 @@ class Repository(object):
        return True

    async def update(self):
-        """Update addon repository."""
+        """Update add-on repository."""
        if self.git:
            return await self.git.pull()
        return True

    def remove(self):
-        """Remove addon repository."""
+        """Remove add-on repository."""
        if self._id in (REPOSITORY_CORE, REPOSITORY_LOCAL):
-            raise RuntimeError("Can't remove built-in repositories!")
+            raise APIError("Can't remove built-in repositories!")

        self.git.remove()
--- a/hassio/addons/util.py
+++ b/hassio/addons/util.py
@@ -1,35 +0,0 @@
-"""Util addons functions."""
-import hashlib
-import logging
-import re
-
-RE_SHA1 = re.compile(r"[a-f0-9]{8}")
-
-_LOGGER = logging.getLogger(__name__)
-
-
-def get_hash_from_repository(name):
-    """Generate a hash from repository."""
-    key = name.lower().encode()
-    return hashlib.sha1(key).hexdigest()[:8]
-
-
-def extract_hash_from_path(path):
-    """Extract repo id from path."""
-    repo_dir = path.parts[-1]
-
-    if not RE_SHA1.match(repo_dir):
-        return get_hash_from_repository(repo_dir)
-    return repo_dir
-
-
-def check_installed(method):
-    """Wrap function with check if addon is installed."""
-    async def wrap_check(addon, *args, **kwargs):
-        """Return False if not installed or the function."""
-        if not addon.is_installed:
-            _LOGGER.error("Addon %s is not installed", addon.slug)
-            return False
-        return await method(addon, *args, **kwargs)
-
-    return wrap_check
--- a/hassio/addons/utils.py
+++ b/hassio/addons/utils.py
@@ -0,0 +1,109 @@
+"""Util add-ons functions."""
+import asyncio
+import hashlib
+import logging
+import re
+
+from ..const import (
+    SECURITY_DISABLE, SECURITY_PROFILE, PRIVILEGED_NET_ADMIN,
+    PRIVILEGED_SYS_ADMIN, PRIVILEGED_SYS_RAWIO, PRIVILEGED_SYS_PTRACE,
+    PRIVILEGED_DAC_READ_SEARCH, ROLE_ADMIN, ROLE_MANAGER)
+
+RE_SHA1 = re.compile(r"[a-f0-9]{8}")
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def rating_security(addon):
+    """Return 1-6 for security rating.
+
+    1 = not secure
+    6 = high secure
+    """
+    rating = 5
+
+    # AppArmor
+    if addon.apparmor == SECURITY_DISABLE:
+        rating += -1
+    elif addon.apparmor == SECURITY_PROFILE:
+        rating += 1
+
+    # Home Assistant Login
+    if addon.access_auth_api:
+        rating += 1
+
+    # Privileged options
+    if any(privilege in addon.privileged
+           for privilege in (PRIVILEGED_NET_ADMIN, PRIVILEGED_SYS_ADMIN,
+                             PRIVILEGED_SYS_RAWIO, PRIVILEGED_SYS_PTRACE,
+                             PRIVILEGED_DAC_READ_SEARCH)):
+        rating += -1
+
+    # API Hass.io role
+    if addon.hassio_role == ROLE_MANAGER:
+        rating += -1
+    elif addon.hassio_role == ROLE_ADMIN:
+        rating += -2
+
+    # Not secure Networking
+    if addon.host_network:
+        rating += -1
+
+    # Insecure PID namespace
+    if addon.host_pid:
+        rating += -2
+
+    # Full Access
+    if addon.with_full_access:
+        rating += -2
+
+    # Docker Access
+    if addon.access_docker_api:
+        rating = 1
+
+    return max(min(6, rating), 1)
+
+
+def get_hash_from_repository(name):
+    """Generate a hash from repository."""
+    key = name.lower().encode()
+    return hashlib.sha1(key).hexdigest()[:8]
+
+
+def extract_hash_from_path(path):
+    """Extract repo id from path."""
+    repo_dir = path.parts[-1]
+
+    if not RE_SHA1.match(repo_dir):
+        return get_hash_from_repository(repo_dir)
+    return repo_dir
+
+
+def check_installed(method):
+    """Wrap function with check if add-on is installed."""
+    async def wrap_check(addon, *args, **kwargs):
+        """Return False if not installed or the function."""
+        if not addon.is_installed:
+            _LOGGER.error("Addon %s is not installed", addon.slug)
+            return False
+        return await method(addon, *args, **kwargs)
+
+    return wrap_check
+
+
+async def remove_data(folder):
+    """Remove folder and reset privileged."""
+    try:
+        proc = await asyncio.create_subprocess_exec(
+            "rm", "-rf", str(folder),
+            stdout=asyncio.subprocess.DEVNULL
+        )
+
+        _, error_msg = await proc.communicate()
+    except OSError as err:
+        error_msg = str(err)
+    else:
+        if proc.returncode == 0:
+            return
+
+    _LOGGER.error("Can't remove Add-on Data: %s", error_msg)
--- a/hassio/addons/validate.py
+++ b/hassio/addons/validate.py
@@ -1,6 +1,7 @@
-"""Validate addons options schema."""
+"""Validate add-ons options schema."""
 import logging
 import re
+import uuid

 import voluptuous as vol

@@ -12,16 +13,27 @@ from ..const import (
    ATTR_ARCH, ATTR_DEVICES, ATTR_ENVIRONMENT, ATTR_HOST_NETWORK, ARCH_ARMHF,
    ARCH_AARCH64, ARCH_AMD64, ARCH_I386, ATTR_TMPFS, ATTR_PRIVILEGED,
    ATTR_USER, ATTR_STATE, ATTR_SYSTEM, STATE_STARTED, STATE_STOPPED,
-    ATTR_LOCATON, ATTR_REPOSITORY, ATTR_TIMEOUT, ATTR_NETWORK,
-    ATTR_AUTO_UPDATE, ATTR_WEBUI, ATTR_AUDIO, ATTR_AUDIO_INPUT,
+    ATTR_LOCATON, ATTR_REPOSITORY, ATTR_TIMEOUT, ATTR_NETWORK, ATTR_UUID,
+    ATTR_AUTO_UPDATE, ATTR_WEBUI, ATTR_AUDIO, ATTR_AUDIO_INPUT, ATTR_HOST_IPC,
    ATTR_AUDIO_OUTPUT, ATTR_HASSIO_API, ATTR_BUILD_FROM, ATTR_SQUASH,
-    ATTR_ARGS, ATTR_GPIO, ATTR_HOMEASSISTANT_API, ATTR_STDIN, ATTR_LEGACY)
-from ..validate import NETWORK_PORT, DOCKER_PORTS, ALSA_CHANNEL
+    ATTR_ARGS, ATTR_GPIO, ATTR_HOMEASSISTANT_API, ATTR_STDIN, ATTR_LEGACY,
+    ATTR_HOST_DBUS, ATTR_AUTO_UART, ATTR_SERVICES, ATTR_DISCOVERY,
+    ATTR_APPARMOR, ATTR_DEVICETREE, ATTR_DOCKER_API, ATTR_PROTECTED,
+    ATTR_FULL_ACCESS, ATTR_ACCESS_TOKEN, ATTR_HOST_PID, ATTR_HASSIO_ROLE,
+    ATTR_MACHINE, ATTR_AUTH_API,
+    PRIVILEGED_NET_ADMIN, PRIVILEGED_SYS_ADMIN, PRIVILEGED_SYS_RAWIO,
+    PRIVILEGED_IPC_LOCK, PRIVILEGED_SYS_TIME, PRIVILEGED_SYS_NICE,
+    PRIVILEGED_SYS_RESOURCE, PRIVILEGED_SYS_PTRACE, PRIVILEGED_DAC_READ_SEARCH,
+    ROLE_DEFAULT, ROLE_HOMEASSISTANT, ROLE_MANAGER, ROLE_ADMIN, ROLE_BACKUP)
+from ..validate import (
+    NETWORK_PORT, DOCKER_PORTS, ALSA_DEVICE, UUID_MATCH, SHA256)
+from ..services.validate import DISCOVERY_SERVICES

 _LOGGER = logging.getLogger(__name__)


-RE_VOLUME = re.compile(r"^(config|ssl|addons|backup|share)(?::(rw|:ro))?$")
+RE_VOLUME = re.compile(r"^(config|ssl|addons|backup|share)(?::(rw|ro))?$")
+RE_SERVICE = re.compile(r"^(?P<service>mqtt):(?P<rights>provide|want|need)$")

 V_STR = 'str'
 V_INT = 'int'
@@ -47,15 +59,38 @@ ARCH_ALL = [
    ARCH_ARMHF, ARCH_AARCH64, ARCH_AMD64, ARCH_I386
 ]

+MACHINE_ALL = [
+    'intel-nuc',
+    'odroid-c2', 'odroid-xu',
+    'orangepi-prime',
+    'qemux86', 'qemux86-64', 'qemuarm', 'qemuarm-64',
+    'raspberrypi', 'raspberrypi2', 'raspberrypi3', 'raspberrypi3-64',
+    'tinker',
+]
+
 STARTUP_ALL = [
    STARTUP_ONCE, STARTUP_INITIALIZE, STARTUP_SYSTEM, STARTUP_SERVICES,
    STARTUP_APPLICATION
 ]

 PRIVILEGED_ALL = [
-    "NET_ADMIN",
-    "SYS_ADMIN",
-    "SYS_RAWIO"
+    PRIVILEGED_NET_ADMIN,
+    PRIVILEGED_SYS_ADMIN,
+    PRIVILEGED_SYS_RAWIO,
+    PRIVILEGED_IPC_LOCK,
+    PRIVILEGED_SYS_TIME,
+    PRIVILEGED_SYS_NICE,
+    PRIVILEGED_SYS_RESOURCE,
+    PRIVILEGED_SYS_PTRACE,
+    PRIVILEGED_DAC_READ_SEARCH,
+]
+
+ROLE_ALL = [
+    ROLE_DEFAULT,
+    ROLE_HOMEASSISTANT,
+    ROLE_BACKUP,
+    ROLE_MANAGER,
+    ROLE_ADMIN,
 ]

 BASE_IMAGE = {
@@ -83,6 +118,7 @@ SCHEMA_ADDON_CONFIG = vol.Schema({
    vol.Required(ATTR_DESCRIPTON): vol.Coerce(str),
    vol.Optional(ATTR_URL): vol.Url(),
    vol.Optional(ATTR_ARCH, default=ARCH_ALL): [vol.In(ARCH_ALL)],
+    vol.Optional(ATTR_MACHINE): [vol.In(MACHINE_ALL)],
    vol.Required(ATTR_STARTUP):
        vol.All(_simple_startup, vol.In(STARTUP_ALL)),
    vol.Required(ATTR_BOOT):
@@ -91,18 +127,30 @@ SCHEMA_ADDON_CONFIG = vol.Schema({
    vol.Optional(ATTR_WEBUI):
        vol.Match(r"^(?:https?|\[PROTO:\w+\]):\/\/\[HOST\]:\[PORT:\d+\].*$"),
    vol.Optional(ATTR_HOST_NETWORK, default=False): vol.Boolean(),
+    vol.Optional(ATTR_HOST_PID, default=False): vol.Boolean(),
+    vol.Optional(ATTR_HOST_IPC, default=False): vol.Boolean(),
+    vol.Optional(ATTR_HOST_DBUS, default=False): vol.Boolean(),
    vol.Optional(ATTR_DEVICES): [vol.Match(r"^(.*):(.*):([rwm]{1,3})$")],
+    vol.Optional(ATTR_AUTO_UART, default=False): vol.Boolean(),
    vol.Optional(ATTR_TMPFS):
        vol.Match(r"^size=(\d)*[kmg](,uid=\d{1,4})?(,rw)?$"),
-    vol.Optional(ATTR_MAP, default=[]): [vol.Match(RE_VOLUME)],
+    vol.Optional(ATTR_MAP, default=list): [vol.Match(RE_VOLUME)],
    vol.Optional(ATTR_ENVIRONMENT): {vol.Match(r"\w*"): vol.Coerce(str)},
    vol.Optional(ATTR_PRIVILEGED): [vol.In(PRIVILEGED_ALL)],
+    vol.Optional(ATTR_APPARMOR, default=True): vol.Boolean(),
+    vol.Optional(ATTR_FULL_ACCESS, default=False): vol.Boolean(),
    vol.Optional(ATTR_AUDIO, default=False): vol.Boolean(),
    vol.Optional(ATTR_GPIO, default=False): vol.Boolean(),
+    vol.Optional(ATTR_DEVICETREE, default=False): vol.Boolean(),
    vol.Optional(ATTR_HASSIO_API, default=False): vol.Boolean(),
+    vol.Optional(ATTR_HASSIO_ROLE, default=ROLE_DEFAULT): vol.In(ROLE_ALL),
    vol.Optional(ATTR_HOMEASSISTANT_API, default=False): vol.Boolean(),
    vol.Optional(ATTR_STDIN, default=False): vol.Boolean(),
    vol.Optional(ATTR_LEGACY, default=False): vol.Boolean(),
+    vol.Optional(ATTR_DOCKER_API, default=False): vol.Boolean(),
+    vol.Optional(ATTR_AUTH_API, default=False): vol.Boolean(),
+    vol.Optional(ATTR_SERVICES): [vol.Match(RE_SERVICE)],
+    vol.Optional(ATTR_DISCOVERY): [vol.In(DISCOVERY_SERVICES)],
    vol.Required(ATTR_OPTIONS): dict,
    vol.Required(ATTR_SCHEMA): vol.Any(vol.Schema({
        vol.Coerce(str): vol.Any(SCHEMA_ELEMENT, [
@@ -114,9 +162,10 @@ SCHEMA_ADDON_CONFIG = vol.Schema({
            vol.Coerce(str): vol.Any(SCHEMA_ELEMENT, [SCHEMA_ELEMENT])
        }))
    }), False),
-    vol.Optional(ATTR_IMAGE): vol.Match(r"^[\w{}]+/[\-\w{}]+$"),
+    vol.Optional(ATTR_IMAGE):
+        vol.Match(r"^([a-zA-Z\-\.:\d{}]+/)*?([\-\w{}]+)/([\-\w{}]+)$"),
    vol.Optional(ATTR_TIMEOUT, default=10):
-        vol.All(vol.Coerce(int), vol.Range(min=10, max=120))
+        vol.All(vol.Coerce(int), vol.Range(min=10, max=120)),
 }, extra=vol.REMOVE_EXTRA)


@@ -134,23 +183,26 @@ SCHEMA_BUILD_CONFIG = vol.Schema({
        vol.In(ARCH_ALL): vol.Match(r"(?:^[\w{}]+/)?[\-\w{}]+:[\.\-\w{}]+$"),
    }),
    vol.Optional(ATTR_SQUASH, default=False): vol.Boolean(),
-    vol.Optional(ATTR_ARGS, default={}): vol.Schema({
+    vol.Optional(ATTR_ARGS, default=dict): vol.Schema({
        vol.Coerce(str): vol.Coerce(str)
    }),
-})
+}, extra=vol.REMOVE_EXTRA)


 # pylint: disable=no-value-for-parameter
 SCHEMA_ADDON_USER = vol.Schema({
    vol.Required(ATTR_VERSION): vol.Coerce(str),
-    vol.Optional(ATTR_OPTIONS, default={}): dict,
+    vol.Optional(ATTR_UUID, default=lambda: uuid.uuid4().hex): UUID_MATCH,
+    vol.Optional(ATTR_ACCESS_TOKEN): SHA256,
+    vol.Optional(ATTR_OPTIONS, default=dict): dict,
    vol.Optional(ATTR_AUTO_UPDATE, default=False): vol.Boolean(),
    vol.Optional(ATTR_BOOT):
        vol.In([BOOT_AUTO, BOOT_MANUAL]),
    vol.Optional(ATTR_NETWORK): DOCKER_PORTS,
-    vol.Optional(ATTR_AUDIO_OUTPUT): ALSA_CHANNEL,
-    vol.Optional(ATTR_AUDIO_INPUT): ALSA_CHANNEL,
-})
+    vol.Optional(ATTR_AUDIO_OUTPUT): ALSA_DEVICE,
+    vol.Optional(ATTR_AUDIO_INPUT): ALSA_DEVICE,
+    vol.Optional(ATTR_PROTECTED, default=True): vol.Boolean(),
+}, extra=vol.REMOVE_EXTRA)


 SCHEMA_ADDON_SYSTEM = SCHEMA_ADDON_CONFIG.extend({
@@ -159,11 +211,11 @@ SCHEMA_ADDON_SYSTEM = SCHEMA_ADDON_CONFIG.extend({
 })


-SCHEMA_ADDON_FILE = vol.Schema({
-    vol.Optional(ATTR_USER, default={}): {
+SCHEMA_ADDONS_FILE = vol.Schema({
+    vol.Optional(ATTR_USER, default=dict): {
        vol.Coerce(str): SCHEMA_ADDON_USER,
    },
-    vol.Optional(ATTR_SYSTEM, default={}): {
+    vol.Optional(ATTR_SYSTEM, default=dict): {
        vol.Coerce(str): SCHEMA_ADDON_SYSTEM,
    }
 })
@@ -174,13 +226,13 @@ SCHEMA_ADDON_SNAPSHOT = vol.Schema({
    vol.Required(ATTR_SYSTEM): SCHEMA_ADDON_SYSTEM,
    vol.Required(ATTR_STATE): vol.In([STATE_STARTED, STATE_STOPPED]),
    vol.Required(ATTR_VERSION): vol.Coerce(str),
-})
+}, extra=vol.REMOVE_EXTRA)


 def validate_options(raw_schema):
    """Validate schema."""
    def validate(struct):
-        """Create schema validator for addons options."""
+        """Create schema validator for add-ons options."""
        options = {}

        # read options
@@ -202,8 +254,7 @@ def validate_options(raw_schema):
                    # normal value
                    options[key] = _single_validate(typ, value, key)
            except (IndexError, KeyError):
-                raise vol.Invalid(
-                    "Type error for {}.".format(key)) from None
+                raise vol.Invalid(f"Type error for {key}") from None

        _check_missing_options(raw_schema, options, 'root')
        return options
@@ -212,11 +263,12 @@ def validate_options(raw_schema):


 # pylint: disable=no-value-for-parameter
+# pylint: disable=inconsistent-return-statements
 def _single_validate(typ, value, key):
    """Validate a single element."""
    # if required argument
    if value is None:
-        raise vol.Invalid("Missing required option '{}'.".format(key))
+        raise vol.Invalid(f"Missing required option '{key}'")

    # parse extend data from type
    match = RE_SCHEMA_ELEMENT.match(typ)
@@ -245,7 +297,7 @@ def _single_validate(typ, value, key):
    elif typ.startswith(V_MATCH):
        return vol.Match(match.group('match'))(str(value))

-    raise vol.Invalid("Fatal error for {} type {}".format(key, typ))
+    raise vol.Invalid(f"Fatal error for {key} type {typ}")


 def _nested_validate_list(typ, data_list, key):
@@ -291,5 +343,4 @@ def _check_missing_options(origin, exists, root):
        if isinstance(origin[miss_opt], str) and \
                origin[miss_opt].endswith("?"):
            continue
-        raise vol.Invalid(
-            "Missing option {} in {}".format(miss_opt, root))
+        raise vol.Invalid(f"Missing option {miss_opt} in {root}")
--- a/hassio/api/init.py
+++ b/hassio/api/init.py
@@ -1,170 +1,283 @@
-"""Init file for HassIO rest api."""
+"""Init file for Hass.io RESTful API."""
 import logging
 from pathlib import Path

 from aiohttp import web

 from .addons import APIAddons
+from .auth import APIAuth
+from .discovery import APIDiscovery
 from .homeassistant import APIHomeAssistant
+from .hardware import APIHardware
 from .host import APIHost
-from .network import APINetwork
+from .hassos import APIHassOS
+from .info import APIInfo
+from .proxy import APIProxy
 from .supervisor import APISupervisor
-from .security import APISecurity
 from .snapshots import APISnapshots
+from .services import APIServices
+from .security import SecurityMiddleware
+from ..coresys import CoreSysAttributes

 _LOGGER = logging.getLogger(__name__)


-class RestAPI(object):
-    """Handle rest api for hassio."""
+class RestAPI(CoreSysAttributes):
+    """Handle RESTful API for Hass.io."""

-    def __init__(self, config, loop):
-        """Initialize docker base wrapper."""
-        self.config = config
-        self.loop = loop
-        self.webapp = web.Application(loop=self.loop)
+    def __init__(self, coresys):
+        """Initialize Docker base wrapper."""
+        self.coresys = coresys
+        self.security = SecurityMiddleware(coresys)
+        self.webapp = web.Application(
+            middlewares=[self.security.token_validation], loop=coresys.loop)

        # service stuff
-        self._handler = None
-        self.server = None
+        self._runner = web.AppRunner(self.webapp)
+        self._site = None

-    def register_host(self, host_control, hardware):
-        """Register hostcontrol function."""
-        api_host = APIHost(self.config, self.loop, host_control, hardware)
+    async def load(self):
+        """Register REST API Calls."""
+        self._register_supervisor()
+        self._register_host()
+        self._register_hassos()
+        self._register_hardware()
+        self._register_homeassistant()
+        self._register_proxy()
+        self._register_panel()
+        self._register_addons()
+        self._register_snapshots()
+        self._register_discovery()
+        self._register_services()
+        self._register_info()
+        self._register_auth()

-        self.webapp.router.add_get('/host/info', api_host.info)
-        self.webapp.router.add_get('/host/hardware', api_host.hardware)
-        self.webapp.router.add_post('/host/reboot', api_host.reboot)
-        self.webapp.router.add_post('/host/shutdown', api_host.shutdown)
-        self.webapp.router.add_post('/host/update', api_host.update)
-        self.webapp.router.add_post('/host/options', api_host.options)
+    def _register_host(self):
+        """Register hostcontrol functions."""
+        api_host = APIHost()
+        api_host.coresys = self.coresys

-    def register_network(self, host_control):
-        """Register network function."""
-        api_net = APINetwork(self.config, self.loop, host_control)
+        self.webapp.add_routes([
+            web.get('/host/info', api_host.info),
+            web.post('/host/reboot', api_host.reboot),
+            web.post('/host/shutdown', api_host.shutdown),
+            web.post('/host/reload', api_host.reload),
+            web.post('/host/options', api_host.options),
+            web.get('/host/services', api_host.services),
+            web.post('/host/services/{service}/stop', api_host.service_stop),
+            web.post('/host/services/{service}/start', api_host.service_start),
+            web.post(
+                '/host/services/{service}/restart', api_host.service_restart),
+            web.post(
+                '/host/services/{service}/reload', api_host.service_reload),
+        ])

-        self.webapp.router.add_get('/network/info', api_net.info)
-        self.webapp.router.add_post('/network/options', api_net.options)
+    def _register_hassos(self):
+        """Register HassOS functions."""
+        api_hassos = APIHassOS()
+        api_hassos.coresys = self.coresys

-    def register_supervisor(self, supervisor, snapshots, addons, host_control,
-                            updater):
-        """Register supervisor function."""
-        api_supervisor = APISupervisor(
-            self.config, self.loop, supervisor, snapshots, addons,
-            host_control, updater)
+        self.webapp.add_routes([
+            web.get('/hassos/info', api_hassos.info),
+            web.post('/hassos/update', api_hassos.update),
+            web.post('/hassos/update/cli', api_hassos.update_cli),
+            web.post('/hassos/config/sync', api_hassos.config_sync),
+        ])

-        self.webapp.router.add_get('/supervisor/ping', api_supervisor.ping)
-        self.webapp.router.add_get('/supervisor/info', api_supervisor.info)
-        self.webapp.router.add_post(
-            '/supervisor/update', api_supervisor.update)
-        self.webapp.router.add_post(
-            '/supervisor/reload', api_supervisor.reload)
-        self.webapp.router.add_post(
-            '/supervisor/options', api_supervisor.options)
-        self.webapp.router.add_get('/supervisor/logs', api_supervisor.logs)
+    def _register_hardware(self):
+        """Register hardware functions."""
+        api_hardware = APIHardware()
+        api_hardware.coresys = self.coresys

-    def register_homeassistant(self, dock_homeassistant):
-        """Register homeassistant function."""
-        api_hass = APIHomeAssistant(self.config, self.loop, dock_homeassistant)
+        self.webapp.add_routes([
+            web.get('/hardware/info', api_hardware.info),
+            web.get('/hardware/audio', api_hardware.audio),
+        ])

-        self.webapp.router.add_get('/homeassistant/info', api_hass.info)
-        self.webapp.router.add_get('/homeassistant/logs', api_hass.logs)
-        self.webapp.router.add_post('/homeassistant/options', api_hass.options)
-        self.webapp.router.add_post('/homeassistant/update', api_hass.update)
-        self.webapp.router.add_post('/homeassistant/restart', api_hass.restart)
-        self.webapp.router.add_post('/homeassistant/stop', api_hass.stop)
-        self.webapp.router.add_post('/homeassistant/start', api_hass.start)
-        self.webapp.router.add_post('/homeassistant/check', api_hass.check)
-        self.webapp.router.add_post(
-            '/homeassistant/api/{path:.+}', api_hass.api)
-        self.webapp.router.add_get(
-            '/homeassistant/api/{path:.+}', api_hass.api)
+    def _register_info(self):
+        """Register info functions."""
+        api_info = APIInfo()
+        api_info.coresys = self.coresys

-    def register_addons(self, addons):
-        """Register homeassistant function."""
-        api_addons = APIAddons(self.config, self.loop, addons)
+        self.webapp.add_routes([
+            web.get('/info', api_info.info),
+        ])

-        self.webapp.router.add_get('/addons', api_addons.list)
-        self.webapp.router.add_post('/addons/reload', api_addons.reload)
+    def _register_auth(self):
+        """Register auth functions."""
+        api_auth = APIAuth()
+        api_auth.coresys = self.coresys

-        self.webapp.router.add_get('/addons/{addon}/info', api_addons.info)
-        self.webapp.router.add_post(
-            '/addons/{addon}/install', api_addons.install)
-        self.webapp.router.add_post(
-            '/addons/{addon}/uninstall', api_addons.uninstall)
-        self.webapp.router.add_post('/addons/{addon}/start', api_addons.start)
-        self.webapp.router.add_post('/addons/{addon}/stop', api_addons.stop)
-        self.webapp.router.add_post(
-            '/addons/{addon}/restart', api_addons.restart)
-        self.webapp.router.add_post(
-            '/addons/{addon}/update', api_addons.update)
-        self.webapp.router.add_post(
-            '/addons/{addon}/options', api_addons.options)
-        self.webapp.router.add_post(
-            '/addons/{addon}/rebuild', api_addons.rebuild)
-        self.webapp.router.add_get('/addons/{addon}/logs', api_addons.logs)
-        self.webapp.router.add_get('/addons/{addon}/logo', api_addons.logo)
-        self.webapp.router.add_post('/addons/{addon}/stdin', api_addons.stdin)
+        self.webapp.add_routes([
+            web.post('/auth', api_auth.auth),
+        ])

-    def register_security(self):
-        """Register security function."""
-        api_security = APISecurity(self.config, self.loop)
+    def _register_supervisor(self):
+        """Register Supervisor functions."""
+        api_supervisor = APISupervisor()
+        api_supervisor.coresys = self.coresys

-        self.webapp.router.add_get('/security/info', api_security.info)
-        self.webapp.router.add_post('/security/options', api_security.options)
-        self.webapp.router.add_post('/security/totp', api_security.totp)
-        self.webapp.router.add_post('/security/session', api_security.session)
+        self.webapp.add_routes([
+            web.get('/supervisor/ping', api_supervisor.ping),
+            web.get('/supervisor/info', api_supervisor.info),
+            web.get('/supervisor/stats', api_supervisor.stats),
+            web.get('/supervisor/logs', api_supervisor.logs),
+            web.post('/supervisor/update', api_supervisor.update),
+            web.post('/supervisor/reload', api_supervisor.reload),
+            web.post('/supervisor/options', api_supervisor.options),
+        ])

-    def register_snapshots(self, snapshots):
-        """Register snapshots function."""
-        api_snapshots = APISnapshots(self.config, self.loop, snapshots)
+    def _register_homeassistant(self):
+        """Register Home Assistant functions."""
+        api_hass = APIHomeAssistant()
+        api_hass.coresys = self.coresys

-        self.webapp.router.add_get('/snapshots', api_snapshots.list)
-        self.webapp.router.add_post('/snapshots/reload', api_snapshots.reload)
+        self.webapp.add_routes([
+            web.get('/homeassistant/info', api_hass.info),
+            web.get('/homeassistant/logs', api_hass.logs),
+            web.get('/homeassistant/stats', api_hass.stats),
+            web.post('/homeassistant/options', api_hass.options),
+            web.post('/homeassistant/update', api_hass.update),
+            web.post('/homeassistant/restart', api_hass.restart),
+            web.post('/homeassistant/stop', api_hass.stop),
+            web.post('/homeassistant/start', api_hass.start),
+            web.post('/homeassistant/check', api_hass.check),
+        ])

-        self.webapp.router.add_post(
-            '/snapshots/new/full', api_snapshots.snapshot_full)
-        self.webapp.router.add_post(
-            '/snapshots/new/partial', api_snapshots.snapshot_partial)
+    def _register_proxy(self):
+        """Register Home Assistant API Proxy."""
+        api_proxy = APIProxy()
+        api_proxy.coresys = self.coresys

-        self.webapp.router.add_get(
-            '/snapshots/{snapshot}/info', api_snapshots.info)
-        self.webapp.router.add_post(
-            '/snapshots/{snapshot}/remove', api_snapshots.remove)
-        self.webapp.router.add_post(
-            '/snapshots/{snapshot}/restore/full', api_snapshots.restore_full)
-        self.webapp.router.add_post(
-            '/snapshots/{snapshot}/restore/partial',
-            api_snapshots.restore_partial)
+        self.webapp.add_routes([
+            web.get('/homeassistant/api/websocket', api_proxy.websocket),
+            web.get('/homeassistant/websocket', api_proxy.websocket),
+            web.get('/homeassistant/api/stream', api_proxy.stream),
+            web.post('/homeassistant/api/{path:.+}', api_proxy.api),
+            web.get('/homeassistant/api/{path:.+}', api_proxy.api),
+            web.get('/homeassistant/api/', api_proxy.api),
+        ])

-    def register_panel(self):
-        """Register panel for homeassistant."""
-        panel = Path(__file__).parents[1].joinpath('panel/hassio-main.html')
+    def _register_addons(self):
+        """Register Add-on functions."""
+        api_addons = APIAddons()
+        api_addons.coresys = self.coresys

-        def get_panel(request):
-            """Return file response with panel."""
-            return web.FileResponse(panel)
+        self.webapp.add_routes([
+            web.get('/addons', api_addons.list),
+            web.post('/addons/reload', api_addons.reload),
+            web.get('/addons/{addon}/info', api_addons.info),
+            web.post('/addons/{addon}/install', api_addons.install),
+            web.post('/addons/{addon}/uninstall', api_addons.uninstall),
+            web.post('/addons/{addon}/start', api_addons.start),
+            web.post('/addons/{addon}/stop', api_addons.stop),
+            web.post('/addons/{addon}/restart', api_addons.restart),
+            web.post('/addons/{addon}/update', api_addons.update),
+            web.post('/addons/{addon}/options', api_addons.options),
+            web.post('/addons/{addon}/rebuild', api_addons.rebuild),
+            web.get('/addons/{addon}/logs', api_addons.logs),
+            web.get('/addons/{addon}/icon', api_addons.icon),
+            web.get('/addons/{addon}/logo', api_addons.logo),
+            web.get('/addons/{addon}/changelog', api_addons.changelog),
+            web.post('/addons/{addon}/stdin', api_addons.stdin),
+            web.post('/addons/{addon}/security', api_addons.security),
+            web.get('/addons/{addon}/stats', api_addons.stats),
+        ])

-        self.webapp.router.add_get('/panel', get_panel)
+    def _register_snapshots(self):
+        """Register snapshots functions."""
+        api_snapshots = APISnapshots()
+        api_snapshots.coresys = self.coresys
+
+        self.webapp.add_routes([
+            web.get('/snapshots', api_snapshots.list),
+            web.post('/snapshots/reload', api_snapshots.reload),
+            web.post('/snapshots/new/full', api_snapshots.snapshot_full),
+            web.post('/snapshots/new/partial', api_snapshots.snapshot_partial),
+            web.post('/snapshots/new/upload', api_snapshots.upload),
+            web.get('/snapshots/{snapshot}/info', api_snapshots.info),
+            web.post('/snapshots/{snapshot}/remove', api_snapshots.remove),
+            web.post('/snapshots/{snapshot}/restore/full',
+                     api_snapshots.restore_full),
+            web.post('/snapshots/{snapshot}/restore/partial',
+                     api_snapshots.restore_partial),
+            web.get('/snapshots/{snapshot}/download', api_snapshots.download),
+        ])
+
+    def _register_services(self):
+        """Register services functions."""
+        api_services = APIServices()
+        api_services.coresys = self.coresys
+
+        self.webapp.add_routes([
+            web.get('/services', api_services.list),
+            web.get('/services/{service}', api_services.get_service),
+            web.post('/services/{service}', api_services.set_service),
+            web.delete('/services/{service}', api_services.del_service),
+        ])
+
+    def _register_discovery(self):
+        """Register discovery functions."""
+        api_discovery = APIDiscovery()
+        api_discovery.coresys = self.coresys
+
+        self.webapp.add_routes([
+            web.get('/discovery', api_discovery.list),
+            web.get('/discovery/{uuid}', api_discovery.get_discovery),
+            web.delete('/discovery/{uuid}',
+                       api_discovery.del_discovery),
+            web.post('/discovery', api_discovery.set_discovery),
+        ])
+
+    def _register_panel(self):
+        """Register panel for Home Assistant."""
+        panel_dir = Path(__file__).parent.joinpath("panel")
+
+        def create_response(panel_file):
+            """Create a function to generate a response."""
+            path = panel_dir.joinpath(f"{panel_file!s}.html")
+            return lambda request: web.FileResponse(path)
+
+        # This route is for backwards compatibility with HA < 0.58
+        self.webapp.add_routes([
+            web.get('/panel', create_response('hassio-main-es5'))])
+
+        # This route is for backwards compatibility with HA 0.58 - 0.61
+        self.webapp.add_routes([
+            web.get('/panel_es5', create_response('hassio-main-es5')),
+            web.get('/panel_latest', create_response('hassio-main-latest')),
+        ])
+
+        # This route is for backwards compatibility with HA 0.62 - 0.70
+        self.webapp.add_routes([
+            web.get('/app-es5/index.html', create_response('index')),
+            web.get('/app-es5/hassio-app.html', create_response('hassio-app')),
+        ])
+
+        # This route is for HA > 0.70
+        self.webapp.add_routes([web.static('/app', panel_dir)])

    async def start(self):
-        """Run rest api webserver."""
-        self._handler = self.webapp.make_handler(loop=self.loop)
+        """Run RESTful API webserver."""
+        await self._runner.setup()
+        self._site = web.TCPSite(
+            self._runner, host="0.0.0.0", port=80, shutdown_timeout=5)

        try:
-            self.server = await self.loop.create_server(
-                self._handler, "0.0.0.0", "80")
+            await self._site.start()
        except OSError as err:
            _LOGGER.fatal(
                "Failed to create HTTP server at 0.0.0.0:80 -> %s", err)
+        else:
+            _LOGGER.info("Start API on %s", self.sys_docker.network.supervisor)

    async def stop(self):
-        """Stop rest api webserver."""
-        if self.server:
-            self.server.close()
-            await self.server.wait_closed()
-        await self.webapp.shutdown()
+        """Stop RESTful API webserver."""
+        if not self._site:
+            return

-        if self._handler:
-            await self._handler.shutdown(60)
-        await self.webapp.cleanup()
+        # Shutdown running API
+        await self._site.stop()
+        await self._runner.cleanup()
+
+        _LOGGER.info("Stop API on %s", self.sys_docker.network.supervisor)
--- a/hassio/api/addons.py
+++ b/hassio/api/addons.py
@@ -1,11 +1,12 @@
-"""Init file for HassIO homeassistant rest api."""
+"""Init file for Hass.io Home Assistant RESTful API."""
 import asyncio
 import logging

 import voluptuous as vol
 from voluptuous.humanize import humanize_error

-from .util import api_process, api_process_raw, api_validate
+from .utils import api_process, api_process_raw, api_validate
+from ..addons.utils import rating_security
 from ..const import (
    ATTR_VERSION, ATTR_LAST_VERSION, ATTR_STATE, ATTR_BOOT, ATTR_OPTIONS,
    ATTR_URL, ATTR_DESCRIPTON, ATTR_DETACHED, ATTR_NAME, ATTR_REPOSITORY,
@@ -14,8 +15,16 @@ from ..const import (
    ATTR_INSTALLED, ATTR_LOGO, ATTR_WEBUI, ATTR_DEVICES, ATTR_PRIVILEGED,
    ATTR_AUDIO, ATTR_AUDIO_INPUT, ATTR_AUDIO_OUTPUT, ATTR_HASSIO_API,
    ATTR_GPIO, ATTR_HOMEASSISTANT_API, ATTR_STDIN, BOOT_AUTO, BOOT_MANUAL,
-    CONTENT_TYPE_PNG, CONTENT_TYPE_BINARY)
-from ..validate import DOCKER_PORTS
+    ATTR_CHANGELOG, ATTR_HOST_IPC, ATTR_HOST_DBUS, ATTR_LONG_DESCRIPTION,
+    ATTR_CPU_PERCENT, ATTR_MEMORY_LIMIT, ATTR_MEMORY_USAGE, ATTR_NETWORK_TX,
+    ATTR_NETWORK_RX, ATTR_BLK_READ, ATTR_BLK_WRITE, ATTR_ICON, ATTR_SERVICES,
+    ATTR_DISCOVERY, ATTR_APPARMOR, ATTR_DEVICETREE, ATTR_DOCKER_API,
+    ATTR_FULL_ACCESS, ATTR_PROTECTED, ATTR_RATING, ATTR_HOST_PID,
+    ATTR_HASSIO_ROLE, ATTR_MACHINE, ATTR_AVAILABLE, ATTR_AUTH_API,
+    CONTENT_TYPE_PNG, CONTENT_TYPE_BINARY, CONTENT_TYPE_TEXT, REQUEST_FROM)
+from ..coresys import CoreSysAttributes
+from ..validate import DOCKER_PORTS, ALSA_DEVICE
+from ..exceptions import APIError

 _LOGGER = logging.getLogger(__name__)

@@ -28,65 +37,58 @@ SCHEMA_OPTIONS = vol.Schema({
    vol.Optional(ATTR_BOOT): vol.In([BOOT_AUTO, BOOT_MANUAL]),
    vol.Optional(ATTR_NETWORK): vol.Any(None, DOCKER_PORTS),
    vol.Optional(ATTR_AUTO_UPDATE): vol.Boolean(),
+    vol.Optional(ATTR_AUDIO_OUTPUT): ALSA_DEVICE,
+    vol.Optional(ATTR_AUDIO_INPUT): ALSA_DEVICE,
+})
+
+# pylint: disable=no-value-for-parameter
+SCHEMA_SECURITY = vol.Schema({
+    vol.Optional(ATTR_PROTECTED): vol.Boolean(),
 })


-class APIAddons(object):
-    """Handle rest api for addons functions."""
-
-    def __init__(self, config, loop, addons):
-        """Initialize homeassistant rest api part."""
-        self.config = config
-        self.loop = loop
-        self.addons = addons
+class APIAddons(CoreSysAttributes):
+    """Handle RESTful API for add-on functions."""

    def _extract_addon(self, request, check_installed=True):
-        """Return addon and if not exists trow a exception."""
-        addon = self.addons.get(request.match_info.get('addon'))
+        """Return addon, throw an exception it it doesn't exist."""
+        addon_slug = request.match_info.get('addon')
+
+        # Lookup itself
+        if addon_slug == 'self':
+            return request.get(REQUEST_FROM)
+
+        addon = self.sys_addons.get(addon_slug)
        if not addon:
-            raise RuntimeError("Addon not exists")
+            raise APIError("Addon does not exist")

        if check_installed and not addon.is_installed:
-            raise RuntimeError("Addon is not installed")
+            raise APIError("Addon is not installed")

        return addon

-    @staticmethod
-    def _pretty_devices(addon):
-        """Return a simplified device list."""
-        dev_list = addon.devices
-        if not dev_list:
-            return
-        return [row.split(':')[0] for row in dev_list]
-
    @api_process
    async def list(self, request):
-        """Return all addons / repositories ."""
+        """Return all add-ons or repositories."""
        data_addons = []
-        for addon in self.addons.list_addons:
+        for addon in self.sys_addons.list_addons:
            data_addons.append({
                ATTR_NAME: addon.name,
                ATTR_SLUG: addon.slug,
                ATTR_DESCRIPTON: addon.description,
                ATTR_VERSION: addon.last_version,
                ATTR_INSTALLED: addon.version_installed,
-                ATTR_ARCH: addon.supported_arch,
+                ATTR_AVAILABLE: addon.available,
                ATTR_DETACHED: addon.is_detached,
                ATTR_REPOSITORY: addon.repository,
                ATTR_BUILD: addon.need_build,
-                ATTR_PRIVILEGED: addon.privileged,
-                ATTR_DEVICES: self._pretty_devices(addon),
                ATTR_URL: addon.url,
+                ATTR_ICON: addon.with_icon,
                ATTR_LOGO: addon.with_logo,
-                ATTR_STDIN: addon.with_stdin,
-                ATTR_HASSIO_API: addon.access_hassio_api,
-                ATTR_HOMEASSISTANT_API: addon.access_homeassistant_api,
-                ATTR_AUDIO: addon.with_audio,
-                ATTR_GPIO: addon.with_gpio,
            })

        data_repositories = []
-        for repository in self.addons.list_repositories:
+        for repository in self.sys_addons.list_repositories:
            data_repositories.append({
                ATTR_SLUG: repository.slug,
                ATTR_NAME: repository.name,
@@ -102,50 +104,70 @@ class APIAddons(object):

    @api_process
    async def reload(self, request):
-        """Reload all addons data."""
-        await asyncio.shield(self.addons.reload(), loop=self.loop)
+        """Reload all add-on data."""
+        await asyncio.shield(self.sys_addons.reload())
        return True

    @api_process
    async def info(self, request):
-        """Return addon information."""
+        """Return add-on information."""
        addon = self._extract_addon(request, check_installed=False)

        return {
            ATTR_NAME: addon.name,
+            ATTR_SLUG: addon.slug,
            ATTR_DESCRIPTON: addon.description,
+            ATTR_LONG_DESCRIPTION: addon.long_description,
            ATTR_VERSION: addon.version_installed,
            ATTR_AUTO_UPDATE: addon.auto_update,
            ATTR_REPOSITORY: addon.repository,
            ATTR_LAST_VERSION: addon.last_version,
            ATTR_STATE: await addon.state(),
+            ATTR_PROTECTED: addon.protected,
+            ATTR_RATING: rating_security(addon),
            ATTR_BOOT: addon.boot,
            ATTR_OPTIONS: addon.options,
+            ATTR_ARCH: addon.supported_arch,
+            ATTR_MACHINE: addon.supported_machine,
            ATTR_URL: addon.url,
            ATTR_DETACHED: addon.is_detached,
+            ATTR_AVAILABLE: addon.available,
            ATTR_BUILD: addon.need_build,
            ATTR_NETWORK: addon.ports,
            ATTR_HOST_NETWORK: addon.host_network,
+            ATTR_HOST_PID: addon.host_pid,
+            ATTR_HOST_IPC: addon.host_ipc,
+            ATTR_HOST_DBUS: addon.host_dbus,
            ATTR_PRIVILEGED: addon.privileged,
-            ATTR_DEVICES: self._pretty_devices(addon),
+            ATTR_FULL_ACCESS: addon.with_full_access,
+            ATTR_APPARMOR: addon.apparmor,
+            ATTR_DEVICES: _pretty_devices(addon),
+            ATTR_ICON: addon.with_icon,
            ATTR_LOGO: addon.with_logo,
+            ATTR_CHANGELOG: addon.with_changelog,
            ATTR_WEBUI: addon.webui,
            ATTR_STDIN: addon.with_stdin,
            ATTR_HASSIO_API: addon.access_hassio_api,
+            ATTR_HASSIO_ROLE: addon.hassio_role,
+            ATTR_AUTH_API: addon.access_auth_api,
            ATTR_HOMEASSISTANT_API: addon.access_homeassistant_api,
            ATTR_GPIO: addon.with_gpio,
+            ATTR_DEVICETREE: addon.with_devicetree,
+            ATTR_DOCKER_API: addon.access_docker_api,
            ATTR_AUDIO: addon.with_audio,
            ATTR_AUDIO_INPUT: addon.audio_input,
            ATTR_AUDIO_OUTPUT: addon.audio_output,
+            ATTR_SERVICES: _pretty_services(addon),
+            ATTR_DISCOVERY: addon.discovery,
        }

    @api_process
    async def options(self, request):
-        """Store user options for addon."""
+        """Store user options for add-on."""
        addon = self._extract_addon(request)

        addon_schema = SCHEMA_OPTIONS.extend({
-            vol.Optional(ATTR_OPTIONS): addon.schema,
+            vol.Optional(ATTR_OPTIONS): vol.Any(None, addon.schema),
        })

        body = await api_validate(addon_schema, request)
@@ -163,23 +185,56 @@ class APIAddons(object):
        if ATTR_AUDIO_OUTPUT in body:
            addon.audio_output = body[ATTR_AUDIO_OUTPUT]

+        addon.save_data()
        return True

+    @api_process
+    async def security(self, request):
+        """Store security options for add-on."""
+        addon = self._extract_addon(request)
+        body = await api_validate(SCHEMA_SECURITY, request)
+
+        if ATTR_PROTECTED in body:
+            _LOGGER.warning("Protected flag changing for %s!", addon.slug)
+            addon.protected = body[ATTR_PROTECTED]
+
+        addon.save_data()
+        return True
+
+    @api_process
+    async def stats(self, request):
+        """Return resource information."""
+        addon = self._extract_addon(request)
+        stats = await addon.stats()
+
+        if not stats:
+            raise APIError("No stats available")
+
+        return {
+            ATTR_CPU_PERCENT: stats.cpu_percent,
+            ATTR_MEMORY_USAGE: stats.memory_usage,
+            ATTR_MEMORY_LIMIT: stats.memory_limit,
+            ATTR_NETWORK_RX: stats.network_rx,
+            ATTR_NETWORK_TX: stats.network_tx,
+            ATTR_BLK_READ: stats.blk_read,
+            ATTR_BLK_WRITE: stats.blk_write,
+        }
+
    @api_process
    def install(self, request):
-        """Install addon."""
+        """Install add-on."""
        addon = self._extract_addon(request, check_installed=False)
-        return asyncio.shield(addon.install(), loop=self.loop)
+        return asyncio.shield(addon.install())

    @api_process
    def uninstall(self, request):
-        """Uninstall addon."""
+        """Uninstall add-on."""
        addon = self._extract_addon(request)
-        return asyncio.shield(addon.uninstall(), loop=self.loop)
+        return asyncio.shield(addon.uninstall())

    @api_process
    def start(self, request):
-        """Start addon."""
+        """Start add-on."""
        addon = self._extract_addon(request)

        # check options
@@ -187,63 +242,99 @@ class APIAddons(object):
        try:
            addon.schema(options)
        except vol.Invalid as ex:
-            raise RuntimeError(humanize_error(options, ex)) from None
+            raise APIError(humanize_error(options, ex)) from None

-        return asyncio.shield(addon.start(), loop=self.loop)
+        return asyncio.shield(addon.start())

    @api_process
    def stop(self, request):
-        """Stop addon."""
+        """Stop add-on."""
        addon = self._extract_addon(request)
-        return asyncio.shield(addon.stop(), loop=self.loop)
+        return asyncio.shield(addon.stop())

    @api_process
    def update(self, request):
-        """Update addon."""
+        """Update add-on."""
        addon = self._extract_addon(request)

        if addon.last_version == addon.version_installed:
-            raise RuntimeError("No update available!")
+            raise APIError("No update available!")

-        return asyncio.shield(addon.update(), loop=self.loop)
+        return asyncio.shield(addon.update())

    @api_process
    def restart(self, request):
-        """Restart addon."""
+        """Restart add-on."""
        addon = self._extract_addon(request)
-        return asyncio.shield(addon.restart(), loop=self.loop)
+        return asyncio.shield(addon.restart())

    @api_process
    def rebuild(self, request):
-        """Rebuild local build addon."""
+        """Rebuild local build add-on."""
        addon = self._extract_addon(request)
        if not addon.need_build:
-            raise RuntimeError("Only local build addons are supported")
+            raise APIError("Only local build addons are supported")

-        return asyncio.shield(addon.rebuild(), loop=self.loop)
+        return asyncio.shield(addon.rebuild())

    @api_process_raw(CONTENT_TYPE_BINARY)
    def logs(self, request):
-        """Return logs from addon."""
+        """Return logs from add-on."""
        addon = self._extract_addon(request)
        return addon.logs()

+    @api_process_raw(CONTENT_TYPE_PNG)
+    async def icon(self, request):
+        """Return icon from add-on."""
+        addon = self._extract_addon(request, check_installed=False)
+        if not addon.with_icon:
+            raise APIError("No icon found!")
+
+        with addon.path_icon.open('rb') as png:
+            return png.read()
+
    @api_process_raw(CONTENT_TYPE_PNG)
    async def logo(self, request):
-        """Return logo from addon."""
+        """Return logo from add-on."""
        addon = self._extract_addon(request, check_installed=False)
        if not addon.with_logo:
-            raise RuntimeError("No image found!")
+            raise APIError("No logo found!")

        with addon.path_logo.open('rb') as png:
            return png.read()

+    @api_process_raw(CONTENT_TYPE_TEXT)
+    async def changelog(self, request):
+        """Return changelog from add-on."""
+        addon = self._extract_addon(request, check_installed=False)
+        if not addon.with_changelog:
+            raise APIError("No changelog found!")
+
+        with addon.path_changelog.open('r') as changelog:
+            return changelog.read()
+
    @api_process
    async def stdin(self, request):
-        """Write to stdin of addon."""
+        """Write to stdin of add-on."""
        addon = self._extract_addon(request)
        if not addon.with_stdin:
-            raise RuntimeError("STDIN not supported by addons")
+            raise APIError("STDIN not supported by add-on")

        data = await request.read()
-        return await asyncio.shield(addon.write_stdin(data), loop=self.loop)
+        return await asyncio.shield(addon.write_stdin(data))
+
+
+def _pretty_devices(addon):
+    """Return a simplified device list."""
+    dev_list = addon.devices
+    if not dev_list:
+        return None
+    return [row.split(':')[0] for row in dev_list]
+
+
+def _pretty_services(addon):
+    """Return a simplified services role list."""
+    services = []
+    for name, access in addon.services_role.items():
+        services.append(f"{name}:{access}")
+    return services
--- a/hassio/api/auth.py
+++ b/hassio/api/auth.py
@@ -0,0 +1,61 @@
+"""Init file for Hass.io auth/SSO RESTful API."""
+import logging
+
+from aiohttp import BasicAuth
+from aiohttp.web_exceptions import HTTPUnauthorized
+from aiohttp.hdrs import CONTENT_TYPE, AUTHORIZATION, WWW_AUTHENTICATE
+
+from .utils import api_process
+from ..const import REQUEST_FROM, CONTENT_TYPE_JSON, CONTENT_TYPE_URL
+from ..coresys import CoreSysAttributes
+from ..exceptions import APIForbidden
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class APIAuth(CoreSysAttributes):
+    """Handle RESTful API for auth functions."""
+
+    def _process_basic(self, request, addon):
+        """Process login request with basic auth.
+
+        Return a coroutine.
+        """
+        auth = BasicAuth.decode(request.headers[AUTHORIZATION])
+        return self.sys_auth.check_login(addon, auth.login, auth.password)
+
+    def _process_dict(self, request, addon, data):
+        """Process login with dict data.
+
+        Return a coroutine.
+        """
+        username = data.get('username') or data.get('user')
+        password = data.get('password')
+
+        return self.sys_auth.check_login(addon, username, password)
+
+    @api_process
+    async def auth(self, request):
+        """Process login request."""
+        addon = request[REQUEST_FROM]
+
+        if not addon.access_auth_api:
+            raise APIForbidden("Can't use Home Assistant auth!")
+
+        # BasicAuth
+        if AUTHORIZATION in request.headers:
+            return await self._process_basic(request, addon)
+
+        # Json
+        if request.headers.get(CONTENT_TYPE) == CONTENT_TYPE_JSON:
+            data = await request.json()
+            return await self._process_dict(request, addon, data)
+
+        # URL encoded
+        if request.headers.get(CONTENT_TYPE) == CONTENT_TYPE_URL:
+            data = await request.post()
+            return await self._process_dict(request, addon, data)
+
+        raise HTTPUnauthorized(headers={
+            WWW_AUTHENTICATE: "Basic realm=\"Hass.io Authentication\""
+        })
--- a/hassio/api/discovery.py
+++ b/hassio/api/discovery.py
@@ -0,0 +1,91 @@
+"""Init file for Hass.io network RESTful API."""
+import voluptuous as vol
+
+from .utils import api_process, api_validate
+from ..const import (
+    ATTR_ADDON, ATTR_UUID, ATTR_CONFIG, ATTR_DISCOVERY, ATTR_SERVICE,
+    REQUEST_FROM)
+from ..coresys import CoreSysAttributes
+from ..exceptions import APIError, APIForbidden
+from ..validate import SERVICE_ALL
+
+
+SCHEMA_DISCOVERY = vol.Schema({
+    vol.Required(ATTR_SERVICE): SERVICE_ALL,
+    vol.Optional(ATTR_CONFIG): vol.Maybe(dict),
+})
+
+
+class APIDiscovery(CoreSysAttributes):
+    """Handle RESTful API for discovery functions."""
+
+    def _extract_message(self, request):
+        """Extract discovery message from URL."""
+        message = self.sys_discovery.get(request.match_info.get('uuid'))
+        if not message:
+            raise APIError("Discovery message not found")
+        return message
+
+    def _check_permission_ha(self, request):
+        """Check permission for API call / Home Assistant."""
+        if request[REQUEST_FROM] != self.sys_homeassistant:
+            raise APIForbidden("Only HomeAssistant can use this API!")
+
+    @api_process
+    async def list(self, request):
+        """Show register services."""
+        self._check_permission_ha(request)
+
+        discovery = []
+        for message in self.sys_discovery.list_messages:
+            discovery.append({
+                ATTR_ADDON: message.addon,
+                ATTR_SERVICE: message.service,
+                ATTR_UUID: message.uuid,
+                ATTR_CONFIG: message.config,
+            })
+
+        return {ATTR_DISCOVERY: discovery}
+
+    @api_process
+    async def set_discovery(self, request):
+        """Write data into a discovery pipeline."""
+        body = await api_validate(SCHEMA_DISCOVERY, request)
+        addon = request[REQUEST_FROM]
+
+        # Access?
+        if body[ATTR_SERVICE] not in addon.discovery:
+            raise APIForbidden(f"Can't use discovery!")
+
+        # Process discovery message
+        message = self.sys_discovery.send(addon, **body)
+
+        return {ATTR_UUID: message.uuid}
+
+    @api_process
+    async def get_discovery(self, request):
+        """Read data into a discovery message."""
+        message = self._extract_message(request)
+
+        # HomeAssistant?
+        self._check_permission_ha(request)
+
+        return {
+            ATTR_ADDON: message.addon,
+            ATTR_SERVICE: message.service,
+            ATTR_UUID: message.uuid,
+            ATTR_CONFIG: message.config,
+        }
+
+    @api_process
+    async def del_discovery(self, request):
+        """Delete data into a discovery message."""
+        message = self._extract_message(request)
+        addon = request[REQUEST_FROM]
+
+        # Permission
+        if message.addon != addon.slug:
+            raise APIForbidden(f"Can't remove discovery message")
+
+        self.sys_discovery.remove(message)
+        return True
--- a/hassio/api/hardware.py
+++ b/hassio/api/hardware.py
@@ -0,0 +1,34 @@
+"""Init file for Hass.io hardware RESTful API."""
+import logging
+
+from .utils import api_process
+from ..const import (
+    ATTR_SERIAL, ATTR_DISK, ATTR_GPIO, ATTR_AUDIO, ATTR_INPUT, ATTR_OUTPUT)
+from ..coresys import CoreSysAttributes
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class APIHardware(CoreSysAttributes):
+    """Handle RESTful API for hardware functions."""
+
+    @api_process
+    async def info(self, request):
+        """Show hardware info."""
+        return {
+            ATTR_SERIAL: list(self.sys_hardware.serial_devices),
+            ATTR_INPUT: list(self.sys_hardware.input_devices),
+            ATTR_DISK: list(self.sys_hardware.disk_devices),
+            ATTR_GPIO: list(self.sys_hardware.gpio_devices),
+            ATTR_AUDIO: self.sys_hardware.audio_devices,
+        }
+
+    @api_process
+    async def audio(self, request):
+        """Show ALSA audio devices."""
+        return {
+            ATTR_AUDIO: {
+                ATTR_INPUT: self.sys_host.alsa.input_devices,
+                ATTR_OUTPUT: self.sys_host.alsa.output_devices,
+            }
+        }
--- a/hassio/api/hassos.py
+++ b/hassio/api/hassos.py
@@ -0,0 +1,53 @@
+"""Init file for Hass.io HassOS RESTful API."""
+import asyncio
+import logging
+
+import voluptuous as vol
+
+from .utils import api_process, api_validate
+from ..const import (
+    ATTR_VERSION, ATTR_BOARD, ATTR_VERSION_LATEST, ATTR_VERSION_CLI,
+    ATTR_VERSION_CLI_LATEST)
+from ..coresys import CoreSysAttributes
+
+_LOGGER = logging.getLogger(__name__)
+
+SCHEMA_VERSION = vol.Schema({
+    vol.Optional(ATTR_VERSION): vol.Coerce(str),
+})
+
+
+class APIHassOS(CoreSysAttributes):
+    """Handle RESTful API for HassOS functions."""
+
+    @api_process
+    async def info(self, request):
+        """Return HassOS information."""
+        return {
+            ATTR_VERSION: self.sys_hassos.version,
+            ATTR_VERSION_CLI: self.sys_hassos.version_cli,
+            ATTR_VERSION_LATEST: self.sys_hassos.version_latest,
+            ATTR_VERSION_CLI_LATEST: self.sys_hassos.version_cli_latest,
+            ATTR_BOARD: self.sys_hassos.board,
+        }
+
+    @api_process
+    async def update(self, request):
+        """Update HassOS."""
+        body = await api_validate(SCHEMA_VERSION, request)
+        version = body.get(ATTR_VERSION, self.sys_hassos.version_latest)
+
+        await asyncio.shield(self.sys_hassos.update(version))
+
+    @api_process
+    async def update_cli(self, request):
+        """Update HassOS CLI."""
+        body = await api_validate(SCHEMA_VERSION, request)
+        version = body.get(ATTR_VERSION, self.sys_hassos.version_cli_latest)
+
+        await asyncio.shield(self.sys_hassos.update_cli(version))
+
+    @api_process
+    def config_sync(self, request):
+        """Trigger config reload on HassOS."""
+        return asyncio.shield(self.sys_hassos.config_sync())
--- a/hassio/api/homeassistant.py
+++ b/hassio/api/homeassistant.py
@@ -1,35 +1,37 @@
-"""Init file for HassIO homeassistant rest api."""
+"""Init file for Hass.io Home Assistant RESTful API."""
 import asyncio
 import logging

-import aiohttp
-from aiohttp import web
-from aiohttp.web_exceptions import HTTPBadGateway
-from aiohttp.hdrs import CONTENT_TYPE
-import async_timeout
 import voluptuous as vol

-from .util import api_process, api_process_raw, api_validate
+from .utils import api_process, api_process_raw, api_validate
 from ..const import (
-    ATTR_VERSION, ATTR_LAST_VERSION, ATTR_DEVICES, ATTR_IMAGE, ATTR_CUSTOM,
-    ATTR_BOOT, ATTR_PORT, ATTR_PASSWORD, ATTR_SSL, ATTR_WATCHDOG,
-    CONTENT_TYPE_BINARY, HEADER_HA_ACCESS)
-from ..validate import HASS_DEVICES, NETWORK_PORT
+    ATTR_VERSION, ATTR_LAST_VERSION, ATTR_IMAGE, ATTR_CUSTOM, ATTR_BOOT,
+    ATTR_PORT, ATTR_PASSWORD, ATTR_SSL, ATTR_WATCHDOG, ATTR_CPU_PERCENT,
+    ATTR_MEMORY_USAGE, ATTR_MEMORY_LIMIT, ATTR_NETWORK_RX, ATTR_NETWORK_TX,
+    ATTR_BLK_READ, ATTR_BLK_WRITE, ATTR_WAIT_BOOT, ATTR_MACHINE,
+    ATTR_REFRESH_TOKEN, CONTENT_TYPE_BINARY)
+from ..coresys import CoreSysAttributes
+from ..validate import NETWORK_PORT, DOCKER_IMAGE
+from ..exceptions import APIError

 _LOGGER = logging.getLogger(__name__)


 # pylint: disable=no-value-for-parameter
 SCHEMA_OPTIONS = vol.Schema({
-    vol.Optional(ATTR_DEVICES): HASS_DEVICES,
    vol.Optional(ATTR_BOOT): vol.Boolean(),
-    vol.Inclusive(ATTR_IMAGE, 'custom_hass'): vol.Any(None, vol.Coerce(str)),
+    vol.Inclusive(ATTR_IMAGE, 'custom_hass'):
+        vol.Maybe(vol.Coerce(str)),
    vol.Inclusive(ATTR_LAST_VERSION, 'custom_hass'):
-        vol.Any(None, vol.Coerce(str)),
+        vol.Any(None, DOCKER_IMAGE),
    vol.Optional(ATTR_PORT): NETWORK_PORT,
-    vol.Optional(ATTR_PASSWORD): vol.Any(None, vol.Coerce(str)),
+    vol.Optional(ATTR_PASSWORD): vol.Maybe(vol.Coerce(str)),
    vol.Optional(ATTR_SSL): vol.Boolean(),
    vol.Optional(ATTR_WATCHDOG): vol.Boolean(),
+    vol.Optional(ATTR_WAIT_BOOT):
+        vol.All(vol.Coerce(int), vol.Range(min=60)),
+    vol.Optional(ATTR_REFRESH_TOKEN): vol.Maybe(vol.Coerce(str)),
 })

 SCHEMA_VERSION = vol.Schema({
@@ -37,146 +39,105 @@ SCHEMA_VERSION = vol.Schema({
 })


-class APIHomeAssistant(object):
-    """Handle rest api for homeassistant functions."""
-
-    def __init__(self, config, loop, homeassistant):
-        """Initialize homeassistant rest api part."""
-        self.config = config
-        self.loop = loop
-        self.homeassistant = homeassistant
-
-    async def homeassistant_proxy(self, path, request):
-        """Return a client request with proxy origin for Home-Assistant."""
-        url = "{}/api/{}".format(self.homeassistant.api_url, path)
-
-        try:
-            data = None
-            headers = {}
-            method = getattr(
-                self.homeassistant.websession, request.method.lower())
-
-            # read data
-            with async_timeout.timeout(10, loop=self.loop):
-                data = await request.read()
-
-            if data:
-                headers.update({CONTENT_TYPE: request.content_type})
-
-            # need api password?
-            if self.homeassistant.api_password:
-                headers = {HEADER_HA_ACCESS: self.homeassistant.api_password}
-
-            # reset headers
-            if not headers:
-                headers = None
-
-            client = await method(
-                url, data=data, headers=headers, timeout=300
-            )
-
-            return client
-
-        except aiohttp.ClientError as err:
-            _LOGGER.error("Client error on api %s request %s.", path, err)
-
-        except asyncio.TimeoutError:
-            _LOGGER.error("Client timeout error on api request %s.", path)
-
-        raise HTTPBadGateway()
+class APIHomeAssistant(CoreSysAttributes):
+    """Handle RESTful API for Home Assistant functions."""

    @api_process
    async def info(self, request):
        """Return host information."""
        return {
-            ATTR_VERSION: self.homeassistant.version,
-            ATTR_LAST_VERSION: self.homeassistant.last_version,
-            ATTR_IMAGE: self.homeassistant.image,
-            ATTR_DEVICES: self.homeassistant.devices,
-            ATTR_CUSTOM: self.homeassistant.is_custom_image,
-            ATTR_BOOT: self.homeassistant.boot,
-            ATTR_PORT: self.homeassistant.api_port,
-            ATTR_SSL: self.homeassistant.api_ssl,
-            ATTR_WATCHDOG: self.homeassistant.watchdog,
+            ATTR_VERSION: self.sys_homeassistant.version,
+            ATTR_LAST_VERSION: self.sys_homeassistant.last_version,
+            ATTR_MACHINE: self.sys_homeassistant.machine,
+            ATTR_IMAGE: self.sys_homeassistant.image,
+            ATTR_CUSTOM: self.sys_homeassistant.is_custom_image,
+            ATTR_BOOT: self.sys_homeassistant.boot,
+            ATTR_PORT: self.sys_homeassistant.api_port,
+            ATTR_SSL: self.sys_homeassistant.api_ssl,
+            ATTR_WATCHDOG: self.sys_homeassistant.watchdog,
+            ATTR_WAIT_BOOT: self.sys_homeassistant.wait_boot,
        }

    @api_process
    async def options(self, request):
-        """Set homeassistant options."""
+        """Set Home Assistant options."""
        body = await api_validate(SCHEMA_OPTIONS, request)

-        if ATTR_DEVICES in body:
-            self.homeassistant.devices = body[ATTR_DEVICES]
-
-        if ATTR_IMAGE in body:
-            self.homeassistant.set_custom(
-                body[ATTR_IMAGE], body[ATTR_LAST_VERSION])
+        if ATTR_IMAGE in body and ATTR_LAST_VERSION in body:
+            self.sys_homeassistant.image = body[ATTR_IMAGE]
+            self.sys_homeassistant.last_version = body[ATTR_LAST_VERSION]

        if ATTR_BOOT in body:
-            self.homeassistant.boot = body[ATTR_BOOT]
+            self.sys_homeassistant.boot = body[ATTR_BOOT]

        if ATTR_PORT in body:
-            self.homeassistant.api_port = body[ATTR_PORT]
+            self.sys_homeassistant.api_port = body[ATTR_PORT]

        if ATTR_PASSWORD in body:
-            self.homeassistant.api_password = body[ATTR_PASSWORD]
+            self.sys_homeassistant.api_password = body[ATTR_PASSWORD]

        if ATTR_SSL in body:
-            self.homeassistant.api_ssl = body[ATTR_SSL]
+            self.sys_homeassistant.api_ssl = body[ATTR_SSL]

        if ATTR_WATCHDOG in body:
-            self.homeassistant.watchdog = body[ATTR_WATCHDOG]
+            self.sys_homeassistant.watchdog = body[ATTR_WATCHDOG]

-        return True
+        if ATTR_WAIT_BOOT in body:
+            self.sys_homeassistant.wait_boot = body[ATTR_WAIT_BOOT]
+
+        if ATTR_REFRESH_TOKEN in body:
+            self.sys_homeassistant.refresh_token = body[ATTR_REFRESH_TOKEN]
+
+        self.sys_homeassistant.save_data()
+
+    @api_process
+    async def stats(self, request):
+        """Return resource information."""
+        stats = await self.sys_homeassistant.stats()
+        if not stats:
+            raise APIError("No stats available")
+
+        return {
+            ATTR_CPU_PERCENT: stats.cpu_percent,
+            ATTR_MEMORY_USAGE: stats.memory_usage,
+            ATTR_MEMORY_LIMIT: stats.memory_limit,
+            ATTR_NETWORK_RX: stats.network_rx,
+            ATTR_NETWORK_TX: stats.network_tx,
+            ATTR_BLK_READ: stats.blk_read,
+            ATTR_BLK_WRITE: stats.blk_write,
+        }

    @api_process
    async def update(self, request):
-        """Update homeassistant."""
+        """Update Home Assistant."""
        body = await api_validate(SCHEMA_VERSION, request)
-        version = body.get(ATTR_VERSION, self.homeassistant.last_version)
+        version = body.get(ATTR_VERSION, self.sys_homeassistant.last_version)

-        if version == self.homeassistant.version:
-            raise RuntimeError("Version {} is already in use".format(version))
-
-        return await asyncio.shield(
-            self.homeassistant.update(version), loop=self.loop)
+        await asyncio.shield(self.sys_homeassistant.update(version))

    @api_process
    def stop(self, request):
-        """Stop homeassistant."""
-        return asyncio.shield(self.homeassistant.stop(), loop=self.loop)
+        """Stop Home Assistant."""
+        return asyncio.shield(self.sys_homeassistant.stop())

    @api_process
    def start(self, request):
-        """Start homeassistant."""
-        return asyncio.shield(self.homeassistant.run(), loop=self.loop)
+        """Start Home Assistant."""
+        return asyncio.shield(self.sys_homeassistant.start())

    @api_process
    def restart(self, request):
-        """Restart homeassistant."""
-        return asyncio.shield(self.homeassistant.restart(), loop=self.loop)
+        """Restart Home Assistant."""
+        return asyncio.shield(self.sys_homeassistant.restart())

    @api_process_raw(CONTENT_TYPE_BINARY)
    def logs(self, request):
-        """Return homeassistant docker logs."""
-        return self.homeassistant.logs()
+        """Return Home Assistant Docker logs."""
+        return self.sys_homeassistant.logs()

    @api_process
    async def check(self, request):
-        """Check config of homeassistant."""
-        code, message = await self.homeassistant.check_config()
-        if not code:
-            raise RuntimeError(message)
-
-        return True
-
-    async def api(self, request):
-        """Proxy API request to Home-Assistant."""
-        path = request.match_info.get('path')
-
-        client = await self.homeassistant_proxy(path, request)
-        return web.Response(
-            body=await client.read(),
-            status=client.status,
-            content_type=client.content_type
-        )
+        """Check configuration of Home Assistant."""
+        result = await self.sys_homeassistant.check_config()
+        if not result.valid:
+            raise APIError(result.log)
--- a/hassio/api/host.py
+++ b/hassio/api/host.py
@@ -1,91 +1,101 @@
-"""Init file for HassIO host rest api."""
+"""Init file for Hass.io host RESTful API."""
 import asyncio
 import logging

 import voluptuous as vol

-from .util import api_process_hostcontrol, api_process, api_validate
+from .utils import api_process, api_validate
 from ..const import (
-    ATTR_VERSION, ATTR_LAST_VERSION, ATTR_TYPE, ATTR_HOSTNAME, ATTR_FEATURES,
-    ATTR_OS, ATTR_SERIAL, ATTR_INPUT, ATTR_DISK, ATTR_AUDIO, ATTR_AUDIO_INPUT,
-    ATTR_AUDIO_OUTPUT, ATTR_GPIO)
-from ..validate import ALSA_CHANNEL
+    ATTR_HOSTNAME, ATTR_FEATURES, ATTR_KERNEL, ATTR_OPERATING_SYSTEM,
+    ATTR_CHASSIS, ATTR_DEPLOYMENT, ATTR_STATE, ATTR_NAME, ATTR_DESCRIPTON,
+    ATTR_SERVICES, ATTR_CPE)
+from ..coresys import CoreSysAttributes

 _LOGGER = logging.getLogger(__name__)

-SCHEMA_VERSION = vol.Schema({
-    vol.Optional(ATTR_VERSION): vol.Coerce(str),
-})
+SERVICE = 'service'

 SCHEMA_OPTIONS = vol.Schema({
-    vol.Optional(ATTR_AUDIO_OUTPUT): ALSA_CHANNEL,
-    vol.Optional(ATTR_AUDIO_INPUT): ALSA_CHANNEL,
+    vol.Optional(ATTR_HOSTNAME): vol.Coerce(str),
 })


-class APIHost(object):
-    """Handle rest api for host functions."""
-
-    def __init__(self, config, loop, host_control, hardware):
-        """Initialize host rest api part."""
-        self.config = config
-        self.loop = loop
-        self.host_control = host_control
-        self.local_hw = hardware
+class APIHost(CoreSysAttributes):
+    """Handle RESTful API for host functions."""

    @api_process
    async def info(self, request):
        """Return host information."""
        return {
-            ATTR_TYPE: self.host_control.type,
-            ATTR_VERSION: self.host_control.version,
-            ATTR_LAST_VERSION: self.host_control.last_version,
-            ATTR_FEATURES: self.host_control.features,
-            ATTR_HOSTNAME: self.host_control.hostname,
-            ATTR_OS: self.host_control.os_info,
+            ATTR_CHASSIS: self.sys_host.info.chassis,
+            ATTR_CPE: self.sys_host.info.cpe,
+            ATTR_FEATURES: self.sys_host.supperted_features,
+            ATTR_HOSTNAME: self.sys_host.info.hostname,
+            ATTR_OPERATING_SYSTEM: self.sys_host.info.operating_system,
+            ATTR_DEPLOYMENT: self.sys_host.info.deployment,
+            ATTR_KERNEL: self.sys_host.info.kernel,
        }

    @api_process
    async def options(self, request):
-        """Process host options."""
+        """Edit host settings."""
        body = await api_validate(SCHEMA_OPTIONS, request)

-        if ATTR_AUDIO_OUTPUT in body:
-            self.config.audio_output = body[ATTR_AUDIO_OUTPUT]
-        if ATTR_AUDIO_INPUT in body:
-            self.config.audio_input = body[ATTR_AUDIO_INPUT]
-
-        return True
-
-    @api_process_hostcontrol
-    def reboot(self, request):
-        """Reboot host."""
-        return self.host_control.reboot()
-
-    @api_process_hostcontrol
-    def shutdown(self, request):
-        """Poweroff host."""
-        return self.host_control.shutdown()
-
-    @api_process_hostcontrol
-    async def update(self, request):
-        """Update host OS."""
-        body = await api_validate(SCHEMA_VERSION, request)
-        version = body.get(ATTR_VERSION, self.host_control.last_version)
-
-        if version == self.host_control.version:
-            raise RuntimeError("Version {} is already in use".format(version))
-
-        return await asyncio.shield(
-            self.host_control.update(version=version), loop=self.loop)
+        # hostname
+        if ATTR_HOSTNAME in body:
+            await asyncio.shield(
+                self.sys_host.control.set_hostname(body[ATTR_HOSTNAME]))

    @api_process
-    async def hardware(self, request):
-        """Return local hardware infos."""
+    def reboot(self, request):
+        """Reboot host."""
+        return asyncio.shield(self.sys_host.control.reboot())
+
+    @api_process
+    def shutdown(self, request):
+        """Poweroff host."""
+        return asyncio.shield(self.sys_host.control.shutdown())
+
+    @api_process
+    def reload(self, request):
+        """Reload host data."""
+        return asyncio.shield(self.sys_host.reload())
+
+    @api_process
+    async def services(self, request):
+        """Return list of available services."""
+        services = []
+        for unit in self.sys_host.services:
+            services.append({
+                ATTR_NAME: unit.name,
+                ATTR_DESCRIPTON: unit.description,
+                ATTR_STATE: unit.state,
+            })
+
        return {
-            ATTR_SERIAL: list(self.local_hw.serial_devices),
-            ATTR_INPUT: list(self.local_hw.input_devices),
-            ATTR_DISK: list(self.local_hw.disk_devices),
-            ATTR_GPIO: list(self.local_hw.gpio_devices),
-            ATTR_AUDIO: self.local_hw.audio_devices,
+            ATTR_SERVICES: services
        }
+
+    @api_process
+    def service_start(self, request):
+        """Start a service."""
+        unit = request.match_info.get(SERVICE)
+        return asyncio.shield(self.sys_host.services.start(unit))
+
+    @api_process
+    def service_stop(self, request):
+        """Stop a service."""
+        unit = request.match_info.get(SERVICE)
+        return asyncio.shield(self.sys_host.services.stop(unit))
+
+    @api_process
+    def service_reload(self, request):
+        """Reload a service."""
+        unit = request.match_info.get(SERVICE)
+        return asyncio.shield(self.sys_host.services.reload(unit))
+
+    @api_process
+    def service_restart(self, request):
+        """Restart a service."""
+        unit = request.match_info.get(SERVICE)
+        return asyncio.shield(self.sys_host.services.restart(unit))
--- a/hassio/api/info.py
+++ b/hassio/api/info.py
@@ -0,0 +1,27 @@
+"""Init file for Hass.io info RESTful API."""
+import logging
+
+from .utils import api_process
+from ..const import (
+    ATTR_HOMEASSISTANT, ATTR_SUPERVISOR, ATTR_MACHINE, ATTR_ARCH, ATTR_HASSOS,
+    ATTR_CHANNEL, ATTR_HOSTNAME)
+from ..coresys import CoreSysAttributes
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class APIInfo(CoreSysAttributes):
+    """Handle RESTful API for info functions."""
+
+    @api_process
+    async def info(self, request):
+        """Show system info."""
+        return {
+            ATTR_SUPERVISOR: self.sys_supervisor.version,
+            ATTR_HOMEASSISTANT: self.sys_homeassistant.version,
+            ATTR_HASSOS: self.sys_hassos.version,
+            ATTR_HOSTNAME: self.sys_host.info.hostname,
+            ATTR_MACHINE: self.sys_machine,
+            ATTR_ARCH: self.sys_arch,
+            ATTR_CHANNEL: self.sys_updater.channel,
+        }
--- a/hassio/api/network.py
+++ b/hassio/api/network.py
@@ -1,43 +0,0 @@
-"""Init file for HassIO network rest api."""
-import logging
-
-import voluptuous as vol
-
-from .util import api_process, api_process_hostcontrol, api_validate
-from ..const import ATTR_HOSTNAME
-
-_LOGGER = logging.getLogger(__name__)
-
-
-SCHEMA_OPTIONS = vol.Schema({
-    vol.Optional(ATTR_HOSTNAME): vol.Coerce(str),
-})
-
-
-class APINetwork(object):
-    """Handle rest api for network functions."""
-
-    def __init__(self, config, loop, host_control):
-        """Initialize network rest api part."""
-        self.config = config
-        self.loop = loop
-        self.host_control = host_control
-
-    @api_process
-    async def info(self, request):
-        """Show network settings."""
-        return {
-            ATTR_HOSTNAME: self.host_control.hostname,
-        }
-
-    @api_process_hostcontrol
-    async def options(self, request):
-        """Edit network settings."""
-        body = await api_validate(SCHEMA_OPTIONS, request)
-
-        # hostname
-        if ATTR_HOSTNAME in body:
-            if self.host_control.hostname != body[ATTR_HOSTNAME]:
-                await self.host_control.set_hostname(body[ATTR_HOSTNAME])
-
-        return True
--- a/hassio/api/panel/chunk.0853908528652fbc5d4f.js
+++ b/hassio/api/panel/chunk.0853908528652fbc5d4f.js
--- a/hassio/api/panel/chunk.0853908528652fbc5d4f.js.gz
+++ b/hassio/api/panel/chunk.0853908528652fbc5d4f.js.gz
--- a/hassio/api/panel/chunk.0853908528652fbc5d4f.js.map
+++ b/hassio/api/panel/chunk.0853908528652fbc5d4f.js.map
--- a/hassio/api/panel/chunk.0cb8b788b03dcc48da14.js
+++ b/hassio/api/panel/chunk.0cb8b788b03dcc48da14.js
--- a/hassio/api/panel/chunk.0cb8b788b03dcc48da14.js.gz
+++ b/hassio/api/panel/chunk.0cb8b788b03dcc48da14.js.gz
--- a/hassio/api/panel/chunk.0cb8b788b03dcc48da14.js.map
+++ b/hassio/api/panel/chunk.0cb8b788b03dcc48da14.js.map
--- a/hassio/api/panel/chunk.8c049a124b9397e54c16.js
+++ b/hassio/api/panel/chunk.8c049a124b9397e54c16.js
--- a/hassio/api/panel/chunk.8c049a124b9397e54c16.js.gz
+++ b/hassio/api/panel/chunk.8c049a124b9397e54c16.js.gz
--- a/hassio/api/panel/chunk.8c049a124b9397e54c16.js.map
+++ b/hassio/api/panel/chunk.8c049a124b9397e54c16.js.map
--- a/hassio/api/panel/chunk.9e3883f96f68b3ce89f5.js
+++ b/hassio/api/panel/chunk.9e3883f96f68b3ce89f5.js
@@ -0,0 +1,2 @@
+(window.webpackJsonp=window.webpackJsonp||[]).push([[4],{100:function(n,r,t){"use strict";t.r(r),t.d(r,"marked",function(){return a}),t.d(r,"filterXSS",function(){return c});var e=t(89),i=t.n(e),o=t(91),u=t.n(o),a=i.a,c=u.a}}]);
+//# sourceMappingURL=chunk.9e3883f96f68b3ce89f5.js.map
--- a/hassio/api/panel/chunk.9e3883f96f68b3ce89f5.js.gz
+++ b/hassio/api/panel/chunk.9e3883f96f68b3ce89f5.js.gz
--- a/hassio/api/panel/chunk.9e3883f96f68b3ce89f5.js.map
+++ b/hassio/api/panel/chunk.9e3883f96f68b3ce89f5.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["webpack:///../src/resources/load_markdown.js"],"names":["__webpack_require__","r","__webpack_exports__","d","marked","filterXSS","marked__WEBPACK_IMPORTED_MODULE_0__","marked__WEBPACK_IMPORTED_MODULE_0___default","n","xss__WEBPACK_IMPORTED_MODULE_1__","xss__WEBPACK_IMPORTED_MODULE_1___default","marked_","filterXSS_"],"mappings":"0FAAAA,EAAAC,EAAAC,GAAAF,EAAAG,EAAAD,EAAA,2BAAAE,IAAAJ,EAAAG,EAAAD,EAAA,8BAAAG,IAAA,IAAAC,EAAAN,EAAA,IAAAO,EAAAP,EAAAQ,EAAAF,GAAAG,EAAAT,EAAA,IAAAU,EAAAV,EAAAQ,EAAAC,GAGaL,EAASO,IACTN,EAAYO","file":"chunk.9e3883f96f68b3ce89f5.js","sourcesContent":["import marked_ from \"marked\";\nimport filterXSS_ from \"xss\";\n\nexport const marked = marked_;\nexport const filterXSS = filterXSS_;\n"],"sourceRoot":""}
--- a/hassio/api/panel/chunk.c1ac97370d72bce0a835.js
+++ b/hassio/api/panel/chunk.c1ac97370d72bce0a835.js
--- a/hassio/api/panel/chunk.c1ac97370d72bce0a835.js.LICENSE
+++ b/hassio/api/panel/chunk.c1ac97370d72bce0a835.js.LICENSE
@@ -0,0 +1,820 @@
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+ * @license
+ * Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at
+ * http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at
+ * http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at
+ * http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at
+ * http://polymer.github.io/PATENTS.txt
+ */
+
+/**
+ * @license
+ * Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at
+ * http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at
+ * http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at
+ * http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at
+ * http://polymer.github.io/PATENTS.txt
+ */
+
+/**
+ * @license
+ * Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at
+ * http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at
+ * http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at
+ * http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at
+ * http://polymer.github.io/PATENTS.txt
+ */
+
+/**
+ * @license
+ * Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at
+ * http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at
+ * http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at
+ * http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at
+ * http://polymer.github.io/PATENTS.txt
+ */
+
+/**
+ * @license
+ * Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at
+ * http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at
+ * http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at
+ * http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at
+ * http://polymer.github.io/PATENTS.txt
+ */
+
+/**
+ * @license
+ * Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at
+ * http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at
+ * http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at
+ * http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at
+ * http://polymer.github.io/PATENTS.txt
+ */
+
+/**
+ * @license
+ * Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at
+ * http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at
+ * http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at
+ * http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at
+ * http://polymer.github.io/PATENTS.txt
+ */
+
+/**
+ * @license
+ * Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at
+ * http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at
+ * http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at
+ * http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at
+ * http://polymer.github.io/PATENTS.txt
+ */
+
+/**
+ * @license
+ * Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at
+ * http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at
+ * http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at
+ * http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at
+ * http://polymer.github.io/PATENTS.txt
+ */
+
+/**
+ * @license
+ * Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at
+ * http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at
+ * http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at
+ * http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at
+ * http://polymer.github.io/PATENTS.txt
+ */
+
+/**
+ * @license
+ * Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at
+ * http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at
+ * http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at
+ * http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at
+ * http://polymer.github.io/PATENTS.txt
+ */
+
+/**
+ * @license
+ * Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+ * This code may only be used under the BSD style license found at
+ * http://polymer.github.io/LICENSE.txt
+ * The complete set of authors may be found at
+ * http://polymer.github.io/AUTHORS.txt
+ * The complete set of contributors may be found at
+ * http://polymer.github.io/CONTRIBUTORS.txt
+ * Code distributed by Google as part of the polymer project is also
+ * subject to an additional IP rights grant found at
+ * http://polymer.github.io/PATENTS.txt
+ */
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2016 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
--- a/hassio/api/panel/chunk.c1ac97370d72bce0a835.js.gz
+++ b/hassio/api/panel/chunk.c1ac97370d72bce0a835.js.gz
--- a/hassio/api/panel/chunk.c1ac97370d72bce0a835.js.map
+++ b/hassio/api/panel/chunk.c1ac97370d72bce0a835.js.map
--- a/hassio/api/panel/chunk.d0eb7b86b775838caf5e.js
+++ b/hassio/api/panel/chunk.d0eb7b86b775838caf5e.js
--- a/hassio/api/panel/chunk.d0eb7b86b775838caf5e.js.gz
+++ b/hassio/api/panel/chunk.d0eb7b86b775838caf5e.js.gz
--- a/hassio/api/panel/chunk.d0eb7b86b775838caf5e.js.map
+++ b/hassio/api/panel/chunk.d0eb7b86b775838caf5e.js.map
--- a/hassio/api/panel/chunk.f32f3c841cc3e1d081f7.js
+++ b/hassio/api/panel/chunk.f32f3c841cc3e1d081f7.js
--- a/hassio/api/panel/chunk.f32f3c841cc3e1d081f7.js.LICENSE
+++ b/hassio/api/panel/chunk.f32f3c841cc3e1d081f7.js.LICENSE
@@ -0,0 +1,471 @@
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at
+http://polymer.github.io/LICENSE.txt The complete set of authors may be found at
+http://polymer.github.io/AUTHORS.txt The complete set of contributors may be
+found at http://polymer.github.io/CONTRIBUTORS.txt Code distributed by Google as
+part of the polymer project is also subject to an additional IP rights grant
+found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
+
+/**
+@license
+Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+*/
--- a/hassio/api/panel/chunk.f32f3c841cc3e1d081f7.js.gz
+++ b/hassio/api/panel/chunk.f32f3c841cc3e1d081f7.js.gz
--- a/hassio/api/panel/chunk.f32f3c841cc3e1d081f7.js.map
+++ b/hassio/api/panel/chunk.f32f3c841cc3e1d081f7.js.map
--- a/hassio/api/panel/entrypoint.js
+++ b/hassio/api/panel/entrypoint.js
@@ -0,0 +1,2 @@
+!function(e){function n(n){for(var t,o,i=n[0],u=n[1],c=0,f=[];c<i.length;c++)o=i[c],r[o]&&f.push(r[o][0]),r[o]=0;for(t in u)Object.prototype.hasOwnProperty.call(u,t)&&(e[t]=u[t]);for(a&&a(n);f.length;)f.shift()()}var t={},r={1:0};function o(n){if(t[n])return t[n].exports;var r=t[n]={i:n,l:!1,exports:{}};return e[n].call(r.exports,r,r.exports,o),r.l=!0,r.exports}o.e=function(e){var n=[],t=r[e];if(0!==t)if(t)n.push(t[2]);else{var i=new Promise(function(n,o){t=r[e]=[n,o]});n.push(t[2]=i);var u,c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.charset="utf-8",a.timeout=120,o.nc&&a.setAttribute("nonce",o.nc),a.src=function(e){return o.p+"chunk."+{0:"f32f3c841cc3e1d081f7",2:"8c049a124b9397e54c16",3:"d0eb7b86b775838caf5e",4:"9e3883f96f68b3ce89f5",5:"0cb8b788b03dcc48da14",6:"c1ac97370d72bce0a835",7:"0853908528652fbc5d4f"}[e]+".js"}(e),u=function(n){a.onerror=a.onload=null,clearTimeout(f);var t=r[e];if(0!==t){if(t){var o=n&&("load"===n.type?"missing":n.type),i=n&&n.target&&n.target.src,u=new Error("Loading chunk "+e+" failed.\n("+o+": "+i+")");u.type=o,u.request=i,t[1](u)}r[e]=void 0}};var f=setTimeout(function(){u({type:"timeout",target:a})},12e4);a.onerror=a.onload=u,c.appendChild(a)}return Promise.all(n)},o.m=e,o.c=t,o.d=function(e,n,t){o.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:t})},o.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.t=function(e,n){if(1&n&&(e=o(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(o.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var r in e)o.d(t,r,function(n){return e[n]}.bind(null,r));return t},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="/api/hassio/app/",o.oe=function(e){throw console.error(e),e};var i=window.webpackJsonp=window.webpackJsonp||[],u=i.push.bind(i);i.push=n,i=i.slice();for(var c=0;c<i.length;c++)n(i[c]);var a=u;o(o.s=0)}([function(e,n,t){window.loadES5Adapter().then(function(){Promise.all([t.e(0),t.e(2)]).then(t.bind(null,2)),Promise.all([t.e(0),t.e(6),t.e(3)]).then(t.bind(null,1))})}]);
+//# sourceMappingURL=entrypoint.js.map
--- a/hassio/api/panel/entrypoint.js.gz
+++ b/hassio/api/panel/entrypoint.js.gz
--- a/hassio/api/panel/entrypoint.js.map
+++ b/hassio/api/panel/entrypoint.js.map
--- a/hassio/api/panel/hassio-app.html
+++ b/hassio/api/panel/hassio-app.html
--- a/hassio/api/panel/hassio-app.html.gz
+++ b/hassio/api/panel/hassio-app.html.gz
--- a/hassio/api/panel/hassio-main-es5.html
+++ b/hassio/api/panel/hassio-main-es5.html
--- a/hassio/api/panel/hassio-main-es5.html.gz
+++ b/hassio/api/panel/hassio-main-es5.html.gz
--- a/hassio/api/panel/hassio-main-latest.html
+++ b/hassio/api/panel/hassio-main-latest.html
--- a/hassio/api/panel/hassio-main-latest.html.gz
+++ b/hassio/api/panel/hassio-main-latest.html.gz
--- a/hassio/api/panel/index.html
+++ b/hassio/api/panel/index.html
@@ -0,0 +1,38 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Hass.io</title>
+    <meta name='viewport' content='width=device-width, user-scalable=no'>
+    <style>
+      body {
+        height: 100vh;
+        margin: 0;
+        padding: 0;
+      }
+    </style>
+    <script src='/frontend_es5/custom-elements-es5-adapter.js'></script>
+  </head>
+  <body>
+    <hassio-app></hassio-app>
+    <script>
+    function addScript(src) {
+      var e = document.createElement('script');
+      e.src = src;
+      document.write(e.outerHTML);
+    }
+    var webComponentsSupported = (
+      'customElements' in window &&
+      'import' in document.createElement('link') &&
+      'content' in document.createElement('template'));
+    if (!webComponentsSupported) {
+      addScript('/static/webcomponents-lite.js');
+    }
+    </script>
+    <!--
+      Disabled while we make Home Assistant able to serve the right files.
+      <script src="./app.js"></script>
+    -->
+    <link rel='import' href='./hassio-app.html'>
+  </body>
+</html>
--- a/hassio/api/panel/index.html.gz
+++ b/hassio/api/panel/index.html.gz
--- a/hassio/api/proxy.py
+++ b/hassio/api/proxy.py
@@ -0,0 +1,255 @@
+"""Utils for Home Assistant Proxy."""
+import asyncio
+from contextlib import asynccontextmanager
+import logging
+
+import aiohttp
+from aiohttp import web
+from aiohttp.web_exceptions import HTTPBadGateway, HTTPUnauthorized
+from aiohttp.client_exceptions import ClientConnectorError
+from aiohttp.hdrs import CONTENT_TYPE, AUTHORIZATION
+import async_timeout
+
+from ..const import HEADER_HA_ACCESS
+from ..coresys import CoreSysAttributes
+from ..exceptions import (
+    HomeAssistantAuthError, HomeAssistantAPIError, APIError)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class APIProxy(CoreSysAttributes):
+    """API Proxy for Home Assistant."""
+
+    def _check_access(self, request):
+        """Check the Hass.io token."""
+        if AUTHORIZATION in request.headers:
+            bearer = request.headers[AUTHORIZATION]
+            hassio_token = bearer.split(' ')[-1]
+        else:
+            hassio_token = request.headers.get(HEADER_HA_ACCESS)
+
+        addon = self.sys_addons.from_token(hassio_token)
+        if not addon:
+            _LOGGER.warning("Unknown Home Assistant API access!")
+        elif not addon.access_homeassistant_api:
+            _LOGGER.warning("Not permitted API access: %s", addon.slug)
+        else:
+            _LOGGER.info("%s access from %s", request.path, addon.slug)
+            return
+
+        raise HTTPUnauthorized()
+
+    @asynccontextmanager
+    async def _api_client(self, request, path, timeout=300):
+        """Return a client request with proxy origin for Home Assistant."""
+        try:
+            # read data
+            with async_timeout.timeout(30):
+                data = await request.read()
+
+            if data:
+                content_type = request.content_type
+            else:
+                content_type = None
+
+            async with self.sys_homeassistant.make_request(
+                    request.method.lower(), f'api/{path}',
+                    content_type=content_type,
+                    data=data,
+                    timeout=timeout,
+            ) as resp:
+                yield resp
+                return
+
+        except HomeAssistantAuthError:
+            _LOGGER.error("Authenticate error on API for request %s", path)
+        except HomeAssistantAPIError:
+            _LOGGER.error("Error on API for request %s", path)
+        except aiohttp.ClientError as err:
+            _LOGGER.error("Client error on API %s request %s", path, err)
+        except asyncio.TimeoutError:
+            _LOGGER.error("Client timeout error on API request %s", path)
+
+        raise HTTPBadGateway()
+
+    async def stream(self, request):
+        """Proxy HomeAssistant EventStream Requests."""
+        self._check_access(request)
+
+        _LOGGER.info("Home Assistant EventStream start")
+        async with self._api_client(request, 'stream', timeout=None) as client:
+            response = web.StreamResponse()
+            response.content_type = request.headers.get(CONTENT_TYPE)
+            try:
+                await response.prepare(request)
+                async for data in client.content:
+                    await response.write(data)
+
+            except (aiohttp.ClientError, aiohttp.ClientPayloadError):
+                pass
+
+            _LOGGER.info("Home Assistant EventStream close")
+            return response
+
+    async def api(self, request):
+        """Proxy Home Assistant API Requests."""
+        self._check_access(request)
+
+        # Normal request
+        path = request.match_info.get('path', '')
+        async with self._api_client(request, path) as client:
+            data = await client.read()
+            return web.Response(
+                body=data,
+                status=client.status,
+                content_type=client.content_type
+            )
+
+    async def _websocket_client(self):
+        """Initialize a WebSocket API connection."""
+        url = f"{self.sys_homeassistant.api_url}/api/websocket"
+
+        try:
+            client = await self.sys_websession_ssl.ws_connect(
+                url, heartbeat=30, verify_ssl=False)
+
+            # Handle authentication
+            data = await client.receive_json()
+
+            if data.get('type') == 'auth_ok':
+                return client
+
+            if data.get('type') != 'auth_required':
+                # Invalid protocol
+                _LOGGER.error(
+                    "Got unexpected response from HA WebSocket: %s", data)
+                raise APIError()
+
+            if self.sys_homeassistant.refresh_token:
+                await self.sys_homeassistant.ensure_access_token()
+                await client.send_json({
+                    'type': 'auth',
+                    'access_token': self.sys_homeassistant.access_token,
+                })
+            else:
+                await client.send_json({
+                    'type': 'auth',
+                    'api_password': self.sys_homeassistant.api_password,
+                })
+
+            data = await client.receive_json()
+
+            if data.get('type') == 'auth_ok':
+                return client
+
+            # Renew the Token is invalid
+            if (data.get('type') == 'invalid_auth' and
+                    self.sys_homeassistant.refresh_token):
+                self.sys_homeassistant.access_token = None
+                return await self._websocket_client()
+
+            raise HomeAssistantAuthError()
+
+        except (RuntimeError, ValueError, ClientConnectorError) as err:
+            _LOGGER.error("Client error on WebSocket API %s.", err)
+        except HomeAssistantAuthError:
+            _LOGGER.error("Failed authentication to Home Assistant WebSocket")
+
+        raise APIError()
+
+    async def websocket(self, request):
+        """Initialize a WebSocket API connection."""
+        _LOGGER.info("Home Assistant WebSocket API request initialize")
+
+        # init server
+        server = web.WebSocketResponse(heartbeat=30)
+        await server.prepare(request)
+
+        # handle authentication
+        try:
+            await server.send_json({
+                'type': 'auth_required',
+                'ha_version': self.sys_homeassistant.version,
+            })
+
+            # Check API access
+            response = await server.receive_json()
+            hassio_token = (response.get('api_password') or
+                            response.get('access_token'))
+            addon = self.sys_addons.from_token(hassio_token)
+
+            if not addon or not addon.access_homeassistant_api:
+                _LOGGER.warning("Unauthorized WebSocket access!")
+                await server.send_json({
+                    'type': 'auth_invalid',
+                    'message': 'Invalid access',
+                })
+                return server
+
+            _LOGGER.info("WebSocket access from %s", addon.slug)
+
+            await server.send_json({
+                'type': 'auth_ok',
+                'ha_version': self.sys_homeassistant.version,
+            })
+        except (RuntimeError, ValueError) as err:
+            _LOGGER.error("Can't initialize handshake: %s", err)
+            return server
+
+        # init connection to hass
+        try:
+            client = await self._websocket_client()
+        except APIError:
+            return server
+
+        _LOGGER.info("Home Assistant WebSocket API request running")
+        try:
+            client_read = None
+            server_read = None
+            while not server.closed and not client.closed:
+                if not client_read:
+                    client_read = self.sys_create_task(
+                        client.receive_str())
+                if not server_read:
+                    server_read = self.sys_create_task(
+                        server.receive_str())
+
+                # wait until data need to be processed
+                await asyncio.wait(
+                    [client_read, server_read],
+                    return_when=asyncio.FIRST_COMPLETED
+                )
+
+                # server
+                if server_read.done() and not client.closed:
+                    server_read.exception()
+                    await client.send_str(server_read.result())
+                    server_read = None
+
+                # client
+                if client_read.done() and not server.closed:
+                    client_read.exception()
+                    await server.send_str(client_read.result())
+                    client_read = None
+
+        except asyncio.CancelledError:
+            pass
+
+        except (RuntimeError, ConnectionError, TypeError) as err:
+            _LOGGER.info("Home Assistant WebSocket API error: %s", err)
+
+        finally:
+            if client_read:
+                client_read.cancel()
+            if server_read:
+                server_read.cancel()
+
+            # close connections
+            if not client.closed:
+                await client.close()
+            if not server.closed:
+                await server.close()
+
+        _LOGGER.info("Home Assistant WebSocket API connection is closed")
+        return server
--- a/hassio/api/security.py
+++ b/hassio/api/security.py
@@ -1,102 +1,140 @@
-"""Init file for HassIO security rest api."""
-from datetime import datetime, timedelta
-import io
+"""Handle security part of this API."""
 import logging
-import hashlib
-import os
+import re

-from aiohttp import web
-import voluptuous as vol
-import pyotp
-import pyqrcode
+from aiohttp.web import middleware
+from aiohttp.web_exceptions import HTTPUnauthorized, HTTPForbidden

-from .util import api_process, api_validate, hash_password
-from ..const import ATTR_INITIALIZE, ATTR_PASSWORD, ATTR_TOTP, ATTR_SESSION
+from ..const import (
+    HEADER_TOKEN, REQUEST_FROM, ROLE_ADMIN, ROLE_DEFAULT, ROLE_HOMEASSISTANT,
+    ROLE_MANAGER, ROLE_BACKUP)
+from ..coresys import CoreSysAttributes

 _LOGGER = logging.getLogger(__name__)

-SCHEMA_PASSWORD = vol.Schema({
-    vol.Required(ATTR_PASSWORD): vol.Coerce(str),
-})

-SCHEMA_SESSION = SCHEMA_PASSWORD.extend({
-    vol.Optional(ATTR_TOTP, default=None): vol.Coerce(str),
-})
+# Block Anytime
+BLACKLIST = re.compile(
+    r"^(?:"
+    r"|/homeassistant/api/hassio/.*"
+    r")$"
+)
+
+# Free to call or have own security concepts
+NO_SECURITY_CHECK = re.compile(
+    r"^(?:"
+    r"|/homeassistant/api/.*"
+    r"|/homeassistant/websocket"
+    r"|/supervisor/ping"
+    r")$"
+)
+
+# Can called by every add-on
+ADDONS_API_BYPASS = re.compile(
+    r"^(?:"
+    r"|/addons/self/(?!security|update)[^/]+"
+    r"|/info"
+    r"|/services.*"
+    r"|/discovery.*"
+    r"|/auth"
+    r")$"
+)
+
+# Policy role add-on API access
+ADDONS_ROLE_ACCESS = {
+    ROLE_DEFAULT: re.compile(
+        r"^(?:"
+        r"|/[^/]+/info"
+        r"|/addons"
+        r")$"
+    ),
+    ROLE_HOMEASSISTANT: re.compile(
+        r"^(?:"
+        r"|/homeassistant/.+"
+        r")$"
+    ),
+    ROLE_BACKUP: re.compile(
+        r"^(?:"
+        r"|/snapshots.*"
+        r")$"
+    ),
+    ROLE_MANAGER: re.compile(
+        r"^(?:"
+        r"|/homeassistant/.+"
+        r"|/host/.+"
+        r"|/hardware/.+"
+        r"|/hassos/.+"
+        r"|/supervisor/.+"
+        r"|/addons(?:/[^/]+/(?!security).+)?"
+        r"|/snapshots.*"
+        r")$"
+    ),
+    ROLE_ADMIN: re.compile(
+        r".*"
+    ),
+}


-class APISecurity(object):
-    """Handle rest api for security functions."""
+class SecurityMiddleware(CoreSysAttributes):
+    """Security middleware functions."""

-    def __init__(self, config, loop):
-        """Initialize security rest api part."""
-        self.config = config
-        self.loop = loop
+    def __init__(self, coresys):
+        """Initialize security middleware."""
+        self.coresys = coresys

-    def _check_password(self, body):
-        """Check if password is valid and security is initialize."""
-        if not self.config.security_initialize:
-            raise RuntimeError("First set a password")
+    @middleware
+    async def token_validation(self, request, handler):
+        """Check security access of this layer."""
+        request_from = None
+        hassio_token = request.headers.get(HEADER_TOKEN)

-        password = hash_password(body[ATTR_PASSWORD])
-        if password != self.config.security_password:
-            raise RuntimeError("Wrong password")
+        # Blacklist
+        if BLACKLIST.match(request.path):
+            _LOGGER.warning("%s is blacklisted!", request.path)
+            raise HTTPForbidden()

-    @api_process
-    async def info(self, request):
-        """Return host information."""
-        return {
-            ATTR_INITIALIZE: self.config.security_initialize,
-            ATTR_TOTP: self.config.security_totp is not None,
-        }
+        # Ignore security check
+        if NO_SECURITY_CHECK.match(request.path):
+            _LOGGER.debug("Passthrough %s", request.path)
+            return await handler(request)

-    @api_process
-    async def options(self, request):
-        """Set options / password."""
-        body = await api_validate(SCHEMA_PASSWORD, request)
+        # Not token
+        if not hassio_token:
+            _LOGGER.warning("No API token provided for %s", request.path)
+            raise HTTPUnauthorized()

-        if self.config.security_initialize:
-            raise RuntimeError("Password is already set!")
+        # Home-Assistant
+        # UUID check need removed with 131
+        if hassio_token in (self.sys_homeassistant.uuid,
+                            self.sys_homeassistant.hassio_token):
+            _LOGGER.debug("%s access from Home Assistant", request.path)
+            request_from = self.sys_homeassistant

-        self.config.security_password = hash_password(body[ATTR_PASSWORD])
-        self.config.security_initialize = True
-        return True
+        # Host
+        if hassio_token == self.sys_machine_id:
+            _LOGGER.debug("%s access from Host", request.path)
+            request_from = self.sys_host

-    @api_process
-    async def totp(self, request):
-        """Set and initialze TOTP."""
-        body = await api_validate(SCHEMA_PASSWORD, request)
-        self._check_password(body)
+        # Add-on
+        addon = None
+        if hassio_token and not request_from:
+            addon = self.sys_addons.from_token(hassio_token)

-        # generate TOTP
-        totp_init_key = pyotp.random_base32()
-        totp = pyotp.TOTP(totp_init_key)
+        # Check Add-on API access
+        if addon and ADDONS_API_BYPASS.match(request.path):
+            _LOGGER.debug("Passthrough %s from %s", request.path, addon.slug)
+            request_from = addon
+        elif addon and addon.access_hassio_api:
+            # Check Role
+            if ADDONS_ROLE_ACCESS[addon.hassio_role].match(request.path):
+                _LOGGER.info("%s access from %s", request.path, addon.slug)
+                request_from = addon
+            else:
+                _LOGGER.warning("%s no role for %s", request.path, addon.slug)

-        # init qrcode
-        buff = io.BytesIO()
+        if request_from:
+            request[REQUEST_FROM] = request_from
+            return await handler(request)

-        qrcode = pyqrcode.create(totp.provisioning_uri("Hass.IO"))
-        qrcode.svg(buff)
-
-        # finish
-        self.config.security_totp = totp_init_key
-        return web.Response(body=buff.getvalue(), content_type='image/svg+xml')
-
-    @api_process
-    async def session(self, request):
-        """Set and initialze session."""
-        body = await api_validate(SCHEMA_SESSION, request)
-        self._check_password(body)
-
-        # check TOTP
-        if self.config.security_totp:
-            totp = pyotp.TOTP(self.config.security_totp)
-            if body[ATTR_TOTP] != totp.now():
-                raise RuntimeError("Invalid TOTP token!")
-
-        # create session
-        valid_until = datetime.now() + timedelta(days=1)
-        session = hashlib.sha256(os.urandom(54)).hexdigest()
-
-        # store session
-        self.config.add_security_session(session, valid_until)
-        return {ATTR_SESSION: session}
+        _LOGGER.error("Invalid token for access %s", request.path)
+        raise HTTPForbidden()
--- a/hassio/api/services.py
+++ b/hassio/api/services.py
@@ -0,0 +1,75 @@
+"""Init file for Hass.io network RESTful API."""
+
+from .utils import api_process, api_validate
+from ..const import (
+    ATTR_AVAILABLE, ATTR_PROVIDERS, ATTR_SLUG, ATTR_SERVICES, REQUEST_FROM,
+    PROVIDE_SERVICE)
+from ..coresys import CoreSysAttributes
+from ..exceptions import APIError, APIForbidden
+
+
+class APIServices(CoreSysAttributes):
+    """Handle RESTful API for services functions."""
+
+    def _extract_service(self, request):
+        """Return service, throw an exception if it doesn't exist."""
+        service = self.sys_services.get(request.match_info.get('service'))
+        if not service:
+            raise APIError("Service does not exist")
+
+        return service
+
+    @api_process
+    async def list(self, request):
+        """Show register services."""
+        services = []
+        for service in self.sys_services.list_services:
+            services.append({
+                ATTR_SLUG: service.slug,
+                ATTR_AVAILABLE: service.enabled,
+                ATTR_PROVIDERS: service.providers,
+            })
+
+        return {ATTR_SERVICES: services}
+
+    @api_process
+    async def set_service(self, request):
+        """Write data into a service."""
+        service = self._extract_service(request)
+        body = await api_validate(service.schema, request)
+        addon = request[REQUEST_FROM]
+
+        _check_access(request, service.slug)
+        service.set_service_data(addon, body)
+
+    @api_process
+    async def get_service(self, request):
+        """Read data into a service."""
+        service = self._extract_service(request)
+
+        # Access
+        _check_access(request, service.slug)
+
+        if not service.enabled:
+            raise APIError("Service not enabled")
+        return service.get_service_data()
+
+    @api_process
+    async def del_service(self, request):
+        """Delete data into a service."""
+        service = self._extract_service(request)
+        addon = request[REQUEST_FROM]
+
+        # Access
+        _check_access(request, service.slug, True)
+        service.del_service_data(addon)
+
+
+def _check_access(request, service, provide=False):
+    """Raise error if the rights are wrong."""
+    addon = request[REQUEST_FROM]
+    if not addon.services_role.get(service):
+        raise APIForbidden(f"No access to {service} service!")
+
+    if provide and addon.services_role.get(service) != PROVIDE_SERVICE:
+        raise APIForbidden(f"No access to write {service} service!")
--- a/hassio/api/snapshots.py
+++ b/hassio/api/snapshots.py
@@ -1,61 +1,72 @@
-"""Init file for HassIO snapshot rest api."""
+"""Init file for Hass.io snapshot RESTful API."""
 import asyncio
 import logging
+from pathlib import Path
+from tempfile import TemporaryDirectory

+from aiohttp import web
 import voluptuous as vol

-from .util import api_process, api_validate
+from .utils import api_process, api_validate
 from ..snapshots.validate import ALL_FOLDERS
 from ..const import (
    ATTR_NAME, ATTR_SLUG, ATTR_DATE, ATTR_ADDONS, ATTR_REPOSITORIES,
    ATTR_HOMEASSISTANT, ATTR_VERSION, ATTR_SIZE, ATTR_FOLDERS, ATTR_TYPE,
-    ATTR_DEVICES, ATTR_SNAPSHOTS)
+    ATTR_SNAPSHOTS, ATTR_PASSWORD, ATTR_PROTECTED, CONTENT_TYPE_TAR)
+from ..coresys import CoreSysAttributes
+from ..exceptions import APIError

 _LOGGER = logging.getLogger(__name__)


 # pylint: disable=no-value-for-parameter
 SCHEMA_RESTORE_PARTIAL = vol.Schema({
+    vol.Optional(ATTR_PASSWORD): vol.Any(None, vol.Coerce(str)),
    vol.Optional(ATTR_HOMEASSISTANT): vol.Boolean(),
-    vol.Optional(ATTR_ADDONS): [vol.Coerce(str)],
-    vol.Optional(ATTR_FOLDERS): [vol.In(ALL_FOLDERS)],
+    vol.Optional(ATTR_ADDONS):
+        vol.All([vol.Coerce(str)], vol.Unique()),
+    vol.Optional(ATTR_FOLDERS):
+        vol.All([vol.In(ALL_FOLDERS)], vol.Unique()),
+})
+
+SCHEMA_RESTORE_FULL = vol.Schema({
+    vol.Optional(ATTR_PASSWORD): vol.Any(None, vol.Coerce(str)),
 })

 SCHEMA_SNAPSHOT_FULL = vol.Schema({
    vol.Optional(ATTR_NAME): vol.Coerce(str),
+    vol.Optional(ATTR_PASSWORD): vol.Any(None, vol.Coerce(str)),
 })

 SCHEMA_SNAPSHOT_PARTIAL = SCHEMA_SNAPSHOT_FULL.extend({
-    vol.Optional(ATTR_ADDONS): [vol.Coerce(str)],
-    vol.Optional(ATTR_FOLDERS): [vol.In(ALL_FOLDERS)],
+    vol.Optional(ATTR_ADDONS):
+        vol.All([vol.Coerce(str)], vol.Unique()),
+    vol.Optional(ATTR_FOLDERS):
+        vol.All([vol.In(ALL_FOLDERS)], vol.Unique()),
 })


-class APISnapshots(object):
-    """Handle rest api for snapshot functions."""
-
-    def __init__(self, config, loop, snapshots):
-        """Initialize network rest api part."""
-        self.config = config
-        self.loop = loop
-        self.snapshots = snapshots
+class APISnapshots(CoreSysAttributes):
+    """Handle RESTful API for snapshot functions."""

    def _extract_snapshot(self, request):
-        """Return addon and if not exists trow a exception."""
-        snapshot = self.snapshots.get(request.match_info.get('snapshot'))
+        """Return snapshot, throw an exception if it doesn't exist."""
+        snapshot = self.sys_snapshots.get(request.match_info.get('snapshot'))
        if not snapshot:
-            raise RuntimeError("Snapshot not exists")
+            raise APIError("Snapshot does not exist")
        return snapshot

    @api_process
    async def list(self, request):
        """Return snapshot list."""
        data_snapshots = []
-        for snapshot in self.snapshots.list_snapshots:
+        for snapshot in self.sys_snapshots.list_snapshots:
            data_snapshots.append({
                ATTR_SLUG: snapshot.slug,
                ATTR_NAME: snapshot.name,
                ATTR_DATE: snapshot.date,
+                ATTR_TYPE: snapshot.sys_type,
+                ATTR_PROTECTED: snapshot.protected,
            })

        return {
@@ -65,7 +76,7 @@ class APISnapshots(object):
    @api_process
    async def reload(self, request):
        """Reload snapshot list."""
-        await asyncio.shield(self.snapshots.reload(), loop=self.loop)
+        await asyncio.shield(self.sys_snapshots.reload())
        return True

    @api_process
@@ -79,6 +90,7 @@ class APISnapshots(object):
                ATTR_SLUG: addon_data[ATTR_SLUG],
                ATTR_NAME: addon_data[ATTR_NAME],
                ATTR_VERSION: addon_data[ATTR_VERSION],
+                ATTR_SIZE: addon_data[ATTR_SIZE],
            })

        return {
@@ -87,10 +99,8 @@ class APISnapshots(object):
            ATTR_NAME: snapshot.name,
            ATTR_DATE: snapshot.date,
            ATTR_SIZE: snapshot.size,
-            ATTR_HOMEASSISTANT: {
-                ATTR_VERSION: snapshot.homeassistant_version,
-                ATTR_DEVICES: snapshot.homeassistant_devices,
-            },
+            ATTR_PROTECTED: snapshot.protected,
+            ATTR_HOMEASSISTANT: snapshot.homeassistant_version,
            ATTR_ADDONS: data_addons,
            ATTR_REPOSITORIES: snapshot.repositories,
            ATTR_FOLDERS: snapshot.folders,
@@ -100,36 +110,78 @@ class APISnapshots(object):
    async def snapshot_full(self, request):
        """Full-Snapshot a snapshot."""
        body = await api_validate(SCHEMA_SNAPSHOT_FULL, request)
-        return await asyncio.shield(
-            self.snapshots.do_snapshot_full(**body), loop=self.loop)
+        snapshot = await asyncio.shield(
+            self.sys_snapshots.do_snapshot_full(**body))
+
+        if snapshot:
+            return {ATTR_SLUG: snapshot.slug}
+        return False

    @api_process
    async def snapshot_partial(self, request):
        """Partial-Snapshot a snapshot."""
        body = await api_validate(SCHEMA_SNAPSHOT_PARTIAL, request)
-        return await asyncio.shield(
-            self.snapshots.do_snapshot_partial(**body), loop=self.loop)
+        snapshot = await asyncio.shield(
+            self.sys_snapshots.do_snapshot_partial(**body))
+
+        if snapshot:
+            return {ATTR_SLUG: snapshot.slug}
+        return False

    @api_process
-    def restore_full(self, request):
+    async def restore_full(self, request):
        """Full-Restore a snapshot."""
        snapshot = self._extract_snapshot(request)
-        return asyncio.shield(
-            self.snapshots.do_restore_full(snapshot), loop=self.loop)
+        body = await api_validate(SCHEMA_RESTORE_FULL, request)
+
+        return await asyncio.shield(
+            self.sys_snapshots.do_restore_full(snapshot, **body))

    @api_process
    async def restore_partial(self, request):
        """Partial-Restore a snapshot."""
        snapshot = self._extract_snapshot(request)
-        body = await api_validate(SCHEMA_SNAPSHOT_PARTIAL, request)
+        body = await api_validate(SCHEMA_RESTORE_PARTIAL, request)

        return await asyncio.shield(
-            self.snapshots.do_restore_partial(snapshot, **body),
-            loop=self.loop
-        )
+            self.sys_snapshots.do_restore_partial(snapshot, **body))

    @api_process
    async def remove(self, request):
        """Remove a snapshot."""
        snapshot = self._extract_snapshot(request)
-        return self.snapshots.remove(snapshot)
+        return self.sys_snapshots.remove(snapshot)
+
+    async def download(self, request):
+        """Download a snapshot file."""
+        snapshot = self._extract_snapshot(request)
+
+        _LOGGER.info("Download snapshot %s", snapshot.slug)
+        response = web.FileResponse(snapshot.tarfile)
+        response.content_type = CONTENT_TYPE_TAR
+        return response
+
+    @api_process
+    async def upload(self, request):
+        """Upload a snapshot file."""
+        with TemporaryDirectory(dir=str(self.sys_config.path_tmp)) as temp_dir:
+            tar_file = Path(temp_dir, f"snapshot.tar")
+
+            try:
+                with tar_file.open('wb') as snapshot:
+                    async for data in request.content.iter_any():
+                        snapshot.write(data)
+
+            except OSError as err:
+                _LOGGER.error("Can't write new snapshot file: %s", err)
+                return False
+
+            except asyncio.CancelledError:
+                return False
+
+            snapshot = await asyncio.shield(
+                self.sys_snapshots.import_snapshot(tar_file))
+
+            if snapshot:
+                return {ATTR_SLUG: snapshot.slug}
+            return False
--- a/hassio/api/supervisor.py
+++ b/hassio/api/supervisor.py
@@ -1,24 +1,29 @@
-"""Init file for HassIO supervisor rest api."""
+"""Init file for Hass.io Supervisor RESTful API."""
 import asyncio
 import logging

 import voluptuous as vol

-from .util import api_process, api_process_raw, api_validate
+from .utils import api_process, api_process_raw, api_validate
 from ..const import (
-    ATTR_ADDONS, ATTR_VERSION, ATTR_LAST_VERSION, ATTR_BETA_CHANNEL, ATTR_ARCH,
+    ATTR_ADDONS, ATTR_VERSION, ATTR_LAST_VERSION, ATTR_CHANNEL, ATTR_ARCH,
    HASSIO_VERSION, ATTR_ADDONS_REPOSITORIES, ATTR_LOGO, ATTR_REPOSITORY,
    ATTR_DESCRIPTON, ATTR_NAME, ATTR_SLUG, ATTR_INSTALLED, ATTR_TIMEZONE,
-    ATTR_STATE, CONTENT_TYPE_BINARY)
-from ..validate import validate_timezone
+    ATTR_STATE, ATTR_WAIT_BOOT, ATTR_CPU_PERCENT, ATTR_MEMORY_USAGE,
+    ATTR_MEMORY_LIMIT, ATTR_NETWORK_RX, ATTR_NETWORK_TX, ATTR_BLK_READ,
+    ATTR_BLK_WRITE, CONTENT_TYPE_BINARY, ATTR_ICON)
+from ..coresys import CoreSysAttributes
+from ..validate import WAIT_BOOT, REPOSITORIES, CHANNELS
+from ..exceptions import APIError
+from ..utils.validate import validate_timezone

 _LOGGER = logging.getLogger(__name__)

 SCHEMA_OPTIONS = vol.Schema({
-    # pylint: disable=no-value-for-parameter
-    vol.Optional(ATTR_BETA_CHANNEL): vol.Boolean(),
-    vol.Optional(ATTR_ADDONS_REPOSITORIES): [vol.Url()],
+    vol.Optional(ATTR_CHANNEL): CHANNELS,
+    vol.Optional(ATTR_ADDONS_REPOSITORIES): REPOSITORIES,
    vol.Optional(ATTR_TIMEZONE): validate_timezone,
+    vol.Optional(ATTR_WAIT_BOOT): WAIT_BOOT,
 })

 SCHEMA_VERSION = vol.Schema({
@@ -26,30 +31,19 @@ SCHEMA_VERSION = vol.Schema({
 })


-class APISupervisor(object):
-    """Handle rest api for supervisor functions."""
-
-    def __init__(self, config, loop, supervisor, snapshots, addons,
-                 host_control, updater):
-        """Initialize supervisor rest api part."""
-        self.config = config
-        self.loop = loop
-        self.supervisor = supervisor
-        self.addons = addons
-        self.snapshots = snapshots
-        self.host_control = host_control
-        self.updater = updater
+class APISupervisor(CoreSysAttributes):
+    """Handle RESTful API for Supervisor functions."""

    @api_process
    async def ping(self, request):
-        """Return ok for signal that the api is ready."""
+        """Return ok for signal that the API is ready."""
        return True

    @api_process
    async def info(self, request):
        """Return host information."""
        list_addons = []
-        for addon in self.addons.list_addons:
+        for addon in self.sys_addons.list_addons:
            if addon.is_installed:
                list_addons.append({
                    ATTR_NAME: addon.name,
@@ -59,67 +53,88 @@ class APISupervisor(object):
                    ATTR_VERSION: addon.last_version,
                    ATTR_INSTALLED: addon.version_installed,
                    ATTR_REPOSITORY: addon.repository,
+                    ATTR_ICON: addon.with_icon,
                    ATTR_LOGO: addon.with_logo,
                })

        return {
            ATTR_VERSION: HASSIO_VERSION,
-            ATTR_LAST_VERSION: self.updater.version_hassio,
-            ATTR_BETA_CHANNEL: self.updater.beta_channel,
-            ATTR_ARCH: self.config.arch,
-            ATTR_TIMEZONE: self.config.timezone,
+            ATTR_LAST_VERSION: self.sys_updater.version_hassio,
+            ATTR_CHANNEL: self.sys_updater.channel,
+            ATTR_ARCH: self.sys_arch,
+            ATTR_WAIT_BOOT: self.sys_config.wait_boot,
+            ATTR_TIMEZONE: self.sys_config.timezone,
            ATTR_ADDONS: list_addons,
-            ATTR_ADDONS_REPOSITORIES: self.config.addons_repositories,
+            ATTR_ADDONS_REPOSITORIES: self.sys_config.addons_repositories,
        }

    @api_process
    async def options(self, request):
-        """Set supervisor options."""
+        """Set Supervisor options."""
        body = await api_validate(SCHEMA_OPTIONS, request)

-        if ATTR_BETA_CHANNEL in body:
-            self.updater.beta_channel = body[ATTR_BETA_CHANNEL]
+        if ATTR_CHANNEL in body:
+            self.sys_updater.channel = body[ATTR_CHANNEL]

        if ATTR_TIMEZONE in body:
-            self.config.timezone = body[ATTR_TIMEZONE]
+            self.sys_config.timezone = body[ATTR_TIMEZONE]
+
+        if ATTR_WAIT_BOOT in body:
+            self.sys_config.wait_boot = body[ATTR_WAIT_BOOT]

        if ATTR_ADDONS_REPOSITORIES in body:
            new = set(body[ATTR_ADDONS_REPOSITORIES])
-            await asyncio.shield(self.addons.load_repositories(new))
+            await asyncio.shield(self.sys_addons.load_repositories(new))

+        self.sys_updater.save_data()
+        self.sys_config.save_data()
        return True

    @api_process
-    async def update(self, request):
-        """Update supervisor OS."""
-        body = await api_validate(SCHEMA_VERSION, request)
-        version = body.get(ATTR_VERSION, self.updater.version_hassio)
+    async def stats(self, request):
+        """Return resource information."""
+        stats = await self.sys_supervisor.stats()
+        if not stats:
+            raise APIError("No stats available")

-        if version == self.supervisor.version:
-            raise RuntimeError("Version {} is already in use".format(version))
+        return {
+            ATTR_CPU_PERCENT: stats.cpu_percent,
+            ATTR_MEMORY_USAGE: stats.memory_usage,
+            ATTR_MEMORY_LIMIT: stats.memory_limit,
+            ATTR_NETWORK_RX: stats.network_rx,
+            ATTR_NETWORK_TX: stats.network_tx,
+            ATTR_BLK_READ: stats.blk_read,
+            ATTR_BLK_WRITE: stats.blk_write,
+        }
+
+    @api_process
+    async def update(self, request):
+        """Update Supervisor OS."""
+        body = await api_validate(SCHEMA_VERSION, request)
+        version = body.get(ATTR_VERSION, self.sys_updater.version_hassio)
+
+        if version == self.sys_supervisor.version:
+            raise APIError("Version {} is already in use".format(version))

        return await asyncio.shield(
-            self.supervisor.update(version), loop=self.loop)
+            self.sys_supervisor.update(version))

    @api_process
    async def reload(self, request):
-        """Reload addons, config ect."""
+        """Reload add-ons, configuration, etc."""
        tasks = [
-            self.addons.reload(),
-            self.snapshots.reload(),
-            self.updater.fetch_data(),
-            self.host_control.load()
+            self.sys_updater.reload(),
        ]
        results, _ = await asyncio.shield(
-            asyncio.wait(tasks, loop=self.loop), loop=self.loop)
+            asyncio.wait(tasks))

        for result in results:
            if result.exception() is not None:
-                raise RuntimeError("Some reload task fails!")
+                raise APIError("Some reload task fails!")

        return True

    @api_process_raw(CONTENT_TYPE_BINARY)
    def logs(self, request):
-        """Return supervisor docker logs."""
-        return self.supervisor.logs()
+        """Return supervisor Docker logs."""
+        return self.sys_supervisor.logs()
--- a/hassio/api/utils.py
+++ b/hassio/api/utils.py
@@ -1,71 +1,51 @@
-"""Init file for HassIO util for rest api."""
+"""Init file for Hass.io util for RESTful API."""
 import json
-import hashlib
 import logging

 from aiohttp import web
-from aiohttp.web_exceptions import HTTPServiceUnavailable
 import voluptuous as vol
 from voluptuous.humanize import humanize_error

 from ..const import (
    JSON_RESULT, JSON_DATA, JSON_MESSAGE, RESULT_OK, RESULT_ERROR,
    CONTENT_TYPE_BINARY)
+from ..exceptions import HassioError, APIError, APIForbidden

 _LOGGER = logging.getLogger(__name__)


 def json_loads(data):
    """Extract json from string with support for '' and None."""
+    if not data:
+        return {}
    try:
        return json.loads(data)
    except json.JSONDecodeError:
-        return {}
+        raise APIError("Invalid json")


 def api_process(method):
    """Wrap function with true/false calls to rest api."""
    async def wrap_api(api, *args, **kwargs):
-        """Return api information."""
+        """Return API information."""
        try:
            answer = await method(api, *args, **kwargs)
-        except RuntimeError as err:
+        except (APIError, APIForbidden) as err:
            return api_return_error(message=str(err))
+        except HassioError:
+            return api_return_error(message="Unknown Error, see logs")

        if isinstance(answer, dict):
            return api_return_ok(data=answer)
        if isinstance(answer, web.Response):
            return answer
-        elif answer:
-            return api_return_ok()
+        elif isinstance(answer, bool) and not answer:
            return api_return_error()
+        return api_return_ok()

    return wrap_api


-def api_process_hostcontrol(method):
-    """Wrap HostControl calls to rest api."""
-    async def wrap_hostcontrol(api, *args, **kwargs):
-        """Return host information."""
-        if not api.host_control.active:
-            raise HTTPServiceUnavailable()
-
-        try:
-            answer = await method(api, *args, **kwargs)
-        except RuntimeError as err:
-            return api_return_error(message=str(err))
-
-        if isinstance(answer, dict):
-            return api_return_ok(data=answer)
-        elif answer is None:
-            return api_return_error("Function is not supported")
-        elif answer:
-            return api_return_ok()
-        return api_return_error()
-
-    return wrap_hostcontrol
-
-
 def api_process_raw(content):
    """Wrap content_type into function."""
    def wrap_method(method):
@@ -75,9 +55,12 @@ def api_process_raw(content):
            try:
                msg_data = await method(api, *args, **kwargs)
                msg_type = content
-            except RuntimeError as err:
+            except (APIError, APIForbidden) as err:
                msg_data = str(err).encode()
                msg_type = CONTENT_TYPE_BINARY
+            except HassioError:
+                msg_data = b''
+                msg_type = CONTENT_TYPE_BINARY

            return web.Response(body=msg_data, content_type=msg_type)

@@ -86,7 +69,7 @@ def api_process_raw(content):


 def api_return_error(message=None):
-    """Return a API error message."""
+    """Return an API error message."""
    return web.json_response({
        JSON_RESULT: RESULT_ERROR,
        JSON_MESSAGE: message,
@@ -94,7 +77,7 @@ def api_return_error(message=None):


 def api_return_ok(data=None):
-    """Return a API ok answer."""
+    """Return an API ok answer."""
    return web.json_response({
        JSON_RESULT: RESULT_OK,
        JSON_DATA: data or {},
@@ -107,12 +90,6 @@ async def api_validate(schema, request):
    try:
        data = schema(data)
    except vol.Invalid as ex:
-        raise RuntimeError(humanize_error(data, ex)) from None
+        raise APIError(humanize_error(data, ex)) from None

    return data
-
-
-def hash_password(password):
-    """Hash and salt our passwords."""
-    key = ")*()*SALT_HASSIO2123{}6554547485HSKA!!*JSLAfdasda$".format(password)
-    return hashlib.sha256(key.encode()).hexdigest()
--- a/hassio/auth.py
+++ b/hassio/auth.py
@@ -0,0 +1,95 @@
+"""Manage SSO for Add-ons with Home Assistant user."""
+import logging
+import hashlib
+
+from .const import (
+    FILE_HASSIO_AUTH, ATTR_PASSWORD, ATTR_USERNAME, ATTR_ADDON)
+from .coresys import CoreSysAttributes
+from .utils.json import JsonConfig
+from .validate import SCHEMA_AUTH_CONFIG
+from .exceptions import AuthError, HomeAssistantAPIError
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class Auth(JsonConfig, CoreSysAttributes):
+    """Manage SSO for Add-ons with Home Assistant user."""
+
+    def __init__(self, coresys):
+        """Initialize updater."""
+        super().__init__(FILE_HASSIO_AUTH, SCHEMA_AUTH_CONFIG)
+        self.coresys = coresys
+
+    def _check_cache(self, username, password):
+        """Check password in cache."""
+        username_h = _rehash(username)
+        password_h = _rehash(password, username)
+
+        if self._data.get(username_h) == password_h:
+            _LOGGER.info("Cache hit for %s", username)
+            return True
+
+        _LOGGER.warning("No cache hit for %s", username)
+        return False
+
+    def _update_cache(self, username, password):
+        """Cache a username, password."""
+        username_h = _rehash(username)
+        password_h = _rehash(password, username)
+
+        if self._data.get(username_h) == password_h:
+            return
+
+        self._data[username_h] = password_h
+        self.save_data()
+
+    def _dismatch_cache(self, username, password):
+        """Remove user from cache."""
+        username_h = _rehash(username)
+        password_h = _rehash(password, username)
+
+        if self._data.get(username_h) != password_h:
+            return
+
+        self._data.pop(username_h, None)
+        self.save_data()
+
+    async def check_login(self, addon, username, password):
+        """Check username login."""
+        if password is None:
+            _LOGGER.error("None as password is not supported!")
+            raise AuthError()
+        _LOGGER.info("Auth request from %s for %s", addon.slug, username)
+
+        # Check API state
+        if not await self.sys_homeassistant.check_api_state():
+            _LOGGER.info("Home Assistant not running, check cache")
+            return self._check_cache(username, password)
+
+        try:
+            async with self.sys_homeassistant.make_request(
+                    'post', 'api/hassio_auth', json={
+                        ATTR_USERNAME: username,
+                        ATTR_PASSWORD: password,
+                        ATTR_ADDON: addon.slug,
+                    }) as req:
+
+                if req.status == 200:
+                    _LOGGER.info("Success login from %s", username)
+                    self._update_cache(username, password)
+                    return True
+
+                _LOGGER.warning("Wrong login from %s", username)
+                self._dismatch_cache(username, password)
+                return False
+        except HomeAssistantAPIError:
+            _LOGGER.error("Can't request auth on Home Assistant!")
+
+        raise AuthError()
+
+
+def _rehash(value, salt2=""):
+    """Rehash a value."""
+    for idx in range(1, 20):
+        value = hashlib.sha256(f"{value}{idx}{salt2}".encode()).hexdigest()
+    return value
--- a/hassio/bootstrap.py
+++ b/hassio/bootstrap.py
@@ -1,4 +1,4 @@
-"""Bootstrap HassIO."""
+"""Bootstrap Hass.io."""
 import logging
 import os
 import signal
@@ -7,63 +7,120 @@ from pathlib import Path

 from colorlog import ColoredFormatter

+from .core import HassIO
+from .auth import Auth
+from .addons import AddonManager
+from .api import RestAPI
 from .const import SOCKET_DOCKER
-from .config import CoreConfig
+from .coresys import CoreSys
+from .supervisor import Supervisor
+from .homeassistant import HomeAssistant
+from .snapshots import SnapshotManager
+from .tasks import Tasks
+from .updater import Updater
+from .services import ServiceManager
+from .discovery import Discovery
+from .host import HostManager
+from .dbus import DBusManager
+from .hassos import HassOS

 _LOGGER = logging.getLogger(__name__)

+ENV_SHARE = 'SUPERVISOR_SHARE'
+ENV_NAME = 'SUPERVISOR_NAME'
+ENV_REPO = 'HOMEASSISTANT_REPOSITORY'

-def initialize_system_data():
-    """Setup default config and create folders."""
-    config = CoreConfig()
+MACHINE_ID = Path('/etc/machine-id')

-    # homeassistant config folder
-    if not config.path_config.is_dir():
+
+def initialize_coresys(loop):
+    """Initialize HassIO coresys/objects."""
+    coresys = CoreSys(loop)
+
+    # Initialize core objects
+    coresys.core = HassIO(coresys)
+    coresys.auth = Auth(coresys)
+    coresys.updater = Updater(coresys)
+    coresys.api = RestAPI(coresys)
+    coresys.supervisor = Supervisor(coresys)
+    coresys.homeassistant = HomeAssistant(coresys)
+    coresys.addons = AddonManager(coresys)
+    coresys.snapshots = SnapshotManager(coresys)
+    coresys.host = HostManager(coresys)
+    coresys.tasks = Tasks(coresys)
+    coresys.services = ServiceManager(coresys)
+    coresys.discovery = Discovery(coresys)
+    coresys.dbus = DBusManager(coresys)
+    coresys.hassos = HassOS(coresys)
+
+    # bootstrap config
+    initialize_system_data(coresys)
+
+    # Set Machine/Host ID
+    if MACHINE_ID.exists():
+        coresys.machine_id = MACHINE_ID.read_text().strip()
+
+    return coresys
+
+
+def initialize_system_data(coresys):
+    """Set up the default configuration and create folders."""
+    config = coresys.config
+
+    # Home Assistant configuration folder
+    if not config.path_homeassistant.is_dir():
        _LOGGER.info(
-            "Create Home-Assistant config folder %s", config.path_config)
-        config.path_config.mkdir()
+            "Create Home Assistant configuration folder %s",
+            config.path_homeassistant)
+        config.path_homeassistant.mkdir()

    # hassio ssl folder
    if not config.path_ssl.is_dir():
-        _LOGGER.info("Create hassio ssl folder %s", config.path_ssl)
+        _LOGGER.info("Create Hass.io SSL/TLS folder %s", config.path_ssl)
        config.path_ssl.mkdir()

    # hassio addon data folder
    if not config.path_addons_data.is_dir():
        _LOGGER.info(
-            "Create hassio addon data folder %s", config.path_addons_data)
+            "Create Hass.io Add-on data folder %s", config.path_addons_data)
        config.path_addons_data.mkdir(parents=True)

    if not config.path_addons_local.is_dir():
-        _LOGGER.info("Create hassio addon local repository folder %s",
+        _LOGGER.info("Create Hass.io Add-on local repository folder %s",
                     config.path_addons_local)
        config.path_addons_local.mkdir(parents=True)

    if not config.path_addons_git.is_dir():
-        _LOGGER.info("Create hassio addon git repositories folder %s",
+        _LOGGER.info("Create Hass.io Add-on git repositories folder %s",
                     config.path_addons_git)
        config.path_addons_git.mkdir(parents=True)

    # hassio tmp folder
    if not config.path_tmp.is_dir():
-        _LOGGER.info("Create hassio temp folder %s", config.path_tmp)
+        _LOGGER.info("Create Hass.io temp folder %s", config.path_tmp)
        config.path_tmp.mkdir(parents=True)

    # hassio backup folder
    if not config.path_backup.is_dir():
-        _LOGGER.info("Create hassio backup folder %s", config.path_backup)
+        _LOGGER.info("Create Hass.io backup folder %s", config.path_backup)
        config.path_backup.mkdir()

    # share folder
    if not config.path_share.is_dir():
-        _LOGGER.info("Create hassio share folder %s", config.path_share)
+        _LOGGER.info("Create Hass.io share folder %s", config.path_share)
        config.path_share.mkdir()

+    # apparmor folder
+    if not config.path_apparmor.is_dir():
+        _LOGGER.info("Create Hass.io Apparmor folder %s", config.path_apparmor)
+        config.path_apparmor.mkdir()
+
    return config


-def migrate_system_env(config):
+def migrate_system_env(coresys):
    """Cleanup some stuff after update."""
+    config = coresys.config

    # hass.io 0.37 -> 0.38
    old_build = Path(config.path_hassio, "addons/build")
@@ -71,7 +128,7 @@ def migrate_system_env(config):
        try:
            old_build.rmdir()
        except OSError:
-            _LOGGER.warning("Can't cleanup old addons build dir.")
+            _LOGGER.warning("Can't cleanup old Add-on build directory")


 def initialize_logging():
@@ -102,8 +159,7 @@ def initialize_logging():
 def check_environment():
    """Check if all environment are exists."""
    # check environment variables
-    for key in ('SUPERVISOR_SHARE', 'SUPERVISOR_NAME',
-                'HOMEASSISTANT_REPOSITORY'):
+    for key in (ENV_SHARE, ENV_NAME, ENV_REPO):
        try:
            os.environ[key]
        except KeyError:
@@ -112,19 +168,24 @@ def check_environment():

    # check docker socket
    if not SOCKET_DOCKER.is_socket():
-        _LOGGER.fatal("Can't find docker socket!")
+        _LOGGER.fatal("Can't find Docker socket!")
        return False

    # check socat exec
    if not shutil.which('socat'):
-        _LOGGER.fatal("Can0t find socat program!")
+        _LOGGER.fatal("Can't find socat!")
+        return False
+
+    # check socat exec
+    if not shutil.which('gdbus'):
+        _LOGGER.fatal("Can't find gdbus!")
        return False

    return True


 def reg_signal(loop):
-    """Register SIGTERM, SIGKILL to stop system."""
+    """Register SIGTERM and SIGKILL to stop system."""
    try:
        loop.add_signal_handler(
            signal.SIGTERM, lambda: loop.call_soon(loop.stop))
--- a/hassio/config.py
+++ b/hassio/config.py
@@ -1,19 +1,22 @@
-"""Bootstrap HassIO."""
+"""Bootstrap Hass.io."""
 from datetime import datetime
 import logging
 import os
+import re
 from pathlib import Path, PurePath

+import pytz
+
 from .const import (
-    FILE_HASSIO_CONFIG, HASSIO_DATA, ATTR_SECURITY, ATTR_SESSIONS,
-    ATTR_PASSWORD, ATTR_TOTP, ATTR_TIMEZONE, ATTR_ADDONS_CUSTOM_LIST,
-    ATTR_AUDIO_INPUT, ATTR_AUDIO_OUTPUT, ATTR_LAST_BOOT)
-from .tools import JsonConfig, parse_datetime
+    FILE_HASSIO_CONFIG, HASSIO_DATA, ATTR_TIMEZONE, ATTR_ADDONS_CUSTOM_LIST,
+    ATTR_LAST_BOOT, ATTR_WAIT_BOOT)
+from .utils.dt import parse_datetime
+from .utils.json import JsonConfig
 from .validate import SCHEMA_HASSIO_CONFIG

 _LOGGER = logging.getLogger(__name__)

-HOMEASSISTANT_CONFIG = PurePath("homeassistant")
+HOMEASSISTANT_CONFIG = PurePath('homeassistant')

 HASSIO_SSL = PurePath("ssl")

@@ -25,9 +28,12 @@ ADDONS_DATA = PurePath("addons/data")
 BACKUP_DATA = PurePath("backup")
 SHARE_DATA = PurePath("share")
 TMP_DATA = PurePath("tmp")
+APPARMOR_DATA = PurePath("apparmor")

 DEFAULT_BOOT_TIME = datetime.utcfromtimestamp(0).isoformat()

+RE_TIMEZONE = re.compile(r"time_zone: (?P<timezone>[\w/\-+]+)")
+

 class CoreConfig(JsonConfig):
    """Hold all core config data."""
@@ -35,18 +41,40 @@ class CoreConfig(JsonConfig):
    def __init__(self):
        """Initialize config object."""
        super().__init__(FILE_HASSIO_CONFIG, SCHEMA_HASSIO_CONFIG)
-        self.arch = None

    @property
    def timezone(self):
        """Return system timezone."""
+        config_file = Path(self.path_homeassistant, 'configuration.yaml')
+        try:
+            assert config_file.exists()
+            configuration = config_file.read_text()
+
+            data = RE_TIMEZONE.search(configuration)
+            assert data
+
+            timezone = data.group('timezone')
+            pytz.timezone(timezone)
+        except (pytz.exceptions.UnknownTimeZoneError, OSError, AssertionError):
+            _LOGGER.debug("Can't parse Home Assistant timezone")
            return self._data[ATTR_TIMEZONE]

+        return timezone
+
    @timezone.setter
    def timezone(self, value):
        """Set system timezone."""
        self._data[ATTR_TIMEZONE] = value
-        self.save()
+
+    @property
+    def wait_boot(self):
+        """Return wait time for auto boot stages."""
+        return self._data[ATTR_WAIT_BOOT]
+
+    @wait_boot.setter
+    def wait_boot(self, value):
+        """Set wait boot time."""
+        self._data[ATTR_WAIT_BOOT] = value

    @property
    def last_boot(self):
@@ -62,31 +90,30 @@ class CoreConfig(JsonConfig):
    def last_boot(self, value):
        """Set last boot datetime."""
        self._data[ATTR_LAST_BOOT] = value.isoformat()
-        self.save()

    @property
    def path_hassio(self):
-        """Return hassio data path."""
+        """Return Hass.io data path."""
        return HASSIO_DATA

    @property
    def path_extern_hassio(self):
-        """Return hassio data path extern for docker."""
+        """Return Hass.io data path external for Docker."""
        return PurePath(os.environ['SUPERVISOR_SHARE'])

    @property
-    def path_extern_config(self):
-        """Return config path extern for docker."""
+    def path_extern_homeassistant(self):
+        """Return config path external for Docker."""
        return str(PurePath(self.path_extern_hassio, HOMEASSISTANT_CONFIG))

    @property
-    def path_config(self):
+    def path_homeassistant(self):
        """Return config path inside supervisor."""
        return Path(HASSIO_DATA, HOMEASSISTANT_CONFIG)

    @property
    def path_extern_ssl(self):
-        """Return SSL path extern for docker."""
+        """Return SSL path external for Docker."""
        return str(PurePath(self.path_extern_hassio, HASSIO_SSL))

    @property
@@ -96,39 +123,44 @@ class CoreConfig(JsonConfig):

    @property
    def path_addons_core(self):
-        """Return git path for core addons."""
+        """Return git path for core Add-ons."""
        return Path(HASSIO_DATA, ADDONS_CORE)

    @property
    def path_addons_git(self):
-        """Return path for git addons."""
+        """Return path for Git Add-on."""
        return Path(HASSIO_DATA, ADDONS_GIT)

    @property
    def path_addons_local(self):
-        """Return path for customs addons."""
+        """Return path for custom Add-ons."""
        return Path(HASSIO_DATA, ADDONS_LOCAL)

    @property
    def path_extern_addons_local(self):
-        """Return path for customs addons."""
+        """Return path for custom Add-ons."""
        return PurePath(self.path_extern_hassio, ADDONS_LOCAL)

    @property
    def path_addons_data(self):
-        """Return root addon data folder."""
+        """Return root Add-on data folder."""
        return Path(HASSIO_DATA, ADDONS_DATA)

    @property
    def path_extern_addons_data(self):
-        """Return root addon data folder extern for docker."""
+        """Return root add-on data folder external for Docker."""
        return PurePath(self.path_extern_hassio, ADDONS_DATA)

    @property
    def path_tmp(self):
-        """Return hass.io temp folder."""
+        """Return Hass.io temp folder."""
        return Path(HASSIO_DATA, TMP_DATA)

+    @property
+    def path_extern_tmp(self):
+        """Return Hass.io temp folder for Docker."""
+        return PurePath(self.path_extern_hassio, TMP_DATA)
+
    @property
    def path_backup(self):
        """Return root backup data folder."""
@@ -136,7 +168,7 @@ class CoreConfig(JsonConfig):

    @property
    def path_extern_backup(self):
-        """Return root backup data folder extern for docker."""
+        """Return root backup data folder external for Docker."""
        return PurePath(self.path_extern_hassio, BACKUP_DATA)

    @property
@@ -144,14 +176,19 @@ class CoreConfig(JsonConfig):
        """Return root share data folder."""
        return Path(HASSIO_DATA, SHARE_DATA)

+    @property
+    def path_apparmor(self):
+        """Return root Apparmor profile folder."""
+        return Path(HASSIO_DATA, APPARMOR_DATA)
+
    @property
    def path_extern_share(self):
-        """Return root share data folder extern for docker."""
+        """Return root share data folder external for Docker."""
        return PurePath(self.path_extern_hassio, SHARE_DATA)

    @property
    def addons_repositories(self):
-        """Return list of addons custom repositories."""
+        """Return list of custom Add-on repositories."""
        return self._data[ATTR_ADDONS_CUSTOM_LIST]

    def add_addon_repository(self, repo):
@@ -160,7 +197,6 @@ class CoreConfig(JsonConfig):
            return

        self._data[ATTR_ADDONS_CUSTOM_LIST].append(repo)
-        self.save()

    def drop_addon_repository(self, repo):
        """Remove a custom repository from list."""
@@ -168,79 +204,3 @@ class CoreConfig(JsonConfig):
            return

        self._data[ATTR_ADDONS_CUSTOM_LIST].remove(repo)
-        self.save()
-
-    @property
-    def security_initialize(self):
-        """Return is security was initialize."""
-        return self._data[ATTR_SECURITY]
-
-    @security_initialize.setter
-    def security_initialize(self, value):
-        """Set is security initialize."""
-        self._data[ATTR_SECURITY] = value
-        self.save()
-
-    @property
-    def security_totp(self):
-        """Return the TOTP key."""
-        return self._data.get(ATTR_TOTP)
-
-    @security_totp.setter
-    def security_totp(self, value):
-        """Set the TOTP key."""
-        self._data[ATTR_TOTP] = value
-        self.save()
-
-    @property
-    def security_password(self):
-        """Return the password key."""
-        return self._data.get(ATTR_PASSWORD)
-
-    @security_password.setter
-    def security_password(self, value):
-        """Set the password key."""
-        self._data[ATTR_PASSWORD] = value
-        self.save()
-
-    @property
-    def security_sessions(self):
-        """Return api sessions."""
-        return {
-            session: parse_datetime(until) for
-            session, until in self._data[ATTR_SESSIONS].items()
-        }
-
-    def add_security_session(self, session, valid):
-        """Set the a new session."""
-        self._data[ATTR_SESSIONS].update(
-            {session: valid.isoformat()}
-        )
-        self.save()
-
-    def drop_security_session(self, session):
-        """Delete the a session."""
-        self._data[ATTR_SESSIONS].pop(session, None)
-        self.save()
-
-    @property
-    def audio_output(self):
-        """Return ALSA audio output card,dev."""
-        return self._data.get(ATTR_AUDIO_OUTPUT)
-
-    @audio_output.setter
-    def audio_output(self, value):
-        """Set ALSA audio output card,dev."""
-        self._data[ATTR_AUDIO_OUTPUT] = value
-        self.save()
-
-    @property
-    def audio_input(self):
-        """Return ALSA audio input card,dev."""
-        return self._data.get(ATTR_AUDIO_INPUT)
-
-    @audio_input.setter
-    def audio_input(self, value):
-        """Set ALSA audio input card,dev."""
-        self._data[ATTR_AUDIO_INPUT] = value
-        self.save()
--- a/hassio/const.py
+++ b/hassio/const.py
@@ -1,32 +1,30 @@
-"""Const file for HassIO."""
+"""Constants file for Hass.io."""
 from pathlib import Path
 from ipaddress import ip_network

-HASSIO_VERSION = '0.73'
+HASSIO_VERSION = '141'

-URL_HASSIO_VERSION = ('https://raw.githubusercontent.com/home-assistant/'
-                      'hassio/{}/version.json')
+URL_HASSIO_ADDONS = "https://github.com/home-assistant/hassio-addons"
+URL_HASSIO_VERSION = \
+    "https://s3.amazonaws.com/hassio-version/{channel}.json"
+URL_HASSIO_APPARMOR = \
+    "https://s3.amazonaws.com/hassio-version/apparmor.txt"

-URL_HASSIO_ADDONS = 'https://github.com/home-assistant/hassio-addons'
+URL_HASSOS_OTA = (
+    "https://github.com/home-assistant/hassos/releases/download/"
+    "{version}/hassos_{board}-{version}.raucb")

 HASSIO_DATA = Path("/data")

-RUN_UPDATE_INFO_TASKS = 28800
-RUN_UPDATE_SUPERVISOR_TASKS = 29100
-RUN_UPDATE_ADDONS_TASKS = 57600
-RUN_RELOAD_ADDONS_TASKS = 28800
-RUN_RELOAD_SNAPSHOTS_TASKS = 72000
-RUN_WATCHDOG_HOMEASSISTANT_DOCKER = 15
-RUN_WATCHDOG_HOMEASSISTANT_API = 300
-RUN_CLEANUP_API_SESSIONS = 900
-
+FILE_HASSIO_AUTH = Path(HASSIO_DATA, "auth.json")
 FILE_HASSIO_ADDONS = Path(HASSIO_DATA, "addons.json")
 FILE_HASSIO_CONFIG = Path(HASSIO_DATA, "config.json")
 FILE_HASSIO_HOMEASSISTANT = Path(HASSIO_DATA, "homeassistant.json")
 FILE_HASSIO_UPDATER = Path(HASSIO_DATA, "updater.json")
+FILE_HASSIO_SERVICES = Path(HASSIO_DATA, "services.json")
+FILE_HASSIO_DISCOVERY = Path(HASSIO_DATA, "discovery.json")

 SOCKET_DOCKER = Path("/var/run/docker.sock")
-SOCKET_HC = Path("/var/run/hassio-hc.sock")

 DOCKER_NETWORK = 'hassio'
 DOCKER_NETWORK_MASK = ip_network('172.30.32.0/23')
@@ -35,6 +33,7 @@ DOCKER_NETWORK_RANGE = ip_network('172.30.33.0/24')
 LABEL_VERSION = 'io.hass.version'
 LABEL_ARCH = 'io.hass.arch'
 LABEL_TYPE = 'io.hass.type'
+LABEL_MACHINE = 'io.hass.machine'

 META_ADDON = 'addon'
 META_SUPERVISOR = 'supervisor'
@@ -50,23 +49,41 @@ RESULT_OK = 'ok'
 CONTENT_TYPE_BINARY = 'application/octet-stream'
 CONTENT_TYPE_PNG = 'image/png'
 CONTENT_TYPE_JSON = 'application/json'
+CONTENT_TYPE_TEXT = 'text/plain'
+CONTENT_TYPE_TAR = 'application/tar'
+CONTENT_TYPE_URL = 'application/x-www-form-urlencoded'
 HEADER_HA_ACCESS = 'x-ha-access'
+HEADER_TOKEN = 'x-hassio-key'

+ENV_TOKEN = 'HASSIO_TOKEN'
+ENV_TIME = 'TZ'
+
+REQUEST_FROM = 'HASSIO_FROM'
+
+ATTR_MACHINE = 'machine'
+ATTR_WAIT_BOOT = 'wait_boot'
+ATTR_DEPLOYMENT = 'deployment'
 ATTR_WATCHDOG = 'watchdog'
+ATTR_CHANGELOG = 'changelog'
 ATTR_DATE = 'date'
 ATTR_ARCH = 'arch'
+ATTR_LONG_DESCRIPTION = 'long_description'
 ATTR_HOSTNAME = 'hostname'
 ATTR_TIMEZONE = 'timezone'
 ATTR_ARGS = 'args'
-ATTR_OS = 'os'
+ATTR_OPERATING_SYSTEM = 'operating_system'
+ATTR_CHASSIS = 'chassis'
 ATTR_TYPE = 'type'
 ATTR_SOURCE = 'source'
 ATTR_FEATURES = 'features'
 ATTR_ADDONS = 'addons'
+ATTR_PROVIDERS = 'providers'
 ATTR_VERSION = 'version'
+ATTR_VERSION_LATEST = 'version_latest'
+ATTR_AUTO_UART = 'auto_uart'
 ATTR_LAST_BOOT = 'last_boot'
 ATTR_LAST_VERSION = 'last_version'
-ATTR_BETA_CHANNEL = 'beta_channel'
+ATTR_CHANNEL = 'channel'
 ATTR_NAME = 'name'
 ATTR_SLUG = 'slug'
 ATTR_DESCRIPTON = 'description'
@@ -83,6 +100,7 @@ ATTR_DETACHED = 'detached'
 ATTR_STATE = 'state'
 ATTR_SCHEMA = 'schema'
 ATTR_IMAGE = 'image'
+ATTR_ICON = 'icon'
 ATTR_LOGO = 'logo'
 ATTR_STDIN = 'stdin'
 ATTR_ADDONS_REPOSITORIES = 'addons_repositories'
@@ -93,13 +111,14 @@ ATTR_MAINTAINER = 'maintainer'
 ATTR_PASSWORD = 'password'
 ATTR_TOTP = 'totp'
 ATTR_INITIALIZE = 'initialize'
-ATTR_SESSION = 'session'
-ATTR_SESSIONS = 'sessions'
 ATTR_LOCATON = 'location'
 ATTR_BUILD = 'build'
 ATTR_DEVICES = 'devices'
 ATTR_ENVIRONMENT = 'environment'
 ATTR_HOST_NETWORK = 'host_network'
+ATTR_HOST_PID = 'host_pid'
+ATTR_HOST_IPC = 'host_ipc'
+ATTR_HOST_DBUS = 'host_dbus'
 ATTR_NETWORK = 'network'
 ATTR_TMPFS = 'tmpfs'
 ATTR_PRIVILEGED = 'privileged'
@@ -110,6 +129,7 @@ ATTR_HOMEASSISTANT = 'homeassistant'
 ATTR_HASSIO = 'hassio'
 ATTR_HASSIO_API = 'hassio_api'
 ATTR_HOMEASSISTANT_API = 'homeassistant_api'
+ATTR_UUID = 'uuid'
 ATTR_FOLDERS = 'folders'
 ATTR_SIZE = 'size'
 ATTR_TYPE = 'type'
@@ -127,8 +147,51 @@ ATTR_SECURITY = 'security'
 ATTR_BUILD_FROM = 'build_from'
 ATTR_SQUASH = 'squash'
 ATTR_GPIO = 'gpio'
-ATTR_LEGACY = 'ATTR_LEGACY'
+ATTR_LEGACY = 'legacy'
 ATTR_ADDONS_CUSTOM_LIST = 'addons_custom_list'
+ATTR_CPU_PERCENT = 'cpu_percent'
+ATTR_NETWORK_RX = 'network_rx'
+ATTR_NETWORK_TX = 'network_tx'
+ATTR_MEMORY_LIMIT = 'memory_limit'
+ATTR_MEMORY_USAGE = 'memory_usage'
+ATTR_BLK_READ = 'blk_read'
+ATTR_BLK_WRITE = 'blk_write'
+ATTR_ADDON = 'addon'
+ATTR_AVAILABLE = 'available'
+ATTR_HOST = 'host'
+ATTR_USERNAME = 'username'
+ATTR_PROTOCOL = 'protocol'
+ATTR_DISCOVERY = 'discovery'
+ATTR_CONFIG = 'config'
+ATTR_SERVICES = 'services'
+ATTR_SERVICE = 'service'
+ATTR_DISCOVERY = 'discovery'
+ATTR_PROTECTED = 'protected'
+ATTR_CRYPTO = 'crypto'
+ATTR_BRANCH = 'branch'
+ATTR_KERNEL = 'kernel'
+ATTR_APPARMOR = 'apparmor'
+ATTR_DEVICETREE = 'devicetree'
+ATTR_CPE = 'cpe'
+ATTR_BOARD = 'board'
+ATTR_HASSOS = 'hassos'
+ATTR_HASSOS_CLI = 'hassos_cli'
+ATTR_VERSION_CLI = 'version_cli'
+ATTR_VERSION_CLI_LATEST = 'version_cli_latest'
+ATTR_REFRESH_TOKEN = 'refresh_token'
+ATTR_ACCESS_TOKEN = 'access_token'
+ATTR_DOCKER_API = 'docker_api'
+ATTR_FULL_ACCESS = 'full_access'
+ATTR_PROTECTED = 'protected'
+ATTR_RATING = 'rating'
+ATTR_HASSIO_ROLE = 'hassio_role'
+ATTR_SUPERVISOR = 'supervisor'
+ATTR_AUTH_API = 'auth_api'
+
+SERVICE_MQTT = 'mqtt'
+PROVIDE_SERVICE = 'provide'
+NEED_SERVICE = 'need'
+WANT_SERVICE = 'want'

 STARTUP_INITIALIZE = 'initialize'
 STARTUP_SYSTEM = 'system'
@@ -154,6 +217,10 @@ ARCH_AARCH64 = 'aarch64'
 ARCH_AMD64 = 'amd64'
 ARCH_I386 = 'i386'

+CHANNEL_STABLE = 'stable'
+CHANNEL_BETA = 'beta'
+CHANNEL_DEV = 'dev'
+
 REPOSITORY_CORE = 'core'
 REPOSITORY_LOCAL = 'local'

@@ -164,3 +231,34 @@ FOLDER_SSL = 'ssl'

 SNAPSHOT_FULL = 'full'
 SNAPSHOT_PARTIAL = 'partial'
+
+CRYPTO_AES128 = 'aes128'
+
+SECURITY_PROFILE = 'profile'
+SECURITY_DEFAULT = 'default'
+SECURITY_DISABLE = 'disable'
+
+PRIVILEGED_NET_ADMIN = 'NET_ADMIN'
+PRIVILEGED_SYS_ADMIN = 'SYS_ADMIN'
+PRIVILEGED_SYS_RAWIO = 'SYS_RAWIO'
+PRIVILEGED_IPC_LOCK = 'IPC_LOCK'
+PRIVILEGED_SYS_TIME = 'SYS_TIME'
+PRIVILEGED_SYS_NICE = 'SYS_NICE'
+PRIVILEGED_SYS_RESOURCE = 'SYS_RESOURCE'
+PRIVILEGED_SYS_PTRACE = 'SYS_PTRACE'
+PRIVILEGED_DAC_READ_SEARCH = 'DAC_READ_SEARCH'
+
+FEATURES_SHUTDOWN = 'shutdown'
+FEATURES_REBOOT = 'reboot'
+FEATURES_HASSOS = 'hassos'
+FEATURES_HOSTNAME = 'hostname'
+FEATURES_SERVICES = 'services'
+
+ROLE_DEFAULT = 'default'
+ROLE_HOMEASSISTANT = 'homeassistant'
+ROLE_BACKUP = 'backup'
+ROLE_MANAGER = 'manager'
+ROLE_ADMIN = 'admin'
+
+CHAN_ID = 'chan_id'
+CHAN_TYPE = 'chan_type'
--- a/hassio/core.py
+++ b/hassio/core.py
@@ -1,190 +1,143 @@
-"""Main file for HassIO."""
+"""Main file for Hass.io."""
+from contextlib import suppress
 import asyncio
 import logging

-import aiohttp
+import async_timeout

-from .addons import AddonManager
-from .api import RestAPI
-from .host_control import HostControl
+from .coresys import CoreSysAttributes
 from .const import (
-    RUN_UPDATE_INFO_TASKS, RUN_RELOAD_ADDONS_TASKS,
-    RUN_UPDATE_SUPERVISOR_TASKS, RUN_WATCHDOG_HOMEASSISTANT_DOCKER,
-    RUN_CLEANUP_API_SESSIONS, STARTUP_SYSTEM, STARTUP_SERVICES,
-    STARTUP_APPLICATION, STARTUP_INITIALIZE, RUN_RELOAD_SNAPSHOTS_TASKS,
-    RUN_UPDATE_ADDONS_TASKS)
-from .hardware import Hardware
-from .homeassistant import HomeAssistant
-from .scheduler import Scheduler
-from .dock import DockerAPI
-from .dock.supervisor import DockerSupervisor
-from .dns import DNSForward
-from .snapshots import SnapshotsManager
-from .updater import Updater
-from .tasks import (
-    hassio_update, homeassistant_watchdog_docker, api_sessions_cleanup,
-    addons_update)
-from .tools import fetch_timezone
+    STARTUP_SYSTEM, STARTUP_SERVICES, STARTUP_APPLICATION, STARTUP_INITIALIZE)
+from .exceptions import HassioError, HomeAssistantError

 _LOGGER = logging.getLogger(__name__)


-class HassIO(object):
-    """Main object of hassio."""
+class HassIO(CoreSysAttributes):
+    """Main object of Hass.io."""

-    def __init__(self, loop, config):
-        """Initialize hassio object."""
-        self.exit_code = 0
-        self.loop = loop
-        self.config = config
-        self.websession = aiohttp.ClientSession(loop=loop)
-        self.updater = Updater(config, loop, self.websession)
-        self.scheduler = Scheduler(loop)
-        self.api = RestAPI(config, loop)
-        self.hardware = Hardware()
-        self.docker = DockerAPI()
-        self.dns = DNSForward()
-
-        # init basic docker container
-        self.supervisor = DockerSupervisor(
-            config, loop, self.docker, self.stop)
-
-        # init homeassistant
-        self.homeassistant = HomeAssistant(
-            config, loop, self.docker, self.updater)
-
-        # init HostControl
-        self.host_control = HostControl(loop)
-
-        # init addon system
-        self.addons = AddonManager(config, loop, self.docker)
-
-        # init snapshot system
-        self.snapshots = SnapshotsManager(
-            config, loop, self.scheduler, self.addons, self.homeassistant)
+    def __init__(self, coresys):
+        """Initialize Hass.io object."""
+        self.coresys = coresys

    async def setup(self):
        """Setup HassIO orchestration."""
-        # supervisor
-        if not await self.supervisor.attach():
-            _LOGGER.fatal("Can't setup supervisor docker container!")
-        await self.supervisor.cleanup()
+        # Load Supervisor
+        await self.sys_supervisor.load()

-        # set running arch
-        self.config.arch = self.supervisor.arch
+        # Load DBus
+        await self.sys_dbus.load()

-        # update timezone
-        if self.config.timezone == 'UTC':
-            self.config.timezone = await fetch_timezone(self.websession)
+        # Load Host
+        await self.sys_host.load()

-        # hostcontrol
-        await self.host_control.load()
+        # Load HassOS
+        await self.sys_hassos.load()

-        # schedule update info tasks
-        self.scheduler.register_task(
-            self.host_control.load, RUN_UPDATE_INFO_TASKS)
+        # Load Home Assistant
+        await self.sys_homeassistant.load()
+
+        # Load Add-ons
+        await self.sys_addons.load()

        # rest api views
-        self.api.register_host(self.host_control, self.hardware)
-        self.api.register_network(self.host_control)
-        self.api.register_supervisor(
-            self.supervisor, self.snapshots, self.addons, self.host_control,
-            self.updater)
-        self.api.register_homeassistant(self.homeassistant)
-        self.api.register_addons(self.addons)
-        self.api.register_security()
-        self.api.register_snapshots(self.snapshots)
-        self.api.register_panel()
+        await self.sys_api.load()

-        # schedule api session cleanup
-        self.scheduler.register_task(
-            api_sessions_cleanup(self.config), RUN_CLEANUP_API_SESSIONS,
-            now=True)
+        # load last available data
+        await self.sys_updater.load()

-        # Load homeassistant
-        await self.homeassistant.prepare()
+        # load last available data
+        await self.sys_snapshots.load()

-        # Load addons
-        await self.addons.prepare()
+        # load services
+        await self.sys_services.load()

-        # schedule addon update task
-        self.scheduler.register_task(
-            self.addons.reload, RUN_RELOAD_ADDONS_TASKS, now=True)
-        self.scheduler.register_task(
-            addons_update(self.loop, self.addons), RUN_UPDATE_ADDONS_TASKS)
-
-        # schedule self update task
-        self.scheduler.register_task(
-            hassio_update(self.supervisor, self.updater),
-            RUN_UPDATE_SUPERVISOR_TASKS)
-
-        # schedule snapshot update tasks
-        self.scheduler.register_task(
-            self.snapshots.reload, RUN_RELOAD_SNAPSHOTS_TASKS, now=True)
+        # Load discovery
+        await self.sys_discovery.load()

        # start dns forwarding
-        self.loop.create_task(self.dns.start())
-
-        # start addon mark as initialize
-        await self.addons.auto_boot(STARTUP_INITIALIZE)
+        self.sys_create_task(self.sys_dns.start())

    async def start(self):
-        """Start HassIO orchestration."""
+        """Start Hass.io orchestration."""
        # on release channel, try update itself
-        # on beta channel, only read new versions
-        await asyncio.wait(
-            [hassio_update(self.supervisor, self.updater)()],
-            loop=self.loop
-        )
+        # on dev mode, only read new versions
+        if not self.sys_dev and self.sys_supervisor.need_update:
+            if await self.sys_supervisor.update():
+                return
+        else:
+            _LOGGER.info("Ignore Hass.io auto updates on dev channel")

        # start api
-        await self.api.start()
-        _LOGGER.info("Start hassio api on %s", self.docker.network.supervisor)
+        await self.sys_api.start()
+
+        # start addon mark as initialize
+        await self.sys_addons.boot(STARTUP_INITIALIZE)

        try:
            # HomeAssistant is already running / supervisor have only reboot
-            if self.hardware.last_boot == self.config.last_boot:
-                _LOGGER.info("HassIO reboot detected")
+            if self.sys_hardware.last_boot == self.sys_config.last_boot:
+                _LOGGER.info("Hass.io reboot detected")
                return

+            # reset register services / discovery
+            self.sys_services.reset()
+
            # start addon mark as system
-            await self.addons.auto_boot(STARTUP_SYSTEM)
+            await self.sys_addons.boot(STARTUP_SYSTEM)

            # start addon mark as services
-            await self.addons.auto_boot(STARTUP_SERVICES)
+            await self.sys_addons.boot(STARTUP_SERVICES)

            # run HomeAssistant
-            if self.homeassistant.boot:
-                await self.homeassistant.run()
+            if self.sys_homeassistant.boot:
+                with suppress(HomeAssistantError):
+                    await self.sys_homeassistant.start()

            # start addon mark as application
-            await self.addons.auto_boot(STARTUP_APPLICATION)
+            await self.sys_addons.boot(STARTUP_APPLICATION)

            # store new last boot
-            self.config.last_boot = self.hardware.last_boot
+            self.sys_config.last_boot = self.sys_hardware.last_boot
+            self.sys_config.save_data()

        finally:
-            # schedule homeassistant watchdog
-            self.scheduler.register_task(
-                homeassistant_watchdog_docker(self.loop, self.homeassistant),
-                RUN_WATCHDOG_HOMEASSISTANT_DOCKER)
-
-            # self.scheduler.register_task(
-            #    homeassistant_watchdog_api(self.loop, self.homeassistant),
-            #    RUN_WATCHDOG_HOMEASSISTANT_API)
+            # Add core tasks into scheduler
+            await self.sys_tasks.load()

            # If landingpage / run upgrade in background
-            if self.homeassistant.version == 'landingpage':
-                self.loop.create_task(self.homeassistant.install())
+            if self.sys_homeassistant.version == 'landingpage':
+                self.sys_create_task(self.sys_homeassistant.install())
+
+            _LOGGER.info("Hass.io is up and running")

    async def stop(self):
        """Stop a running orchestration."""
        # don't process scheduler anymore
-        self.scheduler.suspend = True
-
-        # process stop tasks
-        self.websession.close()
-        self.homeassistant.websession.close()
+        self.sys_scheduler.suspend = True

        # process async stop tasks
-        await asyncio.wait([self.api.stop(), self.dns.stop()], loop=self.loop)
+        try:
+            with async_timeout.timeout(10):
+                await asyncio.wait([
+                    self.sys_api.stop(),
+                    self.sys_dns.stop(),
+                    self.sys_websession.close(),
+                    self.sys_websession_ssl.close()
+                ])
+        except asyncio.TimeoutError:
+            _LOGGER.warning("Force Shutdown!")
+
+        _LOGGER.info("Hass.io is down")
+
+    async def shutdown(self):
+        """Shutdown all running containers in correct order."""
+        await self.sys_addons.shutdown(STARTUP_APPLICATION)
+
+        # Close Home Assistant
+        with suppress(HassioError):
+            await self.sys_homeassistant.stop()
+
+        await self.sys_addons.shutdown(STARTUP_SERVICES)
+        await self.sys_addons.shutdown(STARTUP_SYSTEM)
+        await self.sys_addons.shutdown(STARTUP_INITIALIZE)
--- a/hassio/coresys.py
+++ b/hassio/coresys.py
@@ -0,0 +1,300 @@
+"""Handle core shared data."""
+import aiohttp
+
+from .const import CHANNEL_DEV
+from .config import CoreConfig
+from .docker import DockerAPI
+from .misc.dns import DNSForward
+from .misc.hardware import Hardware
+from .misc.scheduler import Scheduler
+
+
+class CoreSys:
+    """Class that handle all shared data."""
+
+    def __init__(self, loop):
+        """Initialize coresys."""
+        # Static attributes
+        self.exit_code = 0
+        self.machine_id = None
+
+        # External objects
+        self._loop = loop
+        self._websession = aiohttp.ClientSession(loop=loop)
+        self._websession_ssl = aiohttp.ClientSession(
+            connector=aiohttp.TCPConnector(verify_ssl=False), loop=loop)
+
+        # Global objects
+        self._config = CoreConfig()
+        self._hardware = Hardware()
+        self._docker = DockerAPI()
+        self._scheduler = Scheduler(loop=loop)
+        self._dns = DNSForward(loop=loop)
+
+        # Internal objects pointers
+        self._core = None
+        self._auth = None
+        self._homeassistant = None
+        self._supervisor = None
+        self._addons = None
+        self._api = None
+        self._updater = None
+        self._snapshots = None
+        self._tasks = None
+        self._host = None
+        self._dbus = None
+        self._hassos = None
+        self._services = None
+        self._discovery = None
+
+    @property
+    def arch(self):
+        """Return running arch of the Hass.io system."""
+        if self._supervisor:
+            return self._supervisor.arch
+        return None
+
+    @property
+    def machine(self):
+        """Return running machine type of the Hass.io system."""
+        if self._homeassistant:
+            return self._homeassistant.machine
+        return None
+
+    @property
+    def dev(self):
+        """Return True if we run dev mode."""
+        return self._updater.channel == CHANNEL_DEV
+
+    @property
+    def timezone(self):
+        """Return timezone."""
+        return self._config.timezone
+
+    @property
+    def loop(self):
+        """Return loop object."""
+        return self._loop
+
+    @property
+    def websession(self):
+        """Return websession object."""
+        return self._websession
+
+    @property
+    def websession_ssl(self):
+        """Return websession object with disabled SSL."""
+        return self._websession_ssl
+
+    @property
+    def config(self):
+        """Return CoreConfig object."""
+        return self._config
+
+    @property
+    def hardware(self):
+        """Return Hardware object."""
+        return self._hardware
+
+    @property
+    def docker(self):
+        """Return DockerAPI object."""
+        return self._docker
+
+    @property
+    def scheduler(self):
+        """Return Scheduler object."""
+        return self._scheduler
+
+    @property
+    def dns(self):
+        """Return DNSForward object."""
+        return self._dns
+
+    @property
+    def core(self):
+        """Return HassIO object."""
+        return self._core
+
+    @core.setter
+    def core(self, value):
+        """Set a Hass.io object."""
+        if self._core:
+            raise RuntimeError("Hass.io already set!")
+        self._core = value
+
+    @property
+    def auth(self):
+        """Return Auth object."""
+        return self._auth
+
+    @auth.setter
+    def auth(self, value):
+        """Set a Auth object."""
+        if self._auth:
+            raise RuntimeError("Auth already set!")
+        self._auth = value
+
+    @property
+    def homeassistant(self):
+        """Return Home Assistant object."""
+        return self._homeassistant
+
+    @homeassistant.setter
+    def homeassistant(self, value):
+        """Set a HomeAssistant object."""
+        if self._homeassistant:
+            raise RuntimeError("Home Assistant already set!")
+        self._homeassistant = value
+
+    @property
+    def supervisor(self):
+        """Return Supervisor object."""
+        return self._supervisor
+
+    @supervisor.setter
+    def supervisor(self, value):
+        """Set a Supervisor object."""
+        if self._supervisor:
+            raise RuntimeError("Supervisor already set!")
+        self._supervisor = value
+
+    @property
+    def api(self):
+        """Return API object."""
+        return self._api
+
+    @api.setter
+    def api(self, value):
+        """Set an API object."""
+        if self._api:
+            raise RuntimeError("API already set!")
+        self._api = value
+
+    @property
+    def updater(self):
+        """Return Updater object."""
+        return self._updater
+
+    @updater.setter
+    def updater(self, value):
+        """Set a Updater object."""
+        if self._updater:
+            raise RuntimeError("Updater already set!")
+        self._updater = value
+
+    @property
+    def addons(self):
+        """Return AddonManager object."""
+        return self._addons
+
+    @addons.setter
+    def addons(self, value):
+        """Set a AddonManager object."""
+        if self._addons:
+            raise RuntimeError("AddonManager already set!")
+        self._addons = value
+
+    @property
+    def snapshots(self):
+        """Return SnapshotManager object."""
+        return self._snapshots
+
+    @snapshots.setter
+    def snapshots(self, value):
+        """Set a SnapshotManager object."""
+        if self._snapshots:
+            raise RuntimeError("SnapshotsManager already set!")
+        self._snapshots = value
+
+    @property
+    def tasks(self):
+        """Return Tasks object."""
+        return self._tasks
+
+    @tasks.setter
+    def tasks(self, value):
+        """Set a Tasks object."""
+        if self._tasks:
+            raise RuntimeError("Tasks already set!")
+        self._tasks = value
+
+    @property
+    def services(self):
+        """Return ServiceManager object."""
+        return self._services
+
+    @services.setter
+    def services(self, value):
+        """Set a ServiceManager object."""
+        if self._services:
+            raise RuntimeError("Services already set!")
+        self._services = value
+
+    @property
+    def discovery(self):
+        """Return ServiceManager object."""
+        return self._discovery
+
+    @discovery.setter
+    def discovery(self, value):
+        """Set a Discovery object."""
+        if self._discovery:
+            raise RuntimeError("Discovery already set!")
+        self._discovery = value
+
+    @property
+    def dbus(self):
+        """Return DBusManager object."""
+        return self._dbus
+
+    @dbus.setter
+    def dbus(self, value):
+        """Set a DBusManager object."""
+        if self._dbus:
+            raise RuntimeError("DBusManager already set!")
+        self._dbus = value
+
+    @property
+    def host(self):
+        """Return HostManager object."""
+        return self._host
+
+    @host.setter
+    def host(self, value):
+        """Set a HostManager object."""
+        if self._host:
+            raise RuntimeError("HostManager already set!")
+        self._host = value
+
+    @property
+    def hassos(self):
+        """Return HassOS object."""
+        return self._hassos
+
+    @hassos.setter
+    def hassos(self, value):
+        """Set a HassOS object."""
+        if self._hassos:
+            raise RuntimeError("HassOS already set!")
+        self._hassos = value
+
+    def run_in_executor(self, funct, *args):
+        """Wrapper for executor pool."""
+        return self._loop.run_in_executor(None, funct, *args)
+
+    def create_task(self, coroutine):
+        """Wrapper for async task."""
+        return self._loop.create_task(coroutine)
+
+
+class CoreSysAttributes:
+    """Inheret basic CoreSysAttributes."""
+
+    coresys = None
+
+    def __getattr__(self, name):
+        """Mapping to coresys."""
+        if name.startswith("sys_") and hasattr(self.coresys, name[4:]):
+            return getattr(self.coresys, name[4:])
+        raise AttributeError(f"Can't resolve {name} on {self}")
--- a/hassio/dbus/init.py
+++ b/hassio/dbus/init.py
@@ -0,0 +1,39 @@
+"""D-Bus interface objects."""
+
+from .systemd import Systemd
+from .hostname import Hostname
+from .rauc import Rauc
+from ..coresys import CoreSysAttributes
+
+
+class DBusManager(CoreSysAttributes):
+    """A DBus Interface handler."""
+
+    def __init__(self, coresys):
+        """Initialize D-Bus interface."""
+        self.coresys = coresys
+
+        self._systemd = Systemd()
+        self._hostname = Hostname()
+        self._rauc = Rauc()
+
+    @property
+    def systemd(self):
+        """Return the systemd interface."""
+        return self._systemd
+
+    @property
+    def hostname(self):
+        """Return the hostname interface."""
+        return self._hostname
+
+    @property
+    def rauc(self):
+        """Return the rauc interface."""
+        return self._rauc
+
+    async def load(self):
+        """Connect interfaces to D-Bus."""
+        await self.systemd.connect()
+        await self.hostname.connect()
+        await self.rauc.connect()
--- a/hassio/dbus/hostname.py
+++ b/hassio/dbus/hostname.py
@@ -0,0 +1,39 @@
+"""D-Bus interface for hostname."""
+import logging
+
+from .interface import DBusInterface
+from .utils import dbus_connected
+from ..exceptions import DBusError
+from ..utils.gdbus import DBus
+
+_LOGGER = logging.getLogger(__name__)
+
+DBUS_NAME = 'org.freedesktop.hostname1'
+DBUS_OBJECT = '/org/freedesktop/hostname1'
+
+
+class Hostname(DBusInterface):
+    """Handle D-Bus interface for hostname/system."""
+
+    async def connect(self):
+        """Connect to system's D-Bus."""
+        try:
+            self.dbus = await DBus.connect(DBUS_NAME, DBUS_OBJECT)
+        except DBusError:
+            _LOGGER.warning("Can't connect to hostname")
+
+    @dbus_connected
+    def set_static_hostname(self, hostname):
+        """Change local hostname.
+
+        Return a coroutine.
+        """
+        return self.dbus.SetStaticHostname(hostname, False)
+
+    @dbus_connected
+    def get_properties(self):
+        """Return local host informations.
+
+        Return a coroutine.
+        """
+        return self.dbus.get_properties(DBUS_NAME)
--- a/hassio/dbus/interface.py
+++ b/hassio/dbus/interface.py
@@ -0,0 +1,18 @@
+"""Interface class for D-Bus wrappers."""
+
+
+class DBusInterface:
+    """Handle D-Bus interface for hostname/system."""
+
+    def __init__(self):
+        """Initialize systemd."""
+        self.dbus = None
+
+    @property
+    def is_connected(self):
+        """Return True, if they is connected to D-Bus."""
+        return self.dbus is not None
+
+    async def connect(self):
+        """Connect to D-Bus."""
+        raise NotImplementedError()
--- a/hassio/dbus/rauc.py
+++ b/hassio/dbus/rauc.py
@@ -0,0 +1,55 @@
+"""D-Bus interface for rauc."""
+import logging
+
+from .interface import DBusInterface
+from .utils import dbus_connected
+from ..exceptions import DBusError
+from ..utils.gdbus import DBus
+
+_LOGGER = logging.getLogger(__name__)
+
+DBUS_NAME = 'de.pengutronix.rauc'
+DBUS_OBJECT = '/'
+
+
+class Rauc(DBusInterface):
+    """Handle D-Bus interface for rauc."""
+
+    async def connect(self):
+        """Connect to D-Bus."""
+        try:
+            self.dbus = await DBus.connect(DBUS_NAME, DBUS_OBJECT)
+        except DBusError:
+            _LOGGER.warning("Can't connect to rauc")
+
+    @dbus_connected
+    def install(self, raucb_file):
+        """Install rauc bundle file.
+
+        Return a coroutine.
+        """
+        return self.dbus.Installer.Install(raucb_file)
+
+    @dbus_connected
+    def get_slot_status(self):
+        """Get slot status.
+
+        Return a coroutine.
+        """
+        return self.dbus.Installer.GetSlotStatus()
+
+    @dbus_connected
+    def get_properties(self):
+        """Return rauc informations.
+
+        Return a coroutine.
+        """
+        return self.dbus.get_properties(f"{DBUS_NAME}.Installer")
+
+    @dbus_connected
+    def signal_completed(self):
+        """Return a signal wrapper for completed signal.
+
+        Return a coroutine.
+        """
+        return self.dbus.wait_signal(f"{DBUS_NAME}.Installer.Completed")
--- a/hassio/dbus/systemd.py
+++ b/hassio/dbus/systemd.py
@@ -0,0 +1,79 @@
+"""Interface to Systemd over D-Bus."""
+import logging
+
+from .interface import DBusInterface
+from .utils import dbus_connected
+from ..exceptions import DBusError
+from ..utils.gdbus import DBus
+
+_LOGGER = logging.getLogger(__name__)
+
+DBUS_NAME = 'org.freedesktop.systemd1'
+DBUS_OBJECT = '/org/freedesktop/systemd1'
+
+
+class Systemd(DBusInterface):
+    """Systemd function handler."""
+
+    async def connect(self):
+        """Connect to D-Bus."""
+        try:
+            self.dbus = await DBus.connect(DBUS_NAME, DBUS_OBJECT)
+        except DBusError:
+            _LOGGER.warning("Can't connect to systemd")
+
+    @dbus_connected
+    def reboot(self):
+        """Reboot host computer.
+
+        Return a coroutine.
+        """
+        return self.dbus.Manager.Reboot()
+
+    @dbus_connected
+    def power_off(self):
+        """Power off host computer.
+
+        Return a coroutine.
+        """
+        return self.dbus.Manager.PowerOff()
+
+    @dbus_connected
+    def start_unit(self, unit, mode):
+        """Start a systemd service unit.
+
+        Return a coroutine.
+        """
+        return self.dbus.Manager.StartUnit(unit, mode)
+
+    @dbus_connected
+    def stop_unit(self, unit, mode):
+        """Stop a systemd service unit.
+
+        Return a coroutine.
+        """
+        return self.dbus.Manager.StopUnit(unit, mode)
+
+    @dbus_connected
+    def reload_unit(self, unit, mode):
+        """Reload a systemd service unit.
+
+        Return a coroutine.
+        """
+        return self.dbus.Manager.ReloadOrRestartUnit(unit, mode)
+
+    @dbus_connected
+    def restart_unit(self, unit, mode):
+        """Restart a systemd service unit.
+
+        Return a coroutine.
+        """
+        return self.dbus.Manager.RestartUnit(unit, mode)
+
+    @dbus_connected
+    def list_units(self):
+        """Return a list of available systemd services.
+
+        Return a coroutine.
+        """
+        return self.dbus.Manager.ListUnits()
--- a/hassio/dbus/utils.py
+++ b/hassio/dbus/utils.py
@@ -0,0 +1,14 @@
+"""Utils for D-Bus."""
+
+from ..exceptions import DBusNotConnectedError
+
+
+def dbus_connected(method):
+    """Wrapper for check if D-Bus is connected."""
+    def wrap_dbus(api, *args, **kwargs):
+        """Check if D-Bus is connected before call a method."""
+        if api.dbus is None:
+            raise DBusNotConnectedError()
+        return method(api, *args, **kwargs)
+
+    return wrap_dbus
--- a/hassio/discovery.py
+++ b/hassio/discovery.py
@@ -0,0 +1,122 @@
+"""Handle discover message for Home Assistant."""
+import logging
+from contextlib import suppress
+from uuid import uuid4
+
+import attr
+import voluptuous as vol
+from voluptuous.humanize import humanize_error
+
+from .const import FILE_HASSIO_DISCOVERY, ATTR_CONFIG, ATTR_DISCOVERY
+from .coresys import CoreSysAttributes
+from .exceptions import DiscoveryError, HomeAssistantAPIError
+from .validate import SCHEMA_DISCOVERY_CONFIG
+from .utils.json import JsonConfig
+from .services.validate import DISCOVERY_SERVICES
+
+_LOGGER = logging.getLogger(__name__)
+
+CMD_NEW = 'post'
+CMD_DEL = 'delete'
+
+
+class Discovery(CoreSysAttributes, JsonConfig):
+    """Home Assistant Discovery handler."""
+
+    def __init__(self, coresys):
+        """Initialize discovery handler."""
+        super().__init__(FILE_HASSIO_DISCOVERY, SCHEMA_DISCOVERY_CONFIG)
+        self.coresys = coresys
+        self.message_obj = {}
+
+    async def load(self):
+        """Load exists discovery message into storage."""
+        messages = {}
+        for message in self._data[ATTR_DISCOVERY]:
+            discovery = Message(**message)
+            messages[discovery.uuid] = discovery
+
+        _LOGGER.info("Load %d messages", len(messages))
+        self.message_obj = messages
+
+    def save(self):
+        """Write discovery message into data file."""
+        messages = []
+        for message in self.list_messages:
+            messages.append(attr.asdict(message))
+
+        self._data[ATTR_DISCOVERY].clear()
+        self._data[ATTR_DISCOVERY].extend(messages)
+        self.save_data()
+
+    def get(self, uuid):
+        """Return discovery message."""
+        return self.message_obj.get(uuid)
+
+    @property
+    def list_messages(self):
+        """Return list of available discovery messages."""
+        return list(self.message_obj.values())
+
+    def send(self, addon, service, config):
+        """Send a discovery message to Home Assistant."""
+        try:
+            config = DISCOVERY_SERVICES[service](config)
+        except vol.Invalid as err:
+            _LOGGER.error(
+                "Invalid discovery %s config", humanize_error(config, err))
+            raise DiscoveryError() from None
+
+        # Create message
+        message = Message(addon.slug, service, config)
+
+        # Already exists?
+        for old_message in self.list_messages:
+            if old_message != message:
+                continue
+            _LOGGER.info("Duplicate discovery message from %s", addon.slug)
+            return old_message
+
+        _LOGGER.info("Send discovery to Home Assistant %s from %s",
+                     service, addon.slug)
+        self.message_obj[message.uuid] = message
+        self.save()
+
+        self.sys_create_task(self._push_discovery(message, CMD_NEW))
+        return message
+
+    def remove(self, message):
+        """Remove a discovery message from Home Assistant."""
+        self.message_obj.pop(message.uuid, None)
+        self.save()
+
+        _LOGGER.info("Delete discovery to Home Assistant %s from %s",
+                     message.service, message.addon)
+        self.sys_create_task(self._push_discovery(message, CMD_DEL))
+
+    async def _push_discovery(self, message, command):
+        """Send a discovery request."""
+        if not await self.sys_homeassistant.check_api_state():
+            _LOGGER.info("Discovery %s mesage ignore", message.uuid)
+            return
+
+        data = attr.asdict(message)
+        data.pop(ATTR_CONFIG)
+
+        with suppress(HomeAssistantAPIError):
+            async with self.sys_homeassistant.make_request(
+                    command, f"api/hassio_push/discovery/{message.uuid}",
+                    json=data, timeout=10):
+                _LOGGER.info("Discovery %s message send", message.uuid)
+                return
+
+        _LOGGER.warning("Discovery %s message fail", message.uuid)
+
+
+@attr.s
+class Message:
+    """Represent a single Discovery message."""
+    addon = attr.ib()
+    service = attr.ib()
+    config = attr.ib(cmp=False)
+    uuid = attr.ib(factory=lambda: uuid4().hex, cmp=False)
--- a/hassio/dock/addon.py
+++ b/hassio/dock/addon.py
@@ -1,330 +0,0 @@
-"""Init file for HassIO addon docker object."""
-import logging
-import os
-
-import docker
-import requests
-
-from .interface import DockerInterface
-from .util import docker_process
-from ..addons.build import AddonBuild
-from ..const import (
-    MAP_CONFIG, MAP_SSL, MAP_ADDONS, MAP_BACKUP, MAP_SHARE)
-
-_LOGGER = logging.getLogger(__name__)
-
-AUDIO_DEVICE = "/dev/snd:/dev/snd:rwm"
-
-
-class DockerAddon(DockerInterface):
-    """Docker hassio wrapper for HomeAssistant."""
-
-    def __init__(self, config, loop, api, addon):
-        """Initialize docker homeassistant wrapper."""
-        super().__init__(
-            config, loop, api, image=addon.image, timeout=addon.timeout)
-        self.addon = addon
-
-    def process_metadata(self, metadata, force=False):
-        """Use addon data instead meta data with legacy."""
-        if not self.addon.legacy:
-            return super().process_metadata(metadata, force=force)
-
-        # set meta data
-        if not self.version or force:
-            if force:  # called on install/update/build
-                self.version = self.addon.last_version
-            else:
-                self.version = self.addon.version_installed
-
-        if not self.arch:
-            self.arch = self.config.arch
-
-    @property
-    def name(self):
-        """Return name of docker container."""
-        return "addon_{}".format(self.addon.slug)
-
-    @property
-    def hostname(self):
-        """Return slug/id of addon."""
-        return self.addon.slug.replace('_', '-')
-
-    @property
-    def environment(self):
-        """Return environment for docker add-on."""
-        addon_env = self.addon.environment or {}
-        if self.addon.with_audio:
-            addon_env.update({
-                'ALSA_OUTPUT': self.addon.audio_output,
-                'ALSA_INPUT': self.addon.audio_input,
-            })
-
-        return {
-            **addon_env,
-            'TZ': self.config.timezone,
-        }
-
-    @property
-    def devices(self):
-        """Return needed devices."""
-        devices = self.addon.devices or []
-
-        # use audio devices
-        if self.addon.with_audio and AUDIO_DEVICE not in devices:
-            devices.append(AUDIO_DEVICE)
-
-        # Return None if no devices is present
-        if devices:
-            return devices
-        return None
-
-    @property
-    def ports(self):
-        """Filter None from addon ports."""
-        if not self.addon.ports:
-            return None
-
-        return {
-            container_port: host_port
-            for container_port, host_port in self.addon.ports.items()
-            if host_port
-        }
-
-    @property
-    def tmpfs(self):
-        """Return tmpfs for docker add-on."""
-        options = self.addon.tmpfs
-        if options:
-            return {"/tmpfs": "{}".format(options)}
-        return None
-
-    @property
-    def network_mapping(self):
-        """Return hosts mapping."""
-        return {
-            'homeassistant': self.docker.network.gateway,
-            'hassio': self.docker.network.supervisor,
-        }
-
-    @property
-    def network_mode(self):
-        """Return network mode for addon."""
-        if self.addon.host_network:
-            return 'host'
-        return None
-
-    @property
-    def volumes(self):
-        """Generate volumes for mappings."""
-        volumes = {
-            str(self.addon.path_extern_data): {
-                'bind': '/data', 'mode': 'rw'
-            }}
-
-        addon_mapping = self.addon.map_volumes
-
-        # setup config mappings
-        if MAP_CONFIG in addon_mapping:
-            volumes.update({
-                str(self.config.path_extern_config): {
-                    'bind': '/config', 'mode': addon_mapping[MAP_CONFIG]
-                }})
-
-        if MAP_SSL in addon_mapping:
-            volumes.update({
-                str(self.config.path_extern_ssl): {
-                    'bind': '/ssl', 'mode': addon_mapping[MAP_SSL]
-                }})
-
-        if MAP_ADDONS in addon_mapping:
-            volumes.update({
-                str(self.config.path_extern_addons_local): {
-                    'bind': '/addons', 'mode': addon_mapping[MAP_ADDONS]
-                }})
-
-        if MAP_BACKUP in addon_mapping:
-            volumes.update({
-                str(self.config.path_extern_backup): {
-                    'bind': '/backup', 'mode': addon_mapping[MAP_BACKUP]
-                }})
-
-        if MAP_SHARE in addon_mapping:
-            volumes.update({
-                str(self.config.path_extern_share): {
-                    'bind': '/share', 'mode': addon_mapping[MAP_SHARE]
-                }})
-
-        # init other hardware mappings
-        if self.addon.with_gpio:
-            volumes.update({
-                '/sys/class/gpio': {
-                    'bind': '/sys/class/gpio', 'mode': "rw"
-                },
-                '/sys/devices/platform/soc': {
-                    'bind': '/sys/devices/platform/soc', 'mode': "rw"
-                },
-            })
-
-        return volumes
-
-    def _run(self):
-        """Run docker image.
-
-        Need run inside executor.
-        """
-        if self._is_running():
-            return True
-
-        # cleanup
-        self._stop()
-
-        # write config
-        if not self.addon.write_options():
-            return False
-
-        ret = self.docker.run(
-            self.image,
-            name=self.name,
-            hostname=self.hostname,
-            detach=True,
-            stdin_open=self.addon.with_stdin,
-            network_mode=self.network_mode,
-            ports=self.ports,
-            extra_hosts=self.network_mapping,
-            devices=self.devices,
-            cap_add=self.addon.privileged,
-            environment=self.environment,
-            volumes=self.volumes,
-            tmpfs=self.tmpfs
-        )
-
-        if ret:
-            _LOGGER.info("Start docker addon %s with version %s",
-                         self.image, self.version)
-
-        return ret
-
-    def _install(self, tag):
-        """Pull docker image or build it.
-
-        Need run inside executor.
-        """
-        if self.addon.need_build:
-            return self._build(tag)
-
-        return super()._install(tag)
-
-    def _build(self, tag):
-        """Build a docker container.
-
-        Need run inside executor.
-        """
-        build_env = AddonBuild(self.config, self.addon)
-
-        _LOGGER.info("Start build %s:%s", self.image, tag)
-        try:
-            image = self.docker.images.build(**build_env.get_docker_args(tag))
-
-            image.tag(self.image, tag='latest')
-            self.process_metadata(image.attrs, force=True)
-
-        except (docker.errors.DockerException) as err:
-            _LOGGER.error("Can't build %s:%s -> %s", self.image, tag, err)
-            return False
-
-        _LOGGER.info("Build %s:%s done", self.image, tag)
-        return True
-
-    @docker_process
-    def export_image(self, path):
-        """Export current images into a tar file."""
-        return self.loop.run_in_executor(None, self._export_image, path)
-
-    def _export_image(self, tar_file):
-        """Export current images into a tar file.
-
-        Need run inside executor.
-        """
-        try:
-            image = self.docker.api.get_image(self.image)
-        except docker.errors.DockerException as err:
-            _LOGGER.error("Can't fetch image %s -> %s", self.image, err)
-            return False
-
-        try:
-            with tar_file.open("wb") as write_tar:
-                for chunk in image.stream():
-                    write_tar.write(chunk)
-        except (OSError, requests.exceptions.ReadTimeout) as err:
-            _LOGGER.error("Can't write tar file %s -> %s", tar_file, err)
-            return False
-
-        _LOGGER.info("Export image %s to %s", self.image, tar_file)
-        return True
-
-    @docker_process
-    def import_image(self, path, tag):
-        """Import a tar file as image."""
-        return self.loop.run_in_executor(None, self._import_image, path, tag)
-
-    def _import_image(self, tar_file, tag):
-        """Import a tar file as image.
-
-        Need run inside executor.
-        """
-        try:
-            with tar_file.open("rb") as read_tar:
-                self.docker.api.load_image(read_tar)
-
-            image = self.docker.images.get(self.image)
-            image.tag(self.image, tag=tag)
-        except (docker.errors.DockerException, OSError) as err:
-            _LOGGER.error("Can't import image %s -> %s", self.image, err)
-            return False
-
-        _LOGGER.info("Import image %s and tag %s", tar_file, tag)
-        self.process_metadata(image.attrs, force=True)
-        self._cleanup()
-        return True
-
-    def _restart(self):
-        """Restart docker container.
-
-        Addons prepare some thing on start and that is normaly not repeatable.
-        Need run inside executor.
-        """
-        self._stop()
-        return self._run()
-
-    @docker_process
-    def write_stdin(self, data):
-        """Write to add-on stdin."""
-        return self.loop.run_in_executor(None, self._write_stdin, data)
-
-    def _write_stdin(self, data):
-        """Write to add-on stdin.
-
-        Need run inside executor.
-        """
-        if not self._is_running():
-            return False
-
-        try:
-            # load needed docker objects
-            container = self.docker.containers.get(self.name)
-            socket = container.attach_socket(params={'stdin': 1, 'stream': 1})
-        except docker.errors.DockerException as err:
-            _LOGGER.error("Can't attach to %s stdin -> %s", self.name, err)
-            return False
-
-        try:
-            # write to stdin
-            data += b"\n"
-            os.write(socket.fileno(), data)
-            socket.close()
-        except OSError as err:
-            _LOGGER.error("Can't write to %s stdin -> %s", self.name, err)
-            return False
-
-        return True
--- a/hassio/dock/homeassistant.py
+++ b/hassio/dock/homeassistant.py
@@ -1,113 +0,0 @@
-"""Init file for HassIO docker object."""
-import logging
-
-import docker
-
-from .interface import DockerInterface
-
-_LOGGER = logging.getLogger(__name__)
-
-HASS_DOCKER_NAME = 'homeassistant'
-
-
-class DockerHomeAssistant(DockerInterface):
-    """Docker hassio wrapper for HomeAssistant."""
-
-    def __init__(self, config, loop, api, data):
-        """Initialize docker homeassistant wrapper."""
-        super().__init__(config, loop, api, image=data.image)
-        self.data = data
-
-    @property
-    def name(self):
-        """Return name of docker container."""
-        return HASS_DOCKER_NAME
-
-    @property
-    def devices(self):
-        """Create list of special device to map into docker."""
-        if not self.data.devices:
-            return
-
-        devices = []
-        for device in self.data.devices:
-            devices.append("/dev/{0}:/dev/{0}:rwm".format(device))
-
-        return devices
-
-    def _run(self):
-        """Run docker image.
-
-        Need run inside executor.
-        """
-        if self._is_running():
-            return
-
-        # cleanup
-        self._stop()
-
-        ret = self.docker.run(
-            self.image,
-            name=self.name,
-            hostname=self.name,
-            detach=True,
-            privileged=True,
-            devices=self.devices,
-            network_mode='host',
-            environment={
-                'HASSIO': self.docker.network.supervisor,
-                'TZ': self.config.timezone,
-            },
-            volumes={
-                str(self.config.path_extern_config):
-                    {'bind': '/config', 'mode': 'rw'},
-                str(self.config.path_extern_ssl):
-                    {'bind': '/ssl', 'mode': 'ro'},
-                str(self.config.path_extern_share):
-                    {'bind': '/share', 'mode': 'rw'},
-            }
-        )
-
-        if ret:
-            _LOGGER.info("Start homeassistant %s with version %s",
-                         self.image, self.version)
-
-        return ret
-
-    def _execute_command(self, command):
-        """Create a temporary container and run command.
-
-        Need run inside executor.
-        """
-        return self.docker.run_command(
-            self.image,
-            command,
-            detach=True,
-            stdout=True,
-            stderr=True,
-            environment={
-                'TZ': self.config.timezone,
-            },
-            volumes={
-                str(self.config.path_extern_config):
-                    {'bind': '/config', 'mode': 'ro'},
-                str(self.config.path_extern_ssl):
-                    {'bind': '/ssl', 'mode': 'ro'},
-            }
-        )
-
-    def is_initialize(self):
-        """Return True if docker container exists."""
-        return self.loop.run_in_executor(None, self._is_initialize)
-
-    def _is_initialize(self):
-        """Return True if docker container exists.
-
-        Need run inside executor.
-        """
-        try:
-            self.docker.containers.get(self.name)
-        except docker.errors.DockerException:
-            return False
-
-        return True
--- a/hassio/dock/interface.py
+++ b/hassio/dock/interface.py
@@ -1,327 +0,0 @@
-"""Interface class for HassIO docker object."""
-import asyncio
-from contextlib import suppress
-import logging
-
-import docker
-
-from .util import docker_process
-from ..const import LABEL_VERSION, LABEL_ARCH
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class DockerInterface(object):
-    """Docker hassio interface."""
-
-    def __init__(self, config, loop, api, image=None, timeout=30):
-        """Initialize docker base wrapper."""
-        self.config = config
-        self.loop = loop
-        self.docker = api
-
-        self.image = image
-        self.timeout = timeout
-        self.version = None
-        self.arch = None
-        self._lock = asyncio.Lock(loop=loop)
-
-    @property
-    def name(self):
-        """Return name of docker container."""
-        return None
-
-    @property
-    def in_progress(self):
-        """Return True if a task is in progress."""
-        return self._lock.locked()
-
-    def process_metadata(self, metadata, force=False):
-        """Read metadata and set it to object."""
-        # read image
-        if not self.image:
-            self.image = metadata['Config']['Image']
-
-        # read version
-        need_version = force or not self.version
-        if need_version and LABEL_VERSION in metadata['Config']['Labels']:
-            self.version = metadata['Config']['Labels'][LABEL_VERSION]
-        elif need_version:
-            _LOGGER.warning("Can't read version from %s", self.name)
-
-        # read arch
-        need_arch = force or not self.arch
-        if need_arch and LABEL_ARCH in metadata['Config']['Labels']:
-            self.arch = metadata['Config']['Labels'][LABEL_ARCH]
-
-    @docker_process
-    def install(self, tag):
-        """Pull docker image."""
-        return self.loop.run_in_executor(None, self._install, tag)
-
-    def _install(self, tag):
-        """Pull docker image.
-
-        Need run inside executor.
-        """
-        try:
-            _LOGGER.info("Pull image %s tag %s.", self.image, tag)
-            image = self.docker.images.pull("{}:{}".format(self.image, tag))
-
-            image.tag(self.image, tag='latest')
-            self.process_metadata(image.attrs, force=True)
-        except docker.errors.APIError as err:
-            _LOGGER.error("Can't install %s:%s -> %s.", self.image, tag, err)
-            return False
-
-        _LOGGER.info("Tag image %s with version %s as latest", self.image, tag)
-        return True
-
-    def exists(self):
-        """Return True if docker image exists in local repo."""
-        return self.loop.run_in_executor(None, self._exists)
-
-    def _exists(self):
-        """Return True if docker image exists in local repo.
-
-        Need run inside executor.
-        """
-        try:
-            self.docker.images.get(self.image)
-        except docker.errors.DockerException:
-            return False
-
-        return True
-
-    def is_running(self):
-        """Return True if docker is Running.
-
-        Return a Future.
-        """
-        return self.loop.run_in_executor(None, self._is_running)
-
-    def _is_running(self):
-        """Return True if docker is Running.
-
-        Need run inside executor.
-        """
-        try:
-            container = self.docker.containers.get(self.name)
-            image = self.docker.images.get(self.image)
-        except docker.errors.DockerException:
-            return False
-
-        # container is not running
-        if container.status != 'running':
-            return False
-
-        # we run on a old image, stop and start it
-        if container.image.id != image.id:
-            return False
-
-        return True
-
-    @docker_process
-    def attach(self):
-        """Attach to running docker container."""
-        return self.loop.run_in_executor(None, self._attach)
-
-    def _attach(self):
-        """Attach to running docker container.
-
-        Need run inside executor.
-        """
-        try:
-            if self.image:
-                obj_data = self.docker.images.get(self.image).attrs
-            else:
-                obj_data = self.docker.containers.get(self.name).attrs
-        except docker.errors.DockerException:
-            return False
-
-        self.process_metadata(obj_data)
-        _LOGGER.info(
-            "Attach to image %s with version %s", self.image, self.version)
-
-        return True
-
-    @docker_process
-    def run(self):
-        """Run docker image."""
-        return self.loop.run_in_executor(None, self._run)
-
-    def _run(self):
-        """Run docker image.
-
-        Need run inside executor.
-        """
-        raise NotImplementedError()
-
-    @docker_process
-    def stop(self):
-        """Stop/remove docker container."""
-        return self.loop.run_in_executor(None, self._stop)
-
-    def _stop(self):
-        """Stop/remove and remove docker container.
-
-        Need run inside executor.
-        """
-        try:
-            container = self.docker.containers.get(self.name)
-        except docker.errors.DockerException:
-            return False
-
-        if container.status == 'running':
-            _LOGGER.info("Stop %s docker application", self.image)
-            with suppress(docker.errors.DockerException):
-                container.stop(timeout=self.timeout)
-
-        with suppress(docker.errors.DockerException):
-            _LOGGER.info("Clean %s docker application", self.image)
-            container.remove(force=True)
-
-        return True
-
-    @docker_process
-    def remove(self):
-        """Remove docker images."""
-        return self.loop.run_in_executor(None, self._remove)
-
-    def _remove(self):
-        """remove docker images.
-
-        Need run inside executor.
-        """
-        # cleanup container
-        self._stop()
-
-        _LOGGER.info(
-            "Remove docker %s with latest and %s", self.image, self.version)
-
-        try:
-            with suppress(docker.errors.ImageNotFound):
-                self.docker.images.remove(
-                    image="{}:latest".format(self.image), force=True)
-
-            with suppress(docker.errors.ImageNotFound):
-                self.docker.images.remove(
-                    image="{}:{}".format(self.image, self.version), force=True)
-
-        except docker.errors.DockerException as err:
-            _LOGGER.warning("Can't remove image %s -> %s", self.image, err)
-            return False
-
-        # clean metadata
-        self.version = None
-        self.arch = None
-
-        return True
-
-    @docker_process
-    def update(self, tag):
-        """Update a docker image."""
-        return self.loop.run_in_executor(None, self._update, tag)
-
-    def _update(self, tag):
-        """Update a docker image.
-
-        Need run inside executor.
-        """
-        _LOGGER.info(
-            "Update docker %s with %s:%s", self.version, self.image, tag)
-
-        # update docker image
-        if not self._install(tag):
-            return False
-
-        # stop container & cleanup
-        self._stop()
-        self._cleanup()
-
-        return True
-
-    def logs(self):
-        """Return docker logs of container.
-
-        Return a Future.
-        """
-        return self.loop.run_in_executor(None, self._logs)
-
-    def _logs(self):
-        """Return docker logs of container.
-
-        Need run inside executor.
-        """
-        try:
-            container = self.docker.containers.get(self.name)
-        except docker.errors.DockerException:
-            return b""
-
-        try:
-            return container.logs(tail=100, stdout=True, stderr=True)
-        except docker.errors.DockerException as err:
-            _LOGGER.warning("Can't grap logs from %s -> %s", self.image, err)
-
-    @docker_process
-    def restart(self):
-        """Restart docker container."""
-        return self.loop.run_in_executor(None, self._restart)
-
-    def _restart(self):
-        """Restart docker container.
-
-        Need run inside executor.
-        """
-        try:
-            container = self.docker.containers.get(self.name)
-        except docker.errors.DockerException:
-            return False
-
-        _LOGGER.info("Restart %s", self.image)
-
-        try:
-            container.restart(timeout=self.timeout)
-        except docker.errors.DockerException as err:
-            _LOGGER.warning("Can't restart %s -> %s", self.image, err)
-            return False
-
-        return True
-
-    @docker_process
-    def cleanup(self):
-        """Check if old version exists and cleanup."""
-        return self.loop.run_in_executor(None, self._cleanup)
-
-    def _cleanup(self):
-        """Check if old version exists and cleanup.
-
-        Need run inside executor.
-        """
-        try:
-            latest = self.docker.images.get(self.image)
-        except docker.errors.DockerException:
-            _LOGGER.warning("Can't find %s for cleanup", self.image)
-            return False
-
-        for image in self.docker.images.list(name=self.image):
-            if latest.id == image.id:
-                continue
-
-            with suppress(docker.errors.DockerException):
-                _LOGGER.info("Cleanup docker images: %s", image.tags)
-                self.docker.images.remove(image.id, force=True)
-
-        return True
-
-    @docker_process
-    def execute_command(self, command):
-        """Create a temporary container and run command."""
-        return self.loop.run_in_executor(None, self._execute_command, command)
-
-    def _execute_command(self, command):
-        """Create a temporary container and run command.
-
-        Need run inside executor.
-        """
-        raise NotImplementedError()
--- a/hassio/dock/supervisor.py
+++ b/hassio/dock/supervisor.py
@@ -1,77 +0,0 @@
-"""Init file for HassIO docker object."""
-import logging
-import os
-
-import docker
-
-from .interface import DockerInterface
-from .util import docker_process
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class DockerSupervisor(DockerInterface):
-    """Docker hassio wrapper for HomeAssistant."""
-
-    def __init__(self, config, loop, api, stop_callback, image=None):
-        """Initialize docker base wrapper."""
-        super().__init__(config, loop, api, image=image)
-        self.stop_callback = stop_callback
-
-    @property
-    def name(self):
-        """Return name of docker container."""
-        return os.environ['SUPERVISOR_NAME']
-
-    def _attach(self):
-        """Attach to running docker container.
-
-        Need run inside executor.
-        """
-        try:
-            container = self.docker.containers.get(self.name)
-        except docker.errors.DockerException:
-            return False
-
-        self.process_metadata(container.attrs)
-        _LOGGER.info("Attach to supervisor %s with version %s",
-                     self.image, self.version)
-
-        # if already attach
-        if container in self.docker.network.containers:
-            return True
-
-        # attach to network
-        return self.docker.network.attach_container(
-            container, alias=['hassio'], ipv4=self.docker.network.supervisor)
-
-    @docker_process
-    async def update(self, tag):
-        """Update a supervisor docker image."""
-        _LOGGER.info("Update supervisor docker to %s:%s", self.image, tag)
-
-        if await self.loop.run_in_executor(None, self._install, tag):
-            self.loop.call_later(1, self.loop.stop)
-            return True
-
-        return False
-
-    async def run(self):
-        """Run docker image."""
-        raise RuntimeError("Not support on supervisor docker container!")
-
-    async def install(self, tag):
-        """Pull docker image."""
-        raise RuntimeError("Not support on supervisor docker container!")
-
-    async def stop(self):
-        """Stop/remove docker container."""
-        raise RuntimeError("Not support on supervisor docker container!")
-
-    async def remove(self):
-        """Remove docker image."""
-        raise RuntimeError("Not support on supervisor docker container!")
-
-    async def restart(self):
-        """Restart docker container."""
-        raise RuntimeError("Not support on supervisor docker container!")
--- a/hassio/dock/util.py
+++ b/hassio/dock/util.py
@@ -1,20 +0,0 @@
-"""HassIO docker utilitys."""
-import logging
-
-_LOGGER = logging.getLogger(__name__)
-
-
-# pylint: disable=protected-access
-def docker_process(method):
-    """Wrap function with only run once."""
-    async def wrap_api(api, *args, **kwargs):
-        """Return api wrapper."""
-        if api._lock.locked():
-            _LOGGER.error(
-                "Can't excute %s while a task is in progress", method.__name__)
-            return False
-
-        async with api._lock:
-            return await method(api, *args, **kwargs)
-
-    return wrap_api
--- a/hassio/docker/init.py
+++ b/hassio/docker/init.py
@@ -1,7 +1,8 @@
-"""Init file for HassIO docker object."""
+"""Init file for Hass.io Docker object."""
 from contextlib import suppress
 import logging

+import attr
 import docker

 from .network import DockerNetwork
@@ -10,35 +11,43 @@ from ..const import SOCKET_DOCKER
 _LOGGER = logging.getLogger(__name__)


-class DockerAPI(object):
-    """Docker hassio wrapper.
+@attr.s(frozen=True)
+class CommandReturn:
+    """Return object from command run."""
+    exit_code = attr.ib()
+    output = attr.ib()
+
+
+class DockerAPI:
+    """Docker Hass.io wrapper.

    This class is not AsyncIO safe!
    """

    def __init__(self):
-        """Initialize docker base wrapper."""
+        """Initialize Docker base wrapper."""
        self.docker = docker.DockerClient(
-            base_url="unix:/{}".format(str(SOCKET_DOCKER)), version='auto')
+            base_url="unix:/{}".format(str(SOCKET_DOCKER)),
+            version='auto', timeout=900)
        self.network = DockerNetwork(self.docker)

    @property
    def images(self):
-        """Return api images."""
+        """Return API images."""
        return self.docker.images

    @property
    def containers(self):
-        """Return api containers."""
+        """Return API containers."""
        return self.docker.containers

    @property
    def api(self):
-        """Return api containers."""
+        """Return API containers."""
        return self.docker.api

    def run(self, image, **kwargs):
-        """"Create a docker and run it.
+        """"Create a Docker container and run it.

        Need run inside executor.
        """
@@ -46,17 +55,19 @@ class DockerAPI(object):
        network_mode = kwargs.get('network_mode')
        hostname = kwargs.get('hostname')

-        # setup network
+        # Setup network
+        kwargs['dns_search'] = ["."]
        if network_mode:
            kwargs['dns'] = [str(self.network.supervisor)]
+            kwargs['dns_opt'] = ["ndots:0"]
        else:
            kwargs['network'] = None

-        # create container
+        # Create container
        try:
            container = self.docker.containers.create(image, **kwargs)
        except docker.errors.DockerException as err:
-            _LOGGER.error("Can't create container from %s -> %s", name, err)
+            _LOGGER.error("Can't create container from %s: %s", name, err)
            return False

        # attach network
@@ -71,7 +82,7 @@ class DockerAPI(object):
        try:
            container.start()
        except docker.errors.DockerException as err:
-            _LOGGER.error("Can't start %s -> %s", name, err)
+            _LOGGER.error("Can't start %s: %s", name, err)
            return False

        return True
@@ -94,15 +105,16 @@ class DockerAPI(object):
            )

            # wait until command is done
-            exit_code = container.wait()
+            result = container.wait()
            output = container.logs(stdout=stdout, stderr=stderr)

        except docker.errors.DockerException as err:
-            _LOGGER.error("Can't execute command -> %s", err)
-            return (None, b"")
+            _LOGGER.error("Can't execute command: %s", err)
+            return CommandReturn(None, b"")

+        finally:
            # cleanup container
            with suppress(docker.errors.DockerException):
                container.remove(force=True)

-        return (exit_code, output)
+        return CommandReturn(result.get('StatusCode'), output)
--- a/hassio/docker/addon.py
+++ b/hassio/docker/addon.py
@@ -0,0 +1,421 @@
+"""Init file for Hass.io add-on Docker object."""
+import logging
+import os
+
+import docker
+import requests
+
+from .interface import DockerInterface
+from ..addons.build import AddonBuild
+from ..const import (
+    MAP_CONFIG, MAP_SSL, MAP_ADDONS, MAP_BACKUP, MAP_SHARE, ENV_TOKEN,
+    ENV_TIME, SECURITY_PROFILE, SECURITY_DISABLE)
+from ..utils import process_lock
+
+_LOGGER = logging.getLogger(__name__)
+
+AUDIO_DEVICE = "/dev/snd:/dev/snd:rwm"
+
+
+class DockerAddon(DockerInterface):
+    """Docker Hass.io wrapper for Home Assistant."""
+
+    def __init__(self, coresys, slug):
+        """Initialize Docker Home Assistant wrapper."""
+        super().__init__(coresys)
+        self._id = slug
+
+    @property
+    def addon(self):
+        """Return add-on of Docker image."""
+        return self.sys_addons.get(self._id)
+
+    @property
+    def image(self):
+        """Return name of Docker image."""
+        return self.addon.image
+
+    @property
+    def timeout(self):
+        """Return timeout for Docker actions."""
+        return self.addon.timeout
+
+    @property
+    def version(self):
+        """Return version of Docker image."""
+        if not self.addon.legacy:
+            return super().version
+        return self.addon.version_installed
+
+    @property
+    def arch(self):
+        """Return arch of Docker image."""
+        if not self.addon.legacy:
+            return super().arch
+        return self.sys_arch
+
+    @property
+    def name(self):
+        """Return name of Docker container."""
+        return "addon_{}".format(self.addon.slug)
+
+    @property
+    def ipc(self):
+        """Return the IPC namespace."""
+        if self.addon.host_ipc:
+            return 'host'
+        return None
+
+    @property
+    def full_access(self):
+        """Return True if full access is enabled."""
+        return not self.addon.protected and self.addon.with_full_access
+
+    @property
+    def hostname(self):
+        """Return slug/id of add-on."""
+        return self.addon.slug.replace('_', '-')
+
+    @property
+    def environment(self):
+        """Return environment for Docker add-on."""
+        addon_env = self.addon.environment or {}
+
+        # Provide options for legacy add-ons
+        if self.addon.legacy:
+            for key, value in self.addon.options.items():
+                if isinstance(value, (int, str)):
+                    addon_env[key] = value
+                else:
+                    _LOGGER.warning(
+                        "Can not set nested option %s as Docker env", key)
+
+        return {
+            **addon_env,
+            ENV_TIME: self.sys_timezone,
+            ENV_TOKEN: self.addon.hassio_token,
+        }
+
+    @property
+    def devices(self):
+        """Return needed devices."""
+        devices = self.addon.devices or []
+
+        # Use audio devices
+        if self.addon.with_audio and self.sys_hardware.support_audio:
+            devices.append(AUDIO_DEVICE)
+
+        # Auto mapping UART devices
+        if self.addon.auto_uart:
+            for device in self.sys_hardware.serial_devices:
+                devices.append(f"{device}:{device}:rwm")
+
+        # Return None if no devices is present
+        return devices or None
+
+    @property
+    def ports(self):
+        """Filter None from add-on ports."""
+        if not self.addon.ports:
+            return None
+
+        return {
+            container_port: host_port
+            for container_port, host_port in self.addon.ports.items()
+            if host_port
+        }
+
+    @property
+    def security_opt(self):
+        """Controlling security options."""
+        security = []
+
+        # AppArmor
+        apparmor = self.sys_host.apparmor.available
+        if not apparmor or self.addon.apparmor == SECURITY_DISABLE:
+            security.append("apparmor:unconfined")
+        elif self.addon.apparmor == SECURITY_PROFILE:
+            security.append(f"apparmor={self.addon.slug}")
+
+        # Disable Seccomp / We don't support it official and it
+        # make troubles on some kind of host systems.
+        security.append("seccomp=unconfined")
+
+        return security
+
+    @property
+    def tmpfs(self):
+        """Return tmpfs for Docker add-on."""
+        options = self.addon.tmpfs
+        if options:
+            return {"/tmpfs": f"{options}"}
+        return None
+
+    @property
+    def network_mapping(self):
+        """Return hosts mapping."""
+        return {
+            'homeassistant': self.sys_docker.network.gateway,
+            'hassio': self.sys_docker.network.supervisor,
+        }
+
+    @property
+    def network_mode(self):
+        """Return network mode for add-on."""
+        if self.addon.host_network:
+            return 'host'
+        return None
+
+    @property
+    def pid_mode(self):
+        """Return PID mode for add-on."""
+        if not self.addon.protected and self.addon.host_pid:
+            return 'host'
+        return None
+
+    @property
+    def volumes(self):
+        """Generate volumes for mappings."""
+        volumes = {
+            str(self.addon.path_extern_data): {
+                'bind': "/data", 'mode': 'rw'
+            }}
+
+        addon_mapping = self.addon.map_volumes
+
+        # setup config mappings
+        if MAP_CONFIG in addon_mapping:
+            volumes.update({
+                str(self.sys_config.path_extern_homeassistant): {
+                    'bind': "/config", 'mode': addon_mapping[MAP_CONFIG]
+                }})
+
+        if MAP_SSL in addon_mapping:
+            volumes.update({
+                str(self.sys_config.path_extern_ssl): {
+                    'bind': "/ssl", 'mode': addon_mapping[MAP_SSL]
+                }})
+
+        if MAP_ADDONS in addon_mapping:
+            volumes.update({
+                str(self.sys_config.path_extern_addons_local): {
+                    'bind': "/addons", 'mode': addon_mapping[MAP_ADDONS]
+                }})
+
+        if MAP_BACKUP in addon_mapping:
+            volumes.update({
+                str(self.sys_config.path_extern_backup): {
+                    'bind': "/backup", 'mode': addon_mapping[MAP_BACKUP]
+                }})
+
+        if MAP_SHARE in addon_mapping:
+            volumes.update({
+                str(self.sys_config.path_extern_share): {
+                    'bind': "/share", 'mode': addon_mapping[MAP_SHARE]
+                }})
+
+        # Init other hardware mappings
+
+        # GPIO support
+        if self.addon.with_gpio and self.sys_hardware.support_gpio:
+            for gpio_path in ("/sys/class/gpio", "/sys/devices/platform/soc"):
+                volumes.update({
+                    gpio_path: {
+                        'bind': gpio_path, 'mode': 'rw'
+                    },
+                })
+
+        # DeviceTree support
+        if self.addon.with_devicetree:
+            volumes.update({
+                "/sys/firmware/devicetree/base": {
+                    'bind': "/device-tree", 'mode': 'ro'
+                },
+            })
+
+        # Docker API support
+        if not self.addon.protected and self.addon.access_docker_api:
+            volumes.update({
+                "/var/run/docker.sock": {
+                    'bind': "/var/run/docker.sock", 'mode': 'ro'
+                },
+            })
+
+        # Host D-Bus system
+        if self.addon.host_dbus:
+            volumes.update({
+                "/var/run/dbus": {
+                    'bind': "/var/run/dbus", 'mode': 'rw'
+                }})
+
+        # ALSA configuration
+        if self.addon.with_audio:
+            volumes.update({
+                str(self.addon.path_extern_asound): {
+                    'bind': "/etc/asound.conf", 'mode': 'ro'
+                }})
+
+        return volumes
+
+    def _run(self):
+        """Run Docker image.
+
+        Need run inside executor.
+        """
+        if self._is_running():
+            return True
+
+        # Security check
+        if not self.addon.protected:
+            _LOGGER.warning(
+                "%s run with disabled protected mode!", self.addon.name)
+
+        # cleanup
+        self._stop()
+
+        ret = self.sys_docker.run(
+            self.image,
+            name=self.name,
+            hostname=self.hostname,
+            detach=True,
+            init=True,
+            privileged=self.full_access,
+            ipc_mode=self.ipc,
+            stdin_open=self.addon.with_stdin,
+            network_mode=self.network_mode,
+            pid_mode=self.pid_mode,
+            ports=self.ports,
+            extra_hosts=self.network_mapping,
+            devices=self.devices,
+            cap_add=self.addon.privileged,
+            security_opt=self.security_opt,
+            environment=self.environment,
+            volumes=self.volumes,
+            tmpfs=self.tmpfs
+        )
+
+        if ret:
+            _LOGGER.info("Start Docker add-on %s with version %s",
+                         self.image, self.version)
+
+        return ret
+
+    def _install(self, tag):
+        """Pull Docker image or build it.
+
+        Need run inside executor.
+        """
+        if self.addon.need_build:
+            return self._build(tag)
+
+        return super()._install(tag)
+
+    def _build(self, tag):
+        """Build a Docker container.
+
+        Need run inside executor.
+        """
+        build_env = AddonBuild(self.coresys, self._id)
+
+        _LOGGER.info("Start build %s:%s", self.image, tag)
+        try:
+            image, log = self.sys_docker.images.build(
+                **build_env.get_docker_args(tag))
+
+            _LOGGER.debug("Build %s:%s done: %s", self.image, tag, log)
+            image.tag(self.image, tag='latest')
+
+            # Update meta data
+            self._meta = image.attrs
+
+        except docker.errors.DockerException as err:
+            _LOGGER.error("Can't build %s:%s: %s", self.image, tag, err)
+            return False
+
+        _LOGGER.info("Build %s:%s done", self.image, tag)
+        return True
+
+    @process_lock
+    def export_image(self, path):
+        """Export current images into a tar file."""
+        return self.sys_run_in_executor(self._export_image, path)
+
+    def _export_image(self, tar_file):
+        """Export current images into a tar file.
+
+        Need run inside executor.
+        """
+        try:
+            image = self.sys_docker.api.get_image(self.image)
+        except docker.errors.DockerException as err:
+            _LOGGER.error("Can't fetch image %s: %s", self.image, err)
+            return False
+
+        _LOGGER.info("Export image %s to %s", self.image, tar_file)
+        try:
+            with tar_file.open("wb") as write_tar:
+                for chunk in image:
+                    write_tar.write(chunk)
+        except (OSError, requests.exceptions.ReadTimeout) as err:
+            _LOGGER.error("Can't write tar file %s: %s", tar_file, err)
+            return False
+
+        _LOGGER.info("Export image %s done", self.image)
+        return True
+
+    @process_lock
+    def import_image(self, path, tag):
+        """Import a tar file as image."""
+        return self.sys_run_in_executor(self._import_image, path, tag)
+
+    def _import_image(self, tar_file, tag):
+        """Import a tar file as image.
+
+        Need run inside executor.
+        """
+        try:
+            with tar_file.open("rb") as read_tar:
+                self.sys_docker.api.load_image(read_tar, quiet=True)
+
+            image = self.sys_docker.images.get(self.image)
+            image.tag(self.image, tag=tag)
+        except (docker.errors.DockerException, OSError) as err:
+            _LOGGER.error("Can't import image %s: %s", self.image, err)
+            return False
+
+        _LOGGER.info("Import image %s and tag %s", tar_file, tag)
+        self._meta = image.attrs
+        self._cleanup()
+        return True
+
+    @process_lock
+    def write_stdin(self, data):
+        """Write to add-on stdin."""
+        return self.sys_run_in_executor(self._write_stdin, data)
+
+    def _write_stdin(self, data):
+        """Write to add-on stdin.
+
+        Need run inside executor.
+        """
+        if not self._is_running():
+            return False
+
+        try:
+            # Load needed docker objects
+            container = self.sys_docker.containers.get(self.name)
+            socket = container.attach_socket(params={'stdin': 1, 'stream': 1})
+        except docker.errors.DockerException as err:
+            _LOGGER.error("Can't attach to %s stdin: %s", self.name, err)
+            return False
+
+        try:
+            # Write to stdin
+            data += b"\n"
+            os.write(socket.fileno(), data)
+            socket.close()
+        except OSError as err:
+            _LOGGER.error("Can't write to %s stdin: %s", self.name, err)
+            return False
+
+        return True
--- a/hassio/docker/hassos_cli.py
+++ b/hassio/docker/hassos_cli.py
@@ -0,0 +1,37 @@
+"""HassOS Cli docker object."""
+import logging
+
+import docker
+
+from .interface import DockerInterface
+from ..coresys import CoreSysAttributes
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class DockerHassOSCli(DockerInterface, CoreSysAttributes):
+    """Docker Hass.io wrapper for HassOS Cli."""
+
+    @property
+    def image(self):
+        """Return name of HassOS CLI image."""
+        return f"homeassistant/{self.sys_arch}-hassio-cli"
+
+    def _stop(self):
+        """Don't need stop."""
+        return True
+
+    def _attach(self):
+        """Attach to running Docker container.
+        Need run inside executor.
+        """
+        try:
+            image = self.sys_docker.images.get(self.image)
+
+        except docker.errors.DockerException:
+            _LOGGER.warning("Can't find a HassOS CLI %s", self.image)
+
+        else:
+            self._meta = image.attrs
+            _LOGGER.info("Found HassOS CLI %s with version %s",
+                         self.image, self.version)
--- a/hassio/docker/homeassistant.py
+++ b/hassio/docker/homeassistant.py
@@ -0,0 +1,124 @@
+"""Init file for Hass.io Docker object."""
+import logging
+
+import docker
+
+from .interface import DockerInterface
+from ..const import ENV_TOKEN, ENV_TIME, LABEL_MACHINE
+
+_LOGGER = logging.getLogger(__name__)
+
+HASS_DOCKER_NAME = 'homeassistant'
+
+
+class DockerHomeAssistant(DockerInterface):
+    """Docker Hass.io wrapper for Home Assistant."""
+
+    @property
+    def machine(self):
+        """Return machine of Home Assistant Docker image."""
+        if self._meta and LABEL_MACHINE in self._meta['Config']['Labels']:
+            return self._meta['Config']['Labels'][LABEL_MACHINE]
+        return None
+
+    @property
+    def image(self):
+        """Return name of Docker image."""
+        return self.sys_homeassistant.image
+
+    @property
+    def name(self):
+        """Return name of Docker container."""
+        return HASS_DOCKER_NAME
+
+    @property
+    def devices(self):
+        """Create list of special device to map into Docker."""
+        devices = []
+        for device in self.sys_hardware.serial_devices:
+            devices.append(f"{device}:{device}:rwm")
+        return devices or None
+
+    def _run(self):
+        """Run Docker image.
+
+        Need run inside executor.
+        """
+        if self._is_running():
+            return False
+
+        # cleanup
+        self._stop()
+
+        ret = self.sys_docker.run(
+            self.image,
+            name=self.name,
+            hostname=self.name,
+            detach=True,
+            privileged=True,
+            init=True,
+            devices=self.devices,
+            network_mode='host',
+            environment={
+                'HASSIO': self.sys_docker.network.supervisor,
+                ENV_TIME: self.sys_timezone,
+                ENV_TOKEN: self.sys_homeassistant.hassio_token,
+            },
+            volumes={
+                str(self.sys_config.path_extern_homeassistant):
+                    {'bind': '/config', 'mode': 'rw'},
+                str(self.sys_config.path_extern_ssl):
+                    {'bind': '/ssl', 'mode': 'ro'},
+                str(self.sys_config.path_extern_share):
+                    {'bind': '/share', 'mode': 'rw'},
+            }
+        )
+
+        if ret:
+            _LOGGER.info("Start homeassistant %s with version %s",
+                         self.image, self.version)
+
+        return ret
+
+    def _execute_command(self, command):
+        """Create a temporary container and run command.
+
+        Need run inside executor.
+        """
+        return self.sys_docker.run_command(
+            self.image,
+            command,
+            privileged=True,
+            init=True,
+            devices=self.devices,
+            detach=True,
+            stdout=True,
+            stderr=True,
+            environment={
+                ENV_TIME: self.sys_timezone,
+            },
+            volumes={
+                str(self.sys_config.path_extern_homeassistant):
+                    {'bind': '/config', 'mode': 'rw'},
+                str(self.sys_config.path_extern_ssl):
+                    {'bind': '/ssl', 'mode': 'ro'},
+                str(self.sys_config.path_extern_share):
+                    {'bind': '/share', 'mode': 'ro'},
+            }
+        )
+
+    def is_initialize(self):
+        """Return True if Docker container exists."""
+        return self.sys_run_in_executor(self._is_initialize)
+
+    def _is_initialize(self):
+        """Return True if docker container exists.
+
+        Need run inside executor.
+        """
+        try:
+            self.sys_docker.containers.get(self.name)
+        except docker.errors.DockerException:
+            return False
+
+        return True
--- a/hassio/docker/interface.py
+++ b/hassio/docker/interface.py
@@ -0,0 +1,330 @@
+"""Interface class for Hass.io Docker object."""
+import asyncio
+from contextlib import suppress
+import logging
+
+import docker
+
+from .stats import DockerStats
+from ..const import LABEL_VERSION, LABEL_ARCH
+from ..coresys import CoreSysAttributes
+from ..utils import process_lock
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class DockerInterface(CoreSysAttributes):
+    """Docker Hass.io interface."""
+
+    def __init__(self, coresys):
+        """Initialize Docker base wrapper."""
+        self.coresys = coresys
+        self._meta = None
+        self.lock = asyncio.Lock(loop=coresys.loop)
+
+    @property
+    def timeout(self):
+        """Return timeout for Docker actions."""
+        return 30
+
+    @property
+    def name(self):
+        """Return name of Docker container."""
+        return None
+
+    @property
+    def meta_config(self):
+        """Return meta data of configuration for container/image."""
+        if not self._meta:
+            return {}
+        return self._meta.get('Config', {})
+
+    @property
+    def meta_labels(self):
+        """Return meta data of labels for container/image."""
+        return self.meta_config.get('Labels') or {}
+
+    @property
+    def image(self):
+        """Return name of Docker image."""
+        return self.meta_config.get('Image')
+
+    @property
+    def version(self):
+        """Return version of Docker image."""
+        return self.meta_labels.get(LABEL_VERSION)
+
+    @property
+    def arch(self):
+        """Return arch of Docker image."""
+        return self.meta_labels.get(LABEL_ARCH)
+
+    @property
+    def in_progress(self):
+        """Return True if a task is in progress."""
+        return self.lock.locked()
+
+    @process_lock
+    def install(self, tag):
+        """Pull docker image."""
+        return self.sys_run_in_executor(self._install, tag)
+
+    def _install(self, tag):
+        """Pull Docker image.
+
+        Need run inside executor.
+        """
+        try:
+            _LOGGER.info("Pull image %s tag %s.", self.image, tag)
+            image = self.sys_docker.images.pull(f"{self.image}:{tag}")
+
+            image.tag(self.image, tag='latest')
+            self._meta = image.attrs
+        except docker.errors.APIError as err:
+            _LOGGER.error("Can't install %s:%s -> %s.", self.image, tag, err)
+            return False
+
+        _LOGGER.info("Tag image %s with version %s as latest", self.image, tag)
+        return True
+
+    def exists(self):
+        """Return True if Docker image exists in local repository."""
+        return self.sys_run_in_executor(self._exists)
+
+    def _exists(self):
+        """Return True if Docker image exists in local repository.
+
+        Need run inside executor.
+        """
+        try:
+            image = self.sys_docker.images.get(self.image)
+            assert f"{self.image}:{self.version}" in image.tags
+        except (docker.errors.DockerException, AssertionError):
+            return False
+
+        return True
+
+    def is_running(self):
+        """Return True if Docker is running.
+
+        Return a Future.
+        """
+        return self.sys_run_in_executor(self._is_running)
+
+    def _is_running(self):
+        """Return True if Docker is running.
+
+        Need run inside executor.
+        """
+        try:
+            container = self.sys_docker.containers.get(self.name)
+            image = self.sys_docker.images.get(self.image)
+        except docker.errors.DockerException:
+            return False
+
+        # container is not running
+        if container.status != 'running':
+            return False
+
+        # we run on an old image, stop and start it
+        if container.image.id != image.id:
+            return False
+
+        return True
+
+    @process_lock
+    def attach(self):
+        """Attach to running Docker container."""
+        return self.sys_run_in_executor(self._attach)
+
+    def _attach(self):
+        """Attach to running docker container.
+
+        Need run inside executor.
+        """
+        try:
+            if self.image:
+                self._meta = self.sys_docker.images.get(self.image).attrs
+            else:
+                self._meta = self.sys_docker.containers.get(self.name).attrs
+        except docker.errors.DockerException:
+            return False
+
+        _LOGGER.info(
+            "Attach to image %s with version %s", self.image, self.version)
+
+        return True
+
+    @process_lock
+    def run(self):
+        """Run Docker image."""
+        return self.sys_run_in_executor(self._run)
+
+    def _run(self):
+        """Run Docker image.
+
+        Need run inside executor.
+        """
+        raise NotImplementedError()
+
+    @process_lock
+    def stop(self):
+        """Stop/remove Docker container."""
+        return self.sys_run_in_executor(self._stop)
+
+    def _stop(self):
+        """Stop/remove and remove docker container.
+
+        Need run inside executor.
+        """
+        try:
+            container = self.sys_docker.containers.get(self.name)
+        except docker.errors.DockerException:
+            return False
+
+        if container.status == 'running':
+            _LOGGER.info("Stop %s Docker application", self.image)
+            with suppress(docker.errors.DockerException):
+                container.stop(timeout=self.timeout)
+
+        with suppress(docker.errors.DockerException):
+            _LOGGER.info("Clean %s Docker application", self.image)
+            container.remove(force=True)
+
+        return True
+
+    @process_lock
+    def remove(self):
+        """Remove Docker images."""
+        return self.sys_run_in_executor(self._remove)
+
+    def _remove(self):
+        """remove docker images.
+
+        Need run inside executor.
+        """
+        # Cleanup container
+        self._stop()
+
+        _LOGGER.info(
+            "Remove Docker %s with latest and %s", self.image, self.version)
+
+        try:
+            with suppress(docker.errors.ImageNotFound):
+                self.sys_docker.images.remove(
+                    image=f"{self.image}:latest", force=True)
+
+            with suppress(docker.errors.ImageNotFound):
+                self.sys_docker.images.remove(
+                    image=f"{self.image}:{self.version}", force=True)
+
+        except docker.errors.DockerException as err:
+            _LOGGER.warning("Can't remove image %s: %s", self.image, err)
+            return False
+
+        self._meta = None
+        return True
+
+    @process_lock
+    def update(self, tag):
+        """Update a Docker image."""
+        return self.sys_run_in_executor(self._update, tag)
+
+    def _update(self, tag):
+        """Update a docker image.
+
+        Need run inside executor.
+        """
+        _LOGGER.info(
+            "Update Docker %s with %s:%s", self.version, self.image, tag)
+
+        # Update docker image
+        if not self._install(tag):
+            return False
+
+        # Stop container & cleanup
+        self._stop()
+        self._cleanup()
+
+        return True
+
+    def logs(self):
+        """Return Docker logs of container.
+
+        Return a Future.
+        """
+        return self.sys_run_in_executor(self._logs)
+
+    def _logs(self):
+        """Return Docker logs of container.
+
+        Need run inside executor.
+        """
+        try:
+            container = self.sys_docker.containers.get(self.name)
+        except docker.errors.DockerException:
+            return b""
+
+        try:
+            return container.logs(tail=100, stdout=True, stderr=True)
+        except docker.errors.DockerException as err:
+            _LOGGER.warning("Can't grep logs from %s: %s", self.image, err)
+
+    @process_lock
+    def cleanup(self):
+        """Check if old version exists and cleanup."""
+        return self.sys_run_in_executor(self._cleanup)
+
+    def _cleanup(self):
+        """Check if old version exists and cleanup.
+
+        Need run inside executor.
+        """
+        try:
+            latest = self.sys_docker.images.get(self.image)
+        except docker.errors.DockerException:
+            _LOGGER.warning("Can't find %s for cleanup", self.image)
+            return False
+
+        for image in self.sys_docker.images.list(name=self.image):
+            if latest.id == image.id:
+                continue
+
+            with suppress(docker.errors.DockerException):
+                _LOGGER.info("Cleanup Docker images: %s", image.tags)
+                self.sys_docker.images.remove(image.id, force=True)
+
+        return True
+
+    @process_lock
+    def execute_command(self, command):
+        """Create a temporary container and run command."""
+        return self.sys_run_in_executor(self._execute_command, command)
+
+    def _execute_command(self, command):
+        """Create a temporary container and run command.
+
+        Need run inside executor.
+        """
+        raise NotImplementedError()
+
+    def stats(self):
+        """Read and return stats from container."""
+        return self.sys_run_in_executor(self._stats)
+
+    def _stats(self):
+        """Create a temporary container and run command.
+
+        Need run inside executor.
+        """
+        try:
+            container = self.sys_docker.containers.get(self.name)
+        except docker.errors.DockerException:
+            return None
+
+        try:
+            stats = container.stats(stream=False)
+            return DockerStats(stats)
+        except docker.errors.DockerException as err:
+            _LOGGER.error("Can't read stats from %s: %s", self.name, err)
+            return None
--- a/hassio/docker/network.py
+++ b/hassio/docker/network.py
@@ -1,4 +1,4 @@
-"""Internal network manager for HassIO."""
+"""Internal network manager for Hass.io."""
 import logging

 import docker
@@ -8,11 +8,14 @@ from ..const import DOCKER_NETWORK_MASK, DOCKER_NETWORK, DOCKER_NETWORK_RANGE
 _LOGGER = logging.getLogger(__name__)


-class DockerNetwork(object):
-    """Internal HassIO Network."""
+class DockerNetwork:
+    """Internal Hass.io Network.
+
+    This class is not AsyncIO safe!
+    """

    def __init__(self, dock):
-        """Initialize internal hassio network."""
+        """Initialize internal Hass.io network."""
        self.docker = dock
        self.network = self._get_network()

@@ -41,7 +44,7 @@ class DockerNetwork(object):
        try:
            return self.docker.networks.get(DOCKER_NETWORK)
        except docker.errors.NotFound:
-            _LOGGER.info("Can't find HassIO network, create new network")
+            _LOGGER.info("Can't find Hass.io network, create new network")

        ipam_pool = docker.types.IPAMPool(
            subnet=str(DOCKER_NETWORK_MASK),
@@ -52,12 +55,13 @@ class DockerNetwork(object):
        ipam_config = docker.types.IPAMConfig(pool_configs=[ipam_pool])

        return self.docker.networks.create(
-            DOCKER_NETWORK, driver='bridge', ipam=ipam_config, options={
+            DOCKER_NETWORK, driver='bridge', ipam=ipam_config,
+            enable_ipv6=False, options={
                "com.docker.network.bridge.name": DOCKER_NETWORK,
            })

    def attach_container(self, container, alias=None, ipv4=None):
-        """Attach container to hassio network.
+        """Attach container to Hass.io network.

        Need run inside executor.
        """
@@ -66,14 +70,14 @@ class DockerNetwork(object):
        try:
            self.network.connect(container, aliases=alias, ipv4_address=ipv4)
        except docker.errors.APIError as err:
-            _LOGGER.error("Can't link container to hassio-net -> %s", err)
+            _LOGGER.error("Can't link container to hassio-net: %s", err)
            return False

        self.network.reload()
        return True

    def detach_default_bridge(self, container):
-        """Detach default docker bridge.
+        """Detach default Docker bridge.

        Need run inside executor.
        """
@@ -86,4 +90,4 @@ class DockerNetwork(object):

        except docker.errors.APIError as err:
            _LOGGER.warning(
-                "Can't disconnect container from default -> %s", err)
+                "Can't disconnect container from default: %s", err)
--- a/hassio/docker/stats.py
+++ b/hassio/docker/stats.py
@@ -0,0 +1,90 @@
+"""Calc and represent docker stats data."""
+from contextlib import suppress
+
+
+class DockerStats:
+    """Hold stats data from container inside."""
+
+    def __init__(self, stats):
+        """Initialize Docker stats."""
+        self._cpu = 0.0
+        self._network_rx = 0
+        self._network_tx = 0
+        self._blk_read = 0
+        self._blk_write = 0
+
+        try:
+            self._memory_usage = stats['memory_stats']['usage']
+            self._memory_limit = stats['memory_stats']['limit']
+        except KeyError:
+            self._memory_usage = 0
+            self._memory_limit = 0
+
+        with suppress(KeyError):
+            self._calc_cpu_percent(stats)
+
+        with suppress(KeyError):
+            self._calc_network(stats['networks'])
+
+        with suppress(KeyError):
+            self._calc_block_io(stats['blkio_stats'])
+
+    def _calc_cpu_percent(self, stats):
+        """Calculate CPU percent."""
+        cpu_delta = stats['cpu_stats']['cpu_usage']['total_usage'] - \
+            stats['precpu_stats']['cpu_usage']['total_usage']
+        system_delta = stats['cpu_stats']['system_cpu_usage'] - \
+            stats['precpu_stats']['system_cpu_usage']
+
+        if system_delta > 0.0 and cpu_delta > 0.0:
+            self._cpu = (cpu_delta / system_delta) * \
+                len(stats['cpu_stats']['cpu_usage']['percpu_usage']) * 100.0
+
+    def _calc_network(self, networks):
+        """Calculate Network IO stats."""
+        for _, stats in networks.items():
+            self._network_rx += stats['rx_bytes']
+            self._network_tx += stats['tx_bytes']
+
+    def _calc_block_io(self, blkio):
+        """Calculate block IO stats."""
+        for stats in blkio['io_service_bytes_recursive']:
+            if stats['op'] == 'Read':
+                self._blk_read += stats['value']
+            elif stats['op'] == 'Write':
+                self._blk_write += stats['value']
+
+    @property
+    def cpu_percent(self):
+        """Return CPU percent."""
+        return self._cpu
+
+    @property
+    def memory_usage(self):
+        """Return memory usage."""
+        return self._memory_usage
+
+    @property
+    def memory_limit(self):
+        """Return memory limit."""
+        return self._memory_limit
+
+    @property
+    def network_rx(self):
+        """Return network rx stats."""
+        return self._network_rx
+
+    @property
+    def network_tx(self):
+        """Return network rx stats."""
+        return self._network_tx
+
+    @property
+    def blk_read(self):
+        """Return block IO read stats."""
+        return self._blk_read
+
+    @property
+    def blk_write(self):
+        """Return block IO write stats."""
+        return self._blk_write
--- a/hassio/docker/supervisor.py
+++ b/hassio/docker/supervisor.py
@@ -0,0 +1,42 @@
+"""Init file for Hass.io Docker object."""
+import logging
+import os
+
+import docker
+
+from .interface import DockerInterface
+from ..coresys import CoreSysAttributes
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class DockerSupervisor(DockerInterface, CoreSysAttributes):
+    """Docker Hass.io wrapper for Supervisor."""
+
+    @property
+    def name(self):
+        """Return name of Docker container."""
+        return os.environ['SUPERVISOR_NAME']
+
+    def _attach(self):
+        """Attach to running docker container.
+
+        Need run inside executor.
+        """
+        try:
+            container = self.sys_docker.containers.get(self.name)
+        except docker.errors.DockerException:
+            return False
+
+        self._meta = container.attrs
+        _LOGGER.info("Attach to Supervisor %s with version %s",
+                     self.image, self.version)
+
+        # If already attach
+        if container in self.sys_docker.network.containers:
+            return True
+
+        # Attach to network
+        return self.sys_docker.network.attach_container(
+            container, alias=['hassio'],
+            ipv4=self.sys_docker.network.supervisor)
--- a/hassio/exceptions.py
+++ b/hassio/exceptions.py
@@ -0,0 +1,148 @@
+"""Core Exceptions."""
+
+
+class HassioError(Exception):
+    """Root exception."""
+    pass
+
+
+class HassioNotSupportedError(HassioError):
+    """Function is not supported."""
+    pass
+
+
+# HomeAssistant
+
+class HomeAssistantError(HassioError):
+    """Home Assistant exception."""
+    pass
+
+
+class HomeAssistantUpdateError(HomeAssistantError):
+    """Error on update of a Home Assistant."""
+    pass
+
+
+class HomeAssistantAPIError(HomeAssistantError):
+    """Home Assistant API exception."""
+    pass
+
+
+class HomeAssistantAuthError(HomeAssistantAPIError):
+    """Home Assistant Auth API exception."""
+    pass
+
+
+# HassOS
+
+class HassOSError(HassioError):
+    """HassOS exception."""
+    pass
+
+
+class HassOSUpdateError(HassOSError):
+    """Error on update of a HassOS."""
+    pass
+
+
+class HassOSNotSupportedError(HassioNotSupportedError):
+    """Function not supported by HassOS."""
+    pass
+
+
+# Updater
+
+class HassioUpdaterError(HassioError):
+    """Error on Updater."""
+    pass
+
+
+# Auth
+
+class AuthError(HassioError):
+    """Auth errors."""
+    pass
+
+
+# Host
+
+class HostError(HassioError):
+    """Internal Host error."""
+    pass
+
+
+class HostNotSupportedError(HassioNotSupportedError):
+    """Host function is not supprted."""
+    pass
+
+
+class HostServiceError(HostError):
+    """Host service functions fails."""
+    pass
+
+
+class HostAppArmorError(HostError):
+    """Host apparmor functions fails."""
+    pass
+
+
+# API
+
+class APIError(HassioError, RuntimeError):
+    """API errors."""
+    pass
+
+
+class APIForbidden(APIError):
+    """API forbidden error."""
+    pass
+
+
+# Service / Discovery
+
+class DiscoveryError(HassioError):
+    """Discovery Errors."""
+    pass
+
+
+class ServicesError(HassioError):
+    """Services Errors."""
+    pass
+
+
+# utils/gdbus
+
+class DBusError(HassioError):
+    """DBus generic error."""
+    pass
+
+
+class DBusNotConnectedError(HostNotSupportedError):
+    """DBus is not connected and call a method."""
+
+
+class DBusFatalError(DBusError):
+    """DBus call going wrong."""
+    pass
+
+
+class DBusParseError(DBusError):
+    """DBus parse error."""
+    pass
+
+
+# util/apparmor
+
+class AppArmorError(HostAppArmorError):
+    """General AppArmor error."""
+    pass
+
+
+class AppArmorFileError(AppArmorError):
+    """AppArmor profile file error."""
+    pass
+
+
+class AppArmorInvalidError(AppArmorError):
+    """AppArmor profile validate error."""
+    pass
--- a/hassio/hassos.py
+++ b/hassio/hassos.py
@@ -0,0 +1,186 @@
+"""HassOS support on supervisor."""
+import asyncio
+import logging
+from pathlib import Path
+
+import aiohttp
+from cpe import CPE
+
+from .coresys import CoreSysAttributes
+from .const import URL_HASSOS_OTA
+from .docker.hassos_cli import DockerHassOSCli
+from .exceptions import HassOSNotSupportedError, HassOSUpdateError, DBusError
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class HassOS(CoreSysAttributes):
+    """HassOS interface inside HassIO."""
+
+    def __init__(self, coresys):
+        """Initialize HassOS handler."""
+        self.coresys = coresys
+        self.instance = DockerHassOSCli(coresys)
+        self._available = False
+        self._version = None
+        self._board = None
+
+    @property
+    def available(self):
+        """Return True, if HassOS on host."""
+        return self._available
+
+    @property
+    def version(self):
+        """Return version of HassOS."""
+        return self._version
+
+    @property
+    def version_cli(self):
+        """Return version of HassOS cli."""
+        return self.instance.version
+
+    @property
+    def version_latest(self):
+        """Return version of HassOS."""
+        return self.sys_updater.version_hassos
+
+    @property
+    def version_cli_latest(self):
+        """Return version of HassOS."""
+        return self.sys_updater.version_hassos_cli
+
+    @property
+    def need_update(self):
+        """Return true if a HassOS update is available."""
+        return self.version != self.version_latest
+
+    @property
+    def need_cli_update(self):
+        """Return true if a HassOS cli update is available."""
+        return self.version_cli != self.version_cli_latest
+
+    @property
+    def board(self):
+        """Return board name."""
+        return self._board
+
+    def _check_host(self):
+        """Check if HassOS is available."""
+        if not self.available:
+            _LOGGER.error("No HassOS available")
+            raise HassOSNotSupportedError()
+
+    async def _download_raucb(self, version):
+        """Download rauc bundle (OTA) from github."""
+        url = URL_HASSOS_OTA.format(version=version, board=self.board)
+        raucb = Path(self.sys_config.path_tmp, f"hassos-{version}.raucb")
+
+        try:
+            _LOGGER.info("Fetch OTA update from %s", url)
+            async with self.sys_websession.get(url) as request:
+                if request.status != 200:
+                    raise HassOSUpdateError()
+
+                # Download RAUCB file
+                with raucb.open('wb') as ota_file:
+                    while True:
+                        chunk = await request.content.read(1048576)
+                        if not chunk:
+                            break
+                        ota_file.write(chunk)
+
+            _LOGGER.info("OTA update is downloaded on %s", raucb)
+            return raucb
+
+        except (aiohttp.ClientError, asyncio.TimeoutError) as err:
+            _LOGGER.warning("Can't fetch versions from %s: %s", url, err)
+
+        except OSError as err:
+            _LOGGER.error("Can't write OTA file: %s", err)
+
+        raise HassOSUpdateError()
+
+    async def load(self):
+        """Load HassOS data."""
+        try:
+            # Check needed host functions
+            assert self.sys_dbus.rauc.is_connected
+            assert self.sys_dbus.systemd.is_connected
+            assert self.sys_dbus.hostname.is_connected
+
+            assert self.sys_host.info.cpe is not None
+            cpe = CPE(self.sys_host.info.cpe)
+            assert cpe.get_product()[0] == 'hassos'
+        except (AssertionError, NotImplementedError):
+            _LOGGER.debug("Found no HassOS")
+            return
+
+        # Store meta data
+        self._available = True
+        self._version = cpe.get_version()[0]
+        self._board = cpe.get_target_hardware()[0]
+
+        _LOGGER.info("Detect HassOS %s on host system", self.version)
+        await self.instance.attach()
+
+    def config_sync(self):
+        """Trigger a host config reload from usb.
+
+        Return a coroutine.
+        """
+        self._check_host()
+
+        _LOGGER.info("Syncing configuration from USB with HassOS.")
+        return self.sys_host.services.restart('hassos-config.service')
+
+    async def update(self, version=None):
+        """Update HassOS system."""
+        version = version or self.version_latest
+
+        # Check installed version
+        self._check_host()
+        if version == self.version:
+            _LOGGER.warning("Version %s is already installed", version)
+            raise HassOSUpdateError()
+
+        # Fetch files from internet
+        int_ota = await self._download_raucb(version)
+        ext_ota = Path(self.sys_config.path_extern_tmp, int_ota.name)
+
+        try:
+            await self.sys_dbus.rauc.install(ext_ota)
+            completed = await self.sys_dbus.rauc.signal_completed()
+
+        except DBusError:
+            _LOGGER.error("Rauc communication error")
+            raise HassOSUpdateError() from None
+
+        finally:
+            int_ota.unlink()
+
+        # Update success
+        if 0 in completed:
+            _LOGGER.info("Install HassOS %s success", version)
+            self.sys_create_task(self.sys_host.control.reboot())
+            return
+
+        # Update fails
+        rauc_status = await self.sys_dbus.get_properties()
+        _LOGGER.error(
+            "HassOS update fails with: %s", rauc_status.get('LastError'))
+        raise HassOSUpdateError()
+
+    async def update_cli(self, version=None):
+        """Update local HassOS cli."""
+        version = version or self.version_cli_latest
+
+        if version == self.version_cli:
+            _LOGGER.warning("Version %s is already installed for CLI", version)
+            raise HassOSUpdateError()
+
+        if await self.instance.update(version):
+            return
+
+        _LOGGER.error("HassOS CLI update fails")
+        raise HassOSUpdateError()
--- a/hassio/homeassistant.py
+++ b/hassio/homeassistant.py
@@ -1,19 +1,30 @@
-"""HomeAssistant control object."""
+"""Home Assistant control object."""
 import asyncio
+from contextlib import asynccontextmanager, suppress
+from datetime import datetime, timedelta
 import logging
 import os
 import re
+from pathlib import Path
+import socket
+import time

 import aiohttp
-from aiohttp.hdrs import CONTENT_TYPE
-import async_timeout
+from aiohttp import hdrs
+import attr

 from .const import (
-    FILE_HASSIO_HOMEASSISTANT, ATTR_DEVICES, ATTR_IMAGE, ATTR_LAST_VERSION,
-    ATTR_VERSION, ATTR_BOOT, ATTR_PASSWORD, ATTR_PORT, ATTR_SSL, ATTR_WATCHDOG,
-    HEADER_HA_ACCESS, CONTENT_TYPE_JSON)
-from .dock.homeassistant import DockerHomeAssistant
-from .tools import JsonConfig, convert_to_ascii
+    FILE_HASSIO_HOMEASSISTANT, ATTR_IMAGE, ATTR_LAST_VERSION, ATTR_UUID,
+    ATTR_BOOT, ATTR_PASSWORD, ATTR_PORT, ATTR_SSL, ATTR_WATCHDOG,
+    ATTR_WAIT_BOOT, ATTR_REFRESH_TOKEN, ATTR_ACCESS_TOKEN,
+    HEADER_HA_ACCESS)
+from .coresys import CoreSysAttributes
+from .docker.homeassistant import DockerHomeAssistant
+from .exceptions import (
+    HomeAssistantUpdateError, HomeAssistantError, HomeAssistantAPIError,
+    HomeAssistantAuthError)
+from .utils import convert_to_ascii, process_lock, create_token
+from .utils.json import JsonConfig
 from .validate import SCHEMA_HASS_CONFIG

 _LOGGER = logging.getLogger(__name__)
@@ -21,270 +32,472 @@ _LOGGER = logging.getLogger(__name__)
 RE_YAML_ERROR = re.compile(r"homeassistant\.util\.yaml")


-class HomeAssistant(JsonConfig):
-    """Hass core object for handle it."""
+@attr.s(frozen=True)
+class ConfigResult:
+    """Return object from config check."""
+    valid = attr.ib()
+    log = attr.ib()

-    def __init__(self, config, loop, docker, updater):
-        """Initialize hass object."""
+
+class HomeAssistant(JsonConfig, CoreSysAttributes):
+    """Home Assistant core object for handle it."""
+
+    def __init__(self, coresys):
+        """Initialize Home Assistant object."""
        super().__init__(FILE_HASSIO_HOMEASSISTANT, SCHEMA_HASS_CONFIG)
-        self.config = config
-        self.loop = loop
-        self.updater = updater
-        self.docker = DockerHomeAssistant(config, loop, docker, self)
-        self.api_ip = docker.network.gateway
-        self.websession = aiohttp.ClientSession(
-            connector=aiohttp.TCPConnector(verify_ssl=False), loop=loop)
+        self.coresys = coresys
+        self.instance = DockerHomeAssistant(coresys)
+        self.lock = asyncio.Lock(loop=coresys.loop)
+        self._error_state = False
+        # We don't persist access tokens. Instead we fetch new ones when needed
+        self.access_token = None
+        self._access_token_expires = None

-    async def prepare(self):
-        """Prepare HomeAssistant object."""
-        if not await self.docker.exists():
-            _LOGGER.info("No HomeAssistant docker %s found.", self.image)
-            if self.is_custom_image:
-                await self.install()
-            else:
+    async def load(self):
+        """Prepare Home Assistant object."""
+        if await self.instance.attach():
+            return
+
+        _LOGGER.info("No Home Assistant Docker image %s found.", self.image)
        await self.install_landingpage()
-        else:
-            await self.docker.attach()
+
+    @property
+    def machine(self):
+        """Return the system machines."""
+        return self.instance.machine
+
+    @property
+    def error_state(self):
+        """Return True if system is in error."""
+        return self._error_state
+
+    @property
+    def api_ip(self):
+        """Return IP of Home Assistant instance."""
+        return self.sys_docker.network.gateway

    @property
    def api_port(self):
-        """Return network port to home-assistant instance."""
+        """Return network port to Home Assistant instance."""
        return self._data[ATTR_PORT]

    @api_port.setter
    def api_port(self, value):
-        """Set network port for home-assistant instance."""
+        """Set network port for Home Assistant instance."""
        self._data[ATTR_PORT] = value
-        self.save()

    @property
    def api_password(self):
-        """Return password for home-assistant instance."""
+        """Return password for Home Assistant instance."""
        return self._data.get(ATTR_PASSWORD)

    @api_password.setter
    def api_password(self, value):
-        """Set password for home-assistant instance."""
+        """Set password for Home Assistant instance."""
        self._data[ATTR_PASSWORD] = value
-        self.save()

    @property
    def api_ssl(self):
-        """Return if we need ssl to home-assistant instance."""
+        """Return if we need ssl to Home Assistant instance."""
        return self._data[ATTR_SSL]

    @api_ssl.setter
    def api_ssl(self, value):
-        """Set SSL for home-assistant instance."""
+        """Set SSL for Home Assistant instance."""
        self._data[ATTR_SSL] = value
-        self.save()

    @property
    def api_url(self):
-        """Return API url to Home-Assistant."""
+        """Return API url to Home Assistant."""
        return "{}://{}:{}".format(
            'https' if self.api_ssl else 'http', self.api_ip, self.api_port
        )

    @property
    def watchdog(self):
-        """Return True if the watchdog should protect Home-Assistant."""
+        """Return True if the watchdog should protect Home Assistant."""
        return self._data[ATTR_WATCHDOG]

    @watchdog.setter
    def watchdog(self, value):
-        """Return True if the watchdog should protect Home-Assistant."""
+        """Return True if the watchdog should protect Home Assistant."""
        self._data[ATTR_WATCHDOG] = value
-        self.save()
+
+    @property
+    def wait_boot(self):
+        """Return time to wait for Home Assistant startup."""
+        return self._data[ATTR_WAIT_BOOT]
+
+    @wait_boot.setter
+    def wait_boot(self, value):
+        """Set time to wait for Home Assistant startup."""
+        self._data[ATTR_WAIT_BOOT] = value

    @property
    def version(self):
-        """Return version of running homeassistant."""
-        return self.docker.version
+        """Return version of running Home Assistant."""
+        return self.instance.version

    @property
    def last_version(self):
-        """Return last available version of homeassistant."""
+        """Return last available version of Home Assistant."""
        if self.is_custom_image:
            return self._data.get(ATTR_LAST_VERSION)
-        return self.updater.version_homeassistant
+        return self.sys_updater.version_homeassistant
+
+    @last_version.setter
+    def last_version(self, value):
+        """Set last available version of Home Assistant."""
+        if value:
+            self._data[ATTR_LAST_VERSION] = value
+        else:
+            self._data.pop(ATTR_LAST_VERSION, None)

    @property
    def image(self):
-        """Return image name of hass containter."""
-        if ATTR_IMAGE in self._data:
+        """Return image name of the Home Assistant container."""
+        if self._data.get(ATTR_IMAGE):
            return self._data[ATTR_IMAGE]
        return os.environ['HOMEASSISTANT_REPOSITORY']

+    @image.setter
+    def image(self, value):
+        """Set image name of Home Assistant container."""
+        if value:
+            self._data[ATTR_IMAGE] = value
+        else:
+            self._data.pop(ATTR_IMAGE, None)
+
    @property
    def is_custom_image(self):
        """Return True if a custom image is used."""
-        return ATTR_IMAGE in self._data
-
-    @property
-    def devices(self):
-        """Return extend device mapping."""
-        return self._data[ATTR_DEVICES]
-
-    @devices.setter
-    def devices(self, value):
-        """Set extend device mapping."""
-        self._data[ATTR_DEVICES] = value
-        self.save()
+        return all(attr in self._data for attr in
+                   (ATTR_IMAGE, ATTR_LAST_VERSION))

    @property
    def boot(self):
-        """Return True if home-assistant boot is enabled."""
+        """Return True if Home Assistant boot is enabled."""
        return self._data[ATTR_BOOT]

    @boot.setter
    def boot(self, value):
-        """Set home-assistant boot options."""
+        """Set Home Assistant boot options."""
        self._data[ATTR_BOOT] = value
-        self.save()

-    def set_custom(self, image, version):
-        """Set a custom image for homeassistant."""
-        # reset
-        if image is None and version is None:
-            self._data.pop(ATTR_IMAGE, None)
-            self._data.pop(ATTR_VERSION, None)
+    @property
+    def uuid(self):
+        """Return a UUID of this Home Assistant instance."""
+        return self._data[ATTR_UUID]

-            self.docker.image = self.image
-        else:
-            if image:
-                self._data[ATTR_IMAGE] = image
-                self.docker.image = image
-            if version:
-                self._data[ATTR_VERSION] = version
-        self.save()
+    @property
+    def hassio_token(self):
+        """Return an access token for the Hass.io API."""
+        return self._data.get(ATTR_ACCESS_TOKEN)

+    @property
+    def refresh_token(self):
+        """Return the refresh token to authenticate with Home Assistant."""
+        return self._data.get(ATTR_REFRESH_TOKEN)
+
+    @refresh_token.setter
+    def refresh_token(self, value):
+        """Set Home Assistant refresh_token."""
+        self._data[ATTR_REFRESH_TOKEN] = value
+
+    @process_lock
    async def install_landingpage(self):
-        """Install a landingpage."""
+        """Install a landing page."""
        _LOGGER.info("Setup HomeAssistant landingpage")
        while True:
-            if await self.docker.install('landingpage'):
+            if await self.instance.install('landingpage'):
                break
            _LOGGER.warning("Fails install landingpage, retry after 60sec")
-            await asyncio.sleep(60, loop=self.loop)
+            await asyncio.sleep(60)

-        # run landingpage after installation
-        await self.docker.run()
+        # Run landingpage after installation
+        _LOGGER.info("Start landing page")
+        try:
+            await self._start()
+        except HomeAssistantError:
+            _LOGGER.warning("Can't start landing page")

+    @process_lock
    async def install(self):
-        """Install a landingpage."""
-        _LOGGER.info("Setup HomeAssistant")
+        """Install a landing page."""
+        _LOGGER.info("Setup Home Assistant")
        while True:
            # read homeassistant tag and install it
            if not self.last_version:
-                await self.updater.fetch_data()
+                await self.sys_updater.reload()

            tag = self.last_version
-            if tag and await self.docker.install(tag):
+            if tag and await self.instance.install(tag):
                break
-            _LOGGER.warning("Error on install HomeAssistant. Retry in 60sec")
-            await asyncio.sleep(60, loop=self.loop)
+            _LOGGER.warning("Error on install Home Assistant. Retry in 60sec")
+            await asyncio.sleep(60)

        # finishing
-        _LOGGER.info("HomeAssistant docker now installed")
-        if self.boot:
-            await self.docker.run()
-        await self.docker.cleanup()
+        _LOGGER.info("Home Assistant docker now installed")
+        try:
+            if not self.boot:
+                return
+            _LOGGER.info("Start Home Assistant")
+            await self._start()
+        except HomeAssistantError:
+            _LOGGER.error("Can't start Home Assistant!")
+        finally:
+            await self.instance.cleanup()

+    @process_lock
    async def update(self, version=None):
        """Update HomeAssistant version."""
        version = version or self.last_version
-        running = await self.docker.is_running()
+        rollback = self.version if not self.error_state else None
+        running = await self.instance.is_running()
+        exists = await self.instance.exists()

-        if version == self.docker.version:
+        if exists and version == self.instance.version:
            _LOGGER.warning("Version %s is already installed", version)
-            return False
+            return HomeAssistantUpdateError()

+        # process an update
+        async def _update(to_version):
+            """Run Home Assistant update."""
            try:
-            return await self.docker.update(version)
+                _LOGGER.info("Update Home Assistant to version %s", to_version)
+                if not await self.instance.update(to_version):
+                    raise HomeAssistantUpdateError()
            finally:
                if running:
-                await self.docker.run()
+                    await self._start()
+                _LOGGER.info("Successful run Home Assistant %s", to_version)

-    def run(self):
-        """Run HomeAssistant docker.
+        # Update Home Assistant
+        with suppress(HomeAssistantError):
+            await _update(version)
+            return
+
+        # Update going wrong, revert it
+        if self.error_state and rollback:
+            _LOGGER.fatal("HomeAssistant update fails -> rollback!")
+            await _update(rollback)
+        else:
+            raise HomeAssistantUpdateError()
+
+    async def _start(self):
+        """Start Home Assistant Docker & wait."""
+        if await self.instance.is_running():
+            _LOGGER.warning("Home Assistant is already running!")
+            return
+
+        # Create new API token
+        self._data[ATTR_ACCESS_TOKEN] = create_token()
+        self.save_data()
+
+        if not await self.instance.run():
+            raise HomeAssistantError()
+        await self._block_till_run()
+
+    @process_lock
+    def start(self):
+        """Run Home Assistant docker.

        Return a coroutine.
        """
-        return self.docker.run()
+        return self._start()

+    @process_lock
    def stop(self):
-        """Stop HomeAssistant docker.
+        """Stop Home Assistant Docker.

        Return a coroutine.
        """
-        return self.docker.stop()
+        return self.instance.stop()

-    def restart(self):
-        """Restart HomeAssistant docker.
-
-        Return a coroutine.
-        """
-        return self.docker.restart()
+    @process_lock
+    async def restart(self):
+        """Restart Home Assistant Docker."""
+        await self.instance.stop()
+        await self._start()

    def logs(self):
        """Get HomeAssistant docker logs.

        Return a coroutine.
        """
-        return self.docker.logs()
+        return self.instance.logs()
+
+    def stats(self):
+        """Return stats of Home Assistant.
+
+        Return a coroutine.
+        """
+        return self.instance.stats()

    def is_running(self):
-        """Return True if docker container is running.
+        """Return True if Docker container is running.

        Return a coroutine.
        """
-        return self.docker.is_running()
+        return self.instance.is_running()

    def is_initialize(self):
-        """Return True if a docker container is exists.
+        """Return True if a Docker container is exists.

        Return a coroutine.
        """
-        return self.docker.is_initialize()
+        return self.instance.is_initialize()

    @property
    def in_progress(self):
        """Return True if a task is in progress."""
-        return self.docker.in_progress
+        return self.instance.in_progress or self.lock.locked()

    async def check_config(self):
-        """Run homeassistant config check."""
-        exit_code, log = await self.docker.execute_command(
+        """Run Home Assistant config check."""
+        result = await self.instance.execute_command(
            "python3 -m homeassistant -c /config --script check_config"
        )

        # if not valid
-        if exit_code is None:
-            return (False, "")
+        if result.exit_code is None:
+            _LOGGER.error("Fatal error on config check!")
+            raise HomeAssistantError()

        # parse output
-        log = convert_to_ascii(log)
-        if exit_code != 0 or RE_YAML_ERROR.search(log):
-            return (False, log)
-        return (True, log)
+        log = convert_to_ascii(result.output)
+        if result.exit_code != 0 or RE_YAML_ERROR.search(log):
+            _LOGGER.error("Invalid Home Assistant config found!")
+            return ConfigResult(False, log)

-    async def check_api_state(self):
-        """Check if Home-Assistant up and running."""
-        url = "{}/api/".format(self.api_url)
-        header = {CONTENT_TYPE: CONTENT_TYPE_JSON}
+        _LOGGER.info("Home Assistant config is valid")
+        return ConfigResult(True, log)

+    async def ensure_access_token(self):
+        """Ensures there is an access token."""
+        if (self.access_token is not None and
+                self._access_token_expires > datetime.utcnow()):
+            return
+
+        with suppress(asyncio.TimeoutError, aiohttp.ClientError):
+            async with self.sys_websession_ssl.post(
+                    f"{self.api_url}/auth/token",
+                    timeout=30,
+                    data={
+                        "grant_type": "refresh_token",
+                        "refresh_token": self.refresh_token
+                    }
+            ) as resp:
+                if resp.status != 200:
+                    _LOGGER.error("Can't update Home Assistant access token!")
+                    raise HomeAssistantAuthError()
+
+                _LOGGER.info("Updated Home Assistant API token")
+                tokens = await resp.json()
+                self.access_token = tokens['access_token']
+                self._access_token_expires = \
+                    datetime.utcnow() + timedelta(seconds=tokens['expires_in'])
+
+    @asynccontextmanager
+    async def make_request(self, method, path, json=None, content_type=None,
+                           data=None, timeout=30):
+        """Async context manager to make a request with right auth."""
+        url = f"{self.api_url}/{path}"
+        headers = {}
+
+        # Passthrough content type
+        if content_type is not None:
+            headers[hdrs.CONTENT_TYPE] = content_type
+
+        # Set old API Password
        if self.api_password:
-            header.update({HEADER_HA_ACCESS: self.api_password})
+            headers[HEADER_HA_ACCESS] = self.api_password
+
+        for _ in (1, 2):
+            # Prepare Access token
+            if self.refresh_token:
+                await self.ensure_access_token()
+                headers[hdrs.AUTHORIZATION] = f'Bearer {self.access_token}'

            try:
-            async with async_timeout.timeout(30, loop=self.loop):
-                async with self.websession.get(url, headers=header) as request:
-                    status = request.status
+                async with getattr(self.sys_websession_ssl, method)(
+                        url, data=data, timeout=timeout, json=json,
+                        headers=headers
+                ) as resp:
+                    # Access token expired
+                    if resp.status == 401 and self.refresh_token:
+                        self.access_token = None
+                        continue
+                    yield resp
+                    return
+            except (asyncio.TimeoutError, aiohttp.ClientError) as err:
+                _LOGGER.error("Error on call %s: %s", url, err)
+                break
+
+        raise HomeAssistantAPIError()
+
+    async def check_api_state(self):
+        """Return True if Home Assistant up and running."""
+        with suppress(HomeAssistantAPIError):
+            async with self.make_request('get', 'api/') as resp:
+                if resp.status in (200, 201):
+                    return True
+                status = resp.status
+            _LOGGER.warning("Home Assistant API config mismatch: %s", status)

-        except (asyncio.TimeoutError, aiohttp.ClientError):
        return False

-        if status not in (200, 201):
-            _LOGGER.warning("Home-Assistant API config missmatch")
+    async def _block_till_run(self):
+        """Block until Home-Assistant is booting up or startup timeout."""
+        start_time = time.monotonic()
+        migration_progress = False
+        migration_file = Path(
+            self.sys_config.path_homeassistant, '.migration_progress')
+
+        def check_port():
+            """Check if port is mapped."""
+            sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            try:
+                result = sock.connect_ex((str(self.api_ip), self.api_port))
+                sock.close()
+
+                # Check if the port is available
+                if result == 0:
                    return True
+            except OSError:
+                pass
+            return False
+
+        while True:
+            await asyncio.sleep(10)
+
+            # 1: Check if Container is is_running
+            if not await self.instance.is_running():
+                _LOGGER.error("Home Assistant has crashed!")
+                break
+
+            # 2: Check if API response
+            if await self.sys_run_in_executor(check_port):
+                _LOGGER.info("Detect a running Home Assistant instance")
+                self._error_state = False
+                return
+
+            # 3: Running DB Migration
+            if migration_file.exists():
+                if not migration_progress:
+                    migration_progress = True
+                    _LOGGER.info("Home Assistant record migration in progress")
+                continue
+            elif migration_progress:
+                migration_progress = False  # Reset start time
+                start_time = time.monotonic()
+                _LOGGER.info("Home Assistant record migration done")
+
+            # 4: Timeout
+            if time.monotonic() - start_time > self.wait_boot:
+                _LOGGER.warning(
+                    "Don't wait anymore of Home Assistant startup!")
+                break
+
+        self._error_state = True
+        raise HomeAssistantError()
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				{"version":3,"sources":["webpack:///../src/resources/load_markdown.js"],"names":["__webpack_require__","r","__webpack_exports__","d","marked","filterXSS","marked__WEBPACK_IMPORTED_MODULE_0__","marked__WEBPACK_IMPORTED_MODULE_0___default","n","xss__WEBPACK_IMPORTED_MODULE_1__","xss__WEBPACK_IMPORTED_MODULE_1___default","marked_","filterXSS_"],"mappings":"0FAAAA,EAAAC,EAAAC,GAAAF,EAAAG,EAAAD,EAAA,2BAAAE,IAAAJ,EAAAG,EAAAD,EAAA,8BAAAG,IAAA,IAAAC,EAAAN,EAAA,IAAAO,EAAAP,EAAAQ,EAAAF,GAAAG,EAAAT,EAAA,IAAAU,EAAAV,EAAAQ,EAAAC,GAGaL,EAASO,IACTN,EAAYO","file":"chunk.9e3883f96f68b3ce89f5.js","sourcesContent":["import marked_ from \"marked\";\nimport filterXSS_ from \"xss\";\n\nexport const marked = marked_;\nexport const filterXSS = filterXSS_;\n"],"sourceRoot":""}