diff --git a/custom_components/nordpool/__init__.py b/custom_components/nordpool/__init__.py
index 22a3b07..ecd75c0 100644
--- a/custom_components/nordpool/__init__.py
+++ b/custom_components/nordpool/__init__.py
@@ -28,7 +28,7 @@
 
 
 NAME = DOMAIN
-VERSION = "0.0.10b"
+VERSION = "0.0.10b0"
 ISSUEURL = "https://github.com/custom-components/nordpool/issues"
 
 STARTUP = f"""
diff --git a/custom_components/nordpool/manifest.json b/custom_components/nordpool/manifest.json
index 1773c71..722b5e3 100644
--- a/custom_components/nordpool/manifest.json
+++ b/custom_components/nordpool/manifest.json
@@ -15,5 +15,5 @@
   "requirements": [
     "nordpool>=0.2"
   ],
-  "version": "0.0.10b"
+  "version": "0.0.10b0"
 }
\ No newline at end of file
diff --git a/custom_components/nordpool/sensor.py b/custom_components/nordpool/sensor.py
index 01a19bf..922ef17 100644
--- a/custom_components/nordpool/sensor.py
+++ b/custom_components/nordpool/sensor.py
@@ -9,14 +9,21 @@
 from homeassistant.components.sensor import PLATFORM_SCHEMA
 from homeassistant.const import CONF_REGION
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.template import Template, attach
 from homeassistant.util import dt as dt_utils
+
+# Import sensor entity and classes.
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorStateClass,
+)
 from jinja2 import pass_context
 
 from . import DOMAIN, EVENT_NEW_DATA
 from .misc import extract_attrs, has_junk, is_new, start_of
 
+
 _LOGGER = logging.getLogger(__name__)
 
 _CENT_MULTIPLIER = 100
@@ -122,8 +129,10 @@ async def async_setup_entry(hass, config_entry, async_add_devices):
     return True
 
 
-class NordpoolSensor(Entity):
-    """Sensor"""
+class NordpoolSensor(SensorEntity):
+    "Sensors data"
+    _attr_device_class = SensorDeviceClass.MONETARY
+    _attr_state_class = SensorStateClass.MEASUREMENT
 
     def __init__(
         self,
@@ -333,8 +342,8 @@ def _update(self):
         self._min = min(td)
         self._max = max(td)
         self._off_peak_1 = mean(td[0:8])
-        self._peak = mean(td[20:])
-        self._off_peak_2 = mean(td[8:20])
+        self._off_peak_2 = mean(td[20:])
+        self._peak = mean(td[8:20])
         self._mean = median(td)
 
     @property