diff --git a/iso15118/__init__.py b/iso15118/__init__.py
index 7c4a9591..025f4c5d 100644
--- a/iso15118/__init__.py
+++ b/iso15118/__init__.py
@@ -1 +1 @@
-__version__ = "0.26.0"
+__version__ = "0.26.1"
diff --git a/iso15118/secc/states/din_spec_states.py b/iso15118/secc/states/din_spec_states.py
index 1146367f..1ed2119c 100644
--- a/iso15118/secc/states/din_spec_states.py
+++ b/iso15118/secc/states/din_spec_states.py
@@ -10,6 +10,7 @@
 from typing import Optional, Type, Union
 
 from iso15118.secc.comm_session_handler import SECCCommunicationSession
+from iso15118.secc.controller.evse_data import CurrentType
 from iso15118.secc.states.secc_state import StateSECC
 from iso15118.shared.messages.app_protocol import (
     SupportedAppProtocolReq,
@@ -395,7 +396,7 @@ async def process_message(
         dc_evse_charge_params = (
             await self.comm_session.evse_controller.get_dc_charge_parameters_dinspec()  # noqa
         )
-        evse_data_context.update_dc_charge_parameters(dc_evse_charge_params)
+        evse_data_context.current_type = CurrentType.DC
 
         sa_schedule_list = (
             await self.comm_session.evse_controller.get_sa_schedule_list_dinspec(
diff --git a/iso15118/secc/states/iso15118_20_states.py b/iso15118/secc/states/iso15118_20_states.py
index 1d538422..b94b0dff 100644
--- a/iso15118/secc/states/iso15118_20_states.py
+++ b/iso15118/secc/states/iso15118_20_states.py
@@ -10,7 +10,7 @@
 
 from iso15118.secc.comm_session_handler import SECCCommunicationSession
 from iso15118.secc.controller.common import UnknownEnergyService
-from iso15118.secc.controller.evse_data import EVSEDataContext
+from iso15118.secc.controller.evse_data import CurrentType
 from iso15118.secc.states.secc_state import StateSECC
 from iso15118.shared.exi_codec import EXI
 from iso15118.shared.messages.app_protocol import (
@@ -1348,12 +1348,8 @@ async def process_message(
             self.charge_parameter_valid(ac_cpd_req.ac_params)
             ev_data_context = self.comm_session.evse_controller.ev_data_context
             ev_data_context.update_ac_charge_parameters_v20(energy_service, ac_cpd_req)
-            evse_data_context = (
-                self.comm_session.evse_controller.evse_data_context
-            ) = EVSEDataContext()
-            evse_data_context.update_ac_charge_parameters_v20(
-                energy_service, ac_cpd_res
-            )
+            evse_data_context = self.comm_session.evse_controller.evse_data_context
+            evse_data_context.current_type = CurrentType.AC
         except UnknownEnergyService:
             self.stop_state_machine(
                 f"Invalid charge parameter for service {energy_service}",
@@ -1548,9 +1544,7 @@ async def process_message(
             ev_data_context = self.comm_session.evse_controller.ev_data_context
             ev_data_context.update_dc_charge_parameters_v20(energy_service, dc_cpd_req)
             evse_data_context = self.comm_session.evse_controller.evse_data_context
-            evse_data_context.update_dc_charge_parameters_v20(
-                energy_service, dc_cpd_res
-            )
+            evse_data_context.current_type = CurrentType.DC
         except UnknownEnergyService:
             self.stop_state_machine(
                 f"Invalid charge parameter for service {energy_service}",
diff --git a/iso15118/secc/states/iso15118_2_states.py b/iso15118/secc/states/iso15118_2_states.py
index 35d355ae..6a9ff61b 100644
--- a/iso15118/secc/states/iso15118_2_states.py
+++ b/iso15118/secc/states/iso15118_2_states.py
@@ -11,6 +11,7 @@
 
 from iso15118.secc.comm_session_handler import SECCCommunicationSession
 from iso15118.secc.controller.ev_data import EVSessionContext15118
+from iso15118.secc.controller.evse_data import CurrentType
 from iso15118.secc.controller.interface import AuthorizationResponse
 from iso15118.secc.states.secc_state import StateSECC
 from iso15118.shared.exceptions import (
@@ -1366,7 +1367,7 @@ async def process_message(
             ac_evse_charge_params = (
                 await self.comm_session.evse_controller.get_ac_charge_params_v2()
             )
-            evse_data_context.update_ac_charge_parameters_v2(ac_evse_charge_params)
+            evse_data_context.current_type = CurrentType.AC
             ev_data_context.update_ac_charge_parameters_v2(
                 charge_params_req.ac_ev_charge_parameter
             )
@@ -1374,7 +1375,7 @@ async def process_message(
             dc_evse_charge_params = (
                 await self.comm_session.evse_controller.get_dc_charge_parameters_v2()
             )
-            evse_data_context.update_dc_charge_parameters(dc_evse_charge_params)
+            evse_data_context.current_type = CurrentType.DC
             ev_data_context.update_dc_charge_parameters(
                 charge_params_req.dc_ev_charge_parameter
             )
diff --git a/pyproject.toml b/pyproject.toml
index 73cbf577..f83887b6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "iso15118"
-version = "0.26.0"
+version = "0.26.1"
 description = "Implementation of DIN SPEC 70121, ISO 15118-2 and -20 specs for SECC"
 authors = ["André Duarte <andre@switch-ev.com>",
            "Dr. Marc Mültin <marc@switch-ev.com>",