diff --git a/custom_components/georide/binary_sensor.py b/custom_components/georide/binary_sensor.py
index 2bdf912..194a280 100644
--- a/custom_components/georide/binary_sensor.py
+++ b/custom_components/georide/binary_sensor.py
@@ -167,7 +167,7 @@ class GeoRideActiveSubscriptionBinarySensorEntity(GeoRideBinarySensorEntity):
         """state value property"""
         tracker = self._tracker_device.tracker
         if tracker.is_oldsubscription:
-            if .tracker.subscription_id is not None:
+            if tracker.subscription_id is not None:
                 return True
             return False
         else:
diff --git a/custom_components/georide/sensor.py b/custom_components/georide/sensor.py
index 5ea412c..c2a89b2 100644
--- a/custom_components/georide/sensor.py
+++ b/custom_components/georide/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.helpers.update_coordinator import (
 )
 
 from .const import DOMAIN as GEORIDE_DOMAIN
-from .device import Device
+from .device import Device, DeviceBeacon    
 
 
 _LOGGER = logging.getLogger(__name__) 
diff --git a/custom_components/georide/siren.py b/custom_components/georide/siren.py
index 7ef489f..2eb675f 100644
--- a/custom_components/georide/siren.py
+++ b/custom_components/georide/siren.py
@@ -6,7 +6,6 @@ import logging
 from typing import Any, Mapping
 
 from homeassistant.components.siren import SirenEntity
-from homeassistant.components.siren import ENTITY_ID_FORMAT
 
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
@@ -17,6 +16,7 @@ import georideapilib.api as GeoRideApi
 
 from .const import DOMAIN as GEORIDE_DOMAIN
 from .device import Device
+ENTITY_ID_FORMAT: Final = DOMAIN + ".{}"
 
 _LOGGER = logging.getLogger(__name__)