diff --git a/configuration.yaml b/configuration.yaml
index 531a85b..f32e32b 100755
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -88,8 +88,9 @@ weather:
     mode: daily
     
     
+group: !include_dir_merge_named include/groups/
+sensor: !include_dir_merge_list include/sensors/
     
-group: !include groups.yaml
 automation: !include automations.yaml
 script: !include scripts.yaml
 scene: !include scenes.yaml