diff --git a/components/panasonic_heatpump/binary_sensor.py b/components/panasonic_heatpump/binary_sensor.py
index d9961bf..568f922 100644
--- a/components/panasonic_heatpump/binary_sensor.py
+++ b/components/panasonic_heatpump/binary_sensor.py
@@ -6,29 +6,30 @@ from esphome.const import (
 )
 from . import PanasonicHeatpumpComponent, CONF_PANASONIC_HEATPUMP_ID
 
-CONF_TOP0 = "top0"
-CONF_TOP2 = "top2"
-CONF_TOP3 = "top3"
-CONF_TOP13 = "top13"
-CONF_TOP26 = "top26"
-CONF_TOP60 = "top60"
-CONF_TOP61 = "top61"
-CONF_TOP68 = "top68"
-CONF_TOP69 = "top69"
-CONF_TOP99 = "top99"
-CONF_TOP100 = "top100"
-CONF_TOP108 = "top108"
-CONF_TOP109 = "top109"
-CONF_TOP110 = "top110"
-CONF_TOP119 = "top119"
-CONF_TOP120 = "top120"
-CONF_TOP121 = "top121"
-CONF_TOP122 = "top122"
-CONF_TOP123 = "top123"
-CONF_TOP124 = "top124"
-CONF_TOP129 = "top129"
-CONF_TOP132 = "top132"
-CONF_TOP133 = "top133"
+
+CONF_TOP0 = "top0"  # Heatpump State
+CONF_TOP2 = "top2"  # Force DHW State
+CONF_TOP3 = "top3"  # Quiet Mode Schedule
+CONF_TOP13 = "top13"  # Main Schedule State
+CONF_TOP26 = "top26"  # Defrosting State
+CONF_TOP60 = "top60"  # Internal Heater State
+CONF_TOP61 = "top61"  # External Heater State
+CONF_TOP68 = "top68"  # Force Heater State
+CONF_TOP69 = "top69"  # Sterilization State
+CONF_TOP99 = "top99"  # Buffer Installed
+CONF_TOP100 = "top100"  # DHW Installed
+CONF_TOP108 = "top108"  # Alt External Sensor
+CONF_TOP109 = "top109"  # Anti Freeze Mode
+CONF_TOP110 = "top110"  # Optional PCB
+CONF_TOP119 = "top119"  # External Control
+CONF_TOP120 = "top120"  # External Heat Cool Control
+CONF_TOP121 = "top121"  # External Error Signal
+CONF_TOP122 = "top122"  # External Compressor Control
+CONF_TOP123 = "top123"  # Z2 Pump State
+CONF_TOP124 = "top124"  # Z1 Pump State
+CONF_TOP129 = "top129"  # Bivalent Control
+CONF_TOP132 = "top132"  # Bivalent Advanced Heat
+CONF_TOP133 = "top133"  # Bivalent Advanced DHW
 
 TYPES = [
   CONF_TOP0,
diff --git a/components/panasonic_heatpump/number/__init__.py b/components/panasonic_heatpump/number/__init__.py
index 10d9e44..c7637c3 100644
--- a/components/panasonic_heatpump/number/__init__.py
+++ b/components/panasonic_heatpump/number/__init__.py
@@ -10,39 +10,39 @@ from esphome.const import (
 from .. import CONF_PANASONIC_HEATPUMP_ID, PanasonicHeatpumpComponent, panasonic_heatpump_ns
 
 
-CONF_SET5 = "set5"
-CONF_SET6 = "set6"
-CONF_SET7 = "set7"
-CONF_SET8 = "set8"
-CONF_SET11 = "set11"
-CONF_SET15 = "set15"
-CONF_SET16_1 = "set16_1"
-CONF_SET16_2 = "set16_2"
-CONF_SET16_3 = "set16_3"
-CONF_SET16_4 = "set16_4"
-CONF_SET16_5 = "set16_5"
-CONF_SET16_6 = "set16_6"
-CONF_SET16_7 = "set16_7"
-CONF_SET16_8 = "set16_8"
-CONF_SET16_9 = "set16_9"
-CONF_SET16_10 = "set16_10"
-CONF_SET16_11 = "set16_11"
-CONF_SET16_12 = "set16_12"
-CONF_SET16_13 = "set16_13"
-CONF_SET16_14 = "set16_14"
-CONF_SET16_15 = "set16_15"
-CONF_SET16_16 = "set16_16"
-CONF_SET18 = "set18"
-CONF_SET19 = "set19"
-CONF_SET20 = "set20"
-CONF_SET21 = "set21"
-CONF_SET22 = "set22"
-CONF_SET23 = "set23"
-CONF_SET27 = "set27"
-CONF_SET29 = "set29"
-CONF_SET36 = "set36"
-CONF_SET37 = "set37"
-CONF_SET38 = "set38"
+CONF_SET5 = "set5"  # Set Z1 Heat Request Temperature
+CONF_SET6 = "set6"  # Set Z1 Cool Request Temperature
+CONF_SET7 = "set7"  # Set Z2 Heat Request Temperature
+CONF_SET8 = "set8"  # Set Z2 Cool Request Temperature
+CONF_SET11 = "set11"  # Set DHW Temp
+CONF_SET15 = "set15"  # Set Max Pump Duty
+CONF_SET16_1 = "set16_1"  # Set Zone1 Heat Target High
+CONF_SET16_2 = "set16_2"  # Set Zone1 Heat Target Low
+CONF_SET16_3 = "set16_3"  # Set Zone1 Heat Outside Low
+CONF_SET16_4 = "set16_4"  # Set Zone1 Heat Outside High
+CONF_SET16_5 = "set16_5"  # Set Zone2 Heat Target High
+CONF_SET16_6 = "set16_6"  # Set Zone2 Heat Target Low
+CONF_SET16_7 = "set16_7"  # Set Zone2 Heat Outside Low
+CONF_SET16_8 = "set16_8"  # Set Zone2 Heat Outside High
+CONF_SET16_9 = "set16_9"  # Set Zone1 Cool Target High
+CONF_SET16_10 = "set16_10"  # Set Zone1 Cool Target Low
+CONF_SET16_11 = "set16_11"  # Set Zone1 Cool Outside Low
+CONF_SET16_12 = "set16_12"  # Set Zone1 Cool Outside High
+CONF_SET16_13 = "set16_13"  # Set Zone2 Cool Target High
+CONF_SET16_14 = "set16_14"  # Set Zone2 Cool Target Low
+CONF_SET16_15 = "set16_15"  # Set Zone2 Cool Outside Low
+CONF_SET16_16 = "set16_16"  # Set Zone2 Cool Outside High
+CONF_SET18 = "set18"  # Set Floor Heat Delta
+CONF_SET19 = "set19"  # Set Floor Cool Delta
+CONF_SET20 = "set20"  # Set DHW Heat Delta
+CONF_SET21 = "set21"  # Set Heater Delay Time
+CONF_SET22 = "set22"  # Set Heater Start Delta
+CONF_SET23 = "set23"  # Set Heater Stop Delta
+CONF_SET27 = "set27"  # Set Buffer Delta
+CONF_SET29 = "set29"  # Set Heating Off Outdoor Temp
+CONF_SET36 = "set36"  # Set Bivalent Start Temp
+CONF_SET37 = "set37"  # Set Bivalent AP Start Temp
+CONF_SET38 = "set38"  # Set Bivalent AP Stop Temp
 
 TYPES = [
   CONF_SET5,
diff --git a/components/panasonic_heatpump/select/__init__.py b/components/panasonic_heatpump/select/__init__.py
index d6b789d..712d455 100644
--- a/components/panasonic_heatpump/select/__init__.py
+++ b/components/panasonic_heatpump/select/__init__.py
@@ -7,12 +7,12 @@ from esphome.const import (
 from .. import CONF_PANASONIC_HEATPUMP_ID, PanasonicHeatpumpComponent, panasonic_heatpump_ns
 
 
-CONF_SET3 = "set3"
-CONF_SET4 = "set4"
-CONF_SET9 = "set9"
-CONF_SET17 = "set17"
-CONF_SET26 = "set26"
-CONF_SET35 = "set35"
+CONF_SET3 = "set3"  # Set Quiet Mode
+CONF_SET4 = "set4"  # Set Powerful Mode
+CONF_SET9 = "set9"  # Set Operation Mode
+CONF_SET17 = "set17"  # Set Zones
+CONF_SET26 = "set26"  # Set External PadHeater
+CONF_SET35 = "set35"  # Set Bivalent Mode
 
 TYPES = [
   CONF_SET3,
diff --git a/components/panasonic_heatpump/sensor.py b/components/panasonic_heatpump/sensor.py
index 002f680..b727d7f 100644
--- a/components/panasonic_heatpump/sensor.py
+++ b/components/panasonic_heatpump/sensor.py
@@ -24,108 +24,109 @@ from esphome.const import (
 )
 from . import PanasonicHeatpumpComponent, CONF_PANASONIC_HEATPUMP_ID
 
+
 UNIT_LITRE_PER_MINUTE = "L/min"
 UNIT_ROTATIONS_PER_MINUTE = "r/min"
 UNIT_PRESSURE_KGFCM2 = "kgf/cm²"
 UNIT_BAR = "bar"
-
 ICON_FAN_SPEED = "mdi:fan"
 
-CONF_TOP1 = "top1"
-CONF_TOP5 = "top5"
-CONF_TOP6 = "top6"
-CONF_TOP7 = "top7"
-CONF_TOP8 = "top8"
-CONF_TOP9 = "top9"
-CONF_TOP10 = "top10"
-CONF_TOP11 = "top11"
-CONF_TOP12 = "top12"
-CONF_TOP14 = "top14"
-CONF_TOP15 = "top15"
-CONF_TOP16 = "top16"
-CONF_TOP21 = "top21"
-CONF_TOP22 = "top22"
-CONF_TOP23 = "top23"
-CONF_TOP24 = "top24"
-CONF_TOP25 = "top25"
-CONF_TOP27 = "top27"
-CONF_TOP28 = "top28"
-CONF_TOP29 = "top29"
-CONF_TOP30 = "top30"
-CONF_TOP31 = "top31"
-CONF_TOP32 = "top32"
-CONF_TOP33 = "top33"
-CONF_TOP34 = "top34"
-CONF_TOP35 = "top35"
-CONF_TOP36 = "top36"
-CONF_TOP37 = "top37"
-CONF_TOP38 = "top38"
-CONF_TOP39 = "top39"
-CONF_TOP40 = "top40"
-CONF_TOP41 = "top41"
-CONF_TOP42 = "top42"
-CONF_TOP43 = "top43"
-CONF_TOP45 = "top45"
-CONF_TOP46 = "top46"
-CONF_TOP47 = "top47"
-CONF_TOP48 = "top48"
-CONF_TOP49 = "top49"
-CONF_TOP50 = "top50"
-CONF_TOP51 = "top51"
-CONF_TOP52 = "top52"
-CONF_TOP53 = "top53"
-CONF_TOP54 = "top54"
-CONF_TOP55 = "top55"
-CONF_TOP56 = "top56"
-CONF_TOP57 = "top57"
-CONF_TOP62 = "top62"
-CONF_TOP63 = "top63"
-CONF_TOP64 = "top64"
-CONF_TOP65 = "top65"
-CONF_TOP66 = "top66"
-CONF_TOP67 = "top67"
-CONF_TOP70 = "top70"
-CONF_TOP71 = "top71"
-CONF_TOP72 = "top72"
-CONF_TOP73 = "top73"
-CONF_TOP74 = "top74"
-CONF_TOP75 = "top75"
-CONF_TOP77 = "top77"
-CONF_TOP78 = "top78"
-CONF_TOP79 = "top79"
-CONF_TOP80 = "top80"
-CONF_TOP82 = "top82"
-CONF_TOP83 = "top83"
-CONF_TOP84 = "top84"
-CONF_TOP85 = "top85"
-CONF_TOP86 = "top86"
-CONF_TOP87 = "top87"
-CONF_TOP88 = "top88"
-CONF_TOP89 = "top89"
-CONF_TOP90 = "top90"
-CONF_TOP91 = "top91"
-CONF_TOP93 = "top93"
-CONF_TOP95 = "top95"
-CONF_TOP96 = "top96"
-CONF_TOP97 = "top97"
-CONF_TOP98 = "top98"
-CONF_TOP102 = "top102"
-CONF_TOP103 = "top103"
-CONF_TOP104 = "top104"
-CONF_TOP105 = "top105"
-CONF_TOP113 = "top113"
-CONF_TOP115 = "top115"
-CONF_TOP116 = "top116"
-CONF_TOP117 = "top117"
-CONF_TOP118 = "top118"
-CONF_TOP127 = "top127"
-CONF_TOP128 = "top128"
-CONF_TOP131 = "top131"
-CONF_TOP134 = "top134"
-CONF_TOP135 = "top135"
-CONF_TOP136 = "top136"
-CONF_TOP137 = "top137"
-CONF_TOP138 = "top138"
+
+CONF_TOP1 = "top1"  # Pump Flow
+CONF_TOP5 = "top5"  # Main Inlet Temp
+CONF_TOP6 = "top6"  # Main Outlet Temp
+CONF_TOP7 = "top7"  # Main Target Temp
+CONF_TOP8 = "top8"  # Compressor Freq
+CONF_TOP9 = "top9"  # DHW Target Temp
+CONF_TOP10 = "top10"  # DHW Temp
+CONF_TOP11 = "top11"  # Operations Hours
+CONF_TOP12 = "top12"  # Operations Counter
+CONF_TOP14 = "top14"  # Outside Temp
+CONF_TOP15 = "top15"  # Heat Power Production
+CONF_TOP16 = "top16"  # Heat Power Consumption
+CONF_TOP21 = "top21"  # Outside Pipe Temp
+CONF_TOP22 = "top22"  # DHW Heat Delta
+CONF_TOP23 = "top23"  # Heat Delta
+CONF_TOP24 = "top24"  # Cool Delta
+CONF_TOP25 = "top25"  # DHW Holiday Shift Temp
+CONF_TOP27 = "top27"  # Z1 Heat Request Temp
+CONF_TOP28 = "top28"  # Z1 Cool Request Temp
+CONF_TOP29 = "top29"  # Z1 Heat Curve Target High Temp
+CONF_TOP30 = "top30"  # Z1 Heat Curve Target Low Temp
+CONF_TOP31 = "top31"  # Z1 Heat Curve Outside High Temp
+CONF_TOP32 = "top32"  # Z1 Heat Curve Outside Low Temp
+CONF_TOP33 = "top33"  # Room Thermostat Temp
+CONF_TOP34 = "top34"  # Z2 Heat Request Temp
+CONF_TOP35 = "top35"  # Z2 Cool Request Temp
+CONF_TOP36 = "top36"  # Z1 Water Temp
+CONF_TOP37 = "top37"  # Z2 Water Temp
+CONF_TOP38 = "top38"  # Cool Power Production
+CONF_TOP39 = "top39"  # Cool Power Consumption
+CONF_TOP40 = "top40"  # DHW Power Production
+CONF_TOP41 = "top41"  # DHW Power Consumption
+CONF_TOP42 = "top42"  # Z1 Water Target Temp
+CONF_TOP43 = "top43"  # Z2 Water Target Temp
+CONF_TOP45 = "top45"  # Room Holiday Shift Temp
+CONF_TOP46 = "top46"  # Buffer Temp
+CONF_TOP47 = "top47"  # Solar Temp
+CONF_TOP48 = "top48"  # Pool Temp
+CONF_TOP49 = "top49"  # Main Hex Outlet Temp
+CONF_TOP50 = "top50"  # Discharge Temp
+CONF_TOP51 = "top51"  # Inside Pipe Temp
+CONF_TOP52 = "top52"  # Defrost Temp
+CONF_TOP53 = "top53"  # Eva Outlet Temp
+CONF_TOP54 = "top54"  # Bypass Outlet Temp
+CONF_TOP55 = "top55"  # Ipm Temp
+CONF_TOP56 = "top56"  # Z1 Temp
+CONF_TOP57 = "top57"  # Z2 Temp
+CONF_TOP62 = "top62"  # Fan1 Motor Speed
+CONF_TOP63 = "top63"  # Fan2 Motor Speed
+CONF_TOP64 = "top64"  # High Pressure
+CONF_TOP65 = "top65"  # Pump Speed
+CONF_TOP66 = "top66"  # Low Pressure
+CONF_TOP67 = "top67"  # Compressor Current
+CONF_TOP70 = "top70"  # Sterilization Temp
+CONF_TOP71 = "top71"  # Sterilization Max Time
+CONF_TOP72 = "top72"  # Z1 Cool Curve Target High Temp
+CONF_TOP73 = "top73"  # Z1 Cool Curve Target Low Temp
+CONF_TOP74 = "top74"  # Z1 Cool Curve Outside High Temp
+CONF_TOP75 = "top75"  # Z1 Cool Curve Outside Low Temp
+CONF_TOP77 = "top77"  # Heating Off Outdoor Temp
+CONF_TOP78 = "top78"  # Heater On Outdoor Temp
+CONF_TOP79 = "top79"  # Heat To Cool Temp
+CONF_TOP80 = "top80"  # Cool To Heat Temp
+CONF_TOP82 = "top82"  # Z2 Heat Curve Target High Temp
+CONF_TOP83 = "top83"  # Z2 Heat Curve Target Low Temp
+CONF_TOP84 = "top84"  # Z2 Heat Curve Outside High Temp
+CONF_TOP85 = "top85"  # Z2 Heat Curve Outside Low Temp
+CONF_TOP86 = "top86"  # Z2 Cool Curve Target High Temp
+CONF_TOP87 = "top87"  # Z2 Cool Curve Target Low Temp
+CONF_TOP88 = "top88"  # Z2 Cool Curve Outside High Temp
+CONF_TOP89 = "top89"  # Z2 Cool Curve Outside Low Temp
+CONF_TOP90 = "top90"  # Room Heater Operations Hours
+CONF_TOP91 = "top91"  # DHW Heater Operations Hours
+CONF_TOP93 = "top93"  # Pump Duty
+CONF_TOP95 = "top95"  # Max Pump Duty
+CONF_TOP96 = "top96"  # Heater Delay Time
+CONF_TOP97 = "top97"  # Heater Start Delta
+CONF_TOP98 = "top98"  # Heater Stop Delta
+CONF_TOP102 = "top102"  # Solar On Delta
+CONF_TOP103 = "top103"  # Solar Off Delta
+CONF_TOP104 = "top104"  # Solar Frost Protection
+CONF_TOP105 = "top105"  # Solar High Limit
+CONF_TOP113 = "top113"  # Buffer Tank Delta
+CONF_TOP115 = "top115"  # Water Pressure
+CONF_TOP116 = "top116"  # Second Inlet Temp
+CONF_TOP117 = "top117"  # Economizer Outlet Temp
+CONF_TOP118 = "top118"  # Second Room Thermostat Temp
+CONF_TOP127 = "top127"  # Z1 Valve PID
+CONF_TOP128 = "top128"  # Z2 Valve PID
+CONF_TOP131 = "top131"  # Bivalent Start Temperature
+CONF_TOP134 = "top134"  # Bivalent Advanced Start Temp
+CONF_TOP135 = "top135"  # Bivalent Advanced Stop Temp
+CONF_TOP136 = "top136"  # Bivalent Advanced Start Delay
+CONF_TOP137 = "top137"  # Bivalent Advanced Stop Delay
+CONF_TOP138 = "top138"  # Bivalent Advanced DHW Delay
 
 TYPES = [
   CONF_TOP1,
diff --git a/components/panasonic_heatpump/switch/__init__.py b/components/panasonic_heatpump/switch/__init__.py
index 796fd4b..4ba6c3d 100644
--- a/components/panasonic_heatpump/switch/__init__.py
+++ b/components/panasonic_heatpump/switch/__init__.py
@@ -7,20 +7,20 @@ from esphome.const import (
 from .. import CONF_PANASONIC_HEATPUMP_ID, PanasonicHeatpumpComponent, panasonic_heatpump_ns
 
 
-CONF_SET1 = "set1"
-CONF_SET2 = "set2"
-CONF_SET10 = "set10"
-CONF_SET12 = "set12"
-CONF_SET13 = "set13"
-CONF_SET14 = "set14"
-CONF_SET24 = "set24"
-CONF_SET25 = "set25"
-CONF_SET28 = "set28"
-CONF_SET30 = "set30"
-CONF_SET31 = "set31"
-CONF_SET32 = "set32"
-CONF_SET33 = "set33"
-CONF_SET34 = "set34"
+CONF_SET1 = "set1"  # Set Heatpump
+CONF_SET2 = "set2"  # Set Holiday Mode
+CONF_SET10 = "set10"  # Set Force DHW
+CONF_SET12 = "set12"  # Set Force Defrost
+CONF_SET13 = "set13"  # Set Force Sterilization
+CONF_SET14 = "set14"  # Set Pump
+CONF_SET24 = "set24"  # Set Main Schedule
+CONF_SET25 = "set25"  # Set Alt External Sensor
+CONF_SET28 = "set28"  # Set Buffer
+CONF_SET30 = "set30"  # Set External Control
+CONF_SET31 = "set31"  # Set External Error
+CONF_SET32 = "set32"  # Set External Compressor Control
+CONF_SET33 = "set33"  # Set External Heat Cool Control
+CONF_SET34 = "set34"  # Set Bivalent Control
 
 TYPES = [
   CONF_SET1,
diff --git a/components/panasonic_heatpump/text_sensor.py b/components/panasonic_heatpump/text_sensor.py
index 495adf9..ea9d943 100644
--- a/components/panasonic_heatpump/text_sensor.py
+++ b/components/panasonic_heatpump/text_sensor.py
@@ -6,6 +6,7 @@ from esphome.const import (
 )
 from . import PanasonicHeatpumpComponent, CONF_PANASONIC_HEATPUMP_ID
 
+
 ICON_OPERATING_MODE = "mdi:thermostat"
 ICON_POWERFUL_MODE = "mdi:arm-flex"
 ICON_QUIET_MODE = "mdi:sleep"
@@ -22,28 +23,28 @@ ICON_VALVE = "mdi:pipe-valve"
 ICON_PUMP = "mdi:pump"
 ICON_EXTERNAL_PAD_HEATER = "mdi:radiator"
 
-CONF_TOP4 = "top4"
-CONF_TOP17 = "top17"
-CONF_TOP18 = "top18"
-CONF_TOP19 = "top19"
-CONF_TOP20 = "top20"
-CONF_TOP44 = "top44"
-CONF_TOP58 = "top58"
-CONF_TOP59 = "top59"
-CONF_TOP76 = "top76"
-CONF_TOP81 = "top81"
-CONF_TOP92 = "top92"
-CONF_TOP94 = "top94"
-CONF_TOP101 = "top101"
-CONF_TOP106 = "top106"
-CONF_TOP107 = "top107"
-CONF_TOP111 = "top111"
-CONF_TOP112 = "top112"
-CONF_TOP114 = "top114"
-CONF_TOP125 = "top125"
-CONF_TOP126 = "top126"
-CONF_TOP130 = "top130"
 
+CONF_TOP4 = "top4"  # Operating Mode State
+CONF_TOP17 = "top17"  # Powerful Mode Time
+CONF_TOP18 = "top18"  # Quiet Mode Level
+CONF_TOP19 = "top19"  # Holiday Mode State
+CONF_TOP20 = "top20"  # ThreeWay Valve State
+CONF_TOP44 = "top44"  # Error
+CONF_TOP58 = "top58"  # DHW Heater State
+CONF_TOP59 = "top59"  # Room Heater State
+CONF_TOP76 = "top76"  # Heating Mode
+CONF_TOP81 = "top81"  # Cooling Mode
+CONF_TOP92 = "top92"  # Heat Pump Model
+CONF_TOP94 = "top94"  # Zones State
+CONF_TOP101 = "top101"  # Solar Mode
+CONF_TOP106 = "top106"  # Pump Flowrate Mode
+CONF_TOP107 = "top107"  # Liquid Type
+CONF_TOP111 = "top111"  # Z1 Sensor Settings
+CONF_TOP112 = "top112"  # Z2 Sensor Settings
+CONF_TOP114 = "top114"  # External Pad Heater
+CONF_TOP125 = "top125"  # TwoWay Valve State
+CONF_TOP126 = "top126"  # ThreeWay Valve State2
+CONF_TOP130 = "top130"  # Bivalent Mode
 
 TYPES = [
   CONF_TOP4,