diff --git a/custom_components/solarman/inverter_definitions/hyd-zss-hp-3k-6k.yaml b/custom_components/solarman/inverter_definitions/hyd-zss-hp-3k-6k.yaml
index ddf3f19..890112f 100644
--- a/custom_components/solarman/inverter_definitions/hyd-zss-hp-3k-6k.yaml
+++ b/custom_components/solarman/inverter_definitions/hyd-zss-hp-3k-6k.yaml
@@ -1,12 +1,19 @@
-# ZCS Azzurro 3-phase hybrid inverters
+# ZCS Azzurro 3-phase and single phase hybrid inverters
 # with LSW-3 WiFi logger with SN 27xxxxxxxx and FW LSW3_15_270A_1.53:
+# DUPLICATE: this file should be removed! Please use sofar_g3hyd.yaml instead
 
 requests:
   - start: 0x0400
     end: 0x042B
     mb_functioncode: 0x03
+  - start: 0x0445
+    end: 0x0465
+    mb_functioncode: 0x03
   - start: 0x0482
-    end: 0x04A4
+    end: 0x04AF
+    mb_functioncode: 0x03
+  - start: 0x0504
+    end: 0x051F
     mb_functioncode: 0x03
   - start: 0x0582
     end: 0x0589
@@ -17,8 +24,11 @@ requests:
   - start: 0x0682
     end: 0x069B
     mb_functioncode: 0x03
-  - start: 0x0504
-    end: 0x0504
+  - start: 0x104D
+    end: 0x104E
+    mb_functioncode: 0x03
+  - start: 0x1052
+    end: 0x1052
     mb_functioncode: 0x03
 
 parameters:
@@ -32,6 +42,15 @@ parameters:
         rule: 3
         registers: [0x0685,0x0684]
         icon: 'mdi:solar-power'
+		
+      - name: "PV Generation time today"
+        class: "duration"
+        state_class: "measurement"
+        uom: "min"
+        scale: 1
+        rule: 1
+        registers: [ 0x0426 ]
+        icon: 'mdi:clock'
 
       - name: 'PV Generation total'
         class: 'energy'
@@ -198,6 +217,33 @@ parameters:
         registers: [0x0699,0x0698]
         icon: 'mdi:home-lightning-bolt'
 
+      - name: "Battery DoD"
+        class: ""
+        state_class: "measurement"
+        uom: "%"
+        scale: 1
+        rule: 1
+        registers: [ 0x104D ]
+        icon: 'mdi:battery'
+
+      - name: "Battery EoD"
+        class: ""
+        state_class: "measurement"
+        uom: "%"
+        scale: 1
+        rule: 1
+        registers: [ 0x104E ]
+        icon: 'mdi:battery'
+
+      - name: "Battery EPS buffer"
+        class: ""
+        state_class: "measurement"
+        uom: "%"
+        scale: 1
+        rule: 1
+        registers: [ 0x1052 ]
+        icon: 'mdi:battery-low'
+
   - group: Grid
     items:
       - name: 'Grid Frequency'
@@ -218,15 +264,6 @@ parameters:
         registers: [0x0485]
         icon: 'mdi:home-lightning-bolt'
         
-      - name: 'Active Power Load Total'
-        class: 'power'
-        state_class: 'measurement'
-        uom: 'W'
-        scale: 10
-        rule: 2
-        registers: [0x0504]
-        icon: 'mdi:home-lightning-bolt'
-        
       - name: 'Energy Purchase Today'
         class: 'energy'
         state_class: 'total_increasing'
@@ -263,6 +300,44 @@ parameters:
         registers: [0x0693,0x0692]
         icon: 'mdi:home-lightning-bolt'
 
+  - group: EPS
+    items:
+      - name: 'EPS Active Power Load Total'
+        class: 'power'
+        state_class: 'measurement'
+        uom: 'W'
+        scale: 10
+        rule: 2
+        registers: [0x0504]
+        icon: 'mdi:home-lightning-bolt'
+
+      - name: 'EPS Frequency'
+        class: 'frequency'
+        state_class: 'measurement'
+        uom: 'Hz'
+        scale: 0.01
+        rule: 1
+        registers: [0x0507]
+        icon: 'mdi:home-lightning-bolt'
+
+      - name: 'EPS Voltage'
+        class: "voltage"
+        state_class: "measurement"
+        uom: "V"
+        scale: 0.1
+        rule: 1
+        registers: [0x050A]
+        icon: 'mdi:home-lightning-bolt'
+
+      - name: 'EPS Current'
+        class: "current"
+        state_class: "measurement"
+        uom: "A"
+        scale: 0.01
+        rule: 1
+        registers: [ 0x050B ]
+        icon: 'mdi:home-lightning-bolt'
+
   - group: Inverter
     items:
       - name: 'Inverter status'
@@ -274,15 +349,21 @@ parameters:
         registers: [0x0404]
         lookup:
           - key: 0
-            value: 'Stand-by'
+            value: "waiting"
           - key: 1
-            value: 'Self-checking'
+            value: "detection"
           - key: 2
-            value: 'Normal'
+            value: "grid-connected"
           - key: 3
-            value: 'FAULT'
+            value: "emergency power supply"
           - key: 4
-            value: 'Permanent'
+            value: "recoverable fault"
+          - key: 5
+            value: "permanent fault"
+          - key: 6
+            value: "upgrade"
+          - key: 7
+            value: "self-charging"
         icon: 'mdi:wrench'
 
       - name: 'Module temperature'
@@ -312,12 +393,74 @@ parameters:
       - name: 'Insulation Resistance'
         class: ''
         state_class: 'measurement'
-        uom: 'Ω'
+        uom: 'kΩ'
         scale: 1
         rule: 1
         registers: [0x042B]
         icon: 'mdi:omega'
 
+      - name: "Serial Number"
+        class: ""
+        uom: ""
+        scale: 1
+        rule: 5
+        isstr: true
+        registers: [ 0x0445,0x0446,0x0447,0x0448,0x0449,0x044A,0x044B,0x044C ] # serial number 17th to 20th digits are in 0x0470 and 0x0471
+        icon: 'mdi:barcode'
+
+      - name: "Hardware Version"
+        class: ""
+        uom: ""
+        scale: 1
+        rule: 5
+        isstr: true
+        registers: [ 0x044D,0x044E ]
+        icon: 'mdi:alpha-v'
+
+      - name: "Software Version Master"
+        class: ""
+        uom: ""
+        scale: 1
+        rule: 5
+        isstr: true
+        registers: [ 0x0453,0x0454,0x0455,0x0456 ]
+        icon: 'mdi:alpha-v'
+
+      - name: "Software Version Slave"
+        class: ""
+        uom: ""
+        scale: 1
+        rule: 5
+        isstr: true
+        registers: [ 0x0457,0x0458,0x0459,0x045A ]
+        icon: 'mdi:alpha-v'
+
+      - name: "Safety Version"
+        class: ""
+        uom: ""
+        scale: 1
+        rule: 7
+        registers: [ 0x045B,0x045C ]
+        icon: 'mdi:alpha-v'
+
+      - name: "Safety Firmware Version"
+        class: ""
+        uom: ""
+        scale: 1
+        rule: 5
+        isstr: true
+        registers: [ 0x0460,0x0461,0x0462,0x0463 ]
+        icon: 'mdi:alpha-v'
+
+      - name: "Safety Hardware Version"
+        class: ""
+        uom: ""
+        scale: 1
+        rule: 5
+        isstr: true
+        registers: [ 0x0464,0x0465 ]
+        icon: 'mdi:alpha-v'
+
   - group: Alert
     items:
       - name: 'Alert'