diff --git a/Batterie/module.php b/Batterie/module.php
index e034879..7ba02f7 100644
--- a/Batterie/module.php
+++ b/Batterie/module.php
@@ -20,12 +20,8 @@ class Batterie extends IPSModule
         
         
         // Variabeln für Kommunkation mit Manager
-        $this->RegisterVariableFloat("Entladeleistung","Entladeleistung", "",0);
         $this->RegisterVariableInteger("Batteriemanagement_Variabel","Batteriemanagement_Variabel", "",0);
-        //$this->RegisterVariableInteger("Laden3_Entladen4","Laden3_Entladen4", "",3);
         $this->RegisterVariableInteger("Laden_Entladen","Laden_Entladen", "",3);
-        $this->RegisterVariableFloat("Ladeleistung","Ladeleistung", "",0);
-        $this->RegisterVariableFloat("Goodwe_EntLadeleistung","Goodwe_EntLadeleistung", "",0);
         $this->RegisterVariableInteger("Aktuelle_Leistung", "Aktuelle_Leistung", "", 0);
         $this->RegisterVariableString("PowerSteps", "PowerSteps");
         $this->RegisterVariableBoolean("Idle", "Idle", "", 0);
@@ -62,6 +58,38 @@ class Batterie extends IPSModule
         $this->SetValue("Batteriemanagement_Variabel", $batterieManagement);
         $this->SetTimerInterval("Timer_Do_UserCalc_Battery",$this->ReadPropertyInteger("Interval")*1000); 
 
+        $batterietyp = $this->ReadPropertyInteger("Batterietyp");
+
+        switch ($batterietyp) {
+            case 1: // Goodwe
+                $this->MaintainVariable("Goodwe_EntLadeleistung", "Goodwe_EntLadeleistung", VARIABLETYPE_FLOAT, "", 10, true);
+                $this->MaintainVariable("Ladeleistung", "Ladeleistung", VARIABLETYPE_FLOAT, "", 11, false);
+                $this->MaintainVariable("Entladeleistung", "Entladeleistung", VARIABLETYPE_FLOAT, "", 13, false);
+                $this->MaintainVariable("Laden_Entladen", "Laden_Entladen", VARIABLETYPE_INTEGER, "", 12, true);
+                break;
+
+            case 2: // Solaredge
+                $this->MaintainVariable("Goodwe_EntLadeleistung", "Goodwe_EntLadeleistung", VARIABLETYPE_FLOAT, "", 10, false);
+                $this->MaintainVariable("Ladeleistung", "Ladeleistung", VARIABLETYPE_FLOAT, "", 11, true);
+                $this->MaintainVariable("Entladeleistung", "Entladeleistung", VARIABLETYPE_FLOAT, "", 13, true);
+                $this->MaintainVariable("Laden_Entladen", "Laden_Entladen", VARIABLETYPE_INTEGER, "", 12, true);
+                break;
+
+            case 3: // SiG Energy
+                $this->MaintainVariable("Goodwe_EntLadeleistung", "Goodwe_EntLadeleistung", VARIABLETYPE_FLOAT, "", 10, false);
+                $this->MaintainVariable("Ladeleistung", "Ladeleistung", VARIABLETYPE_FLOAT, "", 11, true);
+                $this->MaintainVariable("Entladeleistung", "Entladeleistung", VARIABLETYPE_FLOAT, "", 13, true);
+                $this->MaintainVariable("Laden_Entladen", "Laden_Entladen", VARIABLETYPE_INTEGER, "", 12, true);
+                break;
+
+            default:
+                // Sicherheit: alles weg
+                $this->MaintainVariable("Goodwe_EntLadeleistung", "Goodwe_EntLadeleistung", VARIABLETYPE_FLOAT, "", 10, false);
+                $this->MaintainVariable("Ladeleistung", "Ladeleistung", VARIABLETYPE_FLOAT, "", 11, false);
+                $this->MaintainVariable("Laden_Entladen", "Laden_Entladen", VARIABLETYPE_INTEGER, "", 12, false);
+                $this->MaintainVariable("Entladeleistung", "Entladeleistung", VARIABLETYPE_FLOAT, "", 13, false);
+                break;
+        }