diff --git a/gsy_framework/schema/avro_schemas/simulation_raw_data.json b/gsy_framework/schema/avro_schemas/simulation_raw_data.json
index a42e868c..459b8fc5 100644
--- a/gsy_framework/schema/avro_schemas/simulation_raw_data.json
+++ b/gsy_framework/schema/avro_schemas/simulation_raw_data.json
@@ -434,15 +434,16 @@
       "name": "HeatPump",
       "type": "record",
       "fields": [
-        {"name": "storage_temp_C", "type": "float"},
+        {"name": "average_tank_temp_C", "type": ["float"]},
+        {"name": "average_inlet_temperature_C", "type": "float"},
+        {"name": "net_heat_consumed_kJ", "type": "float"},
         {"name": "energy_consumption_kWh", "type": "float"},
         {"name": "max_energy_demand_kWh", "type": "float"},
         {"name": "min_energy_demand_kWh", "type": "float"},
         {"name": "total_traded_energy_kWh", "type":  "float"},
         {"name": "cop", "type": "float"},
-        {"name": "condenser_temp_C", "type": "float"},
-        {"name": "heat_demand_J", "type": "float"},
-        {"name": "unmatched_demand_kWh", "type": "float"},
+        {"name": "average_soc", "type": "float"},
+        {"name": "heat_demand_kJ", "type": "float"},
         {"name": "market_fee", "type": "float"},
         {
           "name": "tanks",
@@ -454,8 +455,12 @@
               "type": "record",
               "fields": [
                 {"name": "storage_temp_C", "type": "float"},
-                {"name": "temp_decrease_K", "type": "float"},
-                {"name": "temp_increase_K", "type": "float"}
+                {"name": "soc", "type": ["null", "float"], "default": null},
+                {"name": "htf_temp_C", "type": ["null", "float"], "default": null},
+                {"name": "pcm_temp_C", "type": ["null", "float"], "default": null},
+                {"name": "condenser_temp_C", "type": ["null", "float"], "default": null},
+                {"name": "type", "type": "string"},
+                {"name": "name", "type": "string"}
               ]
             }
           }
diff --git a/gsy_framework/schema/avro_schemas/simulation_state.json b/gsy_framework/schema/avro_schemas/simulation_state.json
index d262a3b6..f1a049b9 100644
--- a/gsy_framework/schema/avro_schemas/simulation_state.json
+++ b/gsy_framework/schema/avro_schemas/simulation_state.json
@@ -422,13 +422,6 @@
                 "values": "float"
               }
             },
-            {
-              "name": "unmatched_demand_kWh",
-              "type": {
-                "type": "map",
-                "values": "float"
-              }
-            },
             {
               "name": "energy_consumption_kWh",
               "type": {
@@ -450,29 +443,61 @@
                   "type": "record",
                   "fields": [
                     {
-                      "name": "min_storage_temp_C",
-                      "type": "float"
-                    },
-                    {
-                      "name": "temp_decrease_K",
+                      "name": "soc",
                       "type": {
                         "type": "map",
                         "values": "float"
                       }
                     },
                     {
-                      "name": "temp_increase_K",
-                      "type": {
-                        "type": "map",
-                        "values": "float"
-                      }
+                      "name": "htf_temps_C",
+                      "type": [
+                        "null",
+                        {
+                          "type": "map",
+                          "values": {
+                            "type": "array",
+                            "items": "float"
+                          }
+                        }
+                      ],
+                      "default": null
+                    },
+                    {
+                      "name": "pcm_temps_C",
+                      "type": [
+                        "null",
+                        {
+                          "type": "map",
+                          "values": {
+                            "type": "array",
+                            "items": "float"
+                          }
+                        }
+                      ],
+                      "default": null
+                    },
+                    {
+                      "name": "condenser_temp_C",
+                      "type": [
+                        "null",
+                        {
+                          "type": "map",
+                          "values": "float"
+                        }
+                      ],
+                      "default": null
                     },
                     {
                       "name": "storage_temp_C",
-                      "type": {
-                        "type": "map",
-                        "values": "float"
-                      }
+                      "type": [
+                        "null",
+                        {
+                          "type": "map",
+                          "values": "float"
+                        }
+                      ],
+                      "default": null
                     }
                   ]
                 }
diff --git a/tests/schema/test_data/simulation_state_test_data.json b/tests/schema/test_data/simulation_state_test_data.json
index f26112ae..2a56ee41 100644
--- a/tests/schema/test_data/simulation_state_test_data.json
+++ b/tests/schema/test_data/simulation_state_test_data.json
@@ -262,10 +262,6 @@
         "2023-05-23T22:00": 7.0,
         "2023-05-23T23:00": 8.0
       },
-      "unmatched_demand_kWh": {
-        "2023-05-23T22:00": 4.0,
-        "2023-05-23T23:00": 6.0
-      },
       "energy_consumption_kWh": {
         "2023-05-23T22:00": 0.04,
         "2023-05-23T23:00": 0.6
@@ -273,13 +269,7 @@
       "total_traded_energy_kWh": 0.1,
       "tanks": [
         {
-          "min_storage_temp_C": 20,
-          "temp_decrease_K": {
-            "2023-05-23T22:00": 0.0,
-            "2023-05-23T23:00": 0.0
-          },
-          "temp_increase_K": {},
-          "storage_temp_C": {
+          "soc": {
             "2023-05-23T22:00": 5.0,
             "2023-05-23T23:00": 5.0
           }