diff --git a/typescript/frontend-marios2/src/content/dashboards/Log/graph.util.tsx b/typescript/frontend-marios2/src/content/dashboards/Log/graph.util.tsx
index dbfa788e0..cc71df690 100644
--- a/typescript/frontend-marios2/src/content/dashboards/Log/graph.util.tsx
+++ b/typescript/frontend-marios2/src/content/dashboards/Log/graph.util.tsx
@@ -439,8 +439,14 @@ export interface JSONRecordData {
     GridPower:number;
     Battery1Power:number;
     Battery1Soc:number;
+    Battery1Soh:number;
+    Battery1Voltage:number;
+    Battery1Current:number;
     Battery2Power:number;
     Battery2Soc:number;
+    Battery2Voltage:number;
+    Battery2Current:number;
+    Battery2Soh:number;
     PvPower:number;
     ConsumptionPower:number;
   };
diff --git a/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/SodistoreHomeConfiguration.tsx b/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/SodistoreHomeConfiguration.tsx
index 6667d0ad2..b98cddaa6 100644
--- a/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/SodistoreHomeConfiguration.tsx
+++ b/typescript/frontend-marios2/src/content/dashboards/SodiohomeInstallations/SodistoreHomeConfiguration.tsx
@@ -86,27 +86,19 @@ function SodistoreHomeConfiguration(props: SodistoreHomeConfigurationProps) {
     operatingPriority: OperatingPriorityOptions.indexOf(
       props.values.Config.OperatingPriority
     ),
-    // ...(props.installation.device === 4
-    //   ? {
-    //     timeChargeDischargePower:
-    //       props.values.Config?.TimeChargeDischargePower ?? 0,
-    //     timeChargeDischargeTime: props.values.Config?.TimeChargeDischargeTime
-    //       ? dayjs(props.values.Config.TimeChargeDischargeTime).toDate()
-    //       : dayjs().toDate(),
-    //     timeChargeDischargeDate: props.values.Config?.TimeChargeDischargeDate
-    //       ? dayjs(props.values.Config.TimeChargeDischargeDate).toDate()
-    //       : dayjs().toDate()
-    //   }
-    //   : {})
-
-    timeChargeDischargePower:
-      props.values.Config?.TimeChargeDischargePower ?? 0, // default 0 W
-    timeChargeDischargeTime: props.values.Config?.TimeChargeDischargeTime
-      ? dayjs(props.values.Config.TimeChargeDischargeTime).toDate()
-      : dayjs().hour(8).minute(0).second(0).toDate(), // default 08:00
-    timeChargeDischargeDate: props.values.Config?.TimeChargeDischargeDate
-      ? dayjs(props.values.Config.TimeChargeDischargeDate).toDate()
-      : dayjs().add(1, 'day').toDate() // default = tomorrow
+    batteriesCount: props.values.Config.BatteriesCount,
+    ...(device === 4
+      ? {
+        timeChargeDischargePower:
+          props.values.Config?.TimeChargeDischargePower ?? 0, // default 0 W
+        timeChargeDischargeTime: props.values.Config?.TimeChargeDischargeTime
+          ? dayjs(props.values.Config.TimeChargeDischargeTime).toDate()
+          : dayjs().hour(8).minute(0).second(0).toDate(), // default 08:00
+        timeChargeDischargeDate: props.values.Config?.TimeChargeDischargeDate
+          ? dayjs(props.values.Config.TimeChargeDischargeDate).toDate()
+          : dayjs().add(1, 'day').toDate(), // default = tomorrow
+      }
+      : {}),
   });
 
   const handleOperatingPriorityChange = (event) => {