diff --git a/custom_components/tahoma_extended/__init__.py b/custom_components/tahoma_extended/__init__.py
index 4f72404..be60b43 100755
--- a/custom_components/tahoma_extended/__init__.py
+++ b/custom_components/tahoma_extended/__init__.py
@@ -163,9 +163,10 @@ def device_state_attributes(self):
             "tahoma_device_id": self.tahoma_device.url,
         }
 
-    def apply_action(self, cmd_name, *args):
+    def apply_action(self, commands):
         """Apply Action to Device."""
 
         action = Action(self.tahoma_device.url)
-        action.add_command(cmd_name, *args)
+        for command in commands:
+            action.add_command(*command)
         self.controller.apply_actions("HomeAssistant", [action])
diff --git a/custom_components/tahoma_extended/climate.py b/custom_components/tahoma_extended/climate.py
index b54323f..5fd661d 100755
--- a/custom_components/tahoma_extended/climate.py
+++ b/custom_components/tahoma_extended/climate.py
@@ -216,10 +216,7 @@ def update(self):
 
     @property
     def hvac_action(self):
-        """Return the current running hvac operation if supported.
-
-        Need to be one of CURRENT_HVAC_*.
-        """
+        """Return the current running hvac operation if supported."""
         return self._current_hvac_mode
 
     @property
@@ -342,16 +339,15 @@ def _apply_action(self, target_temperature):
             target_temperature = 16
         if self.tahoma_device.active_states['core:DerogatedTargetTemperatureState'] != target_temperature:
             from time import sleep
-            self.apply_action("refreshState")
-            self.apply_action("setModeTemperature", "manualMode", target_temperature)
-            self.apply_action("setDerogation", target_temperature, "further_notice")
-            self.apply_action("refreshState")
+            self.apply_action([["setModeTemperature", "manualMode", target_temperature],
+                               ["setDerogation", target_temperature, "further_notice"],
+                               ["refreshState"]])
             sleep(20)
 
     async def _async_heater_turn_on(self):
         """Turn heater toggleable device on."""
         if self._type == "io":
-            self.apply_action("setHeatingLevel", "comfort")
+            self.apply_action([["setHeatingLevel", "comfort"]])
         elif self._type == "thermostat":
             self._apply_action(self.target_temperature)
         self._current_hvac_mode = CURRENT_HVAC_HEAT
@@ -362,7 +358,7 @@ async def _async_heater_turn_on(self):
     async def _async_heater_turn_off(self):
         """Turn heater toggleable device off."""
         if self._type == "io":
-            self.apply_action("setHeatingLevel", "off")
+            self.apply_action([["setHeatingLevel", "off"]])
         elif self._type == "thermostat":
             self._apply_action(self.target_temperature)
         self._current_hvac_mode = CURRENT_HVAC_IDLE
@@ -393,10 +389,6 @@ async def async_set_temperature(self, **kwargs):
         if temperature is None:
             return
         self._target_temp = temperature
-        # if self._type == "thermostat":
-        #     self.apply_action(
-        #         "setModeTemperature", "manualMode", self.target_temperature
-        #     )
         await self._async_control_heating()
         # self.update()
 
diff --git a/custom_components/tahoma_extended/light.py b/custom_components/tahoma_extended/light.py
index 65de238..ac115e7 100644
--- a/custom_components/tahoma_extended/light.py
+++ b/custom_components/tahoma_extended/light.py
@@ -78,13 +78,13 @@ async def async_turn_on(self, **kwargs) -> None:
 
         if ATTR_BRIGHTNESS in kwargs:
             self._brightness = int(float(kwargs[ATTR_BRIGHTNESS]) / 255 * 100)
-            self.apply_action("setIntensity", self._brightness)
+            self.apply_action([["setIntensity", self._brightness]])
         elif  ATTR_EFFECT in kwargs:
             self._effect = kwargs[ATTR_EFFECT]
-            self.apply_action("wink", 100)
+            self.apply_action([["wink", 100]])
         else:
             self._brightness = 100
-            self.apply_action("on")
+            self.apply_action([["on"]])
         
 
         self.async_write_ha_state()
@@ -94,7 +94,7 @@ async def async_turn_off(self, **kwargs) -> None:
         _LOGGER.debug("[THM] Called to turn off")
         self._state = False
         self._skip_update = True
-        self.apply_action("off")
+        self.apply_action([["off"]])
 
         self.async_write_ha_state()
 
diff --git a/custom_components/tahoma_extended/pyhoma.py b/custom_components/tahoma_extended/pyhoma.py
index 0478f13..6b366dd 100644
--- a/custom_components/tahoma_extended/pyhoma.py
+++ b/custom_components/tahoma_extended/pyhoma.py
@@ -70,9 +70,10 @@ def login(self):
         self.__logged_in = True
         return self.__logged_in
 
-    def get_user(self):
+    def get_user(self, retries: int = 3):
         """Get the user informations from the server.
 
+        :param retries: maximum number of retries
         :return: a dict with all the informations
         :rtype: dict
 
@@ -80,16 +81,16 @@ def get_user(self):
 
         :Example:
 
-        >>> "creationTime": <time>,
-        >>> "lastUpdateTime": <time>,
-        >>> "userId": "<email for login>",
-        >>> "title": 0,
-        >>> "firstName": "<First>",
-        >>> "lastName": "<Last>",
-        >>> "email": "<contact email>",
-        >>> "phoneNumber": "<phone>",
-        >>> "mobilePhone": "<mobile>",
-        >>> "locale": "<two char country code>"
+            "creationTime": <time>,
+            "lastUpdateTime": <time>,
+            "userId": "<email for login>",
+            "title": 0,
+            "firstName": "<First>",
+            "lastName": "<Last>",
+            "email": "<contact email>",
+            "phoneNumber": "<phone>",
+            "mobilePhone": "<mobile>",
+            "locale": "<two char country code>"
 
         :Warning:
 
@@ -103,10 +104,13 @@ def get_user(self):
                                timeout=10)
 
         if request.status_code != 200:
-            self.__logged_in = False
-            self.login()
-            self.get_user()
-            return
+            if retries > 0:
+                self.__logged_in = False
+                self.login()
+                self.get_user(retries - 1)
+                return
+            else:
+                raise requests.exceptions.RetryError("Too many retries: error "+str(request.content))
 
         try:
             result = request.json()
@@ -116,7 +120,7 @@ def get_user(self):
 
         return result
 
-    def get_setup(self):
+    def get_setup(self, retries: int = 3):
         """Load the setup from the server.
 
         Loads the configuration from the server, nothing will
@@ -125,6 +129,7 @@ def get_setup(self):
         Also location and gateway will be set through this
         method.
 
+        :param retries: maximum number of retries
         raises ValueError in case of protocol issues
 
         :Seealso:
@@ -141,10 +146,13 @@ def get_setup(self):
                                headers=header,
                                timeout=10)
         if request.status_code != 200:
-            self.__logged_in = False
-            self.login()
-            self.get_setup()
-            return
+            if retries > 0:
+                self.__logged_in = False
+                self.login()
+                self.get_setup(retries - 1)
+                return
+            else:
+                raise requests.exceptions.RetryError("Too many retries: error "+str(request.content))
 
         try:
             result = request.json()
@@ -160,7 +168,7 @@ def _get_setup(self, result):
         """Internal method which process the results from the server."""
         self.__devices = {}
 
-        if ('devices' not in result.keys()):
+        if 'devices' not in result.keys():
             raise Exception(
                 "Did not find device definition.")
 
@@ -181,22 +189,22 @@ def location(self):
         :return: a dict with all the informations
         :rtype: dict
         :Example:
-        >>> "creationTime": <time>,
-        >>> "lastUpdateTime": <time>,
-        >>> "addressLine1": "<street>",
-        >>> "postalCode": "<zip>",
-        >>> "city": "<city>",
-        >>> "country": "<country>",
-        >>> "timezone": "Europe/<city>",
-        >>> "longitude": 2.343,
-        >>> "latitude": 48.857,
-        >>> "twilightMode": 2,
-        >>> "twilightCity": "<city>",
-        >>> "summerSolsticeDuskMinutes": 1290,
-        >>> "winterSolsticeDuskMinutes": 990,
-        >>> "twilightOffsetEnabled": False,
-        >>> "dawnOffset": 0,
-        >>> "duskOffset": 0
+            "creationTime": <time>,
+            "lastUpdateTime": <time>,
+            "addressLine1": "<street>",
+            "postalCode": "<zip>",
+            "city": "<city>",
+            "country": "<country>",
+            "timezone": "Europe/<city>",
+            "longitude": 2.343,
+            "latitude": 48.857,
+            "twilightMode": 2,
+            "twilightCity": "<city>",
+            "summerSolsticeDuskMinutes": 1290,
+            "winterSolsticeDuskMinutes": 990,
+            "twilightOffsetEnabled": False,
+            "dawnOffset": 0,
+            "duskOffset": 0
 
         :Warning:
 
@@ -221,22 +229,22 @@ def gateway(self):
 
         :Example:
 
-        >>> [{
-        >>>     "gatewayId": "1234-1234-1234",
-        >>>     "type": 15,
-        >>>     "placeOID": "12345678-1234-1234-1234-12345678",
-        >>>     "alive": True,
-        >>>     "timeReliable": True,
-        >>>     "connectivity": {
-        >>>         "status": "OK",
-        >>>         "protocolVersion": "8"
-        >>>     },
-        >>>     "upToDate": True,
-        >>>     "functions": "INTERNET_AUTHORIZATION,SCENARIO_DOWNLOAD,
+            [{
+                "gatewayId": "1234-1234-1234",
+                "type": 15,
+                "placeOID": "12345678-1234-1234-1234-12345678",
+                "alive": True,
+                "timeReliable": True,
+                "connectivity": {
+                    "status": "OK",
+                    "protocolVersion": "8"
+                },
+                "upToDate": True,
+                "functions": "INTERNET_AUTHORIZATION,SCENARIO_DOWNLOAD,
                 SCENARIO_AUTO_LAUNCHING,SCENARIO_TELECO_LAUNCHING,
                 INTERNET_UPLOAD,INTERNET_UPDATE,TRIGGERS_SENSORS",
-        >>>     "mode": "ACTIVE"
-        >>> }]
+                "mode": "ACTIVE"
+            }]
 
         :Warning:
 
@@ -280,7 +288,7 @@ def get_device(self, url):
         """
         return self.__devices[url]
 
-    def apply_actions(self, name_of_action, actions):
+    def apply_actions(self, name_of_action, actions, retries: int = 3):
         """Start to execute an action or a group of actions.
 
         This method takes a bunch of actions and runs them on your
@@ -288,6 +296,7 @@ def apply_actions(self, name_of_action, actions):
 
         :param name_of_action: the label/name for the action
         :param actions: an array of Action objects
+        :param retries: maximum number of retries
         :return: the execution identifier  **************
         what if it fails
         :rtype: string
@@ -318,10 +327,13 @@ def apply_actions(self, name_of_action, actions):
             timeout=10)
 
         if request.status_code != 200:
-            self.__logged_in = False
-            self.login()
-            self.apply_actions(name_of_action, actions)
-            return
+            if retries > 0:
+                self.__logged_in = False
+                self.login()
+                self.apply_actions(name_of_action, actions, retries - 1)
+                return
+            else:
+                raise requests.exceptions.RetryError("Too many retries: error "+str(request.content))
 
         try:
             result = request.json()
@@ -336,7 +348,7 @@ def apply_actions(self, name_of_action, actions):
 
         return result['execId']
 
-    def get_events(self):
+    def get_events(self, retries: int = 3):
         """Return a set of events.
 
         Which have been occured since the last call of this method.
@@ -351,6 +363,7 @@ def get_events(self):
         through several phases which can be followed
         - ExecutionStateChangedEvent, ******** todo
 
+        :param retries: maximum number of retries
         :return: an array of Events or empty array
         :rtype: list
 
@@ -380,10 +393,13 @@ def get_events(self):
                                 timeout=10)
 
         if request.status_code != 200:
-            self.__logged_in = False
-            self.login()
-            self.get_events()
-            return
+            if retries > 0:
+                self.__logged_in = False
+                self.login()
+                self.get_events(retries - 1)
+                return
+            else:
+                raise requests.exceptions.RetryError("Too many retries: error "+str(request.content))
 
         try:
             result = request.json()
@@ -417,9 +433,10 @@ def _get_events(self, result):
 
         return events
 
-    def get_current_executions(self):
+    def get_current_executions(self, retries: int = 3):
         """Get all current running executions.
 
+        :param retries: maximum number of retries
         :return: Returns a set of running Executions or empty list.
         :rtype: list
 
@@ -441,10 +458,13 @@ def get_current_executions(self):
             timeout=10)
 
         if request.status_code != 200:
-            self.__logged_in = False
-            self.login()
-            self.get_current_executions()
-            return
+            if retries > 0:
+                self.__logged_in = False
+                self.login()
+                self.get_current_executions(retries - 1)
+                return
+            else:
+                raise requests.exceptions.RetryError("Too many retries: error "+str(request.content))
 
         try:
             result = request.json()
@@ -461,8 +481,12 @@ def get_current_executions(self):
 
         return executions
 
-    def get_history(self):
-        """Get history."""
+    def get_history(self, retries: int = 3):
+        """Get history.
+
+        :param retries: maximum number of retries
+        :return: Returns the history of a device.
+        """
         header = BASE_HEADERS.copy()
         header['Cookie'] = self.__cookie
 
@@ -472,10 +496,13 @@ def get_history(self):
             timeout=10)
 
         if request.status_code != 200:
-            self.__logged_in = False
-            self.login()
-            self.get_history()
-            return
+            if retries > 0:
+                self.__logged_in = False
+                self.login()
+                self.get_history(retries - 1)
+                return
+            else:
+                raise requests.exceptions.RetryError("Too many retries: error "+str(request.content))
 
         try:
             result = request.json()
@@ -486,27 +513,32 @@ def get_history(self):
 
         return result
 
-    def cancel_all_executions(self):
+    def cancel_all_executions(self, retries: int = 3):
         """Cancel all running executions.
 
+        :param retries: maximum number of retries
         raises ValueError in case of any protocol issues.
         """
         header = BASE_HEADERS.copy()
         header['Cookie'] = self.__cookie
 
         request = requests.delete(BASE_URL + 'exec/current/setup',
-                               headers=header,
-                               timeout=10)
+                                  headers=header,
+                                  timeout=10)
 
         if request.status_code != 200:
-            self.__logged_in = False
-            self.login()
-            self.cancel_all_executions()
-            return
+            if retries > 0:
+                self.__logged_in = False
+                self.login()
+                self.cancel_all_executions(retries - 1)
+                return
+            else:
+                raise requests.exceptions.RetryError("Too many retries: error "+str(request.content))
 
-    def get_action_groups(self):
+    def get_action_groups(self, retries: int = 3):
         """Get all Action Groups.
 
+        :param retries: maximum number of retries
         :return: List of Action Groups
         """
         header = BASE_HEADERS.copy()
@@ -517,10 +549,13 @@ def get_action_groups(self):
                                timeout=10)
 
         if request.status_code != 200:
-            self.__logged_in = False
-            self.login()
-            self.get_action_groups()
-            return
+            if retries > 0:
+                self.__logged_in = False
+                self.login()
+                self.get_action_groups(retries - 1)
+                return
+            else:
+                raise requests.exceptions.RetryError("Too many retries: error "+str(request.content))
 
         try:
             result = request.json()
@@ -536,8 +571,11 @@ def get_action_groups(self):
 
         return groups
 
-    def launch_action_group(self, action_id):
-        """Start action group."""
+    def launch_action_group(self, action_id, retries: int = 3):
+        """Start action group.
+
+        :param retries: maximum number of retries
+        """
         header = BASE_HEADERS.copy()
         header['Cookie'] = self.__cookie
 
@@ -547,10 +585,13 @@ def launch_action_group(self, action_id):
             timeout=10)
 
         if request.status_code != 200:
-            self.__logged_in = False
-            self.login()
-            self.launch_action_group(action_id)
-            return
+            if retries > 0:
+                self.__logged_in = False
+                self.login()
+                self.launch_action_group(action_id, retries - 1)
+                return
+            else:
+                raise requests.exceptions.RetryError("Too many retries: error "+str(request.content))
 
         try:
             result = request.json()
@@ -591,8 +632,11 @@ def get_states(self, devices):
             except KeyError:
                 pass
 
-    def refresh_all_states(self):
-        """Update all states."""
+    def refresh_all_states(self, retries: int = 3):
+        """Update all states.
+
+        :param retries: maximum number of retries
+        """
         header = BASE_HEADERS.copy()
         header['Cookie'] = self.__cookie
 
@@ -602,10 +646,13 @@ def refresh_all_states(self):
             timeout=10)
 
         if request.status_code != 200:
-            self.__logged_in = False
-            self.login()
-            self.refresh_all_states()
-            return
+            if retries > 0:
+                self.__logged_in = False
+                self.login()
+                self.refresh_all_states(retries - 1)
+                return
+            else:
+                raise requests.exceptions.RetryError("Too many retries: error "+str(request.content))
 
 
 class Device:
@@ -717,12 +764,12 @@ def label(self):
 
     @property
     def command_definitions(self):
-        """List of command definitions."""
+        """List of command devinitions."""
         return self.__definitions['commands']
 
     @property
     def state_definitions(self):
-        """List of state definition."""
+        """State of command devinition."""
         return self.__definitions['states']
 
     @property
diff --git a/custom_components/tahoma_extended/switch.py b/custom_components/tahoma_extended/switch.py
index 757c796..b94e792 100755
--- a/custom_components/tahoma_extended/switch.py
+++ b/custom_components/tahoma_extended/switch.py
@@ -72,7 +72,7 @@ def turn_on(self, **kwargs):
         if self.tahoma_device.type == "rts:GarageDoor4TRTSComponent":
             self.toggle()
         else:
-            self.apply_action("on")
+            self.apply_action([["on"]])
             self._skip_update = True
             self._state = STATE_ON
 
@@ -82,13 +82,13 @@ def turn_off(self, **kwargs):
         if self.tahoma_device.type == "rts:GarageDoor4TRTSComponent":
             return
 
-        self.apply_action("off")
+        self.apply_action([["off"]])
         self._skip_update = True
         self._state = STATE_OFF
 
     def toggle(self, **kwargs):
         """Click the switch."""
-        self.apply_action("cycle")
+        self.apply_action([["cycle"]])
 
     @property
     def is_on(self):