diff --git a/groups.yaml b/groups.yaml
index 216d33b..8c0b0ec 100644
--- a/groups.yaml
+++ b/groups.yaml
@@ -14,9 +14,11 @@ Nova:
   - sensor.ram_free
   - sensor.cpu_temperature
 
-Doors:
+Security:
   - sensor.front_door
+  - sensor.front_door2
   - sensor.back_door
+  - sensor.hall_motion
 
 Presence:
   - device_tracker.bcc6
diff --git a/sensors.yaml b/sensors.yaml
index bd31f9e..358a792 100644
--- a/sensors.yaml
+++ b/sensors.yaml
@@ -28,8 +28,22 @@
         {% else %}
         n/a
         {% endif %}'
+      friendly_name: 'Front Door (binary)'
+
+- platform: template
+  sensors:
+    front_door2:
+      value_template: >-
+          {%- if is_state('sensor.fibaro_system_fgk10x_door_opening_sensor_access_control', '22') -%}
+            Open
+          {%- elif is_state('sensor.fibaro_system_fgk10x_door_opening_sensor_access_control', '23') -%}
+            Closed
+          {%- else -%}
+            Unknown
+          {%- endif -%}
       friendly_name: 'Front Door'
 
+
 - platform: template
   sensors:
     back_door: