diff --git a/luxtronik/calculations.py b/luxtronik/calculations.py
index 23713a85..2c7ca9cf 100755
--- a/luxtronik/calculations.py
+++ b/luxtronik/calculations.py
@@ -317,6 +317,6 @@ def __init__(self):
             264: Unknown("Unknown_Calculation_264"),
             265: Unknown("Unknown_Calculation_265"),
             266: Unknown("Unknown_Calculation_266"),
-            267: Celsius("Desired_Room_Temperature"),
-            268: Power("AC_Power_Input")
+            267: Celsius(["Desired_Room_Temperature", "Unknown_Calculation_267"]),
+            268: Power(["AC_Power_Input", "Unknown_Calculation_268"]),
         }
diff --git a/luxtronik/parameters.py b/luxtronik/parameters.py
index aa9b769c..e97e9395 100755
--- a/luxtronik/parameters.py
+++ b/luxtronik/parameters.py
@@ -19,6 +19,7 @@
     Hours2,
     Minutes,
     MixedCircuitMode,
+    OnOffMode,
     PoolMode,
     Seconds,
     SolarMode,
@@ -1131,7 +1132,7 @@ def __init__(self, safe=True):
             1084: Unknown(["ID_Einst_SmartPlusMK3", "Unknown_Parameter_1084"]),
             1085: Unknown(["ID_Einst_SmartMinusMK3", "Unknown_Parameter_1085"]),
             1086: Unknown("Unknown_Parameter_1086"),
-            1087: Unknown("Unknown_Parameter_1087"),
+            1087: OnOffMode(["SILENT_MODE", "Unknown_Parameter_1087"]),
             1088: Unknown("Unknown_Parameter_1088"),
             1089: Unknown("Unknown_Parameter_1089"),
             1090: Unknown("Unknown_Parameter_1090"),
@@ -1163,7 +1164,7 @@ def __init__(self, safe=True):
             1116: Unknown("Unknown_Parameter_1116"),
             1117: Unknown("Unknown_Parameter_1117"),
             1118: Unknown("Unknown_Parameter_1118"),
-            1119: Unknown("Unknown_Parameter_1119"),
+            1119: Timestamp(["LAST_DEFROST_TIMESTAMP", "Unknown_Parameter_1119"]),
             1120: Unknown("Unknown_Parameter_1120"),
             1121: Unknown("Unknown_Parameter_1121"),
             1122: Unknown("Unknown_Parameter_1122"),
@@ -1180,11 +1181,11 @@ def __init__(self, safe=True):
             1133: Unknown("Unknown_Parameter_1133"),
             1134: Unknown("Unknown_Parameter_1134"),
             1135: Unknown("Unknown_Parameter_1135"),
-            1136: Unknown("Unknown_Parameter_1136"),
-            1137: Unknown("Unknown_Parameter_1137"),
+            1136: Energy(["HEAT_ENERGY_INPUT", "Unknown_Parameter_1136"]),
+            1137: Energy(["DHW_ENERGY_INPUT", "Unknown_Parameter_1137"]),
             1138: Unknown("Unknown_Parameter_1138"),
-            1139: Unknown("Unknown_Parameter_1139"),
-            1140: Unknown("Unknown_Parameter_1140"),
+            1139: Energy(["COOLING_ENERGY_INPUT", "Unknown_Parameter_1139"]),
+            1140: Unknown(["SECOND_HEAT_GENERATOR_AMOUNT_COUNTER", "Unknown_Parameter_1140"]),
             1141: Unknown("Unknown_Parameter_1141"),
             1142: Unknown("Unknown_Parameter_1142"),
             1143: Unknown("Unknown_Parameter_1143"),
@@ -1192,11 +1193,18 @@ def __init__(self, safe=True):
             1145: Unknown("Unknown_Parameter_1145"),
             1146: Unknown("Unknown_Parameter_1146"),
             1147: Unknown("Unknown_Parameter_1147"),
-            1148: Unknown("Unknown_Parameter_1148"),
+            1148: Celsius(["HEATING_TARGET_TEMP_ROOM_THERMOSTAT", "Unknown_Parameter_1148"], True),
             1149: Unknown("Unknown_Parameter_1149"),
             1150: Unknown("Unknown_Parameter_1150"),
             1151: Unknown("Unknown_Parameter_1151"),
             1152: Unknown("Unknown_Parameter_1152"),
+            1153: Unknown("Unknown_Parameter_1153"),
+            1154: Unknown("Unknown_Parameter_1154"),
+            1155: Unknown("Unknown_Parameter_1155"),
+            1156: Unknown("Unknown_Parameter_1156"),
+            1157: Unknown("Unknown_Parameter_1157"),
+            1158: Unknown(["POWER_LIMIT_SWITCH", "Unknown_Parameter_1158"]),
+            1159: Unknown(["POWER_LIMIT_VALUE", "Unknown_Parameter_1159"]),
         }
 
     def set(self, target, value):
diff --git a/luxtronik/visibilities.py b/luxtronik/visibilities.py
index 9c52cf87..5b338270 100755
--- a/luxtronik/visibilities.py
+++ b/luxtronik/visibilities.py
@@ -373,7 +373,7 @@ def __init__(self):
             354: Unknown("Unknown_Visibility_354"),
             355: Unknown(["Unknown_Visibility_355", "Unknown_Parameter_355"]),
             356: Unknown(["Unknown_Visibility_356", "Unknown_Parameter_356"]),
-            357: Unknown(["Unknown_Visibility_357", "Unknown_Parameter_357"]),
+            357: Unknown(["ELECTRICAL_POWER_LIMITATION_SWITCH", "Unknown_Visibility_357", "Unknown_Parameter_357"]),
             358: Unknown(["Unknown_Visibility_358", "Unknown_Parameter_358"]),
             359: Unknown(["Unknown_Visibility_359", "Unknown_Parameter_359"]),
             360: Unknown(["Unknown_Visibility_360", "Unknown_Parameter_360"]),