From 9d93ec8cf45f3ad98b5eac7f407fa0b24ff88dd6 Mon Sep 17 00:00:00 2001
From: Rans4ckeR <ransacker@outlook.com>
Date: Tue, 24 Jan 2023 23:30:36 +0100
Subject: [PATCH 01/15] Update TR-064 services

---
 README.md                                     | 15 +++-
 .../DeviceHosts/Entities/DeviceHost.cs        | 11 ++-
 .../LanConfigSecurityGetInfoResponse.cs       |  4 +-
 .../UserInterfaceCheckUpdateRequest.cs        |  3 +-
 .../Entities/UserInterfaceGetInfoResponse.cs  |  3 +-
 ...WlanConfigurationGetChannelInfoResponse.cs |  4 +-
 .../WlanConfigurationGetInfoResponse.cs       |  4 +-
 ...figurationGetWlanConnectionInfoResponse.cs |  3 +
 ...WlanConfigurationGetWlanExtInfoResponse.cs |  1 +
 .../LanConfigSecurityResourceDictionary.xaml  |  6 ++
 .../UserInterfaceResourceDictionary.xaml      |  7 +-
 ...mmonInterfaceConfigResourceDictionary.xaml |  2 +-
 .../WlanConfigurationResourceDictionary.xaml  | 76 ++++++++++++-------
 .../UserInterfaceCheckUpdateView.xaml         |  7 +-
 .../UserInterfaceCheckUpdateViewModel.cs      | 33 --------
 ...onInterfaceConfigGetOnlineMonitorView.xaml | 26 +++----
 RS.Fritz.Manager.sln.DotSettings              |  5 +-
 17 files changed, 118 insertions(+), 92 deletions(-)

diff --git a/README.md b/README.md
index 0189bce..3a1d956 100644
--- a/README.md
+++ b/README.md
@@ -177,9 +177,12 @@ static async Task StopCaptureAsync(InternetGatewayDevice device, CaptureInterfac
   * ✅ GetATMEncapsulation
   * ✅ GetAutoConfig
   * ✅ GetStatistics
+* ❌ urn:dslforum-org:service:X_AVM-DE_WANMobileConnection
 * 🔶 urn:dslforum-org:service:X_AVM-DE_Speedtest
   * ✅ GetInfo
   * ❌ SetConfig
+  * ❌ GetStatistics
+  * ❌ ResetStatistics
 * ❌ urn:dslforum-org:service:X_AVM-DE_RemoteAccess
 * ❌ urn:dslforum-org:service:X_AVM-DE_MyFritz
 * ❌ urn:dslforum-org:service:X_AVM-DE_HostFilter
@@ -203,6 +206,7 @@ static async Task StopCaptureAsync(InternetGatewayDevice device, CaptureInterfac
   * ✅ GetHostNumberOfEntries
   * ❌ GetSpecificHostEntry
   * ✅ GetGenericHostEntry
+  * ❌ X_AVM-DE_GetInfo
   * ✅ X_AVM-DE_GetChangeCounter
   * ❌ X_AVM-DE_GetAutoWakeOnLANByMACAddress
   * ❌ X_AVM-DE_SetAutoWakeOnLANByMACAddress
@@ -211,16 +215,19 @@ static async Task StopCaptureAsync(InternetGatewayDevice device, CaptureInterfac
   * ❌ X_AVM-DE_GetSpecificHostEntryByIp
   * ❌ X_AVM-DE_HostsCheckUpdate
   * ❌ X_AVM-DE_HostDoUpdate
+  * ❌ X_AVM-DE_SetPrioritizationByIP
   * ✅ X_AVM-DE_GetHostListPath
   * ✅ X_AVM-DE_GetMeshListPath
+  * ❌ X_AVM-DE_GetFriendlyName
+  * ❌ X_AVM-DE_SetFriendlyName
+  * ❌ X_AVM-DE_SetFriendlyNameByIP
+  * ❌ X_AVM-DE_SetFriendlyNameByMAC
 * 🔶 urn:dslforum-org:service:WLANConfiguration
   * ❌ SetEnable
   * ✅ GetInfo
   * ❌ SetConfig
   * ❌ SetSecurityKeys
   * ❌ GetSecurityKeys
-  * ❌ SetDefaultWEPKeyIndex
-  * ❌ GetDefaultWEPKeyIndex
   * ❌ SetBasBeaconSecurityProperties
   * ✅ GetBasBeaconSecurityProperties
   * ✅ GetBSSID
@@ -269,6 +276,7 @@ static async Task StopCaptureAsync(InternetGatewayDevice device, CaptureInterfac
   * ✅ GetInfo
   * ✅ GetStatistics
 * ❌ urn:dslforum-org:service:X_AVM-DE_Dect
+* ❌ urn:dslforum-org:service:X_AVM-DE_Media
 * ❌ urn:dslforum-org:service:X_AVM-DE_Homeauto
 * ❌ urn:dslforum-org:service:X_AVM-DE_Homeplug
 
@@ -297,6 +305,8 @@ static async Task StopCaptureAsync(InternetGatewayDevice device, CaptureInterfac
   * ✅ X_AVM-DE_CreateUrlSID
   * ✅ X_AVM-DE_GetSupportDataInfo
   * ❌ X_AVM-DE_SendSupportData
+  * ❌ X_AVM-DE_GetSupportDataEnable
+  * ❌ X_AVM-DE_SetSupportDataEnable
 * ✅ urn:dslforum-org:service:LANConfigSecurity
   * ✅ GetInfo
   * ✅ X_AVM-DE_GetAnonymousLogin
@@ -315,6 +325,7 @@ static async Task StopCaptureAsync(InternetGatewayDevice device, CaptureInterfac
   * ✅ X_SetTR069Enable
   * ✅ X_AVM-DE_GetTR069FirmwareDownloadEnabled
   * ✅ X_AVM-DE_SetTR069FirmwareDownloadEnabled
+* ❌ urn:dslforum-org:service:X_AVM-DE_USPController
 * ❌ urn:dslforum-org:service:X_AVM-DE_Auth
 * ✅ urn:dslforum-org:service:Time
   * ✅ GetInfo
diff --git a/RS.Fritz.Manager.API/Services/DeviceHosts/Entities/DeviceHost.cs b/RS.Fritz.Manager.API/Services/DeviceHosts/Entities/DeviceHost.cs
index 92d542c..3c177e7 100644
--- a/RS.Fritz.Manager.API/Services/DeviceHosts/Entities/DeviceHost.cs
+++ b/RS.Fritz.Manager.API/Services/DeviceHosts/Entities/DeviceHost.cs
@@ -18,6 +18,11 @@ public readonly record struct DeviceHost(
     [property: DataMember(Name = "X_AVM-DE_Model", Order = 11)] string Model,
     [property: DataMember(Name = "X_AVM-DE_URL", Order = 12)] string Url,
     [property: DataMember(Name = "X_AVM-DE_Guest", Order = 13)] bool Guest,
-    [property: DataMember(Name = "X_AVM-DE_VPN", Order = 14)] bool Vpn,
-    [property: DataMember(Name = "X_AVM-DE_WANAccess", Order = 15)] string WanAccess,
-    [property: DataMember(Name = "X_AVM-DE_Disallow", Order = 16)] bool Disallow);
\ No newline at end of file
+    [property: DataMember(Name = "X_AVM-DE_RequestClient", Order = 14)] bool RequestClient,
+    [property: DataMember(Name = "X_AVM-DE_VPN", Order = 15)] bool Vpn,
+    [property: DataMember(Name = "X_AVM-DE_WANAccess", Order = 16)] string WanAccess,
+    [property: DataMember(Name = "X_AVM-DE_Disallow", Order = 17)] bool Disallow,
+    [property: DataMember(Name = "X_AVM-DE_IsMeshable", Order = 18)] bool IsMeshable,
+    [property: DataMember(Name = "X_AVM-DE_Priority", Order = 19)] bool Priority,
+    [property: DataMember(Name = "X_AVM-DE_FriendlyName", Order = 20)] string FriendlyName,
+    [property: DataMember(Name = "X_AVM-DE_FriendlyNameIsWriteable", Order = 21)] bool FriendlyNameIsWriteable);
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/LanConfigSecurity/Entities/LanConfigSecurityGetInfoResponse.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/LanConfigSecurity/Entities/LanConfigSecurityGetInfoResponse.cs
index a5d1c01..c010bae 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/LanConfigSecurity/Entities/LanConfigSecurityGetInfoResponse.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/LanConfigSecurity/Entities/LanConfigSecurityGetInfoResponse.cs
@@ -4,4 +4,6 @@
 public readonly record struct LanConfigSecurityGetInfoResponse(
     [property: MessageBodyMember(Name = "NewMaxCharsPassword")] ushort MaxCharsPassword,
     [property: MessageBodyMember(Name = "NewMinCharsPassword")] ushort MinCharsPassword,
-    [property: MessageBodyMember(Name = "NewAllowedCharsPassword")] string AllowedCharsPassword);
\ No newline at end of file
+    [property: MessageBodyMember(Name = "NewAllowedCharsPassword")] string AllowedCharsPassword,
+    [property: MessageBodyMember(Name = "NewAllowedCharsUsername")] string AllowedCharsUsername,
+    [property: MessageBodyMember(Name = "NewX_AVM-DE_IsDefaultPasswordActive")] bool IsDefaultPasswordActive);
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/UserInterface/Entities/UserInterfaceCheckUpdateRequest.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/UserInterface/Entities/UserInterfaceCheckUpdateRequest.cs
index 8c74e5a..879896a 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/UserInterface/Entities/UserInterfaceCheckUpdateRequest.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/UserInterface/Entities/UserInterfaceCheckUpdateRequest.cs
@@ -1,5 +1,4 @@
 namespace RS.Fritz.Manager.API;
 
 [MessageContract(WrapperName = "CheckUpdate")]
-public readonly record struct UserInterfaceCheckUpdateRequest(
-    [property: MessageBodyMember(Name = "NewX_AVM-DE_LaborVersion")] string LaborVersion);
\ No newline at end of file
+public readonly record struct UserInterfaceCheckUpdateRequest;
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/UserInterface/Entities/UserInterfaceGetInfoResponse.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/UserInterface/Entities/UserInterfaceGetInfoResponse.cs
index 16f5026..e8825f0 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/UserInterface/Entities/UserInterfaceGetInfoResponse.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/UserInterface/Entities/UserInterfaceGetInfoResponse.cs
@@ -10,4 +10,5 @@ public readonly record struct UserInterfaceGetInfoResponse(
     [property: MessageBodyMember(Name = "NewX_AVM-DE_DownloadURL")] string DownloadUrl,
     [property: MessageBodyMember(Name = "NewX_AVM-DE_InfoURL")] string InfoUrl,
     [property: MessageBodyMember(Name = "NewX_AVM-DE_UpdateState")] string UpdateState,
-    [property: MessageBodyMember(Name = "NewX_AVM-DE_LaborVersion")] string LaborVersion);
\ No newline at end of file
+    [property: MessageBodyMember(Name = "NewX_AVM-DE_BuildType")] string BuildType,
+    [property: MessageBodyMember(Name = "NewX_AVM-DE_SetupAssistantStatus")] bool SetupAssistantStatus);
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/Entities/WlanConfigurationGetChannelInfoResponse.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/Entities/WlanConfigurationGetChannelInfoResponse.cs
index 6cb8cc7..af84444 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/Entities/WlanConfigurationGetChannelInfoResponse.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/Entities/WlanConfigurationGetChannelInfoResponse.cs
@@ -3,4 +3,6 @@
 [MessageContract(WrapperName = "GetChannelInfoResponse")]
 public readonly record struct WlanConfigurationGetChannelInfoResponse(
     [property: MessageBodyMember(Name = "NewChannel")] byte Channel,
-    [property: MessageBodyMember(Name = "NewPossibleChannels")] string PossibleChannels);
\ No newline at end of file
+    [property: MessageBodyMember(Name = "NewPossibleChannels")] string PossibleChannels,
+    [property: MessageBodyMember(Name = "NewX_AVM-DE_AutoChannelEnabled")] bool AutoChannelEnabled,
+    [property: MessageBodyMember(Name = "NewX_AVM-DE_FrequencyBand")] string FrequencyBand);
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/Entities/WlanConfigurationGetInfoResponse.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/Entities/WlanConfigurationGetInfoResponse.cs
index d106beb..cc41ebb 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/Entities/WlanConfigurationGetInfoResponse.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/Entities/WlanConfigurationGetInfoResponse.cs
@@ -19,4 +19,6 @@ public readonly record struct WlanConfigurationGetInfoResponse(
     [property: MessageBodyMember(Name = "NewAllowedCharsSSID")] string AllowedCharsSsid,
     [property: MessageBodyMember(Name = "NewMinCharsPSK")] byte MinCharsPsk,
     [property: MessageBodyMember(Name = "NewMaxCharsPSK")] byte MaxCharsPsk,
-    [property: MessageBodyMember(Name = "NewAllowedCharsPSK")] string AllowedCharsPsk);
\ No newline at end of file
+    [property: MessageBodyMember(Name = "NewAllowedCharsPSK")] string AllowedCharsPsk,
+    [property: MessageBodyMember(Name = "NewX_AVM-DE_FrequencyBand")] string FrequencyBand,
+    [property: MessageBodyMember(Name = "NewX_AVM-DE_WLANGlobalEnable")] bool WlanGlobalEnable);
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/Entities/WlanConfigurationGetWlanConnectionInfoResponse.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/Entities/WlanConfigurationGetWlanConnectionInfoResponse.cs
index 0bf119c..98150ff 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/Entities/WlanConfigurationGetWlanConnectionInfoResponse.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/Entities/WlanConfigurationGetWlanConnectionInfoResponse.cs
@@ -8,6 +8,9 @@ public readonly record struct WlanConfigurationGetWlanConnectionInfoResponse(
     [property: MessageBodyMember(Name = "NewBeaconType")] string BeaconType,
     [property: MessageBodyMember(Name = "NewChannel")] byte Channel,
     [property: MessageBodyMember(Name = "NewStandard")] string Standard,
+    [property: MessageBodyMember(Name = "NewX_AVM-DE_AutoChannelEnabled")] bool AutoChannelEnabled,
+    [property: MessageBodyMember(Name = "NewX_AVM-DE_ChannelWidth")] ushort ChannelWidth,
+    [property: MessageBodyMember(Name = "NewX_AVM-DE_FrequencyBand")] string FrequencyBand,
     [property: MessageBodyMember(Name = "NewX_AVM-DE_SignalStrength")] byte SignalStrength,
     [property: MessageBodyMember(Name = "NewX_AVM-DE_Speed")] ushort Speed,
     [property: MessageBodyMember(Name = "NewX_AVM-DE_SpeedRX")] uint SpeedRx,
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/Entities/WlanConfigurationGetWlanExtInfoResponse.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/Entities/WlanConfigurationGetWlanExtInfoResponse.cs
index 7534af7..77a847f 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/Entities/WlanConfigurationGetWlanExtInfoResponse.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/Entities/WlanConfigurationGetWlanExtInfoResponse.cs
@@ -4,6 +4,7 @@
 public readonly record struct WlanConfigurationGetWlanExtInfoResponse(
     [property: MessageBodyMember(Name = "NewX_AVM-DE_APEnabled")] string ApEnabled,
     [property: MessageBodyMember(Name = "NewX_AVM-DE_APType")] string ApType,
+    [property: MessageBodyMember(Name = "NewX_AVM-DE_FrequencyBand")] string FrequencyBand,
     [property: MessageBodyMember(Name = "NewX_AVM-DE_TimeoutActive")] string TimeoutActive,
     [property: MessageBodyMember(Name = "NewX_AVM-DE_Timeout")] string Timeout,
     [property: MessageBodyMember(Name = "NewX_AVM-DE_TimeRemain")] string TimeRemain,
diff --git a/RS.Fritz.Manager.UI/Resources/TR-064/LanConfigSecurityResourceDictionary.xaml b/RS.Fritz.Manager.UI/Resources/TR-064/LanConfigSecurityResourceDictionary.xaml
index 5d37f84..53f4183 100644
--- a/RS.Fritz.Manager.UI/Resources/TR-064/LanConfigSecurityResourceDictionary.xaml
+++ b/RS.Fritz.Manager.UI/Resources/TR-064/LanConfigSecurityResourceDictionary.xaml
@@ -39,6 +39,8 @@
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto"/>
@@ -47,9 +49,13 @@
             <Label Grid.Row="0" Grid.Column="0" Target="{Binding ElementName=MaxCharsPassword}" Content="_MaxCharsPassword"/>
             <Label Grid.Row="1" Grid.Column="0" Target="{Binding ElementName=MinCharsPassword}" Content="_MinCharsPassword"/>
             <Label Grid.Row="2" Grid.Column="0" Target="{Binding ElementName=AllowedCharsPassword}" Content="_AllowedCharsPassword"/>
+            <Label Grid.Row="3" Grid.Column="0" Target="{Binding ElementName=AllowedCharsUsername}" Content="_AllowedCharsUsername"/>
+            <Label Grid.Row="4" Grid.Column="0" Target="{Binding ElementName=IsDefaultPasswordActive}" Content="_IsDefaultPasswordActive" ToolTip="False if no user with default password, True if at least one user with default password."/>
             <TextBlock x:Name="MaxCharsPassword" Grid.Row="0" Grid.Column="1" Text="{Binding MaxCharsPassword}"/>
             <TextBlock x:Name="MinCharsPassword" Grid.Row="1" Grid.Column="1" Text="{Binding MinCharsPassword}"/>
             <TextBlock x:Name="AllowedCharsPassword" Grid.Row="2" Grid.Column="1" Text="{Binding AllowedCharsPassword}"/>
+            <TextBlock x:Name="AllowedCharsUsername" Grid.Row="3" Grid.Column="1" Text="{Binding AllowedCharsUsername}"/>
+            <TextBlock x:Name="IsDefaultPasswordActive" Grid.Row="4" Grid.Column="1" Text="{Binding IsDefaultPasswordActive}"/>
         </Grid>
     </DataTemplate>
     <DataTemplate DataType="{x:Type api:LanConfigSecurityGetUserListResponse}">
diff --git a/RS.Fritz.Manager.UI/Resources/TR-064/UserInterfaceResourceDictionary.xaml b/RS.Fritz.Manager.UI/Resources/TR-064/UserInterfaceResourceDictionary.xaml
index b696103..ab11157 100644
--- a/RS.Fritz.Manager.UI/Resources/TR-064/UserInterfaceResourceDictionary.xaml
+++ b/RS.Fritz.Manager.UI/Resources/TR-064/UserInterfaceResourceDictionary.xaml
@@ -13,6 +13,7 @@
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto"/>
@@ -34,8 +35,10 @@
             <ContentControl x:Name="InfoUrl" Grid.Row="6" Grid.Column="1" ContentTemplate="{StaticResource UrlDataTemplate}" Content="{Binding InfoUrl}"/>
             <Label Grid.Row="7" Grid.Column="0" Target="{Binding ElementName=UpdateState}" Content="_UpdateState" ToolTip="Possible values are Started, Stopped, Error, NoUpdate, UpdateAvailable, Unknown."/>
             <TextBlock x:Name="UpdateState" Grid.Row="7" Grid.Column="1" Text="{Binding UpdateState}"/>
-            <Label Grid.Row="8" Grid.Column="0" Target="{Binding ElementName=LaborVersion}" Content="_LaborVersion" ToolTip="'Current' currently used Version, either Release or Labor XXX Release-Firmware: '' Labor-Firmware: content of CONFIG_LABOR_ID_NAME e.g. phone."/>
-            <TextBlock x:Name="LaborVersion" Grid.Row="8" Grid.Column="1" Text="{Binding LaborVersion}"/>
+            <Label Grid.Row="8" Grid.Column="0" Target="{Binding ElementName=BuildType}" Content="_BuildType" ToolTip="Possible values are Release, Intern, Work, Personal, Modified, Inhaus, Labor_Beta, Labor_RC, Labor_DSL, Labor_Phone, Labor, Labor_Test, Labor_Plus."/>
+            <TextBlock x:Name="BuildType" Grid.Row="8" Grid.Column="1" Text="{Binding BuildType}"/>
+            <Label Grid.Row="9" Grid.Column="0" Target="{Binding ElementName=SetupAssistantStatus}" Content="_SetupAssistantStatus"/>
+            <TextBlock x:Name="SetupAssistantStatus" Grid.Row="9" Grid.Column="1" Text="{Binding SetupAssistantStatus}"/>
         </Grid>
     </DataTemplate>
     <DataTemplate DataType="{x:Type api:UserInterfaceDoPrepareCgiResponse}">
diff --git a/RS.Fritz.Manager.UI/Resources/TR-064/WanCommonInterfaceConfigResourceDictionary.xaml b/RS.Fritz.Manager.UI/Resources/TR-064/WanCommonInterfaceConfigResourceDictionary.xaml
index c6124de..aee9eac 100644
--- a/RS.Fritz.Manager.UI/Resources/TR-064/WanCommonInterfaceConfigResourceDictionary.xaml
+++ b/RS.Fritz.Manager.UI/Resources/TR-064/WanCommonInterfaceConfigResourceDictionary.xaml
@@ -13,7 +13,7 @@
                 <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            <Label Grid.Row="0" Grid.Column="0" Target="{Binding ElementName=WanAccessType}" Content="_WanAccessType" ToolTip="Specifies the WAN access (modem) between the residential network and the ISP. Possible values are DSL, Ethernet, X_AVM-DE_Fiber, X_AVM-DE_UMTS, X_AVM-DE_Cable, X_AVM-DE_LTE."/>
+            <Label Grid.Row="0" Grid.Column="0" Target="{Binding ElementName=WanAccessType}" Content="_WanAccessType" ToolTip="Specifies the WAN access (modem) between the residential network and the ISP. Possible values are DSL, Ethernet, X_AVM-DE_Fiber, X_AVM-DE_UMTS, X_AVM-DE_Cable, X_AVM-DE_LTE, unknown."/>
             <Label Grid.Row="1" Grid.Column="0" Target="{Binding ElementName=PhysicalLinkStatus}" Content="_PhysicalLinkStatus" ToolTip="Indicates the state of the physical connection (link) from WANDevice to a connected entity. Possible values are Up, Down, Initializing, Unavailable."/>
             <Label Grid.Row="2" Grid.Column="0" Target="{Binding ElementName=Layer1DownstreamMaxBitRate}" Content="_Layer1DownstreamMaxBitRate" ToolTip="Specifies the maximum downstream theoretical bit rate for the WAN device."/>
             <Label Grid.Row="3" Grid.Column="0" Target="{Binding ElementName=Layer1UpstreamMaxBitRate}" Content="_Layer1UpstreamMaxBitRate" ToolTip="Specifies the maximum upstream theoretical bit rate for the WAN device."/>
diff --git a/RS.Fritz.Manager.UI/Resources/TR-064/WlanConfigurationResourceDictionary.xaml b/RS.Fritz.Manager.UI/Resources/TR-064/WlanConfigurationResourceDictionary.xaml
index 47ecb79..18ac4a5 100644
--- a/RS.Fritz.Manager.UI/Resources/TR-064/WlanConfigurationResourceDictionary.xaml
+++ b/RS.Fritz.Manager.UI/Resources/TR-064/WlanConfigurationResourceDictionary.xaml
@@ -23,6 +23,8 @@
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto"/>
@@ -64,6 +66,10 @@
             <TextBlock x:Name="MaxCharsPsk" Grid.Row="16" Grid.Column="1" Text="{Binding MaxCharsPsk}"/>
             <Label Grid.Row="17" Grid.Column="0" Target="{Binding ElementName=AllowedCharsPsk}" Content="_AllowedCharsPsk"/>
             <TextBlock x:Name="AllowedCharsPsk" Grid.Row="17" Grid.Column="1" Text="{Binding AllowedCharsPsk}"/>
+            <Label Grid.Row="18" Grid.Column="0" Target="{Binding ElementName=FrequencyBand}" Content="_FrequencyBand" ToolTip="Possible values are 2400, 5000, 6000, unknown."/>
+            <TextBlock x:Name="FrequencyBand" Grid.Row="18" Grid.Column="1" Text="{Binding FrequencyBand}"/>
+            <Label Grid.Row="19" Grid.Column="0" Target="{Binding ElementName=WlanGlobalEnable}" Content="_WlanGlobalEnable"/>
+            <TextBlock x:Name="WlanGlobalEnable" Grid.Row="19" Grid.Column="1" Text="{Binding WlanGlobalEnable}"/>
         </Grid>
     </DataTemplate>
     <DataTemplate DataType="{x:Type api:WlanDeviceInfo}">
@@ -152,6 +158,8 @@
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto"/>
@@ -161,6 +169,10 @@
             <TextBlock x:Name="Channel" Grid.Row="0" Grid.Column="1" Text="{Binding Channel}"/>
             <Label Grid.Row="1" Grid.Column="0" Target="{Binding ElementName=PossibleChannels}" Content="_PossibleChannels" ToolTip="Comma-separated list (maximum number of characters 1024) of strings. Possible radio channels for the wireless standard (a, b or g) and the regulatory domain."/>
             <TextBlock x:Name="PossibleChannels" Grid.Row="1" Grid.Column="1" Text="{Binding PossibleChannels}"/>
+            <Label Grid.Row="2" Grid.Column="0" Target="{Binding ElementName=AutoChannelEnabled}" Content="_AutoChannelEnabled"/>
+            <TextBlock x:Name="AutoChannelEnabled" Grid.Row="2" Grid.Column="1" Text="{Binding AutoChannelEnabled}"/>
+            <Label Grid.Row="3" Grid.Column="0" Target="{Binding ElementName=FrequencyBand}" Content="_FrequencyBand" ToolTip="Possible values are 2400, 5000, 6000, unknown."/>
+            <TextBlock x:Name="FrequencyBand" Grid.Row="3" Grid.Column="1" Text="{Binding FrequencyBand}"/>
         </Grid>
     </DataTemplate>
     <DataTemplate DataType="{x:Type api:WlanConfigurationGetIpTvOptimizedResponse}">
@@ -264,6 +276,9 @@
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto"/>
@@ -279,18 +294,24 @@
             <TextBlock x:Name="BeaconType" Grid.Row="3" Grid.Column="1" Text="{Binding BeaconType}"/>
             <Label Grid.Row="4" Grid.Column="0" Target="{Binding ElementName=Channel}" Content="_Channel" ToolTip="The current radio channel used by the connection. 0 Means auto channel."/>
             <TextBlock x:Name="Channel" Grid.Row="4" Grid.Column="1" Text="{Binding Channel}"/>
-            <Label Grid.Row="5" Grid.Column="0" Target="{Binding ElementName=Standard}" Content="_Standard" ToolTip="Indicates which IEEE 802.11 mode the device is currently operating in. Possible values are b, g, n, ac, ax, ''. Only the highest of the active modes is returned."/>
-            <TextBlock x:Name="Standard" Grid.Row="5" Grid.Column="1" Text="{Binding Standard}"/>
-            <Label Grid.Row="6" Grid.Column="0" Target="{Binding ElementName=SignalStrength}" Content="_SignalStrength"/>
-            <TextBlock x:Name="SignalStrength" Grid.Row="6" Grid.Column="1" Text="{Binding SignalStrength}"/>
-            <Label Grid.Row="7" Grid.Column="0" Target="{Binding ElementName=Speed}" Content="_Speed"/>
-            <TextBlock x:Name="Speed" Grid.Row="7" Grid.Column="1" Text="{Binding Speed}"/>
-            <Label Grid.Row="8" Grid.Column="0" Target="{Binding ElementName=SpeedRx}" Content="_SpeedRx"/>
-            <TextBlock x:Name="SpeedRx" Grid.Row="8" Grid.Column="1" Text="{Binding SpeedRx}"/>
-            <Label Grid.Row="9" Grid.Column="0" Target="{Binding ElementName=SpeedMax}" Content="_SpeedMax"/>
-            <TextBlock x:Name="SpeedMax" Grid.Row="9" Grid.Column="1" Text="{Binding SpeedMax}"/>
-            <Label Grid.Row="10" Grid.Column="0" Target="{Binding ElementName=SpeedRxMax}" Content="_SpeedRxMax"/>
-            <TextBlock x:Name="SpeedRxMax" Grid.Row="10" Grid.Column="1" Text="{Binding SpeedRxMax}"/>
+            <Label Grid.Row="5" Grid.Column="0" Target="{Binding ElementName=AutoChannelEnabled}" Content="_AutoChannelEnabled"/>
+            <TextBlock x:Name="AutoChannelEnabled" Grid.Row="5" Grid.Column="1" Text="{Binding AutoChannelEnabled}"/>
+            <Label Grid.Row="6" Grid.Column="0" Target="{Binding ElementName=ChannelWidth}" Content="_ChannelWidth" ToolTip="Possible values are 0, 20, 40, 80, 160, 320."/>
+            <TextBlock x:Name="ChannelWidth" Grid.Row="6" Grid.Column="1" Text="{Binding ChannelWidth}"/>
+            <Label Grid.Row="7" Grid.Column="0" Target="{Binding ElementName=FrequencyBand}" Content="_FrequencyBand" ToolTip="Possible values are 2400, 5000, 6000, unknown."/>
+            <TextBlock x:Name="FrequencyBand" Grid.Row="7" Grid.Column="1" Text="{Binding FrequencyBand}"/>
+            <Label Grid.Row="8" Grid.Column="0" Target="{Binding ElementName=Standard}" Content="_Standard" ToolTip="Indicates which IEEE 802.11 mode the device is currently operating in. Possible values are b, g, n, ac, ax, ''. Only the highest of the active modes is returned."/>
+            <TextBlock x:Name="Standard" Grid.Row="8" Grid.Column="1" Text="{Binding Standard}"/>
+            <Label Grid.Row="9" Grid.Column="0" Target="{Binding ElementName=SignalStrength}" Content="_SignalStrength"/>
+            <TextBlock x:Name="SignalStrength" Grid.Row="9" Grid.Column="1" Text="{Binding SignalStrength}"/>
+            <Label Grid.Row="10" Grid.Column="0" Target="{Binding ElementName=Speed}" Content="_Speed"/>
+            <TextBlock x:Name="Speed" Grid.Row="10" Grid.Column="1" Text="{Binding Speed}"/>
+            <Label Grid.Row="11" Grid.Column="0" Target="{Binding ElementName=SpeedRx}" Content="_SpeedRx"/>
+            <TextBlock x:Name="SpeedRx" Grid.Row="11" Grid.Column="1" Text="{Binding SpeedRx}"/>
+            <Label Grid.Row="12" Grid.Column="0" Target="{Binding ElementName=SpeedMax}" Content="_SpeedMax"/>
+            <TextBlock x:Name="SpeedMax" Grid.Row="12" Grid.Column="1" Text="{Binding SpeedMax}"/>
+            <Label Grid.Row="13" Grid.Column="0" Target="{Binding ElementName=SpeedRxMax}" Content="_SpeedRxMax"/>
+            <TextBlock x:Name="SpeedRxMax" Grid.Row="13" Grid.Column="1" Text="{Binding SpeedRxMax}"/>
         </Grid>
     </DataTemplate>
     <DataTemplate DataType="{x:Type api:WlanConfigurationGetWlanExtInfoResponse}">
@@ -305,6 +326,7 @@
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto"/>
@@ -314,20 +336,22 @@
             <TextBlock x:Name="ApEnabled" Grid.Row="0" Grid.Column="1" Text="{Binding ApEnabled}"/>
             <Label Grid.Row="1" Grid.Column="0" Target="{Binding ElementName=ApType}" Content="_ApType"/>
             <TextBlock x:Name="ApType" Grid.Row="1" Grid.Column="1" Text="{Binding ApType}"/>
-            <Label Grid.Row="2" Grid.Column="0" Target="{Binding ElementName=TimeoutActive}" Content="_TimeoutActive"/>
-            <TextBlock x:Name="TimeoutActive" Grid.Row="2" Grid.Column="1" Text="{Binding TimeoutActive}"/>
-            <Label Grid.Row="3" Grid.Column="0" Target="{Binding ElementName=Timeout}" Content="_Timeout"/>
-            <TextBlock x:Name="Timeout" Grid.Row="3" Grid.Column="1" Text="{Binding Timeout}"/>
-            <Label Grid.Row="4" Grid.Column="0" Target="{Binding ElementName=TimeRemain}" Content="_TimeRemain"/>
-            <TextBlock x:Name="TimeRemain" Grid.Row="4" Grid.Column="1" Text="{Binding TimeRemain}"/>
-            <Label Grid.Row="5" Grid.Column="0" Target="{Binding ElementName=NoForcedOff}" Content="_NoForcedOff"/>
-            <TextBlock x:Name="NoForcedOff" Grid.Row="5" Grid.Column="1" Text="{Binding NoForcedOff}"/>
-            <Label Grid.Row="6" Grid.Column="0" Target="{Binding ElementName=UserIsolation}" Content="_UserIsolation"/>
-            <TextBlock x:Name="UserIsolation" Grid.Row="6" Grid.Column="1" Text="{Binding UserIsolation}"/>
-            <Label Grid.Row="7" Grid.Column="0" Target="{Binding ElementName=EncryptionMode}" Content="_EncryptionMode"/>
-            <TextBlock x:Name="EncryptionMode" Grid.Row="7" Grid.Column="1" Text="{Binding EncryptionMode}"/>
-            <Label Grid.Row="8" Grid.Column="0" Target="{Binding ElementName=LastChangedStamp}" Content="_LastChangedStamp"/>
-            <TextBlock x:Name="LastChangedStamp" Grid.Row="8" Grid.Column="1" Text="{Binding LastChangedStamp}"/>
+            <Label Grid.Row="2" Grid.Column="0" Target="{Binding ElementName=FrequencyBand}" Content="_FrequencyBand" ToolTip="Possible values are 2400, 5000, 6000, unknown."/>
+            <TextBlock x:Name="FrequencyBand" Grid.Row="2" Grid.Column="1" Text="{Binding FrequencyBand}"/>
+            <Label Grid.Row="3" Grid.Column="0" Target="{Binding ElementName=TimeoutActive}" Content="_TimeoutActive"/>
+            <TextBlock x:Name="TimeoutActive" Grid.Row="3" Grid.Column="1" Text="{Binding TimeoutActive}"/>
+            <Label Grid.Row="4" Grid.Column="0" Target="{Binding ElementName=Timeout}" Content="_Timeout"/>
+            <TextBlock x:Name="Timeout" Grid.Row="4" Grid.Column="1" Text="{Binding Timeout}"/>
+            <Label Grid.Row="5" Grid.Column="0" Target="{Binding ElementName=TimeRemain}" Content="_TimeRemain"/>
+            <TextBlock x:Name="TimeRemain" Grid.Row="5" Grid.Column="1" Text="{Binding TimeRemain}"/>
+            <Label Grid.Row="6" Grid.Column="0" Target="{Binding ElementName=NoForcedOff}" Content="_NoForcedOff"/>
+            <TextBlock x:Name="NoForcedOff" Grid.Row="6" Grid.Column="1" Text="{Binding NoForcedOff}"/>
+            <Label Grid.Row="7" Grid.Column="0" Target="{Binding ElementName=UserIsolation}" Content="_UserIsolation"/>
+            <TextBlock x:Name="UserIsolation" Grid.Row="7" Grid.Column="1" Text="{Binding UserIsolation}"/>
+            <Label Grid.Row="8" Grid.Column="0" Target="{Binding ElementName=EncryptionMode}" Content="_EncryptionMode"/>
+            <TextBlock x:Name="EncryptionMode" Grid.Row="8" Grid.Column="1" Text="{Binding EncryptionMode}"/>
+            <Label Grid.Row="9" Grid.Column="0" Target="{Binding ElementName=LastChangedStamp}" Content="_LastChangedStamp"/>
+            <TextBlock x:Name="LastChangedStamp" Grid.Row="9" Grid.Column="1" Text="{Binding LastChangedStamp}"/>
         </Grid>
     </DataTemplate>
     <DataTemplate DataType="{x:Type api:WlanConfigurationGetWlanHybridModeResponse}">
diff --git a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceCheckUpdateView.xaml b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceCheckUpdateView.xaml
index bab8c10..3680fa2 100644
--- a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceCheckUpdateView.xaml
+++ b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceCheckUpdateView.xaml
@@ -13,17 +13,14 @@
             <Grid>
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto"/>
-                    <RowDefinition Height="Auto"/>
                 </Grid.RowDefinitions>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
-                <Label Grid.Row="0" Grid.Column="0" Target="{Binding ElementName=LaborVersion}" Content="_LaborVersion" ToolTip="'Current' currently used Version, either Release or Labor XXX Release-Firmware: '' Labor-Firmware: content of CONFIG_LABOR_ID_NAME e.g. phone."/>
-                <TextBox x:Name="LaborVersion" Grid.Row="0" Grid.Column="1" MinWidth="50" Text="{Binding LaborVersion, UpdateSourceTrigger=PropertyChanged}"/>
-                <Button Grid.Row="1" Grid.Column="0" Content="{Binding ButtonText}" Command="{Binding DefaultCommand}" CommandParameter="{StaticResource False}"/>
-                <ContentControl Grid.Row="0" Grid.Column="2" Grid.RowSpan="2" Content="{Binding Response.Value}"/>
+                <Button Grid.Row="0" Grid.Column="0" Content="{Binding ButtonText}" Command="{Binding DefaultCommand}" CommandParameter="{StaticResource False}"/>
+                <ContentControl Grid.Row="0" Grid.Column="2" Content="{Binding Response.Value}"/>
             </Grid>
         </Expander>
     </Border>
diff --git a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceCheckUpdateViewModel.cs b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceCheckUpdateViewModel.cs
index f07d998..27073fd 100644
--- a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceCheckUpdateViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceCheckUpdateViewModel.cs
@@ -1,42 +1,9 @@
 namespace RS.Fritz.Manager.UI;
 
-using System.ComponentModel;
-
 internal sealed class UserInterfaceCheckUpdateViewModel : ManualOperationViewModel<UserInterfaceCheckUpdateRequest, UserInterfaceCheckUpdateResponse>
 {
-    private string? laborVersion;
-
     public UserInterfaceCheckUpdateViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
         : base(deviceLoginInfo, logger, "CheckUpdate", "Check Update", (d, r) => d.UserInterfaceCheckUpdateAsync(r))
     {
     }
-
-    public string? LaborVersion
-    {
-        get => laborVersion;
-        set
-        {
-            if (SetProperty(ref laborVersion, value))
-                DefaultCommand.NotifyCanExecuteChanged();
-        }
-    }
-
-    protected override UserInterfaceCheckUpdateRequest BuildRequest()
-    {
-        return new(LaborVersion!);
-    }
-
-    protected override void FritzServiceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
-    {
-        base.FritzServiceViewModelPropertyChanged(sender, e);
-
-        switch (e.PropertyName)
-        {
-            case nameof(LaborVersion):
-                {
-                    UpdateCanExecuteDefaultCommand();
-                    break;
-                }
-        }
-    }
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigGetOnlineMonitorView.xaml b/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigGetOnlineMonitorView.xaml
index ec73976..bd65fd4 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigGetOnlineMonitorView.xaml
+++ b/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigGetOnlineMonitorView.xaml
@@ -39,32 +39,32 @@
                         <ColumnDefinition Width="Auto"/>
                         <ColumnDefinition Width="Auto"/>
                     </Grid.ColumnDefinitions>
-                    <Label Grid.Row="0" Grid.Column="0" Target="{Binding ElementName=TotalNumberSyncGroups}" Content="_TotalNumberSyncGroups"/>
+                    <Label Grid.Row="0" Grid.Column="0" Target="{Binding ElementName=TotalNumberSyncGroups}" Content="_TotalNumberSyncGroups" ToolTip="Number of sync groups."/>
                     <TextBlock x:Name="TotalNumberSyncGroups" Grid.Row="0" Grid.Column="1" Text="{Binding WanCommonInterfaceConfigGetOnlineMonitorResponse.Key.TotalNumberSyncGroups}"/>
-                    <Label Grid.Row="1" Grid.Column="0" Target="{Binding ElementName=SyncGroupName}" Content="_SyncGroupName"/>
+                    <Label Grid.Row="1" Grid.Column="0" Target="{Binding ElementName=SyncGroupName}" Content="_SyncGroupName" ToolTip="Name of sync group."/>
                     <TextBlock x:Name="SyncGroupName" Grid.Row="1" Grid.Column="1" Text="{Binding WanCommonInterfaceConfigGetOnlineMonitorResponse.Key.SyncGroupName}"/>
-                    <Label Grid.Row="2" Grid.Column="0" Target="{Binding ElementName=SyncGroupMode}" Content="_SyncGroupMode"/>
+                    <Label Grid.Row="2" Grid.Column="0" Target="{Binding ElementName=SyncGroupMode}" Content="_SyncGroupMode" ToolTip="Connection mode of sync group."/>
                     <TextBlock x:Name="SyncGroupMode" Grid.Row="2" Grid.Column="1" Text="{Binding WanCommonInterfaceConfigGetOnlineMonitorResponse.Key.SyncGroupMode}"/>
-                    <Label Grid.Row="3" Grid.Column="0" Target="{Binding ElementName=MaxDownstream}" Content="_MaxDownstream"/>
+                    <Label Grid.Row="3" Grid.Column="0" Target="{Binding ElementName=MaxDownstream}" Content="_MaxDownstream" ToolTip="Max number of bytes per second in downstream direction."/>
                     <TextBlock x:Name="MaxDownstream" Grid.Row="3" Grid.Column="1" Text="{Binding WanCommonInterfaceConfigGetOnlineMonitorResponse.Key.MaxDownstream}"/>
-                    <Label Grid.Row="4" Grid.Column="0" Target="{Binding ElementName=MaxUpstream}" Content="_MaxUpstream"/>
+                    <Label Grid.Row="4" Grid.Column="0" Target="{Binding ElementName=MaxUpstream}" Content="_MaxUpstream" ToolTip="Max number of bytes per second in upstream direction."/>
                     <TextBlock x:Name="MaxUpstream" Grid.Row="4" Grid.Column="1" Text="{Binding WanCommonInterfaceConfigGetOnlineMonitorResponse.Key.MaxUpstream}"/>
-                    <Label Grid.Row="5" Grid.Column="0" Target="{Binding ElementName=SyncGroupIndex}" Content="_SyncGroupIndex"/>
+                    <Label Grid.Row="5" Grid.Column="0" Target="{Binding ElementName=SyncGroupIndex}" Content="_SyncGroupIndex" ToolTip="0..TotalNumberSyncGroups-1."/>
                     <TextBox x:Name="SyncGroupIndex" Grid.Row="5" Grid.Column="1" MinWidth="50" Text="{Binding SyncGroupIndex, UpdateSourceTrigger=PropertyChanged}"/>
                     <Button Grid.Row="6" Grid.Column="0" Content="Get OnlineMonitor" Command="{Binding DefaultCommand}" CommandParameter="{StaticResource False}"/>
-                    <Label Grid.Row="7" Grid.Column="0" Target="{Binding ElementName=CurrentDownstreamInternetBps}" Content="_CurrentDownstreamInternetBps"/>
+                    <Label Grid.Row="7" Grid.Column="0" Target="{Binding ElementName=CurrentDownstreamInternetBps}" Content="_CurrentDownstreamInternetBps" ToolTip="Current number of bytes per second in downstream direction of multicast traffic."/>
                     <TextBlock x:Name="CurrentDownstreamInternetBps" Grid.Row="7" Grid.Column="1" Text="{Binding CurrentDownstreamInternetBps}"/>
-                    <Label Grid.Row="8" Grid.Column="0" Target="{Binding ElementName=CurrentDownstreamIpTvBps}" Content="_CurrentDownstreamIpTvBps"/>
+                    <Label Grid.Row="8" Grid.Column="0" Target="{Binding ElementName=CurrentDownstreamIpTvBps}" Content="_CurrentDownstreamIpTvBps" ToolTip="Current number of bytes per second in downstream direction of home, guest and multicast traffic."/>
                     <TextBlock x:Name="CurrentDownstreamIpTvBps" Grid.Row="8" Grid.Column="1" Text="{Binding CurrentDownstreamIpTvBps}"/>
-                    <Label Grid.Row="9" Grid.Column="0" Target="{Binding ElementName=CurrentUpstreamTotalBps}" Content="_CurrentUpstreamTotalBps"/>
+                    <Label Grid.Row="9" Grid.Column="0" Target="{Binding ElementName=CurrentUpstreamTotalBps}" Content="_CurrentUpstreamTotalBps" ToolTip="Current number of bytes per second in upstream direction."/>
                     <TextBlock x:Name="CurrentUpstreamTotalBps" Grid.Row="9" Grid.Column="1" Text="{Binding CurrentUpstreamTotalBps}"/>
-                    <Label Grid.Row="10" Grid.Column="0" Target="{Binding ElementName=CurrentUpstreamRealTimeApplicationsBps}" Content="_CurrentUpstreamRealTimeApplicationsBps"/>
+                    <Label Grid.Row="10" Grid.Column="0" Target="{Binding ElementName=CurrentUpstreamRealTimeApplicationsBps}" Content="_CurrentUpstreamRealTimeApplicationsBps" ToolTip="Current number of bytes per second in upstream direction of real-time home traffic."/>
                     <TextBlock x:Name="CurrentUpstreamRealTimeApplicationsBps" Grid.Row="10" Grid.Column="1" Text="{Binding CurrentUpstreamRealTimeApplicationsBps}"/>
-                    <Label Grid.Row="11" Grid.Column="0" Target="{Binding ElementName=CurrentUpstreamPrioritizedApplicationsBps}" Content="_CurrentUpstreamPrioritizedApplicationsBps"/>
+                    <Label Grid.Row="11" Grid.Column="0" Target="{Binding ElementName=CurrentUpstreamPrioritizedApplicationsBps}" Content="_CurrentUpstreamPrioritizedApplicationsBps" ToolTip="Current number of bytes per second in upstream direction of important home traffic."/>
                     <TextBlock x:Name="CurrentUpstreamPrioritizedApplicationsBps" Grid.Row="11" Grid.Column="1" Text="{Binding CurrentUpstreamPrioritizedApplicationsBps}"/>
-                    <Label Grid.Row="12" Grid.Column="0" Target="{Binding ElementName=CurrentUpstreamNormalApplicationsBps}" Content="_CurrentUpstreamNormalApplicationsBps"/>
+                    <Label Grid.Row="12" Grid.Column="0" Target="{Binding ElementName=CurrentUpstreamNormalApplicationsBps}" Content="_CurrentUpstreamNormalApplicationsBps" ToolTip="Current number of bytes per second in upstream direction of default home traffic."/>
                     <TextBlock x:Name="CurrentUpstreamNormalApplicationsBps" Grid.Row="12" Grid.Column="1" Text="{Binding CurrentUpstreamNormalApplicationsBps}"/>
-                    <Label Grid.Row="13" Grid.Column="0" Target="{Binding ElementName=CurrentUpstreamBackgroundApplicationsBps}" Content="_CurrentUpstreamBackgroundApplicationsBps"/>
+                    <Label Grid.Row="13" Grid.Column="0" Target="{Binding ElementName=CurrentUpstreamBackgroundApplicationsBps}" Content="_CurrentUpstreamBackgroundApplicationsBps" ToolTip="Current number of bytes per second in upstream direction of background home traffic."/>
                     <TextBlock x:Name="CurrentUpstreamBackgroundApplicationsBps" Grid.Row="13" Grid.Column="1" Text="{Binding CurrentUpstreamBackgroundApplicationsBps}"/>
                 </Grid>
                 <Grid Grid.Row="0" Grid.Column="1">
diff --git a/RS.Fritz.Manager.sln.DotSettings b/RS.Fritz.Manager.sln.DotSettings
index 8621ed9..434b400 100644
--- a/RS.Fritz.Manager.sln.DotSettings
+++ b/RS.Fritz.Manager.sln.DotSettings
@@ -31,12 +31,14 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=IETF/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=iface/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ifaceorminor/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Inhaus/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=inital/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Iperf/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=IPTV/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=kbit/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kbps/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Mbps/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Meshable/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Meshd/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=multicast/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Multihomed/@EntryIndexedValue">True</s:Boolean>
@@ -80,4 +82,5 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=WANIP/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=WANPPP/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Wireshark/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=wlan/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=wlan/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Writeable/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file

From af222794d76e198bd1d98c09687476d57fa09e12 Mon Sep 17 00:00:00 2001
From: Rans4ckeR <ransacker@outlook.com>
Date: Wed, 25 Jan 2023 11:56:25 +0100
Subject: [PATCH 02/15] Add Hosts X_AVM-DE_GetInfo

---
 README.md                                     |  2 +-
 .../InternetGatewayDeviceExtensions.cs        |  5 ++++
 .../Hosts/Entities/HostsGetInfoRequest.cs     |  4 +++
 .../Hosts/Entities/HostsGetInfoResponse.cs    |  9 +++++++
 .../Services/Hosts/FritzHostsService.cs       |  5 ++++
 .../Services/Hosts/IFritzHostsService.cs      |  5 ++++
 .../FritzServiceOperationHandler.cs           |  5 ++++
 .../IFritzServiceOperationHandler.cs          |  2 ++
 .../TR-064/HostsResourceDictionary.xaml       | 25 +++++++++++++++++++
 .../UserControls/Hosts/HostsView.xaml         | 21 +++++++++++++---
 .../UserControls/Hosts/HostsViewModel.cs      | 13 ++++++++++
 RS.Fritz.Manager.sln.DotSettings              |  1 +
 12 files changed, 93 insertions(+), 4 deletions(-)
 create mode 100644 RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsGetInfoRequest.cs
 create mode 100644 RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsGetInfoResponse.cs

diff --git a/README.md b/README.md
index 3a1d956..ae98d35 100644
--- a/README.md
+++ b/README.md
@@ -206,7 +206,7 @@ static async Task StopCaptureAsync(InternetGatewayDevice device, CaptureInterfac
   * ✅ GetHostNumberOfEntries
   * ❌ GetSpecificHostEntry
   * ✅ GetGenericHostEntry
-  * ❌ X_AVM-DE_GetInfo
+  * ✅ X_AVM-DE_GetInfo
   * ✅ X_AVM-DE_GetChangeCounter
   * ❌ X_AVM-DE_GetAutoWakeOnLANByMACAddress
   * ❌ X_AVM-DE_SetAutoWakeOnLANByMACAddress
diff --git a/RS.Fritz.Manager.API/Extensions/InternetGatewayDeviceExtensions.cs b/RS.Fritz.Manager.API/Extensions/InternetGatewayDeviceExtensions.cs
index 40226f0..cf44a40 100644
--- a/RS.Fritz.Manager.API/Extensions/InternetGatewayDeviceExtensions.cs
+++ b/RS.Fritz.Manager.API/Extensions/InternetGatewayDeviceExtensions.cs
@@ -17,6 +17,11 @@ public static Task<HostsGetGenericHostEntryResponse> HostsGetGenericHostEntryAsy
         return internetGatewayDevice.ExecuteAsync((h, d) => h.HostsGetGenericHostEntryAsync(d, hostsGetGenericHostEntryRequest));
     }
 
+    public static Task<HostsGetInfoResponse> HostsGetInfoAsync(this InternetGatewayDevice internetGatewayDevice)
+    {
+        return internetGatewayDevice.ExecuteAsync((h, d) => h.HostsGetInfoAsync(d));
+    }
+
     public static Task<HostsGetChangeCounterResponse> HostsGetChangeCounterAsync(this InternetGatewayDevice internetGatewayDevice)
     {
         return internetGatewayDevice.ExecuteAsync((h, d) => h.HostsGetChangeCounterAsync(d));
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsGetInfoRequest.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsGetInfoRequest.cs
new file mode 100644
index 0000000..d5f838e
--- /dev/null
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsGetInfoRequest.cs
@@ -0,0 +1,4 @@
+namespace RS.Fritz.Manager.API;
+
+[MessageContract(WrapperName = "GetInfo")]
+public readonly record struct HostsGetInfoRequest;
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsGetInfoResponse.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsGetInfoResponse.cs
new file mode 100644
index 0000000..d12b1d0
--- /dev/null
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsGetInfoResponse.cs
@@ -0,0 +1,9 @@
+namespace RS.Fritz.Manager.API;
+
+[MessageContract(WrapperName = "GetInfoResponse")]
+public readonly record struct HostsGetInfoResponse(
+    [property: MessageBodyMember(Name = "NewX_AVM-DE_FriendlynameMinChars")] ushort FriendlynameMinChar,
+    [property: MessageBodyMember(Name = "NewX_AVM-DE_FriendlynameMaxChars")] ushort FriendlynameMaxChars,
+    [property: MessageBodyMember(Name = "NewX_AVM-DE_HostnameMinChars")] ushort HostnameMinChars,
+    [property: MessageBodyMember(Name = "NewX_AVM-DE_HostnameMaxChars")] ushort HostnameMaxChars,
+    [property: MessageBodyMember(Name = "NewX_AVM-DE_HostnameAllowedChars")] string HostnameAllowedChars);
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/FritzHostsService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/FritzHostsService.cs
index af81724..d3c88da 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/FritzHostsService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/FritzHostsService.cs
@@ -26,6 +26,11 @@ public Task<HostsGetGenericHostEntryResponse> GetGenericHostEntryAsync(HostsGetG
         return Channel.GetGenericHostEntryAsync(hostsGetGenericHostEntryRequest);
     }
 
+    public Task<HostsGetInfoResponse> GetInfoAsync(HostsGetInfoRequest hostsGetInfoRequest)
+    {
+        return Channel.GetInfoAsync(hostsGetInfoRequest);
+    }
+
     public Task<HostsGetChangeCounterResponse> GetChangeCounterAsync(HostsGetChangeCounterRequest hostsGetChangeCounterRequest)
     {
         return Channel.GetChangeCounterAsync(hostsGetChangeCounterRequest);
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/IFritzHostsService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/IFritzHostsService.cs
index 381a33e..b8c873d 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/IFritzHostsService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/IFritzHostsService.cs
@@ -19,6 +19,11 @@ internal interface IFritzHostsService
     [FaultContract(typeof(UPnPFault2))]
     Task<HostsGetGenericHostEntryResponse> GetGenericHostEntryAsync(HostsGetGenericHostEntryRequest hostsGetGenericHostEntryRequest);
 
+    [OperationContract(Action = "urn:dslforum-org:service:Hosts:1#X_AVM-DE_GetInfo")]
+    [FaultContract(typeof(UPnPFault1))]
+    [FaultContract(typeof(UPnPFault2))]
+    Task<HostsGetInfoResponse> GetInfoAsync(HostsGetInfoRequest hostsGetInfoRequest);
+
     [OperationContract(Action = "urn:dslforum-org:service:Hosts:1#X_AVM-DE_GetChangeCounter")]
     [FaultContract(typeof(UPnPFault1))]
     [FaultContract(typeof(UPnPFault2))]
diff --git a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs b/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs
index fa1028c..f68480c 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs
@@ -87,6 +87,11 @@ public Task<HostsGetGenericHostEntryResponse> HostsGetGenericHostEntryAsync(Inte
         return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.GetGenericHostEntryAsync(hostsGetGenericHostEntryRequest));
     }
 
+    public Task<HostsGetInfoResponse> HostsGetInfoAsync(InternetGatewayDevice internetGatewayDevice)
+    {
+        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.GetInfoAsync(default));
+    }
+
     public Task<HostsGetChangeCounterResponse> HostsGetChangeCounterAsync(InternetGatewayDevice internetGatewayDevice)
     {
         return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.GetChangeCounterAsync(default));
diff --git a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/IFritzServiceOperationHandler.cs b/RS.Fritz.Manager.API/Services/TR-064/SoapClient/IFritzServiceOperationHandler.cs
index b31c586..b9a4efc 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/IFritzServiceOperationHandler.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/SoapClient/IFritzServiceOperationHandler.cs
@@ -8,6 +8,8 @@ public interface IFritzServiceOperationHandler
 
     Task<HostsGetGenericHostEntryResponse> HostsGetGenericHostEntryAsync(InternetGatewayDevice internetGatewayDevice, HostsGetGenericHostEntryRequest hostsGetGenericHostEntryRequest);
 
+    Task<HostsGetInfoResponse> HostsGetInfoAsync(InternetGatewayDevice internetGatewayDevice);
+
     Task<HostsGetChangeCounterResponse> HostsGetChangeCounterAsync(InternetGatewayDevice internetGatewayDevice);
 
     Task<HostsGetMeshListPathResponse> HostsGetMeshListPathAsync(InternetGatewayDevice internetGatewayDevice);
diff --git a/RS.Fritz.Manager.UI/Resources/TR-064/HostsResourceDictionary.xaml b/RS.Fritz.Manager.UI/Resources/TR-064/HostsResourceDictionary.xaml
index 5929922..5f225f0 100644
--- a/RS.Fritz.Manager.UI/Resources/TR-064/HostsResourceDictionary.xaml
+++ b/RS.Fritz.Manager.UI/Resources/TR-064/HostsResourceDictionary.xaml
@@ -15,6 +15,31 @@
             <TextBlock x:Name="HostNumberOfEntries" Grid.Row="0" Grid.Column="1" Text="{Binding HostNumberOfEntries}"/>
         </Grid>
     </DataTemplate>
+    <DataTemplate DataType="{x:Type api:HostsGetInfoResponse}">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+            <Label Grid.Row="0" Grid.Column="0" Target="{Binding ElementName=FriendlynameMinChar}" Content="_FriendlynameMinChar"/>
+            <TextBlock x:Name="FriendlynameMinChar" Grid.Row="0" Grid.Column="1" Text="{Binding FriendlynameMinChar}"/>
+            <Label Grid.Row="1" Grid.Column="0" Target="{Binding ElementName=FriendlynameMaxChars}" Content="_FriendlynameMaxChars"/>
+            <TextBlock x:Name="FriendlynameMaxChars" Grid.Row="1" Grid.Column="1" Text="{Binding FriendlynameMaxChars}"/>
+            <Label Grid.Row="2" Grid.Column="0" Target="{Binding ElementName=HostnameMinChars}" Content="_HostnameMinChars"/>
+            <TextBlock x:Name="HostnameMinChars" Grid.Row="2" Grid.Column="1" Text="{Binding HostnameMinChars}"/>
+            <Label Grid.Row="3" Grid.Column="0" Target="{Binding ElementName=HostnameMaxChars}" Content="_HostnameMaxChars"/>
+            <TextBlock x:Name="HostnameMaxChars" Grid.Row="3" Grid.Column="1" Text="{Binding HostnameMaxChars}"/>
+            <Label Grid.Row="4" Grid.Column="0" Target="{Binding ElementName=HostnameAllowedChars}" Content="_HostnameAllowedChars"/>
+            <TextBlock x:Name="HostnameAllowedChars" Grid.Row="4" Grid.Column="1" Text="{Binding HostnameAllowedChars}"/>
+        </Grid>
+    </DataTemplate>
     <DataTemplate DataType="{x:Type api:HostsGetChangeCounterResponse}">
         <Grid>
             <Grid.RowDefinitions>
diff --git a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsView.xaml b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsView.xaml
index 8e0653a..dbf4221 100644
--- a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsView.xaml
+++ b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsView.xaml
@@ -15,12 +15,27 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
         <ContentControl Grid.Row="0" Grid.Column="0" Content="{Binding DeviceHostInfo}"/>
         <Border Style="{StaticResource BorderStyle}" Grid.Row="1" Grid.Column="0">
+            <Expander Header="Info">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <ContentControl Grid.Row="0" Grid.Column="0" Content="{Binding HostsGetInfoResponse.Value}"/>
+                    <ContentControl Grid.Row="0" Grid.Column="0" Content="{Binding HostsGetInfoResponse.Key}"/>
+                </Grid>
+            </Expander>
+        </Border>
+        <Border Style="{StaticResource BorderStyle}" Grid.Row="2" Grid.Column="0">
             <Expander Header="NumberOfEntries">
                 <Grid>
                     <Grid.RowDefinitions>
@@ -36,8 +51,8 @@
                 </Grid>
             </Expander>
         </Border>
-        <ContentControl Grid.Row="2" Grid.Column="0" Content="{Binding HostsGetGenericHostEntryViewModel}"/>
-        <Border Style="{StaticResource BorderStyle}" Grid.Row="3" Grid.Column="0">
+        <ContentControl Grid.Row="3" Grid.Column="0" Content="{Binding HostsGetGenericHostEntryViewModel}"/>
+        <Border Style="{StaticResource BorderStyle}" Grid.Row="4" Grid.Column="0">
             <Expander Header="ChangeCounter">
                 <Grid>
                     <Grid.RowDefinitions>
@@ -51,6 +66,6 @@
                 </Grid>
             </Expander>
         </Border>
-        <ContentControl Grid.Row="4" Grid.Column="0" Content="{Binding DeviceMeshInfo}"/>
+        <ContentControl Grid.Row="5" Grid.Column="0" Content="{Binding DeviceMeshInfo}"/>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs
index 9b85251..2192f71 100644
--- a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs
@@ -8,6 +8,7 @@ internal sealed class HostsViewModel : FritzServiceViewModel
     private readonly IDeviceMeshService deviceMeshService;
 
     private KeyValuePair<HostsGetHostNumberOfEntriesResponse?, UPnPFault?>? hostsGetHostNumberOfEntriesResponse;
+    private KeyValuePair<HostsGetInfoResponse?, UPnPFault?>? hostsGetInfoResponse;
     private KeyValuePair<HostsGetChangeCounterResponse?, UPnPFault?>? hostsGetChangeCounterResponse;
     private DeviceHostInfo? deviceHostInfo;
     private DeviceMeshInfo? deviceMeshInfo;
@@ -33,6 +34,12 @@ private set
         }
     }
 
+    public KeyValuePair<HostsGetInfoResponse?, UPnPFault?>? HostsGetInfoResponse
+    {
+        get => hostsGetInfoResponse;
+        private set { _ = SetProperty(ref hostsGetInfoResponse, value); }
+    }
+
     public KeyValuePair<HostsGetChangeCounterResponse?, UPnPFault?>? HostsGetChangeCounterResponse
     {
         get => hostsGetChangeCounterResponse;
@@ -64,6 +71,7 @@ protected override Task DoExecuteDefaultCommandAsync(CancellationToken cancellat
                 GetHostsGetHostListPathAsync(cancellationToken),
                 GetHostsGetMeshListPathAsync(cancellationToken),
                 GetHostsGetHostNumberOfEntriesAsync(),
+                GetHostsGetInfoAsync(),
                 GetHostsGetChangeCounterAsync()
             });
     }
@@ -87,6 +95,11 @@ private async Task GetHostsGetHostNumberOfEntriesAsync()
         HostsGetGenericHostEntryResponses = new(responses.Select(q => q.Key!.Value));
     }
 
+    private async Task GetHostsGetInfoAsync()
+    {
+        HostsGetInfoResponse = await ExecuteApiAsync(q => q.HostsGetInfoAsync());
+    }
+
     private async Task GetHostsGetChangeCounterAsync()
     {
         HostsGetChangeCounterResponse = await ExecuteApiAsync(q => q.HostsGetChangeCounterAsync());
diff --git a/RS.Fritz.Manager.sln.DotSettings b/RS.Fritz.Manager.sln.DotSettings
index 434b400..7753301 100644
--- a/RS.Fritz.Manager.sln.DotSettings
+++ b/RS.Fritz.Manager.sln.DotSettings
@@ -23,6 +23,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=dslforum/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=errored/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Flashbang/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Friendlyname/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=HDSL/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=iand/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=ICMP/@EntryIndexedValue">True</s:Boolean>

From 7141633c2dc3a88519c85489837455af1ce6c724 Mon Sep 17 00:00:00 2001
From: Rans4ckeR <ransacker@outlook.com>
Date: Wed, 25 Jan 2023 13:07:33 +0100
Subject: [PATCH 03/15] Add X_AVM-DE_Speedtest GetStatistics

---
 README.md                                     |  2 +-
 .../InternetGatewayDeviceExtensions.cs        |  5 ++++
 .../AvmSpeedtestGetStatisticsRequest.cs       |  4 +++
 .../AvmSpeedtestGetStatisticsResponse.cs      | 10 +++++++
 .../AvmSpeedtest/FritzAvmSpeedtestService.cs  |  5 ++++
 .../AvmSpeedtest/IFritzAvmSpeedtestService.cs |  5 ++++
 .../FritzServiceOperationHandler.cs           |  5 ++++
 .../IFritzServiceOperationHandler.cs          |  2 ++
 .../AvmSpeedtestResourceDictionary.xaml       | 28 +++++++++++++++++++
 .../AvmSpeedtest/AvmSpeedtestView.xaml        | 15 ++++++++++
 .../AvmSpeedtest/AvmSpeedtestViewModel.cs     | 23 ++++++++++++++-
 RS.Fritz.Manager.sln.DotSettings              |  1 +
 12 files changed, 103 insertions(+), 2 deletions(-)
 create mode 100644 RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/Entities/AvmSpeedtestGetStatisticsRequest.cs
 create mode 100644 RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/Entities/AvmSpeedtestGetStatisticsResponse.cs

diff --git a/README.md b/README.md
index ae98d35..0b6da72 100644
--- a/README.md
+++ b/README.md
@@ -181,7 +181,7 @@ static async Task StopCaptureAsync(InternetGatewayDevice device, CaptureInterfac
 * 🔶 urn:dslforum-org:service:X_AVM-DE_Speedtest
   * ✅ GetInfo
   * ❌ SetConfig
-  * ❌ GetStatistics
+  * ✅ GetStatistics
   * ❌ ResetStatistics
 * ❌ urn:dslforum-org:service:X_AVM-DE_RemoteAccess
 * ❌ urn:dslforum-org:service:X_AVM-DE_MyFritz
diff --git a/RS.Fritz.Manager.API/Extensions/InternetGatewayDeviceExtensions.cs b/RS.Fritz.Manager.API/Extensions/InternetGatewayDeviceExtensions.cs
index cf44a40..eef4653 100644
--- a/RS.Fritz.Manager.API/Extensions/InternetGatewayDeviceExtensions.cs
+++ b/RS.Fritz.Manager.API/Extensions/InternetGatewayDeviceExtensions.cs
@@ -282,6 +282,11 @@ public static Task<AvmSpeedtestGetInfoResponse> AvmSpeedtestGetInfoAsync(this In
         return internetGatewayDevice.ExecuteAsync((h, d) => h.AvmSpeedtestGetInfoAsync(d));
     }
 
+    public static Task<AvmSpeedtestGetStatisticsResponse> AvmSpeedtestGetStatisticsAsync(this InternetGatewayDevice internetGatewayDevice)
+    {
+        return internetGatewayDevice.ExecuteAsync((h, d) => h.AvmSpeedtestGetStatisticsAsync(d));
+    }
+
     public static Task<LanEthernetInterfaceConfigGetInfoResponse> LanEthernetInterfaceConfigGetInfoAsync(this InternetGatewayDevice internetGatewayDevice)
     {
         return internetGatewayDevice.ExecuteAsync((h, d) => h.LanEthernetInterfaceConfigGetInfoAsync(d));
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/Entities/AvmSpeedtestGetStatisticsRequest.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/Entities/AvmSpeedtestGetStatisticsRequest.cs
new file mode 100644
index 0000000..c4e65b1
--- /dev/null
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/Entities/AvmSpeedtestGetStatisticsRequest.cs
@@ -0,0 +1,4 @@
+namespace RS.Fritz.Manager.API;
+
+[MessageContract(WrapperName = "GetStatistics")]
+public readonly record struct AvmSpeedtestGetStatisticsRequest;
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/Entities/AvmSpeedtestGetStatisticsResponse.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/Entities/AvmSpeedtestGetStatisticsResponse.cs
new file mode 100644
index 0000000..b7812d6
--- /dev/null
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/Entities/AvmSpeedtestGetStatisticsResponse.cs
@@ -0,0 +1,10 @@
+namespace RS.Fritz.Manager.API;
+
+[MessageContract(WrapperName = "GetStatisticsResponse")]
+public readonly record struct AvmSpeedtestGetStatisticsResponse(
+    [property: MessageBodyMember(Name = "NewByteCount")] uint ByteCount,
+    [property: MessageBodyMember(Name = "NewKbitsCurrent")] uint KilobitsCurrent,
+    [property: MessageBodyMember(Name = "NewKbitsAvg")] uint KilobitsAverage,
+    [property: MessageBodyMember(Name = "NewPacketCount")] uint PacketCount,
+    [property: MessageBodyMember(Name = "NewPPSCurrent")] uint PacketsPerSecondCurrent,
+    [property: MessageBodyMember(Name = "NewPPSAvg")] uint PacketsPerSecondAverage);
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/FritzAvmSpeedtestService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/FritzAvmSpeedtestService.cs
index 4db63ce..43beffa 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/FritzAvmSpeedtestService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/FritzAvmSpeedtestService.cs
@@ -15,4 +15,9 @@ public Task<AvmSpeedtestGetInfoResponse> GetInfoAsync(AvmSpeedtestGetInfoRequest
     {
         return Channel.GetInfoAsync(avmSpeedtestGetInfoRequest);
     }
+
+    public Task<AvmSpeedtestGetStatisticsResponse> GetStatisticsAsync(AvmSpeedtestGetStatisticsRequest avmSpeedtestGetStatisticsRequest)
+    {
+        return Channel.GetStatisticsAsync(avmSpeedtestGetStatisticsRequest);
+    }
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/IFritzAvmSpeedtestService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/IFritzAvmSpeedtestService.cs
index 5978da4..9532dec 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/IFritzAvmSpeedtestService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/IFritzAvmSpeedtestService.cs
@@ -8,4 +8,9 @@ internal interface IFritzAvmSpeedtestService
     [FaultContract(typeof(UPnPFault1))]
     [FaultContract(typeof(UPnPFault2))]
     Task<AvmSpeedtestGetInfoResponse> GetInfoAsync(AvmSpeedtestGetInfoRequest avmSpeedtestGetInfoRequest);
+
+    [OperationContract(Action = "urn:dslforum-org:service:X_AVM-DE_Speedtest:1#GetStatistics")]
+    [FaultContract(typeof(UPnPFault1))]
+    [FaultContract(typeof(UPnPFault2))]
+    Task<AvmSpeedtestGetStatisticsResponse> GetStatisticsAsync(AvmSpeedtestGetStatisticsRequest avmSpeedtestGetStatisticsRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs b/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs
index f68480c..41d4475 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs
@@ -352,6 +352,11 @@ public Task<AvmSpeedtestGetInfoResponse> AvmSpeedtestGetInfoAsync(InternetGatewa
         return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzAvmSpeedtestServiceClientFactory, (q, r, t) => new FritzAvmSpeedtestService(q, r, t!), FritzAvmSpeedtestService.ControlUrl), q => q.GetInfoAsync(default));
     }
 
+    public Task<AvmSpeedtestGetStatisticsResponse> AvmSpeedtestGetStatisticsAsync(InternetGatewayDevice internetGatewayDevice)
+    {
+        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzAvmSpeedtestServiceClientFactory, (q, r, t) => new FritzAvmSpeedtestService(q, r, t!), FritzAvmSpeedtestService.ControlUrl), q => q.GetStatisticsAsync(default));
+    }
+
     public Task<LanEthernetInterfaceConfigGetInfoResponse> LanEthernetInterfaceConfigGetInfoAsync(InternetGatewayDevice internetGatewayDevice)
     {
         return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanEthernetInterfaceConfigServiceClientFactory, (q, r, t) => new FritzLanEthernetInterfaceConfigService(q, r, t!), FritzLanEthernetInterfaceConfigService.ControlUrl), q => q.GetInfoAsync(default));
diff --git a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/IFritzServiceOperationHandler.cs b/RS.Fritz.Manager.API/Services/TR-064/SoapClient/IFritzServiceOperationHandler.cs
index b9a4efc..ac64831 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/IFritzServiceOperationHandler.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/SoapClient/IFritzServiceOperationHandler.cs
@@ -114,6 +114,8 @@ public interface IFritzServiceOperationHandler
 
     Task<AvmSpeedtestGetInfoResponse> AvmSpeedtestGetInfoAsync(InternetGatewayDevice internetGatewayDevice);
 
+    Task<AvmSpeedtestGetStatisticsResponse> AvmSpeedtestGetStatisticsAsync(InternetGatewayDevice internetGatewayDevice);
+
     Task<LanEthernetInterfaceConfigGetInfoResponse> LanEthernetInterfaceConfigGetInfoAsync(InternetGatewayDevice internetGatewayDevice);
 
     Task<LanEthernetInterfaceConfigGetStatisticsResponse> LanEthernetInterfaceConfigGetStatisticsAsync(InternetGatewayDevice internetGatewayDevice);
diff --git a/RS.Fritz.Manager.UI/Resources/TR-064/AvmSpeedtestResourceDictionary.xaml b/RS.Fritz.Manager.UI/Resources/TR-064/AvmSpeedtestResourceDictionary.xaml
index 4f237ff..fa6a3b6 100644
--- a/RS.Fritz.Manager.UI/Resources/TR-064/AvmSpeedtestResourceDictionary.xaml
+++ b/RS.Fritz.Manager.UI/Resources/TR-064/AvmSpeedtestResourceDictionary.xaml
@@ -35,4 +35,32 @@
             <TextBlock x:Name="PortUdpBidirect" Grid.Row="7" Grid.Column="1" Text="{Binding PortUdpBidirect}"/>
         </Grid>
     </DataTemplate>
+    <DataTemplate DataType="{x:Type api:AvmSpeedtestGetStatisticsResponse}">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+            <Label Grid.Row="0" Grid.Column="0" Target="{Binding ElementName=ByteCount}" Content="_ByteCount" ToolTip="Total number of bytes counted since reset."/>
+            <TextBlock x:Name="ByteCount" Grid.Row="0" Grid.Column="1" Text="{Binding ByteCount}"/>
+            <Label Grid.Row="1" Grid.Column="0" Target="{Binding ElementName=KilobitsCurrent}" Content="_KilobitsCurrent" ToolTip="Current data rate in kbits."/>
+            <TextBlock x:Name="KilobitsCurrent" Grid.Row="1" Grid.Column="1" Text="{Binding KilobitsCurrent}"/>
+            <Label Grid.Row="2" Grid.Column="0" Target="{Binding ElementName=KilobitsAverage}" Content="_KilobitsAverage" ToolTip="Data rate in kbits since start of measurement."/>
+            <TextBlock x:Name="KilobitsAverage" Grid.Row="2" Grid.Column="1" Text="{Binding KilobitsAverage}"/>
+            <Label Grid.Row="3" Grid.Column="0" Target="{Binding ElementName=PacketCount}" Content="_PacketCount" ToolTip="Total number of packets counted since reset."/>
+            <TextBlock x:Name="PacketCount" Grid.Row="3" Grid.Column="1" Text="{Binding PacketCount}"/>
+            <Label Grid.Row="4" Grid.Column="0" Target="{Binding ElementName=PacketsPerSecondCurrent}" Content="_PacketsPerSecondCurrent" ToolTip="Current data rate in packets per second."/>
+            <TextBlock x:Name="PacketsPerSecondCurrent" Grid.Row="4" Grid.Column="1" Text="{Binding PacketsPerSecondCurrent}"/>
+            <Label Grid.Row="5" Grid.Column="0" Target="{Binding ElementName=PacketsPerSecondAverage}" Content="_PacketsPerSecondAverage" ToolTip="Data rate in packets per second since start of measurement."/>
+            <TextBlock x:Name="PacketsPerSecondAverage" Grid.Row="5" Grid.Column="1" Text="{Binding PacketsPerSecondAverage}"/>
+        </Grid>
+    </DataTemplate>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestView.xaml b/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestView.xaml
index d95817d..8745585 100644
--- a/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestView.xaml
+++ b/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestView.xaml
@@ -11,6 +11,7 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*"/>
@@ -29,5 +30,19 @@
                 </Grid>
             </Expander>
         </Border>
+        <Border Style="{StaticResource BorderStyle}" Grid.Row="1" Grid.Column="0">
+            <Expander Header="Statistics">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <ContentControl Grid.Row="0" Grid.Column="0" Content="{Binding AvmSpeedtestGetStatisticsResponse.Value}"/>
+                    <ContentControl Grid.Row="0" Grid.Column="0" Content="{Binding AvmSpeedtestGetStatisticsResponse.Key}"/>
+                </Grid>
+            </Expander>
+        </Border>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestViewModel.cs b/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestViewModel.cs
index ec1d60a..836d71e 100644
--- a/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestViewModel.cs
@@ -3,6 +3,7 @@
 internal sealed class AvmSpeedtestViewModel : FritzServiceViewModel
 {
     private KeyValuePair<AvmSpeedtestGetInfoResponse?, UPnPFault?>? avmSpeedtestGetInfoResponse;
+    private KeyValuePair<AvmSpeedtestGetStatisticsResponse?, UPnPFault?>? avmSpeedtestGetStatisticsResponse;
 
     public AvmSpeedtestViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
         : base(deviceLoginInfo, logger, "X_AVM-DE_Speedtest")
@@ -15,8 +16,28 @@ public AvmSpeedtestViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
         private set { _ = SetProperty(ref avmSpeedtestGetInfoResponse, value); }
     }
 
-    protected override async Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    public KeyValuePair<AvmSpeedtestGetStatisticsResponse?, UPnPFault?>? AvmSpeedtestGetStatisticsResponse
+    {
+        get => avmSpeedtestGetStatisticsResponse;
+        private set { _ = SetProperty(ref avmSpeedtestGetStatisticsResponse, value); }
+    }
+
+    protected override Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    {
+        return API.TaskExtensions.WhenAllSafe(new[]
+            {
+                GetAvmSpeedtestGetInfoAsync(),
+                GetAvmSpeedtestGetStatisticsAsync()
+            });
+    }
+
+    private async Task GetAvmSpeedtestGetInfoAsync()
     {
         AvmSpeedtestGetInfoResponse = await ExecuteApiAsync(q => q.AvmSpeedtestGetInfoAsync());
     }
+
+    private async Task GetAvmSpeedtestGetStatisticsAsync()
+    {
+        AvmSpeedtestGetStatisticsResponse = await ExecuteApiAsync(q => q.AvmSpeedtestGetStatisticsAsync());
+    }
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.sln.DotSettings b/RS.Fritz.Manager.sln.DotSettings
index 7753301..934122d 100644
--- a/RS.Fritz.Manager.sln.DotSettings
+++ b/RS.Fritz.Manager.sln.DotSettings
@@ -37,6 +37,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Iperf/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=IPTV/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=kbit/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kbits/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Kbps/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Mbps/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Meshable/@EntryIndexedValue">True</s:Boolean>

From 1d8c0ac24cb2c0b1cf3d548452e1ceb8dd21431c Mon Sep 17 00:00:00 2001
From: Rans4ckeR <ransacker@outlook.com>
Date: Fri, 27 Jan 2023 10:19:22 +0100
Subject: [PATCH 04/15] Update GetIpInterfaces() filter

---
 RS.Fritz.Manager.API/Properties/GlobalUsings.cs        | 6 ++++--
 RS.Fritz.Manager.API/Services/Shared/NetworkService.cs | 3 ++-
 RS.Fritz.Manager.UI/Properties/GlobalUsings.cs         | 6 ++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/RS.Fritz.Manager.API/Properties/GlobalUsings.cs b/RS.Fritz.Manager.API/Properties/GlobalUsings.cs
index 2c3bba9..2090e69 100644
--- a/RS.Fritz.Manager.API/Properties/GlobalUsings.cs
+++ b/RS.Fritz.Manager.API/Properties/GlobalUsings.cs
@@ -1,3 +1,5 @@
-#pragma warning disable SA1200 // Using directives should be placed correctly
+#pragma warning disable IDE0065 // Misplaced using directive
+#pragma warning disable SA1200 // Using directives should be placed correctly
 global using System.ServiceModel;
-#pragma warning restore SA1200 // Using directives should be placed correctly
\ No newline at end of file
+#pragma warning restore SA1200 // Using directives should be placed correctly
+#pragma warning restore IDE0065 // Misplaced using directive
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/Shared/NetworkService.cs b/RS.Fritz.Manager.API/Services/Shared/NetworkService.cs
index 6a5474c..85eadec 100644
--- a/RS.Fritz.Manager.API/Services/Shared/NetworkService.cs
+++ b/RS.Fritz.Manager.API/Services/Shared/NetworkService.cs
@@ -71,5 +71,6 @@ private static bool IsInRange(string startIpAddress, string endIpAddress, IPAddr
     private static IEnumerable<IPInterfaceProperties> GetIpInterfaces()
         => NetworkInterface.GetAllNetworkInterfaces()
             .Where(q => q.OperationalStatus is OperationalStatus.Up && q.NetworkInterfaceType is not NetworkInterfaceType.Loopback)
-            .Select(q => q.GetIPProperties());
+            .Select(q => q.GetIPProperties())
+            .Where(q => q.GatewayAddresses.Any());
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/Properties/GlobalUsings.cs b/RS.Fritz.Manager.UI/Properties/GlobalUsings.cs
index 3eb3b5d..41859ac 100644
--- a/RS.Fritz.Manager.UI/Properties/GlobalUsings.cs
+++ b/RS.Fritz.Manager.UI/Properties/GlobalUsings.cs
@@ -1,4 +1,6 @@
-#pragma warning disable SA1200 // Using directives should be placed correctly
+#pragma warning disable IDE0065 // Misplaced using directive
+#pragma warning disable SA1200 // Using directives should be placed correctly
 global using RS.Fritz.Manager.API;
 global using Microsoft.Extensions.Logging;
-#pragma warning restore SA1200 // Using directives should be placed correctly
\ No newline at end of file
+#pragma warning restore SA1200 // Using directives should be placed correctly
+#pragma warning restore IDE0065 // Misplaced using directive
\ No newline at end of file

From 482b80db15e15362697ecbb66cb3498d699cf69a Mon Sep 17 00:00:00 2001
From: Rans4ckeR <ransacker@outlook.com>
Date: Fri, 27 Jan 2023 22:12:15 +0100
Subject: [PATCH 05/15] Add Hosts X_AVM-DE_HostsCheckUpdate &
 X_AVM-DE_GetFriendlyName

---
 README.md                                     |  4 +--
 .../InternetGatewayDeviceExtensions.cs        | 10 +++++++
 .../Entities/HostsGetFriendlyNameRequest.cs   |  4 +++
 .../Entities/HostsGetFriendlyNameResponse.cs  |  5 ++++
 .../Entities/HostsHostsCheckUpdateRequest.cs  |  4 +++
 .../Entities/HostsHostsCheckUpdateResponse.cs |  4 +++
 .../Services/Hosts/FritzHostsService.cs       | 10 +++++++
 .../Services/Hosts/IFritzHostsService.cs      | 10 +++++++
 .../FritzServiceOperationHandler.cs           | 10 +++++++
 .../IFritzServiceOperationHandler.cs          |  4 +++
 .../ServiceCollectionExtensions.cs            |  1 +
 .../RS.Fritz.Manager.UI.csproj                |  6 +++++
 .../TR-064/HostsResourceDictionary.xaml       | 13 ++++++++++
 .../ViewModelsResourceDictionary.xaml         |  3 +++
 .../Hosts/HostsHostsCheckUpdateView.xaml      | 26 +++++++++++++++++++
 .../Hosts/HostsHostsCheckUpdateView.xaml.cs   |  9 +++++++
 .../Hosts/HostsHostsCheckUpdateViewModel.cs   |  9 +++++++
 .../UserControls/Hosts/HostsView.xaml         | 19 +++++++++++++-
 .../UserControls/Hosts/HostsViewModel.cs      | 20 ++++++++++++--
 RS.Fritz.Manager.sln                          |  1 +
 20 files changed, 167 insertions(+), 5 deletions(-)
 create mode 100644 RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsGetFriendlyNameRequest.cs
 create mode 100644 RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsGetFriendlyNameResponse.cs
 create mode 100644 RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsHostsCheckUpdateRequest.cs
 create mode 100644 RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsHostsCheckUpdateResponse.cs
 create mode 100644 RS.Fritz.Manager.UI/UserControls/Hosts/HostsHostsCheckUpdateView.xaml
 create mode 100644 RS.Fritz.Manager.UI/UserControls/Hosts/HostsHostsCheckUpdateView.xaml.cs
 create mode 100644 RS.Fritz.Manager.UI/UserControls/Hosts/HostsHostsCheckUpdateViewModel.cs

diff --git a/README.md b/README.md
index 0b6da72..494d0a3 100644
--- a/README.md
+++ b/README.md
@@ -213,12 +213,12 @@ static async Task StopCaptureAsync(InternetGatewayDevice device, CaptureInterfac
   * ❌ X_AVM-DE_SetHostNameByMACAddress
   * ❌ X_AVM-DE_WakeOnLANByMACAddress
   * ❌ X_AVM-DE_GetSpecificHostEntryByIp
-  * ❌ X_AVM-DE_HostsCheckUpdate
+  * ✅ X_AVM-DE_HostsCheckUpdate
   * ❌ X_AVM-DE_HostDoUpdate
   * ❌ X_AVM-DE_SetPrioritizationByIP
   * ✅ X_AVM-DE_GetHostListPath
   * ✅ X_AVM-DE_GetMeshListPath
-  * ❌ X_AVM-DE_GetFriendlyName
+  * ✅ X_AVM-DE_GetFriendlyName
   * ❌ X_AVM-DE_SetFriendlyName
   * ❌ X_AVM-DE_SetFriendlyNameByIP
   * ❌ X_AVM-DE_SetFriendlyNameByMAC
diff --git a/RS.Fritz.Manager.API/Extensions/InternetGatewayDeviceExtensions.cs b/RS.Fritz.Manager.API/Extensions/InternetGatewayDeviceExtensions.cs
index eef4653..2e1e38f 100644
--- a/RS.Fritz.Manager.API/Extensions/InternetGatewayDeviceExtensions.cs
+++ b/RS.Fritz.Manager.API/Extensions/InternetGatewayDeviceExtensions.cs
@@ -7,6 +7,11 @@ public static Task<HostsGetHostNumberOfEntriesResponse> HostsGetHostNumberOfEntr
         return internetGatewayDevice.ExecuteAsync((h, d) => h.HostsGetHostNumberOfEntriesAsync(d));
     }
 
+    public static Task<HostsHostsCheckUpdateResponse> HostsHostsCheckUpdateAsync(this InternetGatewayDevice internetGatewayDevice)
+    {
+        return internetGatewayDevice.ExecuteAsync((h, d) => h.HostsHostsCheckUpdateAsync(d));
+    }
+
     public static Task<HostsGetHostListPathResponse> HostsGetHostListPathAsync(this InternetGatewayDevice internetGatewayDevice)
     {
         return internetGatewayDevice.ExecuteAsync((h, d) => h.HostsGetHostListPathAsync(d));
@@ -32,6 +37,11 @@ public static Task<HostsGetMeshListPathResponse> HostsGetMeshListPathAsync(this
         return internetGatewayDevice.ExecuteAsync((h, d) => h.HostsGetMeshListPathAsync(d));
     }
 
+    public static Task<HostsGetFriendlyNameResponse> HostsGetFriendlyNameAsync(this InternetGatewayDevice internetGatewayDevice)
+    {
+        return internetGatewayDevice.ExecuteAsync((h, d) => h.HostsGetFriendlyNameAsync(d));
+    }
+
     public static Task<WanCommonInterfaceConfigGetCommonLinkPropertiesResponse> WanCommonInterfaceConfigGetCommonLinkPropertiesAsync(this InternetGatewayDevice internetGatewayDevice)
     {
         return internetGatewayDevice.ExecuteAsync((h, d) => h.WanCommonInterfaceConfigGetCommonLinkPropertiesAsync(d));
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsGetFriendlyNameRequest.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsGetFriendlyNameRequest.cs
new file mode 100644
index 0000000..448167e
--- /dev/null
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsGetFriendlyNameRequest.cs
@@ -0,0 +1,4 @@
+namespace RS.Fritz.Manager.API;
+
+[MessageContract(WrapperName = "GetFriendlyName")]
+public readonly record struct HostsGetFriendlyNameRequest;
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsGetFriendlyNameResponse.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsGetFriendlyNameResponse.cs
new file mode 100644
index 0000000..a485f57
--- /dev/null
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsGetFriendlyNameResponse.cs
@@ -0,0 +1,5 @@
+namespace RS.Fritz.Manager.API;
+
+[MessageContract(WrapperName = "GetFriendlyNameResponse")]
+public readonly record struct HostsGetFriendlyNameResponse(
+    [property: MessageBodyMember(Name = "NewX_AVM-DE_FriendlyName")] string FriendlyName);
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsHostsCheckUpdateRequest.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsHostsCheckUpdateRequest.cs
new file mode 100644
index 0000000..e36cd4c
--- /dev/null
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsHostsCheckUpdateRequest.cs
@@ -0,0 +1,4 @@
+namespace RS.Fritz.Manager.API;
+
+[MessageContract(WrapperName = "HostsCheckUpdate")]
+public readonly record struct HostsHostsCheckUpdateRequest;
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsHostsCheckUpdateResponse.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsHostsCheckUpdateResponse.cs
new file mode 100644
index 0000000..8138dce
--- /dev/null
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/Entities/HostsHostsCheckUpdateResponse.cs
@@ -0,0 +1,4 @@
+namespace RS.Fritz.Manager.API;
+
+[MessageContract(WrapperName = "HostsCheckUpdateResponse")]
+public readonly record struct HostsHostsCheckUpdateResponse;
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/FritzHostsService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/FritzHostsService.cs
index d3c88da..30f0f23 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/FritzHostsService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/FritzHostsService.cs
@@ -16,6 +16,11 @@ public Task<HostsGetHostNumberOfEntriesResponse> GetHostNumberOfEntriesAsync(Hos
         return Channel.GetHostNumberOfEntriesAsync(hostsGetHostNumberOfEntriesRequest);
     }
 
+    public Task<HostsHostsCheckUpdateResponse> HostsCheckUpdateAsync(HostsHostsCheckUpdateRequest hostsHostsCheckUpdateRequest)
+    {
+        return Channel.HostsCheckUpdateAsync(hostsHostsCheckUpdateRequest);
+    }
+
     public Task<HostsGetHostListPathResponse> GetHostListPathAsync(HostsGetHostListPathRequest hostsGetHostListPathRequest)
     {
         return Channel.GetHostListPathAsync(hostsGetHostListPathRequest);
@@ -40,4 +45,9 @@ public Task<HostsGetMeshListPathResponse> GetMeshListPathAsync(HostsGetMeshListP
     {
         return Channel.GetMeshListPathAsync(hostsGetMeshListPathRequest);
     }
+
+    public Task<HostsGetFriendlyNameResponse> GetFriendlyNameAsync(HostsGetFriendlyNameRequest hostsGetFriendlyNameRequest)
+    {
+        return Channel.GetFriendlyNameAsync(hostsGetFriendlyNameRequest);
+    }
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/IFritzHostsService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/IFritzHostsService.cs
index b8c873d..34f1e93 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/IFritzHostsService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/IFritzHostsService.cs
@@ -9,6 +9,11 @@ internal interface IFritzHostsService
     [FaultContract(typeof(UPnPFault2))]
     Task<HostsGetHostNumberOfEntriesResponse> GetHostNumberOfEntriesAsync(HostsGetHostNumberOfEntriesRequest hostsGetHostNumberOfEntriesRequest);
 
+    [OperationContract(Action = "urn:dslforum-org:service:Hosts:1#X_AVM-DE_HostsCheckUpdate")]
+    [FaultContract(typeof(UPnPFault1))]
+    [FaultContract(typeof(UPnPFault2))]
+    Task<HostsHostsCheckUpdateResponse> HostsCheckUpdateAsync(HostsHostsCheckUpdateRequest hostsHostsCheckUpdateRequest);
+
     [OperationContract(Action = "urn:dslforum-org:service:Hosts:1#X_AVM-DE_GetHostListPath")]
     [FaultContract(typeof(UPnPFault1))]
     [FaultContract(typeof(UPnPFault2))]
@@ -33,4 +38,9 @@ internal interface IFritzHostsService
     [FaultContract(typeof(UPnPFault1))]
     [FaultContract(typeof(UPnPFault2))]
     Task<HostsGetMeshListPathResponse> GetMeshListPathAsync(HostsGetMeshListPathRequest hostsGetMeshListPathRequest);
+
+    [OperationContract(Action = "urn:dslforum-org:service:Hosts:1#X_AVM-DE_GetFriendlyName")]
+    [FaultContract(typeof(UPnPFault1))]
+    [FaultContract(typeof(UPnPFault2))]
+    Task<HostsGetFriendlyNameResponse> GetFriendlyNameAsync(HostsGetFriendlyNameRequest hostsGetFriendlyNameRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs b/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs
index 41d4475..cc835be 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs
@@ -77,6 +77,11 @@ public Task<HostsGetHostNumberOfEntriesResponse> HostsGetHostNumberOfEntriesAsyn
         return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.GetHostNumberOfEntriesAsync(default));
     }
 
+    public Task<HostsHostsCheckUpdateResponse> HostsHostsCheckUpdateAsync(InternetGatewayDevice internetGatewayDevice)
+    {
+        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.HostsCheckUpdateAsync(default));
+    }
+
     public Task<HostsGetHostListPathResponse> HostsGetHostListPathAsync(InternetGatewayDevice internetGatewayDevice)
     {
         return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.GetHostListPathAsync(default));
@@ -102,6 +107,11 @@ public Task<HostsGetMeshListPathResponse> HostsGetMeshListPathAsync(InternetGate
         return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.GetMeshListPathAsync(default));
     }
 
+    public Task<HostsGetFriendlyNameResponse> HostsGetFriendlyNameAsync(InternetGatewayDevice internetGatewayDevice)
+    {
+        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.GetFriendlyNameAsync(default));
+    }
+
     public Task<WanCommonInterfaceConfigGetCommonLinkPropertiesResponse> WanCommonInterfaceConfigGetCommonLinkPropertiesAsync(InternetGatewayDevice internetGatewayDevice)
     {
         return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanCommonInterfaceConfigServiceClientFactory, (q, r, t) => new FritzWanCommonInterfaceConfigService(q, r, t!), FritzWanCommonInterfaceConfigService.ControlUrl), q => q.GetCommonLinkPropertiesAsync(default));
diff --git a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/IFritzServiceOperationHandler.cs b/RS.Fritz.Manager.API/Services/TR-064/SoapClient/IFritzServiceOperationHandler.cs
index ac64831..d6b3b97 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/IFritzServiceOperationHandler.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/SoapClient/IFritzServiceOperationHandler.cs
@@ -4,6 +4,8 @@ public interface IFritzServiceOperationHandler
 {
     Task<HostsGetHostNumberOfEntriesResponse> HostsGetHostNumberOfEntriesAsync(InternetGatewayDevice internetGatewayDevice);
 
+    Task<HostsHostsCheckUpdateResponse> HostsHostsCheckUpdateAsync(InternetGatewayDevice internetGatewayDevice);
+
     Task<HostsGetHostListPathResponse> HostsGetHostListPathAsync(InternetGatewayDevice internetGatewayDevice);
 
     Task<HostsGetGenericHostEntryResponse> HostsGetGenericHostEntryAsync(InternetGatewayDevice internetGatewayDevice, HostsGetGenericHostEntryRequest hostsGetGenericHostEntryRequest);
@@ -14,6 +16,8 @@ public interface IFritzServiceOperationHandler
 
     Task<HostsGetMeshListPathResponse> HostsGetMeshListPathAsync(InternetGatewayDevice internetGatewayDevice);
 
+    Task<HostsGetFriendlyNameResponse> HostsGetFriendlyNameAsync(InternetGatewayDevice internetGatewayDevice);
+
     Task<WanCommonInterfaceConfigGetTotalBytesReceivedResponse> WanCommonInterfaceConfigGetTotalBytesReceivedAsync(InternetGatewayDevice internetGatewayDevice);
 
     Task<WanCommonInterfaceConfigGetTotalBytesSentResponse> WanCommonInterfaceConfigGetTotalBytesSentAsync(InternetGatewayDevice internetGatewayDevice);
diff --git a/RS.Fritz.Manager.UI/Infrastructure/ServiceCollectionExtensions.cs b/RS.Fritz.Manager.UI/Infrastructure/ServiceCollectionExtensions.cs
index 12852db..a839dda 100644
--- a/RS.Fritz.Manager.UI/Infrastructure/ServiceCollectionExtensions.cs
+++ b/RS.Fritz.Manager.UI/Infrastructure/ServiceCollectionExtensions.cs
@@ -20,6 +20,7 @@ public static IServiceCollection AddViewModels(this IServiceCollection serviceCo
             .AddSingleton<WanCommonInterfaceConfigGetOnlineMonitorViewModel>()
             .AddSingleton<HostsViewModel>()
             .AddSingleton<HostsGetGenericHostEntryViewModel>()
+            .AddSingleton<HostsHostsCheckUpdateViewModel>()
             .AddSingleton<Layer3ForwardingViewModel>()
             .AddSingleton<Layer3ForwardingGetGenericForwardingEntryViewModel>()
             .AddSingleton<WanPppConnectionViewModel>()
diff --git a/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj b/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj
index b53d471..b826e66 100644
--- a/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj
+++ b/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj
@@ -61,6 +61,9 @@
     <Compile Update="UserControls\DeviceConfig\DeviceConfigView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="UserControls\Hosts\HostsHostsCheckUpdateView.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Update="UserControls\UserInterface\UserInterfaceView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -159,6 +162,9 @@
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
       <SubType>Designer</SubType>
     </Page>
+    <Page Update="UserControls\Hosts\HostsHostsCheckUpdateView.xaml">
+      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+    </Page>
     <Page Update="UserControls\UserInterface\UserInterfaceSetConfigView.xaml">
       <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
       <SubType>Designer</SubType>
diff --git a/RS.Fritz.Manager.UI/Resources/TR-064/HostsResourceDictionary.xaml b/RS.Fritz.Manager.UI/Resources/TR-064/HostsResourceDictionary.xaml
index 5f225f0..29ac7ee 100644
--- a/RS.Fritz.Manager.UI/Resources/TR-064/HostsResourceDictionary.xaml
+++ b/RS.Fritz.Manager.UI/Resources/TR-064/HostsResourceDictionary.xaml
@@ -53,6 +53,19 @@
             <TextBlock x:Name="ChangeCounter" Grid.Row="0" Grid.Column="1" Text="{Binding ChangeCounter}"/>
         </Grid>
     </DataTemplate>
+    <DataTemplate DataType="{x:Type api:HostsGetFriendlyNameResponse}">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+            <Label Grid.Row="0" Grid.Column="0" Target="{Binding ElementName=FriendlyName}" Content="_FriendlyName" ToolTip="The own friendly name of the requesting client."/>
+            <TextBlock x:Name="FriendlyName" Grid.Row="0" Grid.Column="1" Text="{Binding FriendlyName}"/>
+        </Grid>
+    </DataTemplate>
     <DataTemplate DataType="{x:Type api:HostsGetGenericHostEntryResponse}">
         <Grid>
             <Grid.RowDefinitions>
diff --git a/RS.Fritz.Manager.UI/Resources/ViewModelsResourceDictionary.xaml b/RS.Fritz.Manager.UI/Resources/ViewModelsResourceDictionary.xaml
index 24803b7..95c0d54 100644
--- a/RS.Fritz.Manager.UI/Resources/ViewModelsResourceDictionary.xaml
+++ b/RS.Fritz.Manager.UI/Resources/ViewModelsResourceDictionary.xaml
@@ -10,6 +10,9 @@
     <DataTemplate DataType="{x:Type ui:HostsGetGenericHostEntryViewModel}">
         <ui:HostsGetGenericHostEntryView/>
     </DataTemplate>
+    <DataTemplate DataType="{x:Type ui:HostsHostsCheckUpdateViewModel}">
+        <ui:HostsHostsCheckUpdateView/>
+    </DataTemplate>
     <DataTemplate DataType="{x:Type ui:DeviceInfoViewModel}">
         <ui:DeviceInfoView/>
     </DataTemplate>
diff --git a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsHostsCheckUpdateView.xaml b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsHostsCheckUpdateView.xaml
new file mode 100644
index 0000000..2853ef6
--- /dev/null
+++ b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsHostsCheckUpdateView.xaml
@@ -0,0 +1,26 @@
+<UserControl x:Class="RS.Fritz.Manager.UI.HostsHostsCheckUpdateView"
+             x:ClassModifier="internal"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:ui="clr-namespace:RS.Fritz.Manager.UI"
+             d:DataContext="{d:DesignInstance Type=ui:HostsHostsCheckUpdateViewModel}"
+             mc:Ignorable="d"
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Border Style="{StaticResource BorderStyle}">
+        <Expander Header="{Binding Title}">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+                <Button Grid.Row="0" Grid.Column="0" Content="{Binding ButtonText}" Command="{Binding DefaultCommand}" CommandParameter="{StaticResource False}"/>
+                <ContentControl Grid.Row="0" Grid.Column="1" Content="{Binding Response.Value}"/>
+            </Grid>
+        </Expander>
+    </Border>
+</UserControl>
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsHostsCheckUpdateView.xaml.cs b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsHostsCheckUpdateView.xaml.cs
new file mode 100644
index 0000000..a38d5d2
--- /dev/null
+++ b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsHostsCheckUpdateView.xaml.cs
@@ -0,0 +1,9 @@
+namespace RS.Fritz.Manager.UI;
+
+internal sealed partial class HostsHostsCheckUpdateView
+{
+    public HostsHostsCheckUpdateView()
+    {
+        InitializeComponent();
+    }
+}
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsHostsCheckUpdateViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsHostsCheckUpdateViewModel.cs
new file mode 100644
index 0000000..4e27021
--- /dev/null
+++ b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsHostsCheckUpdateViewModel.cs
@@ -0,0 +1,9 @@
+namespace RS.Fritz.Manager.UI;
+
+internal sealed class HostsHostsCheckUpdateViewModel : ManualOperationViewModel<HostsHostsCheckUpdateRequest, HostsHostsCheckUpdateResponse>
+{
+    public HostsHostsCheckUpdateViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+        : base(deviceLoginInfo, logger, "HostsHostsCheckUpdate", "Check Hosts Update", (d, _) => d.HostsHostsCheckUpdateAsync())
+    {
+    }
+}
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsView.xaml b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsView.xaml
index dbf4221..ec6b437 100644
--- a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsView.xaml
+++ b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsView.xaml
@@ -16,6 +16,8 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*"/>
@@ -66,6 +68,21 @@
                 </Grid>
             </Expander>
         </Border>
-        <ContentControl Grid.Row="5" Grid.Column="0" Content="{Binding DeviceMeshInfo}"/>
+        <ContentControl Grid.Row="5" Grid.Column="0" Content="{Binding HostsHostsCheckUpdateViewModel}"/>
+        <Border Style="{StaticResource BorderStyle}" Grid.Row="6" Grid.Column="0">
+            <Expander Header="GetFriendlyName">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <ContentControl Grid.Row="0" Grid.Column="0" Content="{Binding HostsGetFriendlyNameResponse.Value}"/>
+                    <ContentControl Grid.Row="0" Grid.Column="0" Content="{Binding HostsGetFriendlyNameResponse.Key}"/>
+                </Grid>
+            </Expander>
+        </Border>
+        <ContentControl Grid.Row="7" Grid.Column="0" Content="{Binding DeviceMeshInfo}"/>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs
index 2192f71..656e20d 100644
--- a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs
@@ -10,20 +10,24 @@ internal sealed class HostsViewModel : FritzServiceViewModel
     private KeyValuePair<HostsGetHostNumberOfEntriesResponse?, UPnPFault?>? hostsGetHostNumberOfEntriesResponse;
     private KeyValuePair<HostsGetInfoResponse?, UPnPFault?>? hostsGetInfoResponse;
     private KeyValuePair<HostsGetChangeCounterResponse?, UPnPFault?>? hostsGetChangeCounterResponse;
+    private KeyValuePair<HostsGetFriendlyNameResponse?, UPnPFault?>? hostsGetFriendlyNameResponse;
     private DeviceHostInfo? deviceHostInfo;
     private DeviceMeshInfo? deviceMeshInfo;
     private ObservableCollection<HostsGetGenericHostEntryResponse>? hostsGetGenericHostEntryResponses;
 
-    public HostsViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger, IDeviceHostsService deviceHostsService, IDeviceMeshService deviceMeshService, HostsGetGenericHostEntryViewModel hostsGetGenericHostEntryViewModel)
+    public HostsViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger, IDeviceHostsService deviceHostsService, IDeviceMeshService deviceMeshService, HostsGetGenericHostEntryViewModel hostsGetGenericHostEntryViewModel, HostsHostsCheckUpdateViewModel hostsHostsCheckUpdateViewModel)
         : base(deviceLoginInfo, logger, "Hosts")
     {
         HostsGetGenericHostEntryViewModel = hostsGetGenericHostEntryViewModel;
+        HostsHostsCheckUpdateViewModel = hostsHostsCheckUpdateViewModel;
         this.deviceHostsService = deviceHostsService;
         this.deviceMeshService = deviceMeshService;
     }
 
     public HostsGetGenericHostEntryViewModel HostsGetGenericHostEntryViewModel { get; }
 
+    public HostsHostsCheckUpdateViewModel HostsHostsCheckUpdateViewModel { get; }
+
     public KeyValuePair<HostsGetHostNumberOfEntriesResponse?, UPnPFault?>? HostsGetHostNumberOfEntriesResponse
     {
         get => hostsGetHostNumberOfEntriesResponse;
@@ -46,6 +50,12 @@ private set
         private set { _ = SetProperty(ref hostsGetChangeCounterResponse, value); }
     }
 
+    public KeyValuePair<HostsGetFriendlyNameResponse?, UPnPFault?>? HostsGetFriendlyNameResponse
+    {
+        get => hostsGetFriendlyNameResponse;
+        private set { _ = SetProperty(ref hostsGetFriendlyNameResponse, value); }
+    }
+
     public DeviceHostInfo? DeviceHostInfo
     {
         get => deviceHostInfo;
@@ -72,7 +82,8 @@ protected override Task DoExecuteDefaultCommandAsync(CancellationToken cancellat
                 GetHostsGetMeshListPathAsync(cancellationToken),
                 GetHostsGetHostNumberOfEntriesAsync(),
                 GetHostsGetInfoAsync(),
-                GetHostsGetChangeCounterAsync()
+                GetHostsGetChangeCounterAsync(),
+                GetHostsGetFriendlyNameAsync()
             });
     }
 
@@ -105,6 +116,11 @@ private async Task GetHostsGetChangeCounterAsync()
         HostsGetChangeCounterResponse = await ExecuteApiAsync(q => q.HostsGetChangeCounterAsync());
     }
 
+    private async Task GetHostsGetFriendlyNameAsync()
+    {
+        HostsGetFriendlyNameResponse = await ExecuteApiAsync(q => q.HostsGetFriendlyNameAsync());
+    }
+
     private async Task GetHostsGetHostListPathAsync(CancellationToken cancellationToken)
     {
         DeviceHostInfo = await deviceHostsService.GetDeviceHostsAsync(ApiDevice, cancellationToken);
diff --git a/RS.Fritz.Manager.sln b/RS.Fritz.Manager.sln
index ac40c59..1a4007d 100644
--- a/RS.Fritz.Manager.sln
+++ b/RS.Fritz.Manager.sln
@@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
+		README.md = README.md
 	EndProjectSection
 EndProject
 Global

From 0c0210f5c70f63473bffb829528475befd0c1563 Mon Sep 17 00:00:00 2001
From: Rans4ckeR <ransacker@outlook.com>
Date: Tue, 21 Feb 2023 20:18:13 +0100
Subject: [PATCH 06/15] Update packages

---
 RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj b/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj
index b826e66..e649458 100644
--- a/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj
+++ b/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj
@@ -39,7 +39,7 @@
     <None Remove="Images\Success.png" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.1.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
       <PrivateAssets>all</PrivateAssets>

From 05955ad0ba640627d32475f3cc96e8157bb4fe97 Mon Sep 17 00:00:00 2001
From: Rans4ckeR <ransacker@outlook.com>
Date: Sat, 15 Apr 2023 22:42:42 +0200
Subject: [PATCH 07/15] Update packages

---
 RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj b/RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj
index 5411bd8..be80e5a 100644
--- a/RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj
+++ b/RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj
@@ -44,7 +44,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-    <PackageReference Include="System.ServiceModel.Http" Version="6.0.0-preview1.23060.3" />
+    <PackageReference Include="System.ServiceModel.Http" Version="6.0.0-rc.23205.4" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 </Project>
\ No newline at end of file

From 8623007bfd1c414ba5079d5ed79f077f9d9f3ced Mon Sep 17 00:00:00 2001
From: Rans4ckeR <ransacker@outlook.com>
Date: Sat, 20 May 2023 00:35:30 +0200
Subject: [PATCH 08/15] Update packages

---
 RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj | 2 +-
 RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj b/RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj
index be80e5a..35e2263 100644
--- a/RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj
+++ b/RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj
@@ -44,7 +44,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-    <PackageReference Include="System.ServiceModel.Http" Version="6.0.0-rc.23205.4" />
+    <PackageReference Include="System.ServiceModel.Http" Version="6.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj b/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj
index e649458..e1f7028 100644
--- a/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj
+++ b/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj
@@ -40,7 +40,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.1.0" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

From 93e6e768f02aaae9f54ad4ea0ef70aec1d3cf415 Mon Sep 17 00:00:00 2001
From: Rans4ckeR <ransacker@outlook.com>
Date: Sat, 3 Jun 2023 21:09:45 +0200
Subject: [PATCH 09/15] ValueTask

---
 RS.Fritz.Manager.API/Entities/InternetGatewayDevice.cs |  2 +-
 RS.Fritz.Manager.API/Extensions/TaskExtensions.cs      |  8 ++++----
 .../Services/Capture/CaptureControlService.cs          |  8 ++++----
 .../Services/Capture/ICaptureControlService.cs         |  6 +++---
 .../Services/DeviceHosts/DeviceHostsService.cs         |  2 +-
 .../Services/DeviceHosts/IDeviceHostsService.cs        |  2 +-
 .../Services/MeshHosts/DeviceMeshService.cs            |  2 +-
 .../Services/MeshHosts/IDeviceMeshService.cs           |  2 +-
 RS.Fritz.Manager.API/Services/Users/IUsersService.cs   |  2 +-
 RS.Fritz.Manager.API/Services/Users/UsersService.cs    |  2 +-
 RS.Fritz.Manager.API/Services/WebUi/IWebUiService.cs   |  8 ++++----
 RS.Fritz.Manager.API/Services/WebUi/WebUiService.cs    | 10 +++++-----
 .../Services/WlanDevice/IWlanDeviceService.cs          |  2 +-
 .../Services/WlanDevice/WlanDeviceService.cs           |  2 +-
 .../Entities/ObservableInternetGatewayDevice.cs        |  2 +-
 .../Infrastructure/FritzServiceViewModel.cs            |  2 +-
 .../Infrastructure/ManualOperationViewModel.cs         |  2 +-
 RS.Fritz.Manager.UI/MainWindow/MainWindowViewModel.cs  |  2 +-
 .../UserControls/AvmSpeedtest/AvmSpeedtestViewModel.cs |  2 +-
 .../Capture/CaptureControlCaptureViewModel.cs          |  8 ++++----
 .../UserControls/DeviceConfig/DeviceConfigViewModel.cs |  2 +-
 .../UserControls/DeviceInfo/DeviceInfoViewModel.cs     |  2 +-
 .../Hosts/HostsGetGenericHostEntryViewModel.cs         |  2 +-
 .../UserControls/Hosts/HostsViewModel.cs               |  2 +-
 .../LanConfigSecurity/LanConfigSecurityViewModel.cs    |  2 +-
 .../LanEthernetInterfaceConfigViewModel.cs             |  2 +-
 .../LanHostConfigManagementViewModel.cs                |  2 +-
 ...yer3ForwardingGetGenericForwardingEntryViewModel.cs |  2 +-
 .../Layer3Forwarding/Layer3ForwardingViewModel.cs      |  2 +-
 .../ManagementServer/ManagementServerViewModel.cs      |  2 +-
 RS.Fritz.Manager.UI/UserControls/Time/TimeViewModel.cs |  2 +-
 .../UserInterface/UserInterfaceViewModel.cs            |  2 +-
 ...anCommonInterfaceConfigGetOnlineMonitorViewModel.cs |  2 +-
 .../WanCommonInterfaceConfigViewModel.cs               |  2 +-
 .../WanDslInterfaceConfigViewModel.cs                  |  2 +-
 .../WanDslLinkConfig/WanDslLinkConfigViewModel.cs      |  2 +-
 .../WanEthernetLinkConfigViewModel.cs                  |  2 +-
 ...nIpConnectionGetGenericPortMappingEntryViewModel.cs |  2 +-
 .../WanIpConnection/WanIpConnectionViewModel.cs        |  2 +-
 ...PppConnectionGetGenericPortMappingEntryViewModel.cs |  2 +-
 .../WanPppConnection/WanPppConnectionViewModel.cs      |  2 +-
 .../WlanConfiguration/WlanConfigurationViewModel.cs    |  4 ++--
 42 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/RS.Fritz.Manager.API/Entities/InternetGatewayDevice.cs b/RS.Fritz.Manager.API/Entities/InternetGatewayDevice.cs
index 306d9bf..71807c8 100644
--- a/RS.Fritz.Manager.API/Entities/InternetGatewayDevice.cs
+++ b/RS.Fritz.Manager.API/Entities/InternetGatewayDevice.cs
@@ -19,7 +19,7 @@ internal Task<TResult> ExecuteAsync<TResult>(Func<IFritzServiceOperationHandler,
         return operation(FritzServiceOperationHandler, this);
     }
 
-    public async Task InitializeAsync()
+    public async ValueTask InitializeAsync()
     {
         SecurityPort = (await this.DeviceInfoGetSecurityPortAsync()).SecurityPort;
         Users = (await UsersService.GetUsersAsync(this)).ToArray();
diff --git a/RS.Fritz.Manager.API/Extensions/TaskExtensions.cs b/RS.Fritz.Manager.API/Extensions/TaskExtensions.cs
index a8cc128..47dfeb1 100644
--- a/RS.Fritz.Manager.API/Extensions/TaskExtensions.cs
+++ b/RS.Fritz.Manager.API/Extensions/TaskExtensions.cs
@@ -8,8 +8,8 @@ public static class TaskExtensions
     /// </summary>
     /// <typeparam name="T">The type of <paramref name="tasks"/>'s return value.</typeparam>
     /// <param name="tasks">The list of <see cref="Task"/>s who's exceptions will be handled.</param>
-    /// <returns>Returns a <see cref="Task"/> that awaited and handled the original <paramref name="tasks"/>.</returns>
-    public static async Task<T[]> WhenAllSafe<T>(IEnumerable<Task<T>> tasks)
+    /// <returns>Returns a <see cref="ValueTask"/> that awaited and handled the original <paramref name="tasks"/>.</returns>
+    public static async ValueTask<T[]> WhenAllSafe<T>(IEnumerable<Task<T>> tasks)
     {
         var whenAllTask = Task.WhenAll(tasks);
 
@@ -31,8 +31,8 @@ public static async Task<T[]> WhenAllSafe<T>(IEnumerable<Task<T>> tasks)
     /// When using <see cref="Task.WhenAll(IEnumerable{Task})"/> only the first thrown exception from a single <see cref="Task"/> may be observed.
     /// </summary>
     /// <param name="tasks">The list of <see cref="Task"/>s who's exceptions will be handled.</param>
-    /// <returns>Returns a <see cref="Task"/> that awaited and handled the original <paramref name="tasks"/>.</returns>
-    public static async Task WhenAllSafe(IEnumerable<Task> tasks)
+    /// <returns>Returns a <see cref="ValueTask"/> that awaited and handled the original <paramref name="tasks"/>.</returns>
+    public static async ValueTask WhenAllSafe(IEnumerable<Task> tasks)
     {
         var whenAllTask = Task.WhenAll(tasks);
 
diff --git a/RS.Fritz.Manager.API/Services/Capture/CaptureControlService.cs b/RS.Fritz.Manager.API/Services/Capture/CaptureControlService.cs
index 6d6ae30..2f17eae 100644
--- a/RS.Fritz.Manager.API/Services/Capture/CaptureControlService.cs
+++ b/RS.Fritz.Manager.API/Services/Capture/CaptureControlService.cs
@@ -13,7 +13,7 @@ public CaptureControlService(IHttpClientFactory httpClientFactory, INetworkServi
         this.networkService = networkService;
     }
 
-    public async Task<IEnumerable<CaptureInterfaceGroup>> GetInterfacesAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
+    public async ValueTask<IEnumerable<CaptureInterfaceGroup>> GetInterfacesAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
     {
         string sid = await GetSidAsync(internetGatewayDevice);
         Uri captureUri = networkService.FormatUri(Uri.UriSchemeHttps, internetGatewayDevice.PreferredLocation, 443, "/data.lua");
@@ -60,7 +60,7 @@ public async Task<IEnumerable<CaptureInterfaceGroup>> GetInterfacesAsync(Interne
         return captureInterfaceGroups;
     }
 
-    public async Task StartCaptureAsync(InternetGatewayDevice internetGatewayDevice, FileInfo fileInfo, CaptureInterface captureInterface, int packetCaptureSizeLimit = 1600, CancellationToken cancellationToken = default)
+    public async ValueTask StartCaptureAsync(InternetGatewayDevice internetGatewayDevice, FileInfo fileInfo, CaptureInterface captureInterface, int packetCaptureSizeLimit = 1600, CancellationToken cancellationToken = default)
     {
         string sid = await GetSidAsync(internetGatewayDevice);
         Uri captureUri = networkService.FormatUri(Uri.UriSchemeHttps, internetGatewayDevice.PreferredLocation, 443, FormattableString.Invariant($"/cgi-bin/capture_notimeout?sid={sid}&capture=Start&snaplen={packetCaptureSizeLimit}&ifaceorminor={captureInterface.InterfaceOrMinor}"));
@@ -79,7 +79,7 @@ public async Task StartCaptureAsync(InternetGatewayDevice internetGatewayDevice,
         }
     }
 
-    public async Task StopCaptureAsync(InternetGatewayDevice internetGatewayDevice, CaptureInterface captureInterface, CancellationToken cancellationToken = default)
+    public async ValueTask StopCaptureAsync(InternetGatewayDevice internetGatewayDevice, CaptureInterface captureInterface, CancellationToken cancellationToken = default)
     {
         string sid = await GetSidAsync(internetGatewayDevice);
         string timeString20 = DateTime.UtcNow.Ticks.ToString("D20", CultureInfo.InvariantCulture);
@@ -91,7 +91,7 @@ public async Task StopCaptureAsync(InternetGatewayDevice internetGatewayDevice,
         _ = httpResponseMessage.EnsureSuccessStatusCode();
     }
 
-    private static async Task<string> GetSidAsync(InternetGatewayDevice internetGatewayDevice)
+    private static async ValueTask<string> GetSidAsync(InternetGatewayDevice internetGatewayDevice)
     {
         DeviceConfigCreateUrlSidResponse deviceConfigCreateUrlSidResponse = await internetGatewayDevice.DeviceConfigCreateUrlSidAsync();
 
diff --git a/RS.Fritz.Manager.API/Services/Capture/ICaptureControlService.cs b/RS.Fritz.Manager.API/Services/Capture/ICaptureControlService.cs
index 7fd4e86..4740e72 100644
--- a/RS.Fritz.Manager.API/Services/Capture/ICaptureControlService.cs
+++ b/RS.Fritz.Manager.API/Services/Capture/ICaptureControlService.cs
@@ -2,9 +2,9 @@
 
 public interface ICaptureControlService
 {
-    Task<IEnumerable<CaptureInterfaceGroup>> GetInterfacesAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default);
+    ValueTask<IEnumerable<CaptureInterfaceGroup>> GetInterfacesAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default);
 
-    Task StartCaptureAsync(InternetGatewayDevice internetGatewayDevice, FileInfo fileInfo, CaptureInterface captureInterface, int packetCaptureSizeLimit = 1600, CancellationToken cancellationToken = default);
+    ValueTask StartCaptureAsync(InternetGatewayDevice internetGatewayDevice, FileInfo fileInfo, CaptureInterface captureInterface, int packetCaptureSizeLimit = 1600, CancellationToken cancellationToken = default);
 
-    Task StopCaptureAsync(InternetGatewayDevice internetGatewayDevice, CaptureInterface captureInterface, CancellationToken cancellationToken = default);
+    ValueTask StopCaptureAsync(InternetGatewayDevice internetGatewayDevice, CaptureInterface captureInterface, CancellationToken cancellationToken = default);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/DeviceHosts/DeviceHostsService.cs b/RS.Fritz.Manager.API/Services/DeviceHosts/DeviceHostsService.cs
index b8ac6c3..4b420ec 100644
--- a/RS.Fritz.Manager.API/Services/DeviceHosts/DeviceHostsService.cs
+++ b/RS.Fritz.Manager.API/Services/DeviceHosts/DeviceHostsService.cs
@@ -14,7 +14,7 @@ public DeviceHostsService(IHttpClientFactory httpClientFactory, INetworkService
         this.networkService = networkService;
     }
 
-    public async Task<DeviceHostInfo> GetDeviceHostsAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
+    public async ValueTask<DeviceHostInfo> GetDeviceHostsAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
     {
         HostsGetHostListPathResponse hostsGetHostListPathResponse = await internetGatewayDevice.HostsGetHostListPathAsync();
         string hostListPath = hostsGetHostListPathResponse.HostListPath;
diff --git a/RS.Fritz.Manager.API/Services/DeviceHosts/IDeviceHostsService.cs b/RS.Fritz.Manager.API/Services/DeviceHosts/IDeviceHostsService.cs
index a6ead7a..838bf5e 100644
--- a/RS.Fritz.Manager.API/Services/DeviceHosts/IDeviceHostsService.cs
+++ b/RS.Fritz.Manager.API/Services/DeviceHosts/IDeviceHostsService.cs
@@ -2,5 +2,5 @@
 
 public interface IDeviceHostsService
 {
-    Task<DeviceHostInfo> GetDeviceHostsAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default);
+    ValueTask<DeviceHostInfo> GetDeviceHostsAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/MeshHosts/DeviceMeshService.cs b/RS.Fritz.Manager.API/Services/MeshHosts/DeviceMeshService.cs
index 0ede2c9..caf5c62 100644
--- a/RS.Fritz.Manager.API/Services/MeshHosts/DeviceMeshService.cs
+++ b/RS.Fritz.Manager.API/Services/MeshHosts/DeviceMeshService.cs
@@ -13,7 +13,7 @@ public DeviceMeshService(IHttpClientFactory httpClientFactory, INetworkService n
         this.networkService = networkService;
     }
 
-    public async Task<DeviceMeshInfo> GetDeviceMeshAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
+    public async ValueTask<DeviceMeshInfo> GetDeviceMeshAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
     {
         HostsGetMeshListPathResponse hostsGetMeshListPathResponse = await internetGatewayDevice.HostsGetMeshListPathAsync();
         string meshListPath = hostsGetMeshListPathResponse.MeshListPath;
diff --git a/RS.Fritz.Manager.API/Services/MeshHosts/IDeviceMeshService.cs b/RS.Fritz.Manager.API/Services/MeshHosts/IDeviceMeshService.cs
index 95af3ac..c2ba0a4 100644
--- a/RS.Fritz.Manager.API/Services/MeshHosts/IDeviceMeshService.cs
+++ b/RS.Fritz.Manager.API/Services/MeshHosts/IDeviceMeshService.cs
@@ -2,5 +2,5 @@
 
 public interface IDeviceMeshService
 {
-    Task<DeviceMeshInfo> GetDeviceMeshAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default);
+    ValueTask<DeviceMeshInfo> GetDeviceMeshAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/Users/IUsersService.cs b/RS.Fritz.Manager.API/Services/Users/IUsersService.cs
index d96b56f..02b096b 100644
--- a/RS.Fritz.Manager.API/Services/Users/IUsersService.cs
+++ b/RS.Fritz.Manager.API/Services/Users/IUsersService.cs
@@ -2,5 +2,5 @@
 
 public interface IUsersService
 {
-    Task<IEnumerable<User>> GetUsersAsync(InternetGatewayDevice internetGatewayDevice);
+    ValueTask<IEnumerable<User>> GetUsersAsync(InternetGatewayDevice internetGatewayDevice);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/Users/UsersService.cs b/RS.Fritz.Manager.API/Services/Users/UsersService.cs
index c1ec386..b57b508 100644
--- a/RS.Fritz.Manager.API/Services/Users/UsersService.cs
+++ b/RS.Fritz.Manager.API/Services/Users/UsersService.cs
@@ -12,7 +12,7 @@ public UsersService(IFritzServiceOperationHandler fritzServiceOperationHandler)
         this.fritzServiceOperationHandler = fritzServiceOperationHandler;
     }
 
-    public async Task<IEnumerable<User>> GetUsersAsync(InternetGatewayDevice internetGatewayDevice)
+    public async ValueTask<IEnumerable<User>> GetUsersAsync(InternetGatewayDevice internetGatewayDevice)
     {
         LanConfigSecurityGetUserListResponse lanConfigSecurityGetUserListResponse = await fritzServiceOperationHandler.LanConfigSecurityGetUserListAsync(internetGatewayDevice);
         using var stringReader = new StringReader(lanConfigSecurityGetUserListResponse.UserList);
diff --git a/RS.Fritz.Manager.API/Services/WebUi/IWebUiService.cs b/RS.Fritz.Manager.API/Services/WebUi/IWebUiService.cs
index cedc139..63b57e3 100644
--- a/RS.Fritz.Manager.API/Services/WebUi/IWebUiService.cs
+++ b/RS.Fritz.Manager.API/Services/WebUi/IWebUiService.cs
@@ -2,11 +2,11 @@
 
 public interface IWebUiService
 {
-    Task<WebUiSessionInfo> GetUsersAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default);
+    ValueTask<WebUiSessionInfo> GetUsersAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default);
 
-    Task<WebUiSessionInfo> LogonAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default);
+    ValueTask<WebUiSessionInfo> LogonAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default);
 
-    Task<WebUiSessionInfo> LogoffAsync(InternetGatewayDevice internetGatewayDevice, string sessionId, CancellationToken cancellationToken = default);
+    ValueTask<WebUiSessionInfo> LogoffAsync(InternetGatewayDevice internetGatewayDevice, string sessionId, CancellationToken cancellationToken = default);
 
-    Task<WebUiSessionInfo> ValidateSessionAsync(InternetGatewayDevice internetGatewayDevice, string sessionId, CancellationToken cancellationToken = default);
+    ValueTask<WebUiSessionInfo> ValidateSessionAsync(InternetGatewayDevice internetGatewayDevice, string sessionId, CancellationToken cancellationToken = default);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/WebUi/WebUiService.cs b/RS.Fritz.Manager.API/Services/WebUi/WebUiService.cs
index 3ce75da..4ddfb18 100644
--- a/RS.Fritz.Manager.API/Services/WebUi/WebUiService.cs
+++ b/RS.Fritz.Manager.API/Services/WebUi/WebUiService.cs
@@ -19,7 +19,7 @@ public WebUiService(IHttpClientFactory httpClientFactory, INetworkService networ
         this.networkService = networkService;
     }
 
-    public async Task<WebUiSessionInfo> GetUsersAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
+    public async ValueTask<WebUiSessionInfo> GetUsersAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
     {
         Uri loginUri = GetLoginUri(internetGatewayDevice);
         Stream xmlResponseStream = await httpClientFactory.CreateClient(Constants.DefaultHttpClientName).GetStreamAsync(loginUri, cancellationToken).ConfigureAwait(false);
@@ -30,7 +30,7 @@ public async Task<WebUiSessionInfo> GetUsersAsync(InternetGatewayDevice internet
         }
     }
 
-    public async Task<WebUiSessionInfo> LogonAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
+    public async ValueTask<WebUiSessionInfo> LogonAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
     {
         WebUiSessionInfo webUiSessionInfo = await GetUsersAsync(internetGatewayDevice, cancellationToken);
         string[] challengeParts = webUiSessionInfo.Challenge.Split('$');
@@ -47,14 +47,14 @@ public async Task<WebUiSessionInfo> LogonAsync(InternetGatewayDevice internetGat
         return await GetResponseAsync(internetGatewayDevice, parameters, cancellationToken);
     }
 
-    public Task<WebUiSessionInfo> LogoffAsync(InternetGatewayDevice internetGatewayDevice, string sessionId, CancellationToken cancellationToken = default)
+    public ValueTask<WebUiSessionInfo> LogoffAsync(InternetGatewayDevice internetGatewayDevice, string sessionId, CancellationToken cancellationToken = default)
     {
         var parameters = new Dictionary<string, string> { { "logout", string.Empty }, { "sid", sessionId } };
 
         return GetResponseAsync(internetGatewayDevice, parameters, cancellationToken);
     }
 
-    public Task<WebUiSessionInfo> ValidateSessionAsync(InternetGatewayDevice internetGatewayDevice, string sessionId, CancellationToken cancellationToken = default)
+    public ValueTask<WebUiSessionInfo> ValidateSessionAsync(InternetGatewayDevice internetGatewayDevice, string sessionId, CancellationToken cancellationToken = default)
     {
         var parameters = new Dictionary<string, string> { { "sid", sessionId } };
 
@@ -78,7 +78,7 @@ private static byte[] GetHash(byte[] password, byte[] salt, int iterations)
     private Uri GetLoginUri(InternetGatewayDevice internetGatewayDevice)
         => networkService.FormatUri(Uri.UriSchemeHttps, internetGatewayDevice.PreferredLocation, 443, LoginPath);
 
-    private async Task<WebUiSessionInfo> GetResponseAsync(InternetGatewayDevice internetGatewayDevice, IDictionary<string, string> parameters, CancellationToken cancellationToken)
+    private async ValueTask<WebUiSessionInfo> GetResponseAsync(InternetGatewayDevice internetGatewayDevice, IDictionary<string, string> parameters, CancellationToken cancellationToken)
     {
         var formContent = new FormUrlEncodedContent(parameters);
         Uri loginUri = GetLoginUri(internetGatewayDevice);
diff --git a/RS.Fritz.Manager.API/Services/WlanDevice/IWlanDeviceService.cs b/RS.Fritz.Manager.API/Services/WlanDevice/IWlanDeviceService.cs
index 5535f05..aafef7f 100644
--- a/RS.Fritz.Manager.API/Services/WlanDevice/IWlanDeviceService.cs
+++ b/RS.Fritz.Manager.API/Services/WlanDevice/IWlanDeviceService.cs
@@ -2,5 +2,5 @@
 
 public interface IWlanDeviceService
 {
-    Task<WlanDeviceInfo> GetWlanDevicesAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default);
+    ValueTask<WlanDeviceInfo> GetWlanDevicesAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/WlanDevice/WlanDeviceService.cs b/RS.Fritz.Manager.API/Services/WlanDevice/WlanDeviceService.cs
index b1db8c6..b413b6a 100644
--- a/RS.Fritz.Manager.API/Services/WlanDevice/WlanDeviceService.cs
+++ b/RS.Fritz.Manager.API/Services/WlanDevice/WlanDeviceService.cs
@@ -14,7 +14,7 @@ public WlanDeviceService(IHttpClientFactory httpClientFactory, INetworkService n
         this.networkService = networkService;
     }
 
-    public async Task<WlanDeviceInfo> GetWlanDevicesAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
+    public async ValueTask<WlanDeviceInfo> GetWlanDevicesAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
     {
         WlanConfigurationGetWlanDeviceListPathResponse wlanConfigurationGetWlanDeviceListPathResponse = await internetGatewayDevice.WlanConfigurationGetWlanDeviceListPathAsync(1);
         string wlanDeviceListPath = wlanConfigurationGetWlanDeviceListPathResponse.WlanDeviceListPath;
diff --git a/RS.Fritz.Manager.UI/Entities/ObservableInternetGatewayDevice.cs b/RS.Fritz.Manager.UI/Entities/ObservableInternetGatewayDevice.cs
index 69aefff..671e20f 100644
--- a/RS.Fritz.Manager.UI/Entities/ObservableInternetGatewayDevice.cs
+++ b/RS.Fritz.Manager.UI/Entities/ObservableInternetGatewayDevice.cs
@@ -36,7 +36,7 @@ public WanAccessType? WanAccessType
         set => _ = SetProperty(ref wanAccessType, value, true);
     }
 
-    public async Task GetDeviceTypeAsync()
+    public async ValueTask GetDeviceTypeAsync()
     {
         WanCommonInterfaceConfigGetCommonLinkPropertiesResponse wanCommonInterfaceConfigGetCommonLinkProperties;
 
diff --git a/RS.Fritz.Manager.UI/Infrastructure/FritzServiceViewModel.cs b/RS.Fritz.Manager.UI/Infrastructure/FritzServiceViewModel.cs
index b134161..64c749a 100644
--- a/RS.Fritz.Manager.UI/Infrastructure/FritzServiceViewModel.cs
+++ b/RS.Fritz.Manager.UI/Infrastructure/FritzServiceViewModel.cs
@@ -58,7 +58,7 @@ private set
         }
     }
 
-    protected abstract Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken);
+    protected abstract ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken);
 
     protected virtual void Receive(PropertyChangedMessage<bool> message)
     {
diff --git a/RS.Fritz.Manager.UI/Infrastructure/ManualOperationViewModel.cs b/RS.Fritz.Manager.UI/Infrastructure/ManualOperationViewModel.cs
index 80fc284..03b4f96 100644
--- a/RS.Fritz.Manager.UI/Infrastructure/ManualOperationViewModel.cs
+++ b/RS.Fritz.Manager.UI/Infrastructure/ManualOperationViewModel.cs
@@ -30,7 +30,7 @@ protected virtual TRequest BuildRequest()
         return default;
     }
 
-    protected override async Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         Response = await ExecuteApiAsync(operation, BuildRequest());
     }
diff --git a/RS.Fritz.Manager.UI/MainWindow/MainWindowViewModel.cs b/RS.Fritz.Manager.UI/MainWindow/MainWindowViewModel.cs
index b898286..691f23b 100644
--- a/RS.Fritz.Manager.UI/MainWindow/MainWindowViewModel.cs
+++ b/RS.Fritz.Manager.UI/MainWindow/MainWindowViewModel.cs
@@ -296,7 +296,7 @@ protected override void FritzServiceViewModelPropertyChanged(object? sender, Pro
         }
     }
 
-    protected override async Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         ActiveView = null;
         DeviceLoginInfo.InternetGatewayDevice = null;
diff --git a/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestViewModel.cs b/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestViewModel.cs
index 836d71e..35f4e7f 100644
--- a/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestViewModel.cs
@@ -22,7 +22,7 @@ public AvmSpeedtestViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
         private set { _ = SetProperty(ref avmSpeedtestGetStatisticsResponse, value); }
     }
 
-    protected override Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         return API.TaskExtensions.WhenAllSafe(new[]
             {
diff --git a/RS.Fritz.Manager.UI/UserControls/Capture/CaptureControlCaptureViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Capture/CaptureControlCaptureViewModel.cs
index c4c99b0..b1f3f68 100644
--- a/RS.Fritz.Manager.UI/UserControls/Capture/CaptureControlCaptureViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Capture/CaptureControlCaptureViewModel.cs
@@ -52,7 +52,7 @@ public ObservableCollection<UserInterfaceCaptureInterfaceGroup>? CaptureInterfac
         private set => _ = SetProperty(ref captureInterfaceGroups, value);
     }
 
-    protected override async Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         if (CaptureInterfaceGroups is not null)
             return;
@@ -87,9 +87,9 @@ private bool CanExecuteCaptureInterfaceStopCommand(CaptureInterface captureInter
         return CaptureInterfaceGroups?.SelectMany(q => q.CaptureInterfaces).Single(q => q.CaptureInterface == captureInterface).Active ?? false;
     }
 
-    private async Task DoExecuteSelectTargetFolderCommandAsync(CancellationToken cancellationToken)
+    private async Task DoExecuteSelectTargetFolderCommandAsync()
     {
-        nint mainWindowHandle = new WindowInteropHelper(Application.Current.MainWindow).Handle;
+        nint mainWindowHandle = new WindowInteropHelper(Application.Current.MainWindow!).Handle;
         var folderPicker = new FolderPicker
         {
             SuggestedStartLocation = PickerLocationId.Downloads
@@ -112,7 +112,7 @@ private async void DoExecuteCaptureInterfaceStartCommand(UserInterfaceCaptureInt
         await StartBackgroundCaptureAsync(userInterfaceCaptureInterface, fileInfo);
     }
 
-    private async Task StartBackgroundCaptureAsync(UserInterfaceCaptureInterface userInterfaceCaptureInterface, FileInfo fileInfo)
+    private async ValueTask StartBackgroundCaptureAsync(UserInterfaceCaptureInterface userInterfaceCaptureInterface, FileInfo fileInfo)
     {
         try
         {
diff --git a/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigViewModel.cs
index 3f3e9a4..c637f10 100644
--- a/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigViewModel.cs
@@ -32,7 +32,7 @@ public DeviceConfigViewModel(
 
     public DeviceConfigCreateUrlSidViewModel DeviceConfigCreateUrlSidViewModel { get; }
 
-    protected override Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         return API.TaskExtensions.WhenAllSafe(new[]
             {
diff --git a/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoViewModel.cs b/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoViewModel.cs
index 65ac591..6e9911b 100644
--- a/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoViewModel.cs
@@ -32,7 +32,7 @@ public DeviceInfoViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger, Devi
 
     public DeviceInfoSetProvisioningCodeViewModel DeviceInfoSetProvisioningCodeViewModel { get; }
 
-    protected override Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         return API.TaskExtensions.WhenAllSafe(new[]
             {
diff --git a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsGetGenericHostEntryViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsGetGenericHostEntryViewModel.cs
index e1d1e2e..164e249 100644
--- a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsGetGenericHostEntryViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsGetGenericHostEntryViewModel.cs
@@ -39,7 +39,7 @@ public ushort? HostNumberOfEntries
         private set { _ = SetProperty(ref hostsGetGenericHostEntryResponse, value); }
     }
 
-    protected override async Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         HostsGetGenericHostEntryResponse = await ExecuteApiAsync(q => q.HostsGetGenericHostEntryAsync(new(Index!.Value)));
     }
diff --git a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs
index 656e20d..0bdce10 100644
--- a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs
@@ -74,7 +74,7 @@ public ObservableCollection<HostsGetGenericHostEntryResponse>? HostsGetGenericHo
         private set { _ = SetProperty(ref hostsGetGenericHostEntryResponses, value); }
     }
 
-    protected override Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         return API.TaskExtensions.WhenAllSafe(new[]
             {
diff --git a/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecurityViewModel.cs b/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecurityViewModel.cs
index 60865f6..bfaf318 100644
--- a/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecurityViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecurityViewModel.cs
@@ -39,7 +39,7 @@ public LanConfigSecurityViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logge
         private set { _ = SetProperty(ref lanConfigSecurityGetUserListResponse, value); }
     }
 
-    protected override Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         return API.TaskExtensions.WhenAllSafe(new[]
             {
diff --git a/RS.Fritz.Manager.UI/UserControls/LanEthernetInterfaceConfig/LanEthernetInterfaceConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/LanEthernetInterfaceConfig/LanEthernetInterfaceConfigViewModel.cs
index 7012b21..c8a38b7 100644
--- a/RS.Fritz.Manager.UI/UserControls/LanEthernetInterfaceConfig/LanEthernetInterfaceConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/LanEthernetInterfaceConfig/LanEthernetInterfaceConfigViewModel.cs
@@ -22,7 +22,7 @@ public LanEthernetInterfaceConfigViewModel(DeviceLoginInfo deviceLoginInfo, ILog
         private set { _ = SetProperty(ref lanEthernetInterfaceConfigGetStatisticsResponse, value); }
     }
 
-    protected override Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         return API.TaskExtensions.WhenAllSafe(new[]
             {
diff --git a/RS.Fritz.Manager.UI/UserControls/LanHostConfigManagement/LanHostConfigManagementViewModel.cs b/RS.Fritz.Manager.UI/UserControls/LanHostConfigManagement/LanHostConfigManagementViewModel.cs
index f07cc19..7e50d9c 100644
--- a/RS.Fritz.Manager.UI/UserControls/LanHostConfigManagement/LanHostConfigManagementViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/LanHostConfigManagement/LanHostConfigManagementViewModel.cs
@@ -50,7 +50,7 @@ public LanHostConfigManagementViewModel(DeviceLoginInfo deviceLoginInfo, ILogger
         private set { _ = SetProperty(ref lanHostConfigManagementGetDnsServersResponse, value); }
     }
 
-    protected override Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         return API.TaskExtensions.WhenAllSafe(new[]
             {
diff --git a/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingGetGenericForwardingEntryViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingGetGenericForwardingEntryViewModel.cs
index d08d03f..932a4b9 100644
--- a/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingGetGenericForwardingEntryViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingGetGenericForwardingEntryViewModel.cs
@@ -39,7 +39,7 @@ public ushort? ForwardNumberOfEntries
         private set { _ = SetProperty(ref layer3ForwardingGetGenericForwardingEntryResponse, value); }
     }
 
-    protected override async Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         Layer3ForwardingGetGenericForwardingEntryResponse = await ExecuteApiAsync(q => q.Layer3ForwardingGetGenericForwardingEntryAsync(new(Index!.Value)));
     }
diff --git a/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingViewModel.cs
index 15c9c2d..5a0bf21 100644
--- a/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingViewModel.cs
@@ -38,7 +38,7 @@ public ObservableCollection<Layer3ForwardingGetGenericForwardingEntryResponse>?
         private set { _ = SetProperty(ref layer3ForwardingGetGenericForwardingEntryResponses, value); }
     }
 
-    protected override Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         return API.TaskExtensions.WhenAllSafe(new[]
             {
diff --git a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerViewModel.cs b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerViewModel.cs
index 612f8bd..b5d7f86 100644
--- a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerViewModel.cs
@@ -56,7 +56,7 @@ public ManagementServerViewModel(
 
     public ManagementServerSetTr069FirmwareDownloadEnabledViewModel ManagementServerSetTr069FirmwareDownloadEnabledViewModel { get; }
 
-    protected override Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         return API.TaskExtensions.WhenAllSafe(new[]
             {
diff --git a/RS.Fritz.Manager.UI/UserControls/Time/TimeViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Time/TimeViewModel.cs
index 3af4002..9022720 100644
--- a/RS.Fritz.Manager.UI/UserControls/Time/TimeViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Time/TimeViewModel.cs
@@ -18,7 +18,7 @@ public TimeViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger, TimeSetNtp
         private set { _ = SetProperty(ref timeGetInfoResponse, value); }
     }
 
-    protected override async Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         TimeGetInfoResponse = await ExecuteApiAsync(q => q.TimeGetInfoAsync());
     }
diff --git a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceViewModel.cs b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceViewModel.cs
index 97e0b4a..75f68d0 100644
--- a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceViewModel.cs
@@ -55,7 +55,7 @@ public UserInterfaceViewModel(
 
     public UserInterfaceSetConfigViewModel UserInterfaceSetConfigViewModel { get; }
 
-    protected override Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         return API.TaskExtensions.WhenAllSafe(new[]
             {
diff --git a/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigGetOnlineMonitorViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigGetOnlineMonitorViewModel.cs
index 0d668c3..a9f8815 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigGetOnlineMonitorViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigGetOnlineMonitorViewModel.cs
@@ -152,7 +152,7 @@ public uint? CurrentUpstreamBackgroundApplicationsBps
         }
     }
 
-    protected override async Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         WanCommonInterfaceConfigGetOnlineMonitorResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetOnlineMonitorAsync(new(SyncGroupIndex)));
     }
diff --git a/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigViewModel.cs
index a8ea5bb..bebbd95 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigViewModel.cs
@@ -74,7 +74,7 @@ public bool AutoRefresh
         private set { _ = SetProperty(ref wanCommonInterfaceConfigGetCommonLinkPropertiesResponse, value); }
     }
 
-    protected override Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         return API.TaskExtensions.WhenAllSafe(new[]
             {
diff --git a/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigViewModel.cs
index 6e055a3..e000978 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigViewModel.cs
@@ -72,7 +72,7 @@ protected override void Receive(PropertyChangedMessage<bool> message)
         }
     }
 
-    protected override Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         return API.TaskExtensions.WhenAllSafe(new[]
             {
diff --git a/RS.Fritz.Manager.UI/UserControls/WanDslLinkConfig/WanDslLinkConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanDslLinkConfig/WanDslLinkConfigViewModel.cs
index 5e69723..af67db9 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanDslLinkConfig/WanDslLinkConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanDslLinkConfig/WanDslLinkConfigViewModel.cs
@@ -50,7 +50,7 @@ public WanDslLinkConfigViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger
         private set { _ = SetProperty(ref wanDslLinkConfigGetStatisticsResponse, value); }
     }
 
-    protected override Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         return API.TaskExtensions.WhenAllSafe(new[]
           {
diff --git a/RS.Fritz.Manager.UI/UserControls/WanEthernetLinkConfig/WanEthernetLinkConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanEthernetLinkConfig/WanEthernetLinkConfigViewModel.cs
index 87e8bf3..cd90307 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanEthernetLinkConfig/WanEthernetLinkConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanEthernetLinkConfig/WanEthernetLinkConfigViewModel.cs
@@ -15,7 +15,7 @@ public WanEthernetLinkConfigViewModel(DeviceLoginInfo deviceLoginInfo, ILogger l
         private set { _ = SetProperty(ref wanEthernetLinkConfigGetEthernetLinkStatusResponse, value); }
     }
 
-    protected override async Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         WanEthernetLinkConfigGetEthernetLinkStatusResponse = await ExecuteApiAsync(q => q.WanEthernetLinkConfigGetEthernetLinkStatusAsync());
     }
diff --git a/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionGetGenericPortMappingEntryViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionGetGenericPortMappingEntryViewModel.cs
index dbc974d..f8f8548 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionGetGenericPortMappingEntryViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionGetGenericPortMappingEntryViewModel.cs
@@ -7,7 +7,7 @@ public WanIpConnectionGetGenericPortMappingEntryViewModel(DeviceLoginInfo device
     {
     }
 
-    protected override async Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         WanConnectionGetGenericPortMappingEntryResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetGenericPortMappingEntryAsync(new(Index!.Value)));
     }
diff --git a/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionViewModel.cs
index 9153661..f74b166 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionViewModel.cs
@@ -73,7 +73,7 @@ public ObservableCollection<WanConnectionGetGenericPortMappingEntryResponse>? Wa
         private set { _ = SetProperty(ref wanConnectionGetGenericPortMappingEntryResponses, value); }
     }
 
-    protected override Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         return API.TaskExtensions.WhenAllSafe(new[]
           {
diff --git a/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionGetGenericPortMappingEntryViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionGetGenericPortMappingEntryViewModel.cs
index 7e44742..aaf8da8 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionGetGenericPortMappingEntryViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionGetGenericPortMappingEntryViewModel.cs
@@ -7,7 +7,7 @@ public WanPppConnectionGetGenericPortMappingEntryViewModel(DeviceLoginInfo devic
     {
     }
 
-    protected override async Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         WanConnectionGetGenericPortMappingEntryResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetGenericPortMappingEntryAsync(new(Index!.Value)));
     }
diff --git a/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionViewModel.cs
index 13b7ed4..0ee86c3 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionViewModel.cs
@@ -94,7 +94,7 @@ public ObservableCollection<WanConnectionGetGenericPortMappingEntryResponse>? Wa
         private set { _ = SetProperty(ref wanConnectionGetGenericPortMappingEntryResponses, value); }
     }
 
-    protected override Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         return API.TaskExtensions.WhenAllSafe(new[]
           {
diff --git a/RS.Fritz.Manager.UI/UserControls/WlanConfiguration/WlanConfigurationViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WlanConfiguration/WlanConfigurationViewModel.cs
index 0c9e299..d00e0ff 100644
--- a/RS.Fritz.Manager.UI/UserControls/WlanConfiguration/WlanConfigurationViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WlanConfiguration/WlanConfigurationViewModel.cs
@@ -150,7 +150,7 @@ public Visibility Interface4Visibility
         get => interface4Visibility ??= HasWlanConfigurationService(4) ? Visibility.Visible : Visibility.Hidden;
     }
 
-    protected override Task DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
+    protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
         return API.TaskExtensions.WhenAllSafe(new[]
           {
@@ -259,7 +259,7 @@ private async Task GetWlanConfigurationGetWlanConnectionInfoAsync()
         WlanConfigurationGetWlanConnectionInfoResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetWlanConnectionInfoAsync(i), new Dictionary<ushort, string> { { 714, "Current device is not directly connected to any of the access points." } });
     }
 
-    private async Task<KeyValuePair<T?, UPnPFault?>?[]> ExecuteApiWlanConfigurationAsync<T>(Func<InternetGatewayDevice, int, Task<T>> operation, IDictionary<ushort, string>? errorReasons = null)
+    private async ValueTask<KeyValuePair<T?, UPnPFault?>?[]> ExecuteApiWlanConfigurationAsync<T>(Func<InternetGatewayDevice, int, Task<T>> operation, IDictionary<ushort, string>? errorReasons = null)
         where T : struct
     {
         var responses = new KeyValuePair<T?, UPnPFault?>?[4];

From 2885fafa7d3b5cdc4168079f5b729495dc33151f Mon Sep 17 00:00:00 2001
From: Rans4ckeR <ransacker@outlook.com>
Date: Sun, 4 Jun 2023 02:24:34 +0200
Subject: [PATCH 10/15] SslProtocols.None

---
 RS.Fritz.Manager.API/Services/TR-064/FritzServiceClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RS.Fritz.Manager.API/Services/TR-064/FritzServiceClient.cs b/RS.Fritz.Manager.API/Services/TR-064/FritzServiceClient.cs
index d6a86d1..5c101e3 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/FritzServiceClient.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/FritzServiceClient.cs
@@ -14,7 +14,7 @@ protected FritzServiceClient(FritzServiceEndpointConfiguration endpointConfigura
     {
         Endpoint.Name = endpointConfiguration.ToString();
 
-        SetSslProtocols(SslProtocols.Tls12);
+        SetSslProtocols(SslProtocols.None);
         SetCredentials(networkCredential);
     }
 

From f3ee3b8ae1190a0d226c9a4c68f59a6f5fd25e7c Mon Sep 17 00:00:00 2001
From: Rans4ckeR <ransacker@outlook.com>
Date: Sun, 4 Jun 2023 02:27:54 +0200
Subject: [PATCH 11/15] Expression body

---
 .editorconfig                                 | 1570 +++++++++++++----
 .../Entities/InternetGatewayDevice.cs         |    7 +-
 .../InternetGatewayDeviceExtensions.cs        |  437 ++---
 .../Infrastructure/ExceptionMessageBuilder.cs |    4 +-
 ...shStreamConfigurationArrayJsonConverter.cs |    4 +-
 .../AvmSpeedtest/FritzAvmSpeedtestService.cs  |    8 +-
 .../DeviceConfig/FritzDeviceConfigService.cs  |   16 +-
 .../DeviceInfo/FritzDeviceInfoService.cs      |   16 +-
 .../Services/Hosts/FritzHostsService.cs       |   32 +-
 .../FritzLanConfigSecurityService.cs          |   20 +-
 .../FritzLanEthernetInterfaceConfigService.cs |    8 +-
 .../FritzLanHostConfigManagementService.cs    |   24 +-
 .../FritzLayer3ForwardingService.cs           |   12 +-
 .../FritzManagementServerService.cs           |   40 +-
 .../TR-064/Services/Time/FritzTimeService.cs  |    8 +-
 .../FritzUserInterfaceService.cs              |   36 +-
 .../FritzWanCommonInterfaceConfigService.cs   |   28 +-
 .../FritzWanDslInterfaceConfigService.cs      |   16 +-
 .../FritzWanDslLinkConfigService.cs           |   24 +-
 .../FritzWanEthernetLinkConfigService.cs      |    4 +-
 .../FritzWanIpConnectionService.cs            |   32 +-
 .../FritzWanPppConnectionService.cs           |   44 +-
 .../FritzWlanConfiguration1Service.cs         |   68 +-
 .../FritzWlanConfiguration2Service.cs         |   68 +-
 .../FritzWlanConfiguration3Service.cs         |   68 +-
 .../FritzWlanConfiguration4Service.cs         |   68 +-
 .../TR-064/SoapClient/ClientFactory.cs        |    8 +-
 .../FritzServiceOperationHandler.cs           |  644 ++-----
 .../Entities/DeviceLoginInfo.cs               |    4 +-
 .../Infrastructure/FritzServiceViewModel.cs   |   20 +-
 .../ManualOperationViewModel.cs               |   11 +-
 ...WanAccessTypeAwareFritzServiceViewModel.cs |    4 +-
 .../MainWindow/MainWindow.xaml.cs             |    5 +-
 .../MainWindow/MainWindowViewModel.cs         |   25 +-
 .../Properties/GlobalUsings.cs                |    8 +-
 .../AvmSpeedtest/AvmSpeedtestViewModel.cs     |   12 +-
 .../Capture/CaptureControlCaptureViewModel.cs |   16 +-
 .../DeviceConfig/DeviceConfigViewModel.cs     |   12 +-
 .../DeviceInfoSetProvisioningCodeViewModel.cs |    5 +-
 .../DeviceInfo/DeviceInfoViewModel.cs         |   21 +-
 .../HostsGetGenericHostEntryViewModel.cs      |   10 +-
 .../UserControls/Hosts/HostsViewModel.cs      |   32 +-
 ...onfigSecuritySetConfigPasswordViewModel.cs |    4 +-
 .../LanConfigSecurityViewModel.cs             |   24 +-
 .../LanEthernetInterfaceConfigViewModel.cs    |   12 +-
 .../LanHostConfigManagementViewModel.cs       |   36 +-
 ...rdingGetGenericForwardingEntryViewModel.cs |   10 +-
 .../Layer3ForwardingViewModel.cs              |    8 +-
 ...onnectionRequestAuthenticationViewModel.cs |    4 +-
 ...verSetManagementServerPasswordViewModel.cs |    4 +-
 ...ntServerSetManagementServerUrlViewModel.cs |    4 +-
 ...verSetManagementServerUsernameViewModel.cs |    4 +-
 ...agementServerSetPeriodicInformViewModel.cs |    8 +-
 ...ManagementServerSetTr069EnableViewModel.cs |    8 +-
 ...etTr069FirmwareDownloadEnabledViewModel.cs |    8 +-
 ...mentServerSetUpgradeManagementViewModel.cs |    8 +-
 .../ManagementServerViewModel.cs              |   12 +-
 .../Time/TimeSetNtpServersViewModel.cs        |    4 +-
 .../UserControls/Time/TimeViewModel.cs        |    6 +-
 .../UserInterfaceDoManualUpdateViewModel.cs   |    8 +-
 .../UserInterfaceSetConfigViewModel.cs        |    4 +-
 ...nterfaceSetInternationalConfigViewModel.cs |    4 +-
 .../UserInterface/UserInterfaceViewModel.cs   |   18 +-
 ...nterfaceConfigGetOnlineMonitorViewModel.cs |   24 +-
 ...nterfaceConfigSetWanAccessTypeViewModel.cs |    4 +-
 .../WanCommonInterfaceConfigViewModel.cs      |   34 +-
 ...tionGetGenericPortMappingEntryViewModel.cs |    6 +-
 .../WanDslInterfaceConfigInfoViewModel.cs     |   20 +-
 .../WanDslInterfaceConfigViewModel.cs         |   20 +-
 .../WanDslLinkConfigViewModel.cs              |   36 +-
 .../WanEthernetLinkConfigViewModel.cs         |    6 +-
 ...tionGetGenericPortMappingEntryViewModel.cs |    4 +-
 .../WanIpConnectionViewModel.cs               |   38 +-
 ...tionGetGenericPortMappingEntryViewModel.cs |    4 +-
 .../WanPppConnectionViewModel.cs              |   56 +-
 .../WlanConfigurationViewModel.cs             |  121 +-
 76 files changed, 1892 insertions(+), 2178 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 56aa9a4..5d3d1dd 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,463 +1,1321 @@
-# Remove the line below if you want to inherit .editorconfig settings from higher directories
+###############################
+# Core EditorConfig Options   #
+###############################
 root = true
+# All files
+[*]
+indent_style = space
+end_of_line = crlf
 
-# C# files
-[*.cs]
+# XML project files
+[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
+indent_size = 2
 
-#### Core EditorConfig Options ####
+# XML config files
+[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
+indent_size = 2
 
-# Indentation and spacing
+# Code files
+[*.{cs,csx,vb,vbx}]
 indent_size = 4
-indent_style = space
-tab_width = 4
-
-# New line preferences
-end_of_line = crlf
 insert_final_newline = false
-
-#### .NET Coding Conventions ####
-
+charset = utf-8-bom
+trim_trailing_whitespace = true
+###############################
+# .NET Coding Conventions     #
+###############################
+[*.{cs,vb}]
 # Organize usings
-dotnet_separate_import_directive_groups = false
 dotnet_sort_system_directives_first = true
-file_header_template = unset
-
-# this. and Me. preferences
-dotnet_style_qualification_for_event = false:warning
-dotnet_style_qualification_for_field = false:warning
-dotnet_style_qualification_for_method = false:warning
-dotnet_style_qualification_for_property = false:warning
-
+# this. preferences
+dotnet_style_qualification_for_field = false:silent
+dotnet_style_qualification_for_property = false:silent
+dotnet_style_qualification_for_method = false:silent
+dotnet_style_qualification_for_event = false:silent
 # Language keywords vs BCL types preferences
-dotnet_style_predefined_type_for_locals_parameters_members = true:warning
-dotnet_style_predefined_type_for_member_access = true:warning
-
+dotnet_style_predefined_type_for_locals_parameters_members = true:silent
+dotnet_style_predefined_type_for_member_access = true:silent
 # Parentheses preferences
-dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:warning
-dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:warning
-dotnet_style_parentheses_in_other_operators = never_if_unnecessary:warning
-dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:warning
-
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
 # Modifier preferences
-dotnet_style_require_accessibility_modifiers = for_non_interface_members
-
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+dotnet_style_readonly_field = true:suggestion
 # Expression-level preferences
-dotnet_style_coalesce_expression = true:warning
-dotnet_style_collection_initializer = true:warning
-dotnet_style_explicit_tuple_names = true:warning
-dotnet_style_namespace_match_folder = true
-dotnet_style_null_propagation = true:warning
-dotnet_style_object_initializer = true:warning
-dotnet_style_operator_placement_when_wrapping = beginning_of_line
-dotnet_style_prefer_auto_properties = true:warning
-dotnet_style_prefer_compound_assignment = true:warning
-dotnet_style_prefer_conditional_expression_over_assignment = true:warning
-dotnet_style_prefer_conditional_expression_over_return = true:warning
-dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning
-dotnet_style_prefer_inferred_tuple_names = true:warning
-dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning
-dotnet_style_prefer_simplified_boolean_expressions = true:warning
-dotnet_style_prefer_simplified_interpolation = true
-
-# Field preferences
-dotnet_style_readonly_field = true:warning
-
-# Parameter preferences
-dotnet_code_quality_unused_parameters = all:warning
-
-# Suppression preferences
-dotnet_remove_unnecessary_suppression_exclusions = 0
-
-# New line preferences
-dotnet_style_allow_multiple_blank_lines_experimental = false:warning
-dotnet_style_allow_statement_immediately_after_block_experimental = false:warning
-
-#### C# Coding Conventions ####
-
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+###############################
+# Naming Conventions          #
+###############################
+# Style Definitions
+dotnet_naming_style.pascal_case_style.capitalization             = pascal_case
+# Use PascalCase for constant fields
+dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols  = constant_fields
+dotnet_naming_rule.constant_fields_should_be_pascal_case.style    = pascal_case_style
+dotnet_naming_symbols.constant_fields.applicable_kinds            = field
+dotnet_naming_symbols.constant_fields.applicable_accessibilities  = *
+dotnet_naming_symbols.constant_fields.required_modifiers          = const
+###############################
+# C# Coding Conventions       #
+###############################
+[*.cs]
 # var preferences
-csharp_style_var_elsewhere = false:warning
-csharp_style_var_for_built_in_types = false:warning
-csharp_style_var_when_type_is_apparent = true:warning
-
+csharp_style_var_for_built_in_types = false:silent
+csharp_style_var_when_type_is_apparent = true:silent
+csharp_style_var_elsewhere = false:silent
 # Expression-bodied members
-csharp_style_expression_bodied_accessors = true:none
-csharp_style_expression_bodied_constructors = false:none
-csharp_style_expression_bodied_indexers = true:none
-csharp_style_expression_bodied_lambdas = true:none
-csharp_style_expression_bodied_local_functions = false:none
-csharp_style_expression_bodied_methods = false:none
-csharp_style_expression_bodied_operators = false:none
-csharp_style_expression_bodied_properties = true:none
-
+csharp_style_expression_bodied_methods = when_on_single_line:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_accessors = true:silent
 # Pattern matching preferences
-csharp_style_pattern_matching_over_as_with_null_check = true:warning
-csharp_style_pattern_matching_over_is_with_cast_check = true:warning
-csharp_style_prefer_extended_property_pattern = true:warning
-csharp_style_prefer_not_pattern = true:warning
-csharp_style_prefer_pattern_matching = true:warning
-csharp_style_prefer_switch_expression = true:warning
-
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
 # Null-checking preferences
-csharp_style_conditional_delegate_call = true:warning
-csharp_style_prefer_parameter_null_checking = true:warning
-
+csharp_style_throw_expression = true:suggestion
+csharp_style_conditional_delegate_call = true:suggestion
 # Modifier preferences
-csharp_prefer_static_local_function = true:warning
-csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async
-
-# Code-block preferences
-csharp_prefer_braces = when_multiline:warning
-csharp_prefer_simple_using_statement = true:warning
-csharp_style_namespace_declarations = file_scoped:warning
-csharp_style_prefer_method_group_conversion = true:warning
-
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
 # Expression-level preferences
-csharp_prefer_simple_default_expression = true:warning
-csharp_style_deconstructed_variable_declaration = true:warning
-csharp_style_implicit_object_creation_when_type_is_apparent = true:warning
-csharp_style_inlined_variable_declaration = true:warning
-csharp_style_prefer_index_operator = true:warning
-csharp_style_prefer_local_over_anonymous_function = true:warning
-csharp_style_prefer_null_check_over_type_check = true:warning
-csharp_style_prefer_range_operator = true:warning
-csharp_style_prefer_tuple_swap = true:warning
-csharp_style_throw_expression = true:warning
-csharp_style_unused_value_assignment_preference = discard_variable:warning
-csharp_style_unused_value_expression_statement_preference = discard_variable:warning
-
-# 'using' directive preferences
-csharp_using_directive_placement = inside_namespace:warning
-
-# New line preferences
-csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = false:warning
-csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false:warning
-csharp_style_allow_embedded_statements_on_same_line_experimental = false:warning
-
-#### C# Formatting Rules ####
-
+csharp_prefer_braces = true:silent
+csharp_style_deconstructed_variable_declaration = true:suggestion
+csharp_prefer_simple_default_expression = true:suggestion
+csharp_style_prefer_local_over_anonymous_function = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+###############################
+# C# Formatting Rules         #
+###############################
 # New line preferences
-csharp_new_line_before_catch = true
+csharp_new_line_before_open_brace = all
 csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
 csharp_new_line_before_finally = true
-csharp_new_line_before_members_in_anonymous_types = true
 csharp_new_line_before_members_in_object_initializers = true
-csharp_new_line_before_open_brace = all
+csharp_new_line_before_members_in_anonymous_types = true
 csharp_new_line_between_query_expression_clauses = true
-
 # Indentation preferences
-csharp_indent_block_contents = true
-csharp_indent_braces = false
 csharp_indent_case_contents = true
-csharp_indent_case_contents_when_block = true
-csharp_indent_labels = no_change
 csharp_indent_switch_labels = true
-
+csharp_indent_labels = flush_left
 # Space preferences
 csharp_space_after_cast = false
-csharp_space_after_colon_in_inheritance_clause = true
-csharp_space_after_comma = true
-csharp_space_after_dot = false
 csharp_space_after_keywords_in_control_flow_statements = true
-csharp_space_after_semicolon_in_for_statement = true
-csharp_space_around_binary_operators = before_and_after
-csharp_space_around_declaration_statements = false
-csharp_space_before_colon_in_inheritance_clause = true
-csharp_space_before_comma = false
-csharp_space_before_dot = false
-csharp_space_before_open_square_brackets = false
-csharp_space_before_semicolon_in_for_statement = false
-csharp_space_between_empty_square_brackets = false
-csharp_space_between_method_call_empty_parameter_list_parentheses = false
-csharp_space_between_method_call_name_and_opening_parenthesis = false
 csharp_space_between_method_call_parameter_list_parentheses = false
-csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
-csharp_space_between_method_declaration_name_and_open_parenthesis = false
 csharp_space_between_method_declaration_parameter_list_parentheses = false
 csharp_space_between_parentheses = false
-csharp_space_between_square_brackets = false
-
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
 # Wrapping preferences
-csharp_preserve_single_line_blocks = true
 csharp_preserve_single_line_statements = true
+csharp_preserve_single_line_blocks = true
+###############################
+# VB Coding Conventions       #
+###############################
+[*.vb]
+# Modifier preferences
+visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion
 
-#### Naming styles ####
-
-# Naming rules
-
-dotnet_naming_rule.interface_should_be_begins_with_i.severity = warning
-dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
-dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
-
-dotnet_naming_rule.types_should_be_pascal_case.severity = warning
-dotnet_naming_rule.types_should_be_pascal_case.symbols = types
-dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
-
-dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = warning
-dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
-dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
-
-# Symbol specifications
-
-dotnet_naming_symbols.interface.applicable_kinds = interface
-dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.interface.required_modifiers = 
+[*.cs]
 
-dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
-dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.types.required_modifiers = 
+# CS1591: Missing XML comment for publicly visible type or member
+dotnet_diagnostic.CS1591.severity = silent
 
-dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
-dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
-dotnet_naming_symbols.non_field_members.required_modifiers = 
+# IDE0033: Use explicitly provided tuple name
+dotnet_diagnostic.IDE0033.severity = warning
 
-# Naming styles
+# IDE0070: Use 'System.HashCode'
+dotnet_diagnostic.IDE0070.severity = warning
 
-dotnet_naming_style.pascal_case.required_prefix = 
-dotnet_naming_style.pascal_case.required_suffix = 
-dotnet_naming_style.pascal_case.word_separator = 
-dotnet_naming_style.pascal_case.capitalization = pascal_case
+# IDE0004: Remove Unnecessary Cast
+dotnet_diagnostic.IDE0004.severity = warning
 
-dotnet_naming_style.begins_with_i.required_prefix = I
-dotnet_naming_style.begins_with_i.required_suffix = 
-dotnet_naming_style.begins_with_i.word_separator = 
-dotnet_naming_style.begins_with_i.capitalization = pascal_case
+# IDE0005: Using directive is unnecessary.
 dotnet_diagnostic.IDE0005.severity = warning
-dotnet_diagnostic.IDE0063.severity = warning
-dotnet_diagnostic.IDE0065.severity = warning
-dotnet_diagnostic.CA1200.severity = warning
-dotnet_diagnostic.IDE0051.severity = warning
-dotnet_diagnostic.IDE0052.severity = warning
-dotnet_diagnostic.IDE0064.severity = warning
-dotnet_diagnostic.IDE0076.severity = warning
-dotnet_diagnostic.IDE0077.severity = warning
-dotnet_diagnostic.IDE0043.severity = warning
-dotnet_diagnostic.CA1070.severity = warning
-dotnet_diagnostic.CA1001.severity = warning
-dotnet_diagnostic.CA1309.severity = warning
-dotnet_diagnostic.CA1507.severity = warning
-dotnet_diagnostic.CA1805.severity = warning
-dotnet_diagnostic.CA1824.severity = warning
-dotnet_diagnostic.CA1825.severity = warning
-dotnet_diagnostic.CA1841.severity = warning
-dotnet_diagnostic.CA1845.severity = warning
-dotnet_diagnostic.CA2016.severity = warning
-dotnet_diagnostic.IDE0004.severity = warning
+
+# IDE0007: Use implicit type
 dotnet_diagnostic.IDE0007.severity = warning
+
+# IDE0008: Use explicit type
 dotnet_diagnostic.IDE0008.severity = warning
+
+# IDE0009: Member access should be qualified.
 dotnet_diagnostic.IDE0009.severity = warning
-dotnet_diagnostic.IDE0010.severity = none
+
+# IDE0011: Add braces
 dotnet_diagnostic.IDE0011.severity = warning
+
+# IDE0016: Use 'throw' expression
 dotnet_diagnostic.IDE0016.severity = warning
+
+# IDE0017: Simplify object initialization
 dotnet_diagnostic.IDE0017.severity = warning
+
+# IDE0018: Inline variable declaration
 dotnet_diagnostic.IDE0018.severity = warning
+
+# IDE0019: Use pattern matching
 dotnet_diagnostic.IDE0019.severity = warning
+
+# IDE0020: Use pattern matching
 dotnet_diagnostic.IDE0020.severity = warning
-dotnet_diagnostic.IDE0021.severity = none
-dotnet_diagnostic.IDE0022.severity = none
-dotnet_diagnostic.IDE0023.severity = none
-dotnet_diagnostic.IDE0024.severity = none
-dotnet_diagnostic.IDE0025.severity = none
-dotnet_diagnostic.IDE0026.severity = none
-dotnet_diagnostic.IDE0027.severity = none
+
+# IDE0021: Use expression body for constructor
+dotnet_diagnostic.IDE0021.severity = warning
+
+# IDE0022: Use expression body for method
+dotnet_diagnostic.IDE0022.severity = warning
+
+# IDE0023: Use expression body for conversion operator
+dotnet_diagnostic.IDE0023.severity = warning
+
+# IDE0024: Use expression body for operator
+dotnet_diagnostic.IDE0024.severity = warning
+
+# IDE0025: Use expression body for property
+dotnet_diagnostic.IDE0025.severity = warning
+
+# IDE0026: Use expression body for indexer
+dotnet_diagnostic.IDE0026.severity = warning
+
+# IDE0027: Use expression body for accessor
+dotnet_diagnostic.IDE0027.severity = warning
+
+# IDE0028: Simplify collection initialization
 dotnet_diagnostic.IDE0028.severity = warning
+
+# IDE0029: Use coalesce expression
 dotnet_diagnostic.IDE0029.severity = warning
+
+# IDE0030: Use coalesce expression
 dotnet_diagnostic.IDE0030.severity = warning
+
+# IDE0031: Use null propagation
 dotnet_diagnostic.IDE0031.severity = warning
-dotnet_diagnostic.IDE0032.severity = warning
+
+# IDE0034: Simplify 'default' expression
 dotnet_diagnostic.IDE0034.severity = warning
+
+# IDE0032: Use auto property
+dotnet_diagnostic.IDE0032.severity = warning
+
+# IDE0036: Order modifiers
 dotnet_diagnostic.IDE0036.severity = warning
+
+# IDE0037: Use inferred member name
 dotnet_diagnostic.IDE0037.severity = warning
+
+# IDE0039: Use local function
 dotnet_diagnostic.IDE0039.severity = warning
+
+# IDE0040: Add accessibility modifiers
 dotnet_diagnostic.IDE0040.severity = warning
+
+# IDE0041: Use 'is null' check
 dotnet_diagnostic.IDE0041.severity = warning
-dotnet_diagnostic.IDE0042.severity = warning
+
+# IDE0044: Add readonly modifier
+dotnet_diagnostic.IDE0044.severity = warning
+
+# IDE0045: Convert to conditional expression
 dotnet_diagnostic.IDE0045.severity = warning
-dotnet_diagnostic.IDE0046.severity = none
+
+# IDE0046: Convert to conditional expression
+dotnet_diagnostic.IDE0046.severity = warning
+
+# IDE0047: Remove unnecessary parentheses
 dotnet_diagnostic.IDE0047.severity = warning
+
+# IDE0043: Invalid format string
+dotnet_diagnostic.IDE0043.severity = warning
+
+# IDE0048: Add parentheses for clarity
 dotnet_diagnostic.IDE0048.severity = warning
-dotnet_diagnostic.IDE0055.severity = warning
+
+# IDE0053: Use block body for lambda expression
+dotnet_diagnostic.IDE0053.severity = warning
+
+# IDE0054: Use compound assignment
 dotnet_diagnostic.IDE0054.severity = warning
+
+# IDE0055: Fix formatting
+dotnet_diagnostic.IDE0055.severity = warning
+
+# IDE0056: Use index operator
 dotnet_diagnostic.IDE0056.severity = warning
-dotnet_diagnostic.IDE0057.severity = warning
-dotnet_diagnostic.IDE0058.severity = warning
-dotnet_diagnostic.IDE0060.severity = warning
-dotnet_diagnostic.IDE0066.severity = warning
+
+# IDE0058: Expression value is never used
+dotnet_diagnostic.IDE0058.severity = suggestion
+
+# IDE0059: Unnecessary assignment of a value
 dotnet_diagnostic.IDE0059.severity = warning
+
+# IDE0060: Remove unused parameter
+dotnet_diagnostic.IDE0060.severity = warning
+
+# IDE0061: Use expression body for local function
 dotnet_diagnostic.IDE0061.severity = warning
+
+# IDE0062: Make local function 'static'
 dotnet_diagnostic.IDE0062.severity = warning
+
+# IDE0063: Use simple 'using' statement
+dotnet_diagnostic.IDE0063.severity = warning
+
+# IDE0064: Make readonly fields writable
+dotnet_diagnostic.IDE0064.severity = warning
+
+# IDE0065: Misplaced using directive
+dotnet_diagnostic.IDE0065.severity = warning
+
+# IDE0066: Convert switch statement to expression
+dotnet_diagnostic.IDE0066.severity = warning
+
+# IDE0071: Simplify interpolation
 dotnet_diagnostic.IDE0071.severity = warning
-dotnet_diagnostic.IDE0072.severity = warning
-dotnet_diagnostic.IDE0073.severity = none
+
+# IDE0073: The file header does not match the required text
+dotnet_diagnostic.IDE0073.severity = warning
+
+# IDE0074: Use compound assignment
 dotnet_diagnostic.IDE0074.severity = warning
+
+# IDE0075: Simplify conditional expression
 dotnet_diagnostic.IDE0075.severity = warning
+
+# IDE0076: Invalid global 'SuppressMessageAttribute'
+dotnet_diagnostic.IDE0076.severity = warning
+
+# IDE0077: Avoid legacy format target in 'SuppressMessageAttribute'
+dotnet_diagnostic.IDE0077.severity = warning
+
+# IDE0078: Use pattern matching
 dotnet_diagnostic.IDE0078.severity = warning
+
+# IDE0080: Remove unnecessary suppression operator
 dotnet_diagnostic.IDE0080.severity = warning
+
+# IDE0082: 'typeof' can be converted  to 'nameof'
 dotnet_diagnostic.IDE0082.severity = warning
+
+# IDE0083: Use pattern matching
 dotnet_diagnostic.IDE0083.severity = warning
+
+# IDE0090: Use 'new(...)'
 dotnet_diagnostic.IDE0090.severity = warning
-dotnet_diagnostic.IDE0100.severity = warning
+
+# IDE0110: Remove unnecessary discard
 dotnet_diagnostic.IDE0110.severity = warning
+
+# IDE0120: Simplify LINQ expression
 dotnet_diagnostic.IDE0120.severity = warning
+
+# IDE0130: Namespace does not match folder structure
 dotnet_diagnostic.IDE0130.severity = none
+
+# IDE0150: Prefer 'null' check over type check
 dotnet_diagnostic.IDE0150.severity = warning
+
+# IDE0160: Convert to block scoped namespace
 dotnet_diagnostic.IDE0160.severity = warning
-dotnet_diagnostic.IDE0161.severity = warning
+
+# IDE0170: Property pattern can be simplified
 dotnet_diagnostic.IDE0170.severity = warning
-dotnet_diagnostic.IDE0190.severity = warning
+
+# IDE0180: Use tuple to swap values
 dotnet_diagnostic.IDE0180.severity = warning
+
+# IDE0200: Remove unnecessary lambda expression
 dotnet_diagnostic.IDE0200.severity = warning
+
+# IDE0210: Convert to top-level statements
+dotnet_diagnostic.IDE0210.severity = warning
+
+# IDE0211: Convert to 'Program.Main' style program
+dotnet_diagnostic.IDE0211.severity = warning
+
+# IDE0230: Use UTF-8 string literal
+dotnet_diagnostic.IDE0230.severity = warning
+
+# IDE0240: Remove redundant nullable directive
+dotnet_diagnostic.IDE0240.severity = warning
+
+# IDE0241: Remove unnecessary nullable directive
+dotnet_diagnostic.IDE0241.severity = warning
+
+# IDE0250: Make struct 'readonly'
+dotnet_diagnostic.IDE0250.severity = warning
+
+# IDE0260: Use pattern matching
+dotnet_diagnostic.IDE0260.severity = warning
+
+# IDE0270: Use coalesce expression
+dotnet_diagnostic.IDE0270.severity = warning
+
+# IDE0280: Use 'nameof'
+dotnet_diagnostic.IDE0280.severity = warning
+
+# IDE1005: Delegate invocation can be simplified.
 dotnet_diagnostic.IDE1005.severity = warning
-dotnet_diagnostic.IDE1006.severity = warning
+
+# IDE2000: Avoid multiple blank lines
 dotnet_diagnostic.IDE2000.severity = warning
+
+# IDE2001: Embedded statements must be on their own line
 dotnet_diagnostic.IDE2001.severity = warning
+
+# IDE2002: Consecutive braces must not have blank line between them
 dotnet_diagnostic.IDE2002.severity = warning
+
+# IDE2003: Blank line required between block and subsequent statement
 dotnet_diagnostic.IDE2003.severity = warning
+
+# IDE2004: Blank line not allowed after constructor initializer colon
 dotnet_diagnostic.IDE2004.severity = warning
-dotnet_diagnostic.CA2244.severity = warning
-dotnet_diagnostic.CA2246.severity = warning
-dotnet_diagnostic.SA1633.severity = none
-dotnet_diagnostic.SA1600.severity = none
-dotnet_diagnostic.SA1601.severity = none
-dotnet_diagnostic.SA1602.severity = none
-dotnet_diagnostic.SA1101.severity = none
-dotnet_diagnostic.SA1503.severity = none
-dotnet_diagnostic.SA1413.severity = none
-dotnet_diagnostic.SA1210.severity = none
-dotnet_diagnostic.SA0001.severity = none
 
-[*.{cs,vb}]
-dotnet_style_operator_placement_when_wrapping = beginning_of_line
-tab_width = 4
-indent_size = 4
-end_of_line = crlf
-dotnet_style_coalesce_expression = true:warning
-dotnet_style_null_propagation = true:warning
-dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning
-dotnet_style_prefer_auto_properties = true:warning
-dotnet_style_object_initializer = true:warning
-dotnet_style_collection_initializer = true:warning
-dotnet_style_prefer_simplified_boolean_expressions = true:warning
-dotnet_style_prefer_conditional_expression_over_assignment = true:warning
-dotnet_style_prefer_conditional_expression_over_return = true:warning
-dotnet_style_explicit_tuple_names = true:warning
-dotnet_style_prefer_inferred_tuple_names = true:warning
-dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning
-dotnet_style_prefer_compound_assignment = true:warning
-dotnet_style_prefer_simplified_interpolation = true:warning
-dotnet_style_namespace_match_folder = true:none
-dotnet_diagnostic.CA1834.severity = warning
-dotnet_diagnostic.CA2249.severity = warning
-dotnet_diagnostic.CA1000.severity = warning
-dotnet_diagnostic.CA1010.severity = warning
-dotnet_diagnostic.CA1016.severity = warning
-dotnet_diagnostic.CA1018.severity = warning
-dotnet_diagnostic.CA1041.severity = warning
-dotnet_diagnostic.CA1050.severity = warning
-dotnet_diagnostic.CA1051.severity = warning
-dotnet_diagnostic.CA1061.severity = warning
-dotnet_diagnostic.CA1067.severity = warning
-dotnet_diagnostic.CA1068.severity = warning
-dotnet_diagnostic.CA1069.severity = warning
-dotnet_diagnostic.CA1304.severity = warning
-dotnet_diagnostic.CA1305.severity = warning
-dotnet_diagnostic.CA1310.severity = warning
-dotnet_diagnostic.CA2101.severity = warning
-dotnet_diagnostic.CA1401.severity = warning
-dotnet_diagnostic.CA1419.severity = warning
-dotnet_diagnostic.CA1707.severity = warning
-dotnet_diagnostic.CA1708.severity = warning
-dotnet_diagnostic.CA1710.severity = warning
-dotnet_diagnostic.CA1711.severity = warning
-dotnet_diagnostic.CA1712.severity = warning
-dotnet_diagnostic.CA1715.severity = warning
-dotnet_diagnostic.CA1716.severity = warning
-dotnet_diagnostic.CA1720.severity = warning
-dotnet_diagnostic.CA1725.severity = warning
-dotnet_diagnostic.CA1806.severity = warning
-dotnet_diagnostic.CA1821.severity = warning
-dotnet_diagnostic.CA1822.severity = warning
-dotnet_diagnostic.CA1826.severity = warning
-dotnet_diagnostic.CA1827.severity = warning
-dotnet_diagnostic.CA1828.severity = warning
-dotnet_diagnostic.CA1829.severity = warning
-dotnet_diagnostic.CA1830.severity = warning
-dotnet_diagnostic.CA1832.severity = warning
-dotnet_diagnostic.CA1833.severity = warning
-dotnet_diagnostic.CA1835.severity = warning
-dotnet_diagnostic.CA1836.severity = warning
-dotnet_diagnostic.CA1837.severity = warning
-dotnet_diagnostic.CA1838.severity = warning
-dotnet_diagnostic.CA1839.severity = warning
-dotnet_diagnostic.CA1840.severity = warning
-dotnet_diagnostic.CA1842.severity = warning
-dotnet_diagnostic.CA1843.severity = warning
-dotnet_diagnostic.CA1844.severity = warning
-dotnet_diagnostic.CA1846.severity = warning
-dotnet_diagnostic.CA1847.severity = warning
-dotnet_diagnostic.CA1848.severity = warning
-dotnet_diagnostic.CA1850.severity = warning
-dotnet_diagnostic.CA2009.severity = warning
-dotnet_diagnostic.CA2011.severity = warning
-dotnet_diagnostic.CA2012.severity = warning
-dotnet_diagnostic.CA3061.severity = warning
-dotnet_diagnostic.CA3075.severity = warning
-dotnet_diagnostic.CA3076.severity = warning
-dotnet_diagnostic.CA3077.severity = warning
-dotnet_diagnostic.CA3147.severity = warning
+# IDE2005: Blank line not allowed after conditional expression token
+dotnet_diagnostic.IDE2005.severity = warning
+
+# IDE2006: Blank line not allowed after arrow expression clause token
+dotnet_diagnostic.IDE2006.severity = warning
+
+# CA1001: Types that own disposable fields should be disposable
+dotnet_diagnostic.CA1001.severity = warning
+
+# CA1032: Implement standard exception constructors
+dotnet_diagnostic.CA1032.severity = silent
+
+# CA1200: Avoid using cref tags with a prefix
+dotnet_diagnostic.CA1200.severity = warning
+
+# CA1311: Specify a culture or use an invariant version
+dotnet_diagnostic.CA1311.severity = warning
+
+# CA1507: Use nameof to express symbol names
+dotnet_diagnostic.CA1507.severity = warning
+
+# CA1802: Use literals where appropriate
+dotnet_diagnostic.CA1802.severity = warning
+
+# CA1805: Do not initialize unnecessarily
+dotnet_diagnostic.CA1805.severity = warning
+
+# CA1824: Mark assemblies with NeutralResourcesLanguageAttribute
+dotnet_diagnostic.CA1824.severity = warning
+
+# CA1825: Avoid zero-length array allocations
+dotnet_diagnostic.CA1825.severity = warning
+
+# CA1841: Prefer Dictionary.Contains methods
+dotnet_diagnostic.CA1841.severity = warning
+
+# CA1845: Use span-based 'string.Concat'
+dotnet_diagnostic.CA1845.severity = warning
+
+# CA1851: Possible multiple enumerations of 'IEnumerable' collection
+dotnet_diagnostic.CA1851.severity = warning
+
+# CA1855: Prefer 'Clear' over 'Fill'
+dotnet_diagnostic.CA1855.severity = warning
+
+# CA2014: Do not use stackalloc in loops
+dotnet_diagnostic.CA2014.severity = warning
+
+# CA2016: Forward the 'CancellationToken' parameter to methods
+dotnet_diagnostic.CA2016.severity = warning
+
+# CA2020: Prevent from behavioral change
+dotnet_diagnostic.CA2020.severity = warning
+
+# CA2234: Pass system uri objects instead of strings
+dotnet_diagnostic.CA2234.severity = warning
+
+# CA2252: This API requires opting into preview features
+dotnet_diagnostic.CA2252.severity = warning
+
+# CA2352: Unsafe DataSet or DataTable in serializable type can be vulnerable to remote code execution attacks
+dotnet_diagnostic.CA2352.severity = warning
+
+# CA2353: Unsafe DataSet or DataTable in serializable type
+dotnet_diagnostic.CA2353.severity = warning
+
+# CA2354: Unsafe DataSet or DataTable in deserialized object graph can be vulnerable to remote code execution attacks
+dotnet_diagnostic.CA2354.severity = warning
+
+# CA2355: Unsafe DataSet or DataTable type found in deserializable object graph
+dotnet_diagnostic.CA2355.severity = warning
+
+# CA2362: Unsafe DataSet or DataTable in auto-generated serializable type can be vulnerable to remote code execution attacks
+dotnet_diagnostic.CA2362.severity = warning
+
+# CA1812: Avoid uninstantiated internal classes
+dotnet_diagnostic.CA1812.severity = none
+
+# CA1309: Use ordinal string comparison
+dotnet_diagnostic.CA1309.severity = warning
+
+# CA2356: Unsafe DataSet or DataTable type in web deserializable object graph
+dotnet_diagnostic.CA2356.severity = warning
+
+# IDE1006: Naming Styles
+dotnet_diagnostic.IDE1006.severity = warning
+
+# IDE0220: Add explicit cast
+dotnet_diagnostic.IDE0220.severity = warning
+
+# IDE0161: Convert to file-scoped namespace
+dotnet_diagnostic.IDE0161.severity = warning
+
+# IDE0100: Remove redundant equality
+dotnet_diagnostic.IDE0100.severity = warning
+
+# IDE0072: Add missing cases
+dotnet_diagnostic.IDE0072.severity = warning
+
+# IDE0057: Use range operator
+dotnet_diagnostic.IDE0057.severity = warning
+
+# IDE0042: Deconstruct variable declaration
+dotnet_diagnostic.IDE0042.severity = warning
+
+# IDE0051: Remove unused private members
+dotnet_diagnostic.IDE0051.severity = warning
+
+# IDE0052: Remove unread private members
+dotnet_diagnostic.IDE0052.severity = warning
+
+# IDE0010: Add missing cases
+dotnet_diagnostic.IDE0010.severity = suggestion
+
+# CA1000: Do not declare static members on generic types
+dotnet_diagnostic.CA1000.severity = warning
+
+# CA1002: Do not expose generic lists
+dotnet_diagnostic.CA1002.severity = warning
+
+# CA1003: Use generic event handler instances
+dotnet_diagnostic.CA1003.severity = warning
+
+# CA1005: Avoid excessive parameters on generic types
+dotnet_diagnostic.CA1005.severity = warning
+
+# CA1008: Enums should have zero value
+dotnet_diagnostic.CA1008.severity = silent
+
+# CA1010: Generic interface should also be implemented
+dotnet_diagnostic.CA1010.severity = warning
+
+# CA1014: Mark assemblies with CLSCompliant
+dotnet_diagnostic.CA1014.severity = warning
+
+# CA1012: Abstract types should not have public constructors
+dotnet_diagnostic.CA1012.severity = warning
+
+# CA1016: Mark assemblies with assembly version
+dotnet_diagnostic.CA1016.severity = warning
+
+# CA1017: Mark assemblies with ComVisible
+dotnet_diagnostic.CA1017.severity = warning
+
+# CA1019: Define accessors for attribute arguments
+dotnet_diagnostic.CA1019.severity = warning
+
+# CA1021: Avoid out parameters
+dotnet_diagnostic.CA1021.severity = warning
+
+# CA1024: Use properties where appropriate
+dotnet_diagnostic.CA1024.severity = warning
+
+# CA1027: Mark enums with FlagsAttribute
+dotnet_diagnostic.CA1027.severity = warning
+
+# CA1030: Use events where appropriate
+dotnet_diagnostic.CA1030.severity = warning
+
+# CA1031: Do not catch general exception types
+dotnet_diagnostic.CA1031.severity = suggestion
+
+# CA1033: Interface methods should be callable by child types
+dotnet_diagnostic.CA1033.severity = warning
+
+# CA1034: Nested types should not be visible
+dotnet_diagnostic.CA1034.severity = warning
+
+# CA1036: Override methods on comparable types
+dotnet_diagnostic.CA1036.severity = warning
+
+# CA1040: Avoid empty interfaces
+dotnet_diagnostic.CA1040.severity = warning
+
+# CA1041: Provide ObsoleteAttribute message
+dotnet_diagnostic.CA1041.severity = warning
+
+# CA1043: Use Integral Or String Argument For Indexers
+dotnet_diagnostic.CA1043.severity = warning
+
+# CA1045: Do not pass types by reference
+dotnet_diagnostic.CA1045.severity = warning
+
+# CA1046: Do not overload equality operator on reference types
+dotnet_diagnostic.CA1046.severity = warning
+
+# CA1050: Declare types in namespaces
+dotnet_diagnostic.CA1050.severity = warning
+
+# CA1052: Static holder types should be Static or NotInheritable
+dotnet_diagnostic.CA1052.severity = warning
+
+# CA1054: URI-like parameters should not be strings
+dotnet_diagnostic.CA1054.severity = warning
+
+# CA1055: URI-like return values should not be strings
+dotnet_diagnostic.CA1055.severity = warning
+
+# CA1058: Types should not extend certain base types
+dotnet_diagnostic.CA1058.severity = warning
+
+# CA1060: Move pinvokes to native methods class
+dotnet_diagnostic.CA1060.severity = warning
+
+# CA1061: Do not hide base class methods
+dotnet_diagnostic.CA1061.severity = warning
+
+# CA1063: Implement IDisposable Correctly
+dotnet_diagnostic.CA1063.severity = warning
+
+# CA1065: Do not raise exceptions in unexpected locations
+dotnet_diagnostic.CA1065.severity = warning
+
+# CA1066: Implement IEquatable when overriding Object.Equals
+dotnet_diagnostic.CA1066.severity = warning
+
+# CA1068: CancellationToken parameters must come last
+dotnet_diagnostic.CA1068.severity = warning
+
+# CA1069: Enums values should not be duplicated
+dotnet_diagnostic.CA1069.severity = warning
+
+# CA1303: Do not pass literals as localized parameters
+dotnet_diagnostic.CA1303.severity = warning
+
+# CA1304: Specify CultureInfo
+dotnet_diagnostic.CA1304.severity = warning
+
+# CA1307: Specify StringComparison for clarity
+dotnet_diagnostic.CA1307.severity = warning
+
+# CA1308: Normalize strings to uppercase
+dotnet_diagnostic.CA1308.severity = warning
+
+# CA1401: P/Invokes should not be visible
+dotnet_diagnostic.CA1401.severity = warning
+
+# CA1416: Validate platform compatibility
+dotnet_diagnostic.CA1416.severity = warning
+
+# CA1417: Do not use 'OutAttribute' on string parameters for P/Invokes
+dotnet_diagnostic.CA1417.severity = warning
+
+# CA1419: Provide a parameterless constructor that is as visible as the containing type for concrete types derived from 'System.Runtime.InteropServices.SafeHandle'
+dotnet_diagnostic.CA1419.severity = warning
+
+# CA1420: Property, type, or attribute requires runtime marshalling
+dotnet_diagnostic.CA1420.severity = warning
+
+# CA1422: Validate platform compatibility
+dotnet_diagnostic.CA1422.severity = warning
+
+# CA1501: Avoid excessive inheritance
+dotnet_diagnostic.CA1501.severity = warning
+
+# CA1502: Avoid excessive complexity
+dotnet_diagnostic.CA1502.severity = warning
+
+# CA1505: Avoid unmaintainable code
+dotnet_diagnostic.CA1505.severity = warning
+
+# CA1506: Avoid excessive class coupling
+dotnet_diagnostic.CA1506.severity = warning
+
+# CA1508: Avoid dead conditional code
+dotnet_diagnostic.CA1508.severity = warning
+
+# CA1509: Invalid entry in code metrics rule specification file
+dotnet_diagnostic.CA1509.severity = warning
+
+# CA1707: Identifiers should not contain underscores
+dotnet_diagnostic.CA1707.severity = silent
+
+# CA1708: Identifiers should differ by more than case
+dotnet_diagnostic.CA1708.severity = warning
+
+# CA1710: Identifiers should have correct suffix
+dotnet_diagnostic.CA1710.severity = warning
+
+# CA1711: Identifiers should not have incorrect suffix
+dotnet_diagnostic.CA1711.severity = silent
+
+# CA1712: Do not prefix enum values with type name
+dotnet_diagnostic.CA1712.severity = warning
+
+# CA1713: Events should not have 'Before' or 'After' prefix
+dotnet_diagnostic.CA1713.severity = warning
+
+# CA1715: Identifiers should have correct prefix
+dotnet_diagnostic.CA1715.severity = warning
+
+# CA1720: Identifier contains type name
+dotnet_diagnostic.CA1720.severity = warning
+
+# CA1721: Property names should not match get methods
+dotnet_diagnostic.CA1721.severity = warning
+
+# CA1724: Type names should not match namespaces
+dotnet_diagnostic.CA1724.severity = warning
+
+# CA1727: Use PascalCase for named placeholders
+dotnet_diagnostic.CA1727.severity = warning
+
+# CA1810: Initialize reference type static fields inline
+dotnet_diagnostic.CA1810.severity = warning
+
+# CA1813: Avoid unsealed attributes
+dotnet_diagnostic.CA1813.severity = warning
+
+# CA1815: Override equals and operator equals on value types
+dotnet_diagnostic.CA1815.severity = warning
+
+# CA1816: Dispose methods should call SuppressFinalize
+dotnet_diagnostic.CA1816.severity = warning
+
+# CA1820: Test for empty strings using string length
+dotnet_diagnostic.CA1820.severity = warning
+
+# CA1821: Remove empty Finalizers
+dotnet_diagnostic.CA1821.severity = warning
+
+# CA1822: Mark members as static
+dotnet_diagnostic.CA1822.severity = warning
+
+# CA1826: Do not use Enumerable methods on indexable collections
+dotnet_diagnostic.CA1826.severity = warning
+
+# CA1827: Do not use Count() or LongCount() when Any() can be used
+dotnet_diagnostic.CA1827.severity = warning
+
+# CA1828: Do not use CountAsync() or LongCountAsync() when AnyAsync() can be used
+dotnet_diagnostic.CA1828.severity = warning
+
+# CA1830: Prefer strongly-typed Append and Insert method overloads on StringBuilder
+dotnet_diagnostic.CA1830.severity = warning
+
+# CA1831: Use AsSpan or AsMemory instead of Range-based indexers when appropriate
+dotnet_diagnostic.CA1831.severity = warning
+
+# CA1833: Use AsSpan or AsMemory instead of Range-based indexers when appropriate
+dotnet_diagnostic.CA1833.severity = warning
+
+# CA1834: Consider using 'StringBuilder.Append(char)' when applicable
+dotnet_diagnostic.CA1834.severity = warning
+
+# CA1835: Prefer the 'Memory'-based overloads for 'ReadAsync' and 'WriteAsync'
+dotnet_diagnostic.CA1835.severity = warning
+
+# CA1837: Use 'Environment.ProcessId'
+dotnet_diagnostic.CA1837.severity = warning
+
+# CA1838: Avoid 'StringBuilder' parameters for P/Invokes
+dotnet_diagnostic.CA1838.severity = warning
+
+# CA1839: Use 'Environment.ProcessPath'
+dotnet_diagnostic.CA1839.severity = warning
+
+# CA1840: Use 'Environment.CurrentManagedThreadId'
+dotnet_diagnostic.CA1840.severity = warning
+
+# CA1842: Do not use 'WhenAll' with a single task
+dotnet_diagnostic.CA1842.severity = warning
+
+# CA1844: Provide memory-based overrides of async methods when subclassing 'Stream'
+dotnet_diagnostic.CA1844.severity = warning
+
+# CA1846: Prefer 'AsSpan' over 'Substring'
+dotnet_diagnostic.CA1846.severity = warning
+
+# CA1847: Use char literal for a single character lookup
+dotnet_diagnostic.CA1847.severity = warning
+
+# CA1849: Call async methods when in an async method
+dotnet_diagnostic.CA1849.severity = warning
+
+# CA1850: Prefer static 'HashData' method over 'ComputeHash'
+dotnet_diagnostic.CA1850.severity = warning
+
+# CA1853: Unnecessary call to 'Dictionary.ContainsKey(key)'
+dotnet_diagnostic.CA1853.severity = warning
+
+# CA2000: Dispose objects before losing scope
+dotnet_diagnostic.CA2000.severity = warning
+
+# CA2002: Do not lock on objects with weak identity
+dotnet_diagnostic.CA2002.severity = warning
+
+# CA2007: Consider calling ConfigureAwait on the awaited task
+dotnet_diagnostic.CA2007.severity = warning
+
+# CA2008: Do not create tasks without passing a TaskScheduler
+dotnet_diagnostic.CA2008.severity = warning
+
+# CA2009: Do not call ToImmutableCollection on an ImmutableCollection value
+dotnet_diagnostic.CA2009.severity = warning
+
+# CA2012: Use ValueTasks correctly
+dotnet_diagnostic.CA2012.severity = warning
+
+# CA1028: Enum Storage should be Int32
+dotnet_diagnostic.CA1028.severity = warning
+
+# CA1056: URI-like properties should not be strings
+dotnet_diagnostic.CA1056.severity = warning
+
+# CA1067: Override Object.Equals(object) when implementing IEquatable<T>
+dotnet_diagnostic.CA1067.severity = warning
+
+# CA1418: Use valid platform string
+dotnet_diagnostic.CA1418.severity = warning
+
+# CA1421: This method uses runtime marshalling even when the 'DisableRuntimeMarshallingAttribute' is applied
+dotnet_diagnostic.CA1421.severity = warning
+
+# CA1700: Do not name enum values 'Reserved'
+dotnet_diagnostic.CA1700.severity = warning
+
+# CA1716: Identifiers should not match keywords
+dotnet_diagnostic.CA1716.severity = warning
+
+# CA1725: Parameter names should match base declaration
+dotnet_diagnostic.CA1725.severity = warning
+
+# CA1806: Do not ignore method results
+dotnet_diagnostic.CA1806.severity = warning
+
+# CA1819: Properties should not return arrays
+dotnet_diagnostic.CA1819.severity = warning
+
+# CA1823: Avoid unused private fields
+dotnet_diagnostic.CA1823.severity = warning
+
+# CA1836: Prefer IsEmpty over Count
+dotnet_diagnostic.CA1836.severity = warning
+
+# CA1843: Do not use 'WaitAll' with a single task
+dotnet_diagnostic.CA1843.severity = warning
+
+# CA1018: Mark attributes with AttributeUsageAttribute
+dotnet_diagnostic.CA1018.severity = warning
+
+# CA1044: Properties should not be write only
+dotnet_diagnostic.CA1044.severity = warning
+
+# CA1051: Do not declare visible instance fields
+dotnet_diagnostic.CA1051.severity = warning
+
+# CA1062: Validate arguments of public methods
+dotnet_diagnostic.CA1062.severity = none
+
+# CA1064: Exceptions should be public
+dotnet_diagnostic.CA1064.severity = warning
+
+# CA1070: Do not declare event fields as virtual
+dotnet_diagnostic.CA1070.severity = warning
+
+# CA1305: Specify IFormatProvider
+dotnet_diagnostic.CA1305.severity = warning
+
+# CA1310: Specify StringComparison for correctness
+dotnet_diagnostic.CA1310.severity = warning
+
+# CA1814: Prefer jagged arrays over multidimensional
+dotnet_diagnostic.CA1814.severity = warning
+
+# CA1829: Use Length/Count property instead of Count() when available
+dotnet_diagnostic.CA1829.severity = warning
+
+# CA1832: Use AsSpan or AsMemory instead of Range-based indexers when appropriate
+dotnet_diagnostic.CA1832.severity = warning
+
+# CA1848: Use the LoggerMessage delegates
+dotnet_diagnostic.CA1848.severity = warning
+
+# CA1854: Prefer the 'IDictionary.TryGetValue(TKey, out TValue)' method
+dotnet_diagnostic.CA1854.severity = warning
+
+# CA2011: Avoid infinite recursion
+dotnet_diagnostic.CA2011.severity = warning
+
+# CA2013: Do not use ReferenceEquals with value types
+dotnet_diagnostic.CA2013.severity = warning
+
+# CA2015: Do not define finalizers for types derived from MemoryManager<T>
+dotnet_diagnostic.CA2015.severity = warning
+
+# CA2018: 'Buffer.BlockCopy' expects the number of bytes to be copied for the 'count' argument
+dotnet_diagnostic.CA2018.severity = warning
+
+# CA2019: Improper 'ThreadStatic' field initialization
+dotnet_diagnostic.CA2019.severity = warning
+
+# CA2100: Review SQL queries for security vulnerabilities
+dotnet_diagnostic.CA2100.severity = warning
+
+# CA2109: Review visible event handlers
+dotnet_diagnostic.CA2109.severity = warning
+
+# CA2119: Seal methods that satisfy private interfaces
+dotnet_diagnostic.CA2119.severity = warning
+
+# CA2153: Do Not Catch Corrupted State Exceptions
+dotnet_diagnostic.CA2153.severity = warning
+
+# CA1852: Seal internal types
+dotnet_diagnostic.CA1852.severity = warning
+
+# CA2101: Specify marshaling for P/Invoke string arguments
+dotnet_diagnostic.CA2101.severity = warning
+
+# CA2201: Do not raise reserved exception types
+dotnet_diagnostic.CA2201.severity = warning
+
+# CA2207: Initialize value type static fields inline
+dotnet_diagnostic.CA2207.severity = warning
+
+# CA2208: Instantiate argument exceptions correctly
+dotnet_diagnostic.CA2208.severity = none
+
+# CA2213: Disposable fields should be disposed
+dotnet_diagnostic.CA2213.severity = warning
+
+# CA2214: Do not call overridable methods in constructors
+dotnet_diagnostic.CA2214.severity = warning
+
+# CA2215: Dispose methods should call base class dispose
+dotnet_diagnostic.CA2215.severity = warning
+
+# CA2216: Disposable types should declare finalizer
+dotnet_diagnostic.CA2216.severity = warning
+
+# CA2217: Do not mark enums with FlagsAttribute
+dotnet_diagnostic.CA2217.severity = warning
+
+# CA2219: Do not raise exceptions in finally clauses
+dotnet_diagnostic.CA2219.severity = warning
+
+# CA2225: Operator overloads have named alternates
+dotnet_diagnostic.CA2225.severity = warning
+
+# CA2226: Operators should have symmetrical overloads
+dotnet_diagnostic.CA2226.severity = warning
+
+# CA2227: Collection properties should be read only
+dotnet_diagnostic.CA2227.severity = warning
+
+# CA2229: Implement serialization constructors
+dotnet_diagnostic.CA2229.severity = warning
+
+# CA2231: Overload operator equals on overriding value type Equals
+dotnet_diagnostic.CA2231.severity = warning
+
+# CA2235: Mark all non-serializable fields
+dotnet_diagnostic.CA2235.severity = warning
+
+# CA2241: Provide correct arguments to formatting methods
+dotnet_diagnostic.CA2241.severity = warning
+
+# CA2242: Test for NaN correctly
+dotnet_diagnostic.CA2242.severity = warning
+
+# CA2243: Attribute string literals should parse correctly
+dotnet_diagnostic.CA2243.severity = warning
+
+# CA2211: Non-constant fields should not be visible
+dotnet_diagnostic.CA2211.severity = warning
+
+# CA2237: Mark ISerializable types with serializable
+dotnet_diagnostic.CA2237.severity = none
+
+# CA2244: Do not duplicate indexed element initializations
+dotnet_diagnostic.CA2244.severity = warning
+
+# CA2245: Do not assign a property to itself
+dotnet_diagnostic.CA2245.severity = warning
+
+# CA2246: Assigning symbol and its member in the same statement
+dotnet_diagnostic.CA2246.severity = warning
+
+# CA2247: Argument passed to TaskCompletionSource constructor should be TaskCreationOptions enum instead of TaskContinuationOptions enum
+dotnet_diagnostic.CA2247.severity = warning
+
+# CA2248: Provide correct 'enum' argument to 'Enum.HasFlag'
+dotnet_diagnostic.CA2248.severity = warning
+
+# CA2249: Consider using 'string.Contains' instead of 'string.IndexOf'
+dotnet_diagnostic.CA2249.severity = warning
+
+# CA2250: Use 'ThrowIfCancellationRequested'
+dotnet_diagnostic.CA2250.severity = warning
+
+# CA2251: Use 'string.Equals'
+dotnet_diagnostic.CA2251.severity = warning
+
+# CA2253: Named placeholders should not be numeric values
+dotnet_diagnostic.CA2253.severity = warning
+
+# CA2254: Template should be a static expression
+dotnet_diagnostic.CA2254.severity = warning
+
+# CA2300: Do not use insecure deserializer BinaryFormatter
+dotnet_diagnostic.CA2300.severity = warning
+
+# CA2301: Do not call BinaryFormatter.Deserialize without first setting BinaryFormatter.Binder
+dotnet_diagnostic.CA2301.severity = warning
+
+# CA2302: Ensure BinaryFormatter.Binder is set before calling BinaryFormatter.Deserialize
+dotnet_diagnostic.CA2302.severity = warning
+
+# CA2305: Do not use insecure deserializer LosFormatter
+dotnet_diagnostic.CA2305.severity = warning
+
+# CA2311: Do not deserialize without first setting NetDataContractSerializer.Binder
+dotnet_diagnostic.CA2311.severity = warning
+
+# CA2312: Ensure NetDataContractSerializer.Binder is set before deserializing
+dotnet_diagnostic.CA2312.severity = warning
+
+# CA2315: Do not use insecure deserializer ObjectStateFormatter
+dotnet_diagnostic.CA2315.severity = warning
+
+# CA2321: Do not deserialize with JavaScriptSerializer using a SimpleTypeResolver
+dotnet_diagnostic.CA2321.severity = warning
+
+# CA2326: Do not use TypeNameHandling values other than None
+dotnet_diagnostic.CA2326.severity = warning
+
+# CA2327: Do not use insecure JsonSerializerSettings
+dotnet_diagnostic.CA2327.severity = warning
+
+# CA2328: Ensure that JsonSerializerSettings are secure
+dotnet_diagnostic.CA2328.severity = warning
+
+# CA2329: Do not deserialize with JsonSerializer using an insecure configuration
+dotnet_diagnostic.CA2329.severity = warning
+
+# CA2330: Ensure that JsonSerializer has a secure configuration when deserializing
+dotnet_diagnostic.CA2330.severity = warning
+
+# CA2351: Do not use DataSet.ReadXml() with untrusted data
+dotnet_diagnostic.CA2351.severity = warning
+
+# CA2361: Ensure auto-generated class containing DataSet.ReadXml() is not used with untrusted data
+dotnet_diagnostic.CA2361.severity = warning
+
+# CA3001: Review code for SQL injection vulnerabilities
+dotnet_diagnostic.CA3001.severity = warning
+
+# CA3002: Review code for XSS vulnerabilities
+dotnet_diagnostic.CA3002.severity = warning
+
+# CA3003: Review code for file path injection vulnerabilities
+dotnet_diagnostic.CA3003.severity = warning
+
+# CA3005: Review code for LDAP injection vulnerabilities
+dotnet_diagnostic.CA3005.severity = warning
+
+# CA3006: Review code for process command injection vulnerabilities
+dotnet_diagnostic.CA3006.severity = warning
+
+# CA3007: Review code for open redirect vulnerabilities
+dotnet_diagnostic.CA3007.severity = warning
+
+# CA3008: Review code for XPath injection vulnerabilities
+dotnet_diagnostic.CA3008.severity = warning
+
+# CA3009: Review code for XML injection vulnerabilities
+dotnet_diagnostic.CA3009.severity = warning
+
+# CA2310: Do not use insecure deserializer NetDataContractSerializer
+dotnet_diagnostic.CA2310.severity = warning
+
+# CA2322: Ensure JavaScriptSerializer is not initialized with SimpleTypeResolver before deserializing
+dotnet_diagnostic.CA2322.severity = warning
+
+# CA2350: Do not use DataTable.ReadXml() with untrusted data
+dotnet_diagnostic.CA2350.severity = warning
+
+# CA3004: Review code for information disclosure vulnerabilities
+dotnet_diagnostic.CA3004.severity = warning
+
+# CA3010: Review code for XAML injection vulnerabilities
+dotnet_diagnostic.CA3010.severity = warning
+
+# CA3011: Review code for DLL injection vulnerabilities
+dotnet_diagnostic.CA3011.severity = warning
+
+# CA3012: Review code for regex injection vulnerabilities
+dotnet_diagnostic.CA3012.severity = warning
+
+# CA3061: Do Not Add Schema By URL
+dotnet_diagnostic.CA3061.severity = warning
+
+# CA3076: Insecure XSLT script processing
+dotnet_diagnostic.CA3076.severity = warning
+
+# CA3077: Insecure Processing in API Design, XmlDocument and XmlTextReader
+dotnet_diagnostic.CA3077.severity = warning
+
+# CA3147: Mark Verb Handlers With Validate Antiforgery Token
+dotnet_diagnostic.CA3147.severity = warning
+
+# CA5350: Do Not Use Weak Cryptographic Algorithms
 dotnet_diagnostic.CA5350.severity = warning
+
+# CA5351: Do Not Use Broken Cryptographic Algorithms
 dotnet_diagnostic.CA5351.severity = warning
+
+# CA5358: Review cipher mode usage with cryptography experts
+dotnet_diagnostic.CA5358.severity = warning
+
+# CA5359: Do Not Disable Certificate Validation
 dotnet_diagnostic.CA5359.severity = warning
+
+# CA5360: Do Not Call Dangerous Methods In Deserialization
 dotnet_diagnostic.CA5360.severity = warning
+
+# CA5362: Potential reference cycle in deserialized object graph
+dotnet_diagnostic.CA5362.severity = warning
+
+# CA5363: Do Not Disable Request Validation
 dotnet_diagnostic.CA5363.severity = warning
+
+# CA5364: Do Not Use Deprecated Security Protocols
 dotnet_diagnostic.CA5364.severity = warning
+
+# CA5365: Do Not Disable HTTP Header Checking
 dotnet_diagnostic.CA5365.severity = warning
-dotnet_diagnostic.CA5366.severity = warning
+
+# CA5367: Do Not Serialize Types With Pointer Fields
+dotnet_diagnostic.CA5367.severity = warning
+
+# CA5368: Set ViewStateUserKey For Classes Derived From Page
 dotnet_diagnostic.CA5368.severity = warning
+
+# CA3075: Insecure DTD processing in XML
+dotnet_diagnostic.CA3075.severity = warning
+
+# CA5361: Do Not Disable SChannel Use of Strong Crypto
+dotnet_diagnostic.CA5361.severity = warning
+
+# CA5366: Use XmlReader for 'DataSet.ReadXml()'
+dotnet_diagnostic.CA5366.severity = warning
+
+# CA5369: Use XmlReader for 'XmlSerializer.Deserialize()'
 dotnet_diagnostic.CA5369.severity = warning
+
+# CA5370: Use XmlReader for XmlValidatingReader constructor
 dotnet_diagnostic.CA5370.severity = warning
+
+# CA5371: Use XmlReader for 'XmlSchema.Read()'
 dotnet_diagnostic.CA5371.severity = warning
+
+# CA5372: Use XmlReader for XPathDocument constructor
 dotnet_diagnostic.CA5372.severity = warning
-dotnet_diagnostic.CA5373.severity = warning
+
+# CA5374: Do Not Use XslTransform
 dotnet_diagnostic.CA5374.severity = warning
-dotnet_diagnostic.CA5379.severity = warning
+
+# CA5375: Do Not Use Account Shared Access Signature
+dotnet_diagnostic.CA5375.severity = warning
+
+# CA5376: Use SharedAccessProtocol HttpsOnly
+dotnet_diagnostic.CA5376.severity = warning
+
+# CA5377: Use Container Level Access Policy
+dotnet_diagnostic.CA5377.severity = warning
+
+# CA5378: Do not disable ServicePointManagerSecurityProtocols
+dotnet_diagnostic.CA5378.severity = warning
+
+# CA5380: Do Not Add Certificates To Root Store
+dotnet_diagnostic.CA5380.severity = warning
+
+# CA5381: Ensure Certificates Are Not Added To Root Store
+dotnet_diagnostic.CA5381.severity = warning
+
+# CA5382: Use Secure Cookies In ASP.NET Core
+dotnet_diagnostic.CA5382.severity = warning
+
+# CA5383: Ensure Use Secure Cookies In ASP.NET Core
+dotnet_diagnostic.CA5383.severity = warning
+
+# CA5384: Do Not Use Digital Signature Algorithm (DSA)
 dotnet_diagnostic.CA5384.severity = warning
+
+# CA5385: Use Rivest-Shamir-Adleman (RSA) Algorithm With Sufficient Key Size
 dotnet_diagnostic.CA5385.severity = warning
+
+# CA5386: Avoid hardcoding SecurityProtocolType value
+dotnet_diagnostic.CA5386.severity = warning
+
+# CA5387: Do Not Use Weak Key Derivation Function With Insufficient Iteration Count
+dotnet_diagnostic.CA5387.severity = warning
+
+# CA5388: Ensure Sufficient Iteration Count When Using Weak Key Derivation Function
+dotnet_diagnostic.CA5388.severity = warning
+
+# CA5389: Do Not Add Archive Item's Path To The Target File System Path
+dotnet_diagnostic.CA5389.severity = warning
+
+# CA5379: Ensure Key Derivation Function algorithm is sufficiently strong
+dotnet_diagnostic.CA5379.severity = warning
+
+# CA5373: Do not use obsolete key derivation function
+dotnet_diagnostic.CA5373.severity = warning
+
+# CA5390: Do not hard-code encryption key
+dotnet_diagnostic.CA5390.severity = warning
+
+# CA5391: Use antiforgery tokens in ASP.NET Core MVC controllers
+dotnet_diagnostic.CA5391.severity = warning
+
+# CA5392: Use DefaultDllImportSearchPaths attribute for P/Invokes
+dotnet_diagnostic.CA5392.severity = warning
+
+# CA5393: Do not use unsafe DllImportSearchPath value
+dotnet_diagnostic.CA5393.severity = warning
+
+# CA5394: Do not use insecure randomness
+dotnet_diagnostic.CA5394.severity = warning
+
+# CA5395: Miss HttpVerb attribute for action methods
+dotnet_diagnostic.CA5395.severity = warning
+
+# CA5396: Set HttpOnly to true for HttpCookie
+dotnet_diagnostic.CA5396.severity = warning
+
+# CA5397: Do not use deprecated SslProtocols values
 dotnet_diagnostic.CA5397.severity = warning
-dotnet_diagnostic.IDE0033.severity = warning
-dotnet_diagnostic.IDE0044.severity = warning
-dotnet_diagnostic.IDE0070.severity = warning
-dotnet_diagnostic.CA1816.severity = warning
-dotnet_diagnostic.CA2201.severity = warning
-dotnet_diagnostic.CA2208.severity = warning
-dotnet_diagnostic.CA2211.severity = warning
-dotnet_diagnostic.CA2215.severity = warning
-dotnet_diagnostic.CA2219.severity = warning
-dotnet_diagnostic.CA2229.severity = warning
-dotnet_diagnostic.CA2231.severity = warning
-dotnet_diagnostic.CA2241.severity = warning
-dotnet_diagnostic.CA2242.severity = warning
-dotnet_diagnostic.CA2245.severity = warning
-dotnet_diagnostic.CA2248.severity = warning
-dotnet_diagnostic.CA2250.severity = warning
-dotnet_diagnostic.CA2251.severity = warning
-dotnet_diagnostic.CA2253.severity = warning
-dotnet_diagnostic.CA2254.severity = warning
-dotnet_style_readonly_field = true:warning
-dotnet_style_predefined_type_for_locals_parameters_members = true:warning
-dotnet_style_predefined_type_for_member_access = true:warning
-dotnet_style_require_accessibility_modifiers = always:warning
-dotnet_style_allow_multiple_blank_lines_experimental = false:warning
-dotnet_style_allow_statement_immediately_after_block_experimental = false:warning
-dotnet_code_quality_unused_parameters = all:warning
-dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:warning
-dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:warning
-dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:warning
-dotnet_style_parentheses_in_other_operators = never_if_unnecessary:warning
-dotnet_style_qualification_for_field = false:warning
-dotnet_style_qualification_for_property = false:warning
-dotnet_style_qualification_for_method = false:warning
-dotnet_style_qualification_for_event = false:warning
-dotnet_diagnostic.CA1036.severity = warning
-dotnet_diagnostic.CA1727.severity = warning
-[*.vb]
-dotnet_diagnostic.CA1047.severity = warning
\ No newline at end of file
+
+# CA5399: HttpClients should enable certificate revocation list checks
+dotnet_diagnostic.CA5399.severity = warning
+
+# CA5400: Ensure HttpClient certificate revocation list check is not disabled
+dotnet_diagnostic.CA5400.severity = warning
+
+# CA5401: Do not use CreateEncryptor with non-default IV
+dotnet_diagnostic.CA5401.severity = warning
+
+# CA5402: Use CreateEncryptor with the default IV 
+dotnet_diagnostic.CA5402.severity = warning
+
+# CA5403: Do not hard-code certificate
+dotnet_diagnostic.CA5403.severity = warning
+
+# CA5404: Do not disable token validation checks
+dotnet_diagnostic.CA5404.severity = warning
+
+# CA5405: Do not always skip token validation in delegates
+dotnet_diagnostic.CA5405.severity = warning
+
+# CA5398: Avoid hardcoded SslProtocols values
+dotnet_diagnostic.CA5398.severity = warning
+
+# SYSLIB1054: Use 'LibraryImportAttribute' instead of 'DllImportAttribute' to generate P/Invoke marshalling code at compile time
+dotnet_diagnostic.SYSLIB1054.severity = warning
+
+# SYSLIB1045: Convert to 'GeneratedRegexAttribute'.
+dotnet_diagnostic.SYSLIB1045.severity = warning
+
+# IDE0160: Convert to block scoped namespace
+csharp_style_namespace_declarations = file_scoped
+
+# IDE0008: Use explicit type
+csharp_style_var_when_type_is_apparent = true
+
+# IDE0011: Add braces
+csharp_prefer_braces = when_multiline
+
+# SA1305: Field names should not use Hungarian notation
+dotnet_diagnostic.SA1305.severity = warning
+
+# SA1412: Store files as UTF-8 with byte order mark
+dotnet_diagnostic.SA1412.severity = warning
+
+# SA1609: Property documentation should have value
+dotnet_diagnostic.SA1609.severity = suggestion
+
+# SA1639: File header should have summary
+dotnet_diagnostic.SA1639.severity = warning
+
+# SX1101: Do not prefix local calls with 'this.'
+dotnet_diagnostic.SX1101.severity = warning
+
+# SA1101: Prefix local calls with this
+dotnet_diagnostic.SA1101.severity = none
+
+# IDE0065: Misplaced using directive
+csharp_using_directive_placement = inside_namespace
+
+# SA1633: File should have header
+dotnet_diagnostic.SA1633.severity = none
+
+# SA1503: Braces should not be omitted
+dotnet_diagnostic.SA1503.severity = none
+
+# SA1413: Use trailing comma in multi-line initializers
+dotnet_diagnostic.SA1413.severity = none
+
+# SA1600: Elements should be documented
+dotnet_diagnostic.SA1600.severity = none
+
+# SA1642: Constructor summary documentation should begin with standard text
+dotnet_diagnostic.SA1642.severity = suggestion
+
+# SA1615: Element return value should be documented
+dotnet_diagnostic.SA1615.severity = suggestion
+
+# SA1611: Element parameters should be documented
+dotnet_diagnostic.SA1611.severity = suggestion
+
+# SA1623: Property summary documentation should match accessors
+dotnet_diagnostic.SA1623.severity = suggestion
+
+# SA1311: Static readonly fields should begin with upper-case letter
+dotnet_diagnostic.SA1311.severity = none
+
+# SA1310: Field names should not contain underscore
+dotnet_diagnostic.SA1310.severity = suggestion
+
+# SA1602: Enumeration items should be documented
+dotnet_diagnostic.SA1602.severity = none
+
+# SA0001: XML comment analysis is disabled due to project configuration
+dotnet_diagnostic.SA0001.severity = none
+
+# SA1601: Partial element is missing a documentation header
+dotnet_diagnostic.SA1601.severity = none
diff --git a/RS.Fritz.Manager.API/Entities/InternetGatewayDevice.cs b/RS.Fritz.Manager.API/Entities/InternetGatewayDevice.cs
index 71807c8..f1aff88 100644
--- a/RS.Fritz.Manager.API/Entities/InternetGatewayDevice.cs
+++ b/RS.Fritz.Manager.API/Entities/InternetGatewayDevice.cs
@@ -12,12 +12,11 @@ public sealed record InternetGatewayDevice(IFritzServiceOperationHandler FritzSe
 
     public NetworkCredential? NetworkCredential { get; set; }
 
-    public IEnumerable<ServiceListItem> Services { get => services ??= UPnPDescription.Device.GetServices().ToArray(); }
+    public IEnumerable<ServiceListItem> Services
+        => services ??= UPnPDescription.Device.GetServices().ToArray();
 
     internal Task<TResult> ExecuteAsync<TResult>(Func<IFritzServiceOperationHandler, InternetGatewayDevice, Task<TResult>> operation)
-    {
-        return operation(FritzServiceOperationHandler, this);
-    }
+        => operation(FritzServiceOperationHandler, this);
 
     public async ValueTask InitializeAsync()
     {
diff --git a/RS.Fritz.Manager.API/Extensions/InternetGatewayDeviceExtensions.cs b/RS.Fritz.Manager.API/Extensions/InternetGatewayDeviceExtensions.cs
index 2e1e38f..c7f3016 100644
--- a/RS.Fritz.Manager.API/Extensions/InternetGatewayDeviceExtensions.cs
+++ b/RS.Fritz.Manager.API/Extensions/InternetGatewayDeviceExtensions.cs
@@ -3,549 +3,330 @@
 public static class InternetGatewayDeviceExtensions
 {
     public static Task<HostsGetHostNumberOfEntriesResponse> HostsGetHostNumberOfEntriesAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.HostsGetHostNumberOfEntriesAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.HostsGetHostNumberOfEntriesAsync(d));
 
     public static Task<HostsHostsCheckUpdateResponse> HostsHostsCheckUpdateAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.HostsHostsCheckUpdateAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.HostsHostsCheckUpdateAsync(d));
 
     public static Task<HostsGetHostListPathResponse> HostsGetHostListPathAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.HostsGetHostListPathAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.HostsGetHostListPathAsync(d));
 
     public static Task<HostsGetGenericHostEntryResponse> HostsGetGenericHostEntryAsync(this InternetGatewayDevice internetGatewayDevice, HostsGetGenericHostEntryRequest hostsGetGenericHostEntryRequest)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.HostsGetGenericHostEntryAsync(d, hostsGetGenericHostEntryRequest));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.HostsGetGenericHostEntryAsync(d, hostsGetGenericHostEntryRequest));
 
     public static Task<HostsGetInfoResponse> HostsGetInfoAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.HostsGetInfoAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.HostsGetInfoAsync(d));
 
     public static Task<HostsGetChangeCounterResponse> HostsGetChangeCounterAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.HostsGetChangeCounterAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.HostsGetChangeCounterAsync(d));
 
     public static Task<HostsGetMeshListPathResponse> HostsGetMeshListPathAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.HostsGetMeshListPathAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.HostsGetMeshListPathAsync(d));
 
     public static Task<HostsGetFriendlyNameResponse> HostsGetFriendlyNameAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.HostsGetFriendlyNameAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.HostsGetFriendlyNameAsync(d));
 
     public static Task<WanCommonInterfaceConfigGetCommonLinkPropertiesResponse> WanCommonInterfaceConfigGetCommonLinkPropertiesAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanCommonInterfaceConfigGetCommonLinkPropertiesAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanCommonInterfaceConfigGetCommonLinkPropertiesAsync(d));
 
     public static Task<WanCommonInterfaceConfigGetTotalBytesReceivedResponse> WanCommonInterfaceConfigGetTotalBytesReceivedAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanCommonInterfaceConfigGetTotalBytesReceivedAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanCommonInterfaceConfigGetTotalBytesReceivedAsync(d));
 
     public static Task<WanCommonInterfaceConfigGetTotalBytesSentResponse> WanCommonInterfaceConfigGetTotalBytesSentAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanCommonInterfaceConfigGetTotalBytesSentAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanCommonInterfaceConfigGetTotalBytesSentAsync(d));
 
     public static Task<WanCommonInterfaceConfigGetTotalPacketsReceivedResponse> WanCommonInterfaceConfigGetTotalPacketsReceivedAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanCommonInterfaceConfigGetTotalPacketsReceivedAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanCommonInterfaceConfigGetTotalPacketsReceivedAsync(d));
 
     public static Task<WanCommonInterfaceConfigGetTotalPacketsSentResponse> WanCommonInterfaceConfigGetTotalPacketsSentAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanCommonInterfaceConfigGetTotalPacketsSentAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanCommonInterfaceConfigGetTotalPacketsSentAsync(d));
 
     public static Task<WanCommonInterfaceConfigGetOnlineMonitorResponse> WanCommonInterfaceConfigGetOnlineMonitorAsync(this InternetGatewayDevice internetGatewayDevice, WanCommonInterfaceConfigGetOnlineMonitorRequest wanCommonInterfaceConfigGetOnlineMonitorRequest)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanCommonInterfaceConfigGetOnlineMonitorAsync(d, wanCommonInterfaceConfigGetOnlineMonitorRequest));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanCommonInterfaceConfigGetOnlineMonitorAsync(d, wanCommonInterfaceConfigGetOnlineMonitorRequest));
 
     public static Task<WanCommonInterfaceConfigSetWanAccessTypeResponse> WanCommonInterfaceConfigSetWanAccessTypeAsync(this InternetGatewayDevice internetGatewayDevice, WanCommonInterfaceConfigSetWanAccessTypeRequest wanCommonInterfaceConfigSetWanAccessTypeRequest)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanCommonInterfaceConfigSetWanAccessTypeAsync(d, wanCommonInterfaceConfigSetWanAccessTypeRequest));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanCommonInterfaceConfigSetWanAccessTypeAsync(d, wanCommonInterfaceConfigSetWanAccessTypeRequest));
 
-    public static Task<DeviceInfoGetInfoResponse> DeviceInfoGetInfoAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.DeviceInfoGetInfoAsync(d));
-    }
+    public static Task<DeviceInfoGetInfoResponse> DeviceInfoGetInfoAsync(this InternetGatewayDevice internetGatewayDevice) => internetGatewayDevice.ExecuteAsync((h, d) => h.DeviceInfoGetInfoAsync(d));
 
     public static Task<DeviceInfoGetDeviceLogResponse> DeviceInfoGetDeviceLogAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.DeviceInfoGetDeviceLogAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.DeviceInfoGetDeviceLogAsync(d));
 
     public static Task<DeviceInfoGetSecurityPortResponse> DeviceInfoGetSecurityPortAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.DeviceInfoGetSecurityPortAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.DeviceInfoGetSecurityPortAsync(d));
 
     public static Task<DeviceInfoSetProvisioningCodeResponse> DeviceInfoSetProvisioningCodeAsync(this InternetGatewayDevice internetGatewayDevice, DeviceInfoSetProvisioningCodeRequest deviceInfoSetProvisioningCodeRequest)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.DeviceInfoSetProvisioningCodeAsync(d, deviceInfoSetProvisioningCodeRequest));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.DeviceInfoSetProvisioningCodeAsync(d, deviceInfoSetProvisioningCodeRequest));
 
     public static Task<LanConfigSecurityGetAnonymousLoginResponse> LanConfigSecurityGetAnonymousLoginAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.LanConfigSecurityGetAnonymousLoginAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.LanConfigSecurityGetAnonymousLoginAsync(d));
 
     public static Task<LanConfigSecurityGetCurrentUserResponse> LanConfigSecurityGetCurrentUserAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.LanConfigSecurityGetCurrentUserAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.LanConfigSecurityGetCurrentUserAsync(d));
 
     public static Task<LanConfigSecurityGetInfoResponse> LanConfigSecurityGetInfoAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.LanConfigSecurityGetInfoAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.LanConfigSecurityGetInfoAsync(d));
 
     public static Task<LanConfigSecurityGetUserListResponse> LanConfigSecurityGetUserListAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.LanConfigSecurityGetUserListAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.LanConfigSecurityGetUserListAsync(d));
 
     public static Task<LanConfigSecuritySetConfigPasswordResponse> LanConfigSecuritySetConfigPasswordAsync(this InternetGatewayDevice internetGatewayDevice, LanConfigSecuritySetConfigPasswordRequest lanConfigSecuritySetConfigPasswordRequest)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.LanConfigSecuritySetConfigPasswordAsync(d, lanConfigSecuritySetConfigPasswordRequest));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.LanConfigSecuritySetConfigPasswordAsync(d, lanConfigSecuritySetConfigPasswordRequest));
 
     public static Task<Layer3ForwardingGetDefaultConnectionServiceResponse> Layer3ForwardingGetDefaultConnectionServiceAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.Layer3ForwardingGetDefaultConnectionServiceAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.Layer3ForwardingGetDefaultConnectionServiceAsync(d));
 
     public static Task<Layer3ForwardingGetForwardNumberOfEntriesResponse> Layer3ForwardingGetForwardNumberOfEntriesAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.Layer3ForwardingGetForwardNumberOfEntriesAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.Layer3ForwardingGetForwardNumberOfEntriesAsync(d));
 
     public static Task<Layer3ForwardingGetGenericForwardingEntryResponse> Layer3ForwardingGetGenericForwardingEntryAsync(this InternetGatewayDevice internetGatewayDevice, Layer3ForwardingGetGenericForwardingEntryRequest layer3ForwardingGetGenericForwardingEntryRequest)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.Layer3ForwardingGetGenericForwardingEntryAsync(d, layer3ForwardingGetGenericForwardingEntryRequest));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.Layer3ForwardingGetGenericForwardingEntryAsync(d, layer3ForwardingGetGenericForwardingEntryRequest));
 
     public static Task<WanDslInterfaceConfigGetDslDiagnoseInfoResponse> WanDslInterfaceConfigGetDslDiagnoseInfoAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanDslInterfaceConfigGetDslDiagnoseInfoAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanDslInterfaceConfigGetDslDiagnoseInfoAsync(d));
 
     public static Task<WanDslInterfaceConfigGetDslInfoResponse> WanDslInterfaceConfigGetDslInfoAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanDslInterfaceConfigGetDslInfoAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanDslInterfaceConfigGetDslInfoAsync(d));
 
     public static Task<WanDslInterfaceConfigGetInfoResponse> WanDslInterfaceConfigGetInfoAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanDslInterfaceConfigGetInfoAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanDslInterfaceConfigGetInfoAsync(d));
 
     public static Task<WanDslInterfaceConfigGetStatisticsTotalResponse> WanDslInterfaceConfigGetStatisticsTotalAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanDslInterfaceConfigGetStatisticsTotalAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanDslInterfaceConfigGetStatisticsTotalAsync(d));
 
     public static Task<WanIpConnectionGetInfoResponse> WanIpConnectionGetInfoAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanIpConnectionGetInfoAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanIpConnectionGetInfoAsync(d));
 
     public static Task<WanConnectionGetConnectionTypeInfoResponse> WanIpConnectionGetConnectionTypeInfoAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanIpConnectionGetConnectionTypeInfoAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanIpConnectionGetConnectionTypeInfoAsync(d));
 
     public static Task<WanConnectionGetStatusInfoResponse> WanIpConnectionGetStatusInfoAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanIpConnectionGetStatusInfoAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanIpConnectionGetStatusInfoAsync(d));
 
     public static Task<WanConnectionGetNatRsipStatusResponse> WanIpConnectionGetNatRsipStatusAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanIpConnectionGetNatRsipStatusAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanIpConnectionGetNatRsipStatusAsync(d));
 
     public static Task<WanConnectionGetDnsServersResponse> WanIpConnectionGetDnsServersAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanIpConnectionGetDnsServersAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanIpConnectionGetDnsServersAsync(d));
 
     public static Task<WanConnectionGetPortMappingNumberOfEntriesResponse> WanIpConnectionGetPortMappingNumberOfEntriesAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanIpConnectionGetPortMappingNumberOfEntriesAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanIpConnectionGetPortMappingNumberOfEntriesAsync(d));
 
     public static Task<WanConnectionGetExternalIpAddressResponse> WanIpConnectionGetExternalIpAddressAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanIpConnectionGetExternalIpAddressAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanIpConnectionGetExternalIpAddressAsync(d));
 
     public static Task<WanConnectionGetGenericPortMappingEntryResponse> WanIpConnectionGetGenericPortMappingEntryAsync(this InternetGatewayDevice internetGatewayDevice, WanConnectionGetGenericPortMappingEntryRequest wanConnectionGetGenericPortMappingEntryRequest)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanIpConnectionGetGenericPortMappingEntryAsync(d, wanConnectionGetGenericPortMappingEntryRequest));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanIpConnectionGetGenericPortMappingEntryAsync(d, wanConnectionGetGenericPortMappingEntryRequest));
 
     public static Task<WanPppConnectionGetInfoResponse> WanPppConnectionGetInfoAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanPppConnectionGetInfoAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanPppConnectionGetInfoAsync(d));
 
     public static Task<WanConnectionGetConnectionTypeInfoResponse> WanPppConnectionGetConnectionTypeInfoAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanPppConnectionGetConnectionTypeInfoAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanPppConnectionGetConnectionTypeInfoAsync(d));
 
     public static Task<WanConnectionGetStatusInfoResponse> WanPppConnectionGetStatusInfoAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanPppConnectionGetStatusInfoAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanPppConnectionGetStatusInfoAsync(d));
 
     public static Task<WanPppConnectionGetLinkLayerMaxBitRatesResponse> WanPppConnectionGetLinkLayerMaxBitRatesAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanPppConnectionGetLinkLayerMaxBitRatesAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanPppConnectionGetLinkLayerMaxBitRatesAsync(d));
 
     public static Task<WanPppConnectionGetUserNameResponse> WanPppConnectionGetUserNameAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanPppConnectionGetUserNameAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanPppConnectionGetUserNameAsync(d));
 
     public static Task<WanConnectionGetNatRsipStatusResponse> WanPppConnectionGetNatRsipStatusAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanPppConnectionGetNatRsipStatusAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanPppConnectionGetNatRsipStatusAsync(d));
 
     public static Task<WanConnectionGetDnsServersResponse> WanPppConnectionGetDnsServersAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanPppConnectionGetDnsServersAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanPppConnectionGetDnsServersAsync(d));
 
     public static Task<WanConnectionGetPortMappingNumberOfEntriesResponse> WanPppConnectionGetPortMappingNumberOfEntriesAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanPppConnectionGetPortMappingNumberOfEntriesAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanPppConnectionGetPortMappingNumberOfEntriesAsync(d));
 
     public static Task<WanConnectionGetExternalIpAddressResponse> WanPppConnectionGetExternalIpAddressAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanPppConnectionGetExternalIpAddressAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanPppConnectionGetExternalIpAddressAsync(d));
 
     public static Task<WanPppConnectionGetAutoDisconnectTimeSpanResponse> WanPppConnectionGetAutoDisconnectTimeSpanAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanPppConnectionGetAutoDisconnectTimeSpanAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanPppConnectionGetAutoDisconnectTimeSpanAsync(d));
 
     public static Task<WanConnectionGetGenericPortMappingEntryResponse> WanPppConnectionGetGenericPortMappingEntryAsync(this InternetGatewayDevice internetGatewayDevice, WanConnectionGetGenericPortMappingEntryRequest wanConnectionGetGenericPortMappingEntryRequest)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanPppConnectionGetGenericPortMappingEntryAsync(d, wanConnectionGetGenericPortMappingEntryRequest));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanPppConnectionGetGenericPortMappingEntryAsync(d, wanConnectionGetGenericPortMappingEntryRequest));
 
     public static Task<WanEthernetLinkConfigGetEthernetLinkStatusResponse> WanEthernetLinkConfigGetEthernetLinkStatusAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanEthernetLinkConfigGetEthernetLinkStatusAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanEthernetLinkConfigGetEthernetLinkStatusAsync(d));
 
     public static Task<WanDslLinkConfigGetInfoResponse> WanDslLinkConfigGetInfoAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanDslLinkConfigGetInfoAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanDslLinkConfigGetInfoAsync(d));
 
     public static Task<WanDslLinkConfigGetDslLinkInfoResponse> WanDslLinkConfigGetDslLinkInfoAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanDslLinkConfigGetDslLinkInfoAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanDslLinkConfigGetDslLinkInfoAsync(d));
 
     public static Task<WanDslLinkConfigGetDestinationAddressResponse> WanDslLinkConfigGetDestinationAddressAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanDslLinkConfigGetDestinationAddressAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanDslLinkConfigGetDestinationAddressAsync(d));
 
     public static Task<WanDslLinkConfigGetAtmEncapsulationResponse> WanDslLinkConfigGetAtmEncapsulationAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanDslLinkConfigGetAtmEncapsulationAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanDslLinkConfigGetAtmEncapsulationAsync(d));
 
     public static Task<WanDslLinkConfigGetAutoConfigResponse> WanDslLinkConfigGetAutoConfigAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanDslLinkConfigGetAutoConfigAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanDslLinkConfigGetAutoConfigAsync(d));
 
     public static Task<WanDslLinkConfigGetStatisticsResponse> WanDslLinkConfigGetStatisticsAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.WanDslLinkConfigGetStatisticsAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.WanDslLinkConfigGetStatisticsAsync(d));
 
     public static Task<AvmSpeedtestGetInfoResponse> AvmSpeedtestGetInfoAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.AvmSpeedtestGetInfoAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.AvmSpeedtestGetInfoAsync(d));
 
     public static Task<AvmSpeedtestGetStatisticsResponse> AvmSpeedtestGetStatisticsAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.AvmSpeedtestGetStatisticsAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.AvmSpeedtestGetStatisticsAsync(d));
 
     public static Task<LanEthernetInterfaceConfigGetInfoResponse> LanEthernetInterfaceConfigGetInfoAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.LanEthernetInterfaceConfigGetInfoAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.LanEthernetInterfaceConfigGetInfoAsync(d));
 
     public static Task<LanEthernetInterfaceConfigGetStatisticsResponse> LanEthernetInterfaceConfigGetStatisticsAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.LanEthernetInterfaceConfigGetStatisticsAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.LanEthernetInterfaceConfigGetStatisticsAsync(d));
 
     public static Task<LanHostConfigManagementGetInfoResponse> LanHostConfigManagementGetInfoAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.LanHostConfigManagementGetInfoAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.LanHostConfigManagementGetInfoAsync(d));
 
     public static Task<LanHostConfigManagementGetSubnetMaskResponse> LanHostConfigManagementGetSubnetMaskAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.LanHostConfigManagementGetSubnetMaskAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.LanHostConfigManagementGetSubnetMaskAsync(d));
 
     public static Task<LanHostConfigManagementGetIpRoutersListResponse> LanHostConfigManagementGetIpRoutersListAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.LanHostConfigManagementGetIpRoutersListAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.LanHostConfigManagementGetIpRoutersListAsync(d));
 
     public static Task<LanHostConfigManagementGetAddressRangeResponse> LanHostConfigManagementGetAddressRangeAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.LanHostConfigManagementGetAddressRangeAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.LanHostConfigManagementGetAddressRangeAsync(d));
 
     public static Task<LanHostConfigManagementGetIpInterfaceNumberOfEntriesResponse> LanHostConfigManagementGetIpInterfaceNumberOfEntriesAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.LanHostConfigManagementGetIpInterfaceNumberOfEntriesAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.LanHostConfigManagementGetIpInterfaceNumberOfEntriesAsync(d));
 
     public static Task<LanHostConfigManagementGetDnsServersResponse> LanHostConfigManagementGetDnsServersAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.LanHostConfigManagementGetDnsServersAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.LanHostConfigManagementGetDnsServersAsync(d));
 
     public static Task<WlanConfigurationGetInfoResponse> WlanConfigurationGetInfoAsync(this InternetGatewayDevice internetGatewayDevice, int interfaceNumber)
-    {
-        return internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetInfoAsync(d), (h, d) => h.WlanConfiguration2GetInfoAsync(d), (h, d) => h.WlanConfiguration3GetInfoAsync(d), (h, d) => h.WlanConfiguration4GetInfoAsync(d)));
-    }
+        => internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetInfoAsync(d), (h, d) => h.WlanConfiguration2GetInfoAsync(d), (h, d) => h.WlanConfiguration3GetInfoAsync(d), (h, d) => h.WlanConfiguration4GetInfoAsync(d)));
 
     public static Task<WlanConfigurationGetWlanDeviceListPathResponse> WlanConfigurationGetWlanDeviceListPathAsync(this InternetGatewayDevice internetGatewayDevice, int interfaceNumber)
-    {
-        return internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetWlanDeviceListPathAsync(d), (h, d) => h.WlanConfiguration2GetWlanDeviceListPathAsync(d), (h, d) => h.WlanConfiguration3GetWlanDeviceListPathAsync(d), (h, d) => h.WlanConfiguration4GetWlanDeviceListPathAsync(d)));
-    }
+        => internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetWlanDeviceListPathAsync(d), (h, d) => h.WlanConfiguration2GetWlanDeviceListPathAsync(d), (h, d) => h.WlanConfiguration3GetWlanDeviceListPathAsync(d), (h, d) => h.WlanConfiguration4GetWlanDeviceListPathAsync(d)));
 
     public static Task<WlanConfigurationGetBasBeaconSecurityPropertiesResponse> WlanConfigurationGetBasBeaconSecurityPropertiesAsync(this InternetGatewayDevice internetGatewayDevice, int interfaceNumber)
-    {
-        return internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetBasBeaconSecurityPropertiesAsync(d), (h, d) => h.WlanConfiguration2GetBasBeaconSecurityPropertiesAsync(d), (h, d) => h.WlanConfiguration3GetBasBeaconSecurityPropertiesAsync(d), (h, d) => h.WlanConfiguration4GetBasBeaconSecurityPropertiesAsync(d)));
-    }
+        => internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetBasBeaconSecurityPropertiesAsync(d), (h, d) => h.WlanConfiguration2GetBasBeaconSecurityPropertiesAsync(d), (h, d) => h.WlanConfiguration3GetBasBeaconSecurityPropertiesAsync(d), (h, d) => h.WlanConfiguration4GetBasBeaconSecurityPropertiesAsync(d)));
 
     public static Task<WlanConfigurationGetBssIdResponse> WlanConfigurationGetBssIdAsync(this InternetGatewayDevice internetGatewayDevice, int interfaceNumber)
-    {
-        return internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetBssIdAsync(d), (h, d) => h.WlanConfiguration2GetBssIdAsync(d), (h, d) => h.WlanConfiguration3GetBssIdAsync(d), (h, d) => h.WlanConfiguration4GetBssIdAsync(d)));
-    }
+        => internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetBssIdAsync(d), (h, d) => h.WlanConfiguration2GetBssIdAsync(d), (h, d) => h.WlanConfiguration3GetBssIdAsync(d), (h, d) => h.WlanConfiguration4GetBssIdAsync(d)));
 
     public static Task<WlanConfigurationGetSsIdResponse> WlanConfigurationGetSsIdAsync(this InternetGatewayDevice internetGatewayDevice, int interfaceNumber)
-    {
-        return internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetSsIdAsync(d), (h, d) => h.WlanConfiguration2GetSsIdAsync(d), (h, d) => h.WlanConfiguration3GetSsIdAsync(d), (h, d) => h.WlanConfiguration4GetSsIdAsync(d)));
-    }
+        => internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetSsIdAsync(d), (h, d) => h.WlanConfiguration2GetSsIdAsync(d), (h, d) => h.WlanConfiguration3GetSsIdAsync(d), (h, d) => h.WlanConfiguration4GetSsIdAsync(d)));
 
     public static Task<WlanConfigurationGetBeaconTypeResponse> WlanConfigurationGetBeaconTypeAsync(this InternetGatewayDevice internetGatewayDevice, int interfaceNumber)
-    {
-        return internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetBeaconTypeAsync(d), (h, d) => h.WlanConfiguration2GetBeaconTypeAsync(d), (h, d) => h.WlanConfiguration3GetBeaconTypeAsync(d), (h, d) => h.WlanConfiguration4GetBeaconTypeAsync(d)));
-    }
+        => internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetBeaconTypeAsync(d), (h, d) => h.WlanConfiguration2GetBeaconTypeAsync(d), (h, d) => h.WlanConfiguration3GetBeaconTypeAsync(d), (h, d) => h.WlanConfiguration4GetBeaconTypeAsync(d)));
 
     public static Task<WlanConfigurationGetChannelInfoResponse> WlanConfigurationGetChannelInfoAsync(this InternetGatewayDevice internetGatewayDevice, int interfaceNumber)
-    {
-        return internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetChannelInfoAsync(d), (h, d) => h.WlanConfiguration2GetChannelInfoAsync(d), (h, d) => h.WlanConfiguration3GetChannelInfoAsync(d), (h, d) => h.WlanConfiguration4GetChannelInfoAsync(d)));
-    }
+        => internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetChannelInfoAsync(d), (h, d) => h.WlanConfiguration2GetChannelInfoAsync(d), (h, d) => h.WlanConfiguration3GetChannelInfoAsync(d), (h, d) => h.WlanConfiguration4GetChannelInfoAsync(d)));
 
     public static Task<WlanConfigurationGetBeaconAdvertisementResponse> WlanConfigurationGetBeaconAdvertisementAsync(this InternetGatewayDevice internetGatewayDevice, int interfaceNumber)
-    {
-        return internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetBeaconAdvertisementAsync(d), (h, d) => h.WlanConfiguration2GetBeaconAdvertisementAsync(d), (h, d) => h.WlanConfiguration3GetBeaconAdvertisementAsync(d), (h, d) => h.WlanConfiguration4GetBeaconAdvertisementAsync(d)));
-    }
+        => internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetBeaconAdvertisementAsync(d), (h, d) => h.WlanConfiguration2GetBeaconAdvertisementAsync(d), (h, d) => h.WlanConfiguration3GetBeaconAdvertisementAsync(d), (h, d) => h.WlanConfiguration4GetBeaconAdvertisementAsync(d)));
 
     public static Task<WlanConfigurationGetTotalAssociationsResponse> WlanConfigurationGetTotalAssociationsAsync(this InternetGatewayDevice internetGatewayDevice, int interfaceNumber)
-    {
-        return internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetTotalAssociationsAsync(d), (h, d) => h.WlanConfiguration2GetTotalAssociationsAsync(d), (h, d) => h.WlanConfiguration3GetTotalAssociationsAsync(d), (h, d) => h.WlanConfiguration4GetTotalAssociationsAsync(d)));
-    }
+        => internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetTotalAssociationsAsync(d), (h, d) => h.WlanConfiguration2GetTotalAssociationsAsync(d), (h, d) => h.WlanConfiguration3GetTotalAssociationsAsync(d), (h, d) => h.WlanConfiguration4GetTotalAssociationsAsync(d)));
 
     public static Task<WlanConfigurationGetIpTvOptimizedResponse> WlanConfigurationGetIpTvOptimizedAsync(this InternetGatewayDevice internetGatewayDevice, int interfaceNumber)
-    {
-        return internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetIpTvOptimizedAsync(d), (h, d) => h.WlanConfiguration2GetIpTvOptimizedAsync(d), (h, d) => h.WlanConfiguration3GetIpTvOptimizedAsync(d), (h, d) => h.WlanConfiguration4GetIpTvOptimizedAsync(d)));
-    }
+        => internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetIpTvOptimizedAsync(d), (h, d) => h.WlanConfiguration2GetIpTvOptimizedAsync(d), (h, d) => h.WlanConfiguration3GetIpTvOptimizedAsync(d), (h, d) => h.WlanConfiguration4GetIpTvOptimizedAsync(d)));
 
     public static Task<WlanConfigurationGetStatisticsResponse> WlanConfigurationGetStatisticsAsync(this InternetGatewayDevice internetGatewayDevice, int interfaceNumber)
-    {
-        return internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetStatisticsAsync(d), (h, d) => h.WlanConfiguration2GetStatisticsAsync(d), (h, d) => h.WlanConfiguration3GetStatisticsAsync(d), (h, d) => h.WlanConfiguration4GetStatisticsAsync(d)));
-    }
+        => internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetStatisticsAsync(d), (h, d) => h.WlanConfiguration2GetStatisticsAsync(d), (h, d) => h.WlanConfiguration3GetStatisticsAsync(d), (h, d) => h.WlanConfiguration4GetStatisticsAsync(d)));
 
     public static Task<WlanConfigurationGetPacketStatisticsResponse> WlanConfigurationGetPacketStatisticsAsync(this InternetGatewayDevice internetGatewayDevice, int interfaceNumber)
-    {
-        return internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetPacketStatisticsAsync(d), (h, d) => h.WlanConfiguration2GetPacketStatisticsAsync(d), (h, d) => h.WlanConfiguration3GetPacketStatisticsAsync(d), (h, d) => h.WlanConfiguration4GetPacketStatisticsAsync(d)));
-    }
+        => internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetPacketStatisticsAsync(d), (h, d) => h.WlanConfiguration2GetPacketStatisticsAsync(d), (h, d) => h.WlanConfiguration3GetPacketStatisticsAsync(d), (h, d) => h.WlanConfiguration4GetPacketStatisticsAsync(d)));
 
     public static Task<WlanConfigurationGetNightControlResponse> WlanConfigurationGetNightControlAsync(this InternetGatewayDevice internetGatewayDevice, int interfaceNumber)
-    {
-        return internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetNightControlAsync(d), (h, d) => h.WlanConfiguration2GetNightControlAsync(d), (h, d) => h.WlanConfiguration3GetNightControlAsync(d), (h, d) => h.WlanConfiguration4GetNightControlAsync(d)));
-    }
+        => internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetNightControlAsync(d), (h, d) => h.WlanConfiguration2GetNightControlAsync(d), (h, d) => h.WlanConfiguration3GetNightControlAsync(d), (h, d) => h.WlanConfiguration4GetNightControlAsync(d)));
 
     public static Task<WlanConfigurationGetWlanHybridModeResponse> WlanConfigurationGetWlanHybridModeAsync(this InternetGatewayDevice internetGatewayDevice, int interfaceNumber)
-    {
-        return internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetWlanHybridModeAsync(d), (h, d) => h.WlanConfiguration2GetWlanHybridModeAsync(d), (h, d) => h.WlanConfiguration3GetWlanHybridModeAsync(d), (h, d) => h.WlanConfiguration4GetWlanHybridModeAsync(d)));
-    }
+        => internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetWlanHybridModeAsync(d), (h, d) => h.WlanConfiguration2GetWlanHybridModeAsync(d), (h, d) => h.WlanConfiguration3GetWlanHybridModeAsync(d), (h, d) => h.WlanConfiguration4GetWlanHybridModeAsync(d)));
 
     public static Task<WlanConfigurationGetWlanExtInfoResponse> WlanConfigurationGetWlanExtInfoAsync(this InternetGatewayDevice internetGatewayDevice, int interfaceNumber)
-    {
-        return internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetWlanExtInfoAsync(d), (h, d) => h.WlanConfiguration2GetWlanExtInfoAsync(d), (h, d) => h.WlanConfiguration3GetWlanExtInfoAsync(d), (h, d) => h.WlanConfiguration4GetWlanExtInfoAsync(d)));
-    }
+        => internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetWlanExtInfoAsync(d), (h, d) => h.WlanConfiguration2GetWlanExtInfoAsync(d), (h, d) => h.WlanConfiguration3GetWlanExtInfoAsync(d), (h, d) => h.WlanConfiguration4GetWlanExtInfoAsync(d)));
 
     public static Task<WlanConfigurationGetWpsInfoResponse> WlanConfigurationGetWpsInfoAsync(this InternetGatewayDevice internetGatewayDevice, int interfaceNumber)
-    {
-        return internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetWpsInfoAsync(d), (h, d) => h.WlanConfiguration2GetWpsInfoAsync(d), (h, d) => h.WlanConfiguration3GetWpsInfoAsync(d), (h, d) => h.WlanConfiguration4GetWpsInfoAsync(d)));
-    }
+        => internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetWpsInfoAsync(d), (h, d) => h.WlanConfiguration2GetWpsInfoAsync(d), (h, d) => h.WlanConfiguration3GetWpsInfoAsync(d), (h, d) => h.WlanConfiguration4GetWpsInfoAsync(d)));
 
     public static Task<WlanConfigurationGetWlanConnectionInfoResponse> WlanConfigurationGetWlanConnectionInfoAsync(this InternetGatewayDevice internetGatewayDevice, int interfaceNumber)
-    {
-        return internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetWlanConnectionInfoAsync(d), (h, d) => h.WlanConfiguration2GetWlanConnectionInfoAsync(d), (h, d) => h.WlanConfiguration3GetWlanConnectionInfoAsync(d), (h, d) => h.WlanConfiguration4GetWlanConnectionInfoAsync(d)));
-    }
+        => internetGatewayDevice.ExecuteAsync(GetWlanOperation(interfaceNumber, (h, d) => h.WlanConfiguration1GetWlanConnectionInfoAsync(d), (h, d) => h.WlanConfiguration2GetWlanConnectionInfoAsync(d), (h, d) => h.WlanConfiguration3GetWlanConnectionInfoAsync(d), (h, d) => h.WlanConfiguration4GetWlanConnectionInfoAsync(d)));
 
     public static Task<ManagementServerGetInfoResponse> ManagementServerGetInfoAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.ManagementServerGetInfoAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.ManagementServerGetInfoAsync(d));
 
     public static Task<ManagementServerGetTr069FirmwareDownloadEnabledResponse> ManagementServerGetTr069FirmwareDownloadEnabledAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.ManagementServerGetTr069FirmwareDownloadEnabledAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.ManagementServerGetTr069FirmwareDownloadEnabledAsync(d));
 
     public static Task<ManagementServerSetManagementServerUrlResponse> ManagementServerSetManagementServerUrlAsync(this InternetGatewayDevice internetGatewayDevice, ManagementServerSetManagementServerUrlRequest managementServerSetManagementServerUrlRequest)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.ManagementServerSetManagementServerUrlAsync(d, managementServerSetManagementServerUrlRequest));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.ManagementServerSetManagementServerUrlAsync(d, managementServerSetManagementServerUrlRequest));
 
     public static Task<ManagementServerSetManagementServerUsernameResponse> ManagementServerSetManagementServerUsernameAsync(this InternetGatewayDevice internetGatewayDevice, ManagementServerSetManagementServerUsernameRequest managementServerSetManagementServerUsernameRequest)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.ManagementServerSetManagementServerUsernameAsync(d, managementServerSetManagementServerUsernameRequest));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.ManagementServerSetManagementServerUsernameAsync(d, managementServerSetManagementServerUsernameRequest));
 
     public static Task<ManagementServerSetManagementServerPasswordResponse> ManagementServerSetManagementServerPasswordAsync(this InternetGatewayDevice internetGatewayDevice, ManagementServerSetManagementServerPasswordRequest managementServerSetManagementServerPasswordRequest)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.ManagementServerSetManagementServerPasswordAsync(d, managementServerSetManagementServerPasswordRequest));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.ManagementServerSetManagementServerPasswordAsync(d, managementServerSetManagementServerPasswordRequest));
 
     public static Task<ManagementServerSetPeriodicInformResponse> ManagementServerSetPeriodicInformAsync(this InternetGatewayDevice internetGatewayDevice, ManagementServerSetPeriodicInformRequest managementServerSetPeriodicInformRequest)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.ManagementServerSetPeriodicInformAsync(d, managementServerSetPeriodicInformRequest));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.ManagementServerSetPeriodicInformAsync(d, managementServerSetPeriodicInformRequest));
 
     public static Task<ManagementServerSetConnectionRequestAuthenticationResponse> ManagementServerSetConnectionRequestAuthenticationAsync(this InternetGatewayDevice internetGatewayDevice, ManagementServerSetConnectionRequestAuthenticationRequest managementServerSetConnectionRequestAuthenticationRequest)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.ManagementServerSetConnectionRequestAuthenticationAsync(d, managementServerSetConnectionRequestAuthenticationRequest));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.ManagementServerSetConnectionRequestAuthenticationAsync(d, managementServerSetConnectionRequestAuthenticationRequest));
 
     public static Task<ManagementServerSetUpgradeManagementResponse> ManagementServerSetUpgradeManagementAsync(this InternetGatewayDevice internetGatewayDevice, ManagementServerSetUpgradeManagementRequest managementServerSetUpgradeManagementRequest)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.ManagementServerSetUpgradeManagementAsync(d, managementServerSetUpgradeManagementRequest));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.ManagementServerSetUpgradeManagementAsync(d, managementServerSetUpgradeManagementRequest));
 
     public static Task<ManagementServerSetTr069EnableResponse> ManagementServerSetTr069EnableAsync(this InternetGatewayDevice internetGatewayDevice, ManagementServerSetTr069EnableRequest managementServerSetTr069EnableRequest)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.ManagementServerSetTr069EnableAsync(d, managementServerSetTr069EnableRequest));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.ManagementServerSetTr069EnableAsync(d, managementServerSetTr069EnableRequest));
 
     public static Task<ManagementServerSetTr069FirmwareDownloadEnabledResponse> ManagementServerSetTr069FirmwareDownloadEnabledAsync(this InternetGatewayDevice internetGatewayDevice, ManagementServerSetTr069FirmwareDownloadEnabledRequest managementServerSetTr069FirmwareDownloadEnabledRequest)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.ManagementServerSetTr069FirmwareDownloadEnabledAsync(d, managementServerSetTr069FirmwareDownloadEnabledRequest));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.ManagementServerSetTr069FirmwareDownloadEnabledAsync(d, managementServerSetTr069FirmwareDownloadEnabledRequest));
 
     public static Task<TimeGetInfoResponse> TimeGetInfoAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.TimeGetInfoAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.TimeGetInfoAsync(d));
 
     public static Task<TimeSetNtpServersResponse> TimeSetNtpServersAsync(this InternetGatewayDevice internetGatewayDevice, TimeSetNtpServersRequest timeSetNtpServersRequest)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.TimeSetNtpServersAsync(d, timeSetNtpServersRequest));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.TimeSetNtpServersAsync(d, timeSetNtpServersRequest));
 
     public static Task<UserInterfaceGetInfoResponse> UserInterfaceGetInfoAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.UserInterfaceGetInfoAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.UserInterfaceGetInfoAsync(d));
 
     public static Task<UserInterfaceCheckUpdateResponse> UserInterfaceCheckUpdateAsync(this InternetGatewayDevice internetGatewayDevice, UserInterfaceCheckUpdateRequest userInterfaceCheckUpdateRequest)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.UserInterfaceCheckUpdateAsync(d, userInterfaceCheckUpdateRequest));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.UserInterfaceCheckUpdateAsync(d, userInterfaceCheckUpdateRequest));
 
     public static Task<UserInterfaceDoPrepareCgiResponse> UserInterfaceDoPrepareCgiAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.UserInterfaceDoPrepareCgiAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.UserInterfaceDoPrepareCgiAsync(d));
 
     public static Task<UserInterfaceDoUpdateResponse> UserInterfaceDoUpdateAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.UserInterfaceDoUpdateAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.UserInterfaceDoUpdateAsync(d));
 
     public static Task<UserInterfaceDoManualUpdateResponse> UserInterfaceDoManualUpdateAsync(this InternetGatewayDevice internetGatewayDevice, UserInterfaceDoManualUpdateRequest userInterfaceDoManualUpdateRequest)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.UserInterfaceDoManualUpdateAsync(d, userInterfaceDoManualUpdateRequest));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.UserInterfaceDoManualUpdateAsync(d, userInterfaceDoManualUpdateRequest));
 
     public static Task<UserInterfaceGetInternationalConfigResponse> UserInterfaceGetInternationalConfigAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.UserInterfaceGetInternationalConfigAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.UserInterfaceGetInternationalConfigAsync(d));
 
     public static Task<UserInterfaceSetInternationalConfigResponse> UserInterfaceSetInternationalConfigAsync(this InternetGatewayDevice internetGatewayDevice, UserInterfaceSetInternationalConfigRequest userInterfaceSetInternationalConfigRequest)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.UserInterfaceSetInternationalConfigAsync(d, userInterfaceSetInternationalConfigRequest));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.UserInterfaceSetInternationalConfigAsync(d, userInterfaceSetInternationalConfigRequest));
 
     public static Task<UserInterfaceAvmGetInfoResponse> UserInterfaceAvmGetInfoAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.UserInterfaceAvmGetInfoAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.UserInterfaceAvmGetInfoAsync(d));
 
     public static Task<UserInterfaceSetConfigResponse> UserInterfaceSetConfigAsync(this InternetGatewayDevice internetGatewayDevice, UserInterfaceSetConfigRequest userInterfaceSetConfigRequest)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.UserInterfaceSetConfigAsync(d, userInterfaceSetConfigRequest));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.UserInterfaceSetConfigAsync(d, userInterfaceSetConfigRequest));
 
     public static Task<DeviceConfigGetPersistentDataResponse> DeviceConfigGetPersistentDataAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.DeviceConfigGetPersistentDataAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.DeviceConfigGetPersistentDataAsync(d));
 
     public static Task<DeviceConfigGenerateUuIdResponse> DeviceConfigGenerateUuIdAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.DeviceConfigGenerateUuIdAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.DeviceConfigGenerateUuIdAsync(d));
 
     public static Task<DeviceConfigCreateUrlSidResponse> DeviceConfigCreateUrlSidAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.DeviceConfigCreateUrlSidAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.DeviceConfigCreateUrlSidAsync(d));
 
     public static Task<DeviceConfigGetSupportDataInfoResponse> DeviceConfigGetSupportDataInfoAsync(this InternetGatewayDevice internetGatewayDevice)
-    {
-        return internetGatewayDevice.ExecuteAsync((h, d) => h.DeviceConfigGetSupportDataInfoAsync(d));
-    }
+        => internetGatewayDevice.ExecuteAsync((h, d) => h.DeviceConfigGetSupportDataInfoAsync(d));
 
     private static Func<IFritzServiceOperationHandler, InternetGatewayDevice, Task<T>> GetWlanOperation<T>(
         int interfaceNumber,
diff --git a/RS.Fritz.Manager.API/Infrastructure/ExceptionMessageBuilder.cs b/RS.Fritz.Manager.API/Infrastructure/ExceptionMessageBuilder.cs
index 243105d..d17a317 100644
--- a/RS.Fritz.Manager.API/Infrastructure/ExceptionMessageBuilder.cs
+++ b/RS.Fritz.Manager.API/Infrastructure/ExceptionMessageBuilder.cs
@@ -5,9 +5,7 @@
 public static class ExceptionMessageBuilder
 {
     public static string GetDetailedExceptionInfo(this Exception ex)
-    {
-        return new StringBuilder().GetExceptionInfo(ex).ToString();
-    }
+        => new StringBuilder().GetExceptionInfo(ex).ToString();
 
     private static StringBuilder GetExceptionInfo(this StringBuilder sb, Exception ex)
     {
diff --git a/RS.Fritz.Manager.API/Services/MeshHosts/DeviceMeshStreamConfigurationArrayJsonConverter.cs b/RS.Fritz.Manager.API/Services/MeshHosts/DeviceMeshStreamConfigurationArrayJsonConverter.cs
index b647e97..337fdbe 100644
--- a/RS.Fritz.Manager.API/Services/MeshHosts/DeviceMeshStreamConfigurationArrayJsonConverter.cs
+++ b/RS.Fritz.Manager.API/Services/MeshHosts/DeviceMeshStreamConfigurationArrayJsonConverter.cs
@@ -50,7 +50,5 @@ public override DeviceMeshStreamConfiguration[] Read(ref Utf8JsonReader reader,
     }
 
     public override void Write(Utf8JsonWriter writer, DeviceMeshStreamConfiguration[] value, JsonSerializerOptions options)
-    {
-        throw new NotSupportedException();
-    }
+        => throw new NotSupportedException();
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/FritzAvmSpeedtestService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/FritzAvmSpeedtestService.cs
index 43beffa..b43e761 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/FritzAvmSpeedtestService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/FritzAvmSpeedtestService.cs
@@ -12,12 +12,8 @@ public FritzAvmSpeedtestService(FritzServiceEndpointConfiguration endpointConfig
     }
 
     public Task<AvmSpeedtestGetInfoResponse> GetInfoAsync(AvmSpeedtestGetInfoRequest avmSpeedtestGetInfoRequest)
-    {
-        return Channel.GetInfoAsync(avmSpeedtestGetInfoRequest);
-    }
+        => Channel.GetInfoAsync(avmSpeedtestGetInfoRequest);
 
     public Task<AvmSpeedtestGetStatisticsResponse> GetStatisticsAsync(AvmSpeedtestGetStatisticsRequest avmSpeedtestGetStatisticsRequest)
-    {
-        return Channel.GetStatisticsAsync(avmSpeedtestGetStatisticsRequest);
-    }
+        => Channel.GetStatisticsAsync(avmSpeedtestGetStatisticsRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceConfig/FritzDeviceConfigService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceConfig/FritzDeviceConfigService.cs
index e88b61c..4b8b376 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceConfig/FritzDeviceConfigService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceConfig/FritzDeviceConfigService.cs
@@ -12,22 +12,14 @@ public FritzDeviceConfigService(FritzServiceEndpointConfiguration endpointConfig
     }
 
     public Task<DeviceConfigGetPersistentDataResponse> GetPersistentDataAsync(DeviceConfigGetPersistentDataRequest deviceConfigGetPersistentDataRequest)
-    {
-        return Channel.GetPersistentDataAsync(deviceConfigGetPersistentDataRequest);
-    }
+        => Channel.GetPersistentDataAsync(deviceConfigGetPersistentDataRequest);
 
     public Task<DeviceConfigGenerateUuIdResponse> GenerateUuIdAsync(DeviceConfigGenerateUuIdRequest deviceConfigGenerateUuIdRequest)
-    {
-        return Channel.GenerateUuIdAsync(deviceConfigGenerateUuIdRequest);
-    }
+        => Channel.GenerateUuIdAsync(deviceConfigGenerateUuIdRequest);
 
     public Task<DeviceConfigCreateUrlSidResponse> CreateUrlSidAsync(DeviceConfigCreateUrlSidRequest deviceConfigCreateUrlSidRequest)
-    {
-        return Channel.CreateUrlSidAsync(deviceConfigCreateUrlSidRequest);
-    }
+        => Channel.CreateUrlSidAsync(deviceConfigCreateUrlSidRequest);
 
     public Task<DeviceConfigGetSupportDataInfoResponse> GetSupportDataInfoAsync(DeviceConfigGetSupportDataInfoRequest deviceConfigGetSupportDataInfoRequest)
-    {
-        return Channel.GetSupportDataInfoAsync(deviceConfigGetSupportDataInfoRequest);
-    }
+        => Channel.GetSupportDataInfoAsync(deviceConfigGetSupportDataInfoRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceInfo/FritzDeviceInfoService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceInfo/FritzDeviceInfoService.cs
index 682ef38..7bcb7c0 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceInfo/FritzDeviceInfoService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceInfo/FritzDeviceInfoService.cs
@@ -12,22 +12,14 @@ public FritzDeviceInfoService(FritzServiceEndpointConfiguration endpointConfigur
     }
 
     public Task<DeviceInfoGetSecurityPortResponse> GetSecurityPortAsync(DeviceInfoGetSecurityPortRequest deviceInfoGetSecurityPortRequest)
-    {
-        return Channel.GetSecurityPortAsync(deviceInfoGetSecurityPortRequest);
-    }
+        => Channel.GetSecurityPortAsync(deviceInfoGetSecurityPortRequest);
 
     public Task<DeviceInfoGetInfoResponse> GetInfoAsync(DeviceInfoGetInfoRequest deviceInfoGetInfoRequest)
-    {
-        return Channel.GetInfoAsync(deviceInfoGetInfoRequest);
-    }
+        => Channel.GetInfoAsync(deviceInfoGetInfoRequest);
 
     public Task<DeviceInfoGetDeviceLogResponse> GetDeviceLogAsync(DeviceInfoGetDeviceLogRequest deviceInfoGetDeviceLogRequest)
-    {
-        return Channel.GetDeviceLogAsync(deviceInfoGetDeviceLogRequest);
-    }
+        => Channel.GetDeviceLogAsync(deviceInfoGetDeviceLogRequest);
 
     public Task<DeviceInfoSetProvisioningCodeResponse> SetProvisioningCodeAsync(DeviceInfoSetProvisioningCodeRequest setProvisioningCodeRequest)
-    {
-        return Channel.SetProvisioningCodeAsync(setProvisioningCodeRequest);
-    }
+        => Channel.SetProvisioningCodeAsync(setProvisioningCodeRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/FritzHostsService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/FritzHostsService.cs
index 30f0f23..330bcad 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/FritzHostsService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/FritzHostsService.cs
@@ -12,42 +12,26 @@ public FritzHostsService(FritzServiceEndpointConfiguration endpointConfiguration
     }
 
     public Task<HostsGetHostNumberOfEntriesResponse> GetHostNumberOfEntriesAsync(HostsGetHostNumberOfEntriesRequest hostsGetHostNumberOfEntriesRequest)
-    {
-        return Channel.GetHostNumberOfEntriesAsync(hostsGetHostNumberOfEntriesRequest);
-    }
+        => Channel.GetHostNumberOfEntriesAsync(hostsGetHostNumberOfEntriesRequest);
 
     public Task<HostsHostsCheckUpdateResponse> HostsCheckUpdateAsync(HostsHostsCheckUpdateRequest hostsHostsCheckUpdateRequest)
-    {
-        return Channel.HostsCheckUpdateAsync(hostsHostsCheckUpdateRequest);
-    }
+        => Channel.HostsCheckUpdateAsync(hostsHostsCheckUpdateRequest);
 
     public Task<HostsGetHostListPathResponse> GetHostListPathAsync(HostsGetHostListPathRequest hostsGetHostListPathRequest)
-    {
-        return Channel.GetHostListPathAsync(hostsGetHostListPathRequest);
-    }
+        => Channel.GetHostListPathAsync(hostsGetHostListPathRequest);
 
     public Task<HostsGetGenericHostEntryResponse> GetGenericHostEntryAsync(HostsGetGenericHostEntryRequest hostsGetGenericHostEntryRequest)
-    {
-        return Channel.GetGenericHostEntryAsync(hostsGetGenericHostEntryRequest);
-    }
+        => Channel.GetGenericHostEntryAsync(hostsGetGenericHostEntryRequest);
 
     public Task<HostsGetInfoResponse> GetInfoAsync(HostsGetInfoRequest hostsGetInfoRequest)
-    {
-        return Channel.GetInfoAsync(hostsGetInfoRequest);
-    }
+        => Channel.GetInfoAsync(hostsGetInfoRequest);
 
     public Task<HostsGetChangeCounterResponse> GetChangeCounterAsync(HostsGetChangeCounterRequest hostsGetChangeCounterRequest)
-    {
-        return Channel.GetChangeCounterAsync(hostsGetChangeCounterRequest);
-    }
+        => Channel.GetChangeCounterAsync(hostsGetChangeCounterRequest);
 
     public Task<HostsGetMeshListPathResponse> GetMeshListPathAsync(HostsGetMeshListPathRequest hostsGetMeshListPathRequest)
-    {
-        return Channel.GetMeshListPathAsync(hostsGetMeshListPathRequest);
-    }
+        => Channel.GetMeshListPathAsync(hostsGetMeshListPathRequest);
 
     public Task<HostsGetFriendlyNameResponse> GetFriendlyNameAsync(HostsGetFriendlyNameRequest hostsGetFriendlyNameRequest)
-    {
-        return Channel.GetFriendlyNameAsync(hostsGetFriendlyNameRequest);
-    }
+        => Channel.GetFriendlyNameAsync(hostsGetFriendlyNameRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/LanConfigSecurity/FritzLanConfigSecurityService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/LanConfigSecurity/FritzLanConfigSecurityService.cs
index 781caac..510dd51 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/LanConfigSecurity/FritzLanConfigSecurityService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/LanConfigSecurity/FritzLanConfigSecurityService.cs
@@ -12,27 +12,17 @@ public FritzLanConfigSecurityService(FritzServiceEndpointConfiguration endpointC
     }
 
     public Task<LanConfigSecurityGetAnonymousLoginResponse> GetAnonymousLoginAsync(LanConfigSecurityGetAnonymousLoginRequest lanConfigSecurityGetAnonymousLoginRequest)
-    {
-        return Channel.GetAnonymousLoginAsync(lanConfigSecurityGetAnonymousLoginRequest);
-    }
+        => Channel.GetAnonymousLoginAsync(lanConfigSecurityGetAnonymousLoginRequest);
 
     public Task<LanConfigSecurityGetCurrentUserResponse> GetCurrentUserAsync(LanConfigSecurityGetCurrentUserRequest lanConfigSecurityGetCurrentUserRequest)
-    {
-        return Channel.GetCurrentUserAsync(lanConfigSecurityGetCurrentUserRequest);
-    }
+        => Channel.GetCurrentUserAsync(lanConfigSecurityGetCurrentUserRequest);
 
     public Task<LanConfigSecurityGetInfoResponse> GetInfoAsync(LanConfigSecurityGetInfoRequest lanConfigSecurityGetInfoRequest)
-    {
-        return Channel.GetInfoAsync(lanConfigSecurityGetInfoRequest);
-    }
+        => Channel.GetInfoAsync(lanConfigSecurityGetInfoRequest);
 
     public Task<LanConfigSecurityGetUserListResponse> GetUserListAsync(LanConfigSecurityGetUserListRequest lanConfigSecurityGetUserListRequest)
-    {
-        return Channel.GetUserListAsync(lanConfigSecurityGetUserListRequest);
-    }
+        => Channel.GetUserListAsync(lanConfigSecurityGetUserListRequest);
 
     public Task<LanConfigSecuritySetConfigPasswordResponse> SetConfigPasswordAsync(LanConfigSecuritySetConfigPasswordRequest lanConfigSecuritySetConfigPasswordRequest)
-    {
-        return Channel.SetConfigPasswordAsync(lanConfigSecuritySetConfigPasswordRequest);
-    }
+        => Channel.SetConfigPasswordAsync(lanConfigSecuritySetConfigPasswordRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/LanEthernetInterfaceConfig/FritzLanEthernetInterfaceConfigService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/LanEthernetInterfaceConfig/FritzLanEthernetInterfaceConfigService.cs
index 856cc77..7120653 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/LanEthernetInterfaceConfig/FritzLanEthernetInterfaceConfigService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/LanEthernetInterfaceConfig/FritzLanEthernetInterfaceConfigService.cs
@@ -12,12 +12,8 @@ public FritzLanEthernetInterfaceConfigService(FritzServiceEndpointConfiguration
     }
 
     public Task<LanEthernetInterfaceConfigGetInfoResponse> GetInfoAsync(LanEthernetInterfaceConfigGetInfoRequest lanEthernetInterfaceConfigGetInfoRequest)
-    {
-        return Channel.GetInfoAsync(lanEthernetInterfaceConfigGetInfoRequest);
-    }
+        => Channel.GetInfoAsync(lanEthernetInterfaceConfigGetInfoRequest);
 
     public Task<LanEthernetInterfaceConfigGetStatisticsResponse> GetStatisticsAsync(LanEthernetInterfaceConfigGetStatisticsRequest lanEthernetInterfaceConfigGetStatisticsRequest)
-    {
-        return Channel.GetStatisticsAsync(lanEthernetInterfaceConfigGetStatisticsRequest);
-    }
+        => Channel.GetStatisticsAsync(lanEthernetInterfaceConfigGetStatisticsRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/LanHostConfigManagement/FritzLanHostConfigManagementService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/LanHostConfigManagement/FritzLanHostConfigManagementService.cs
index 19f12ea..f383744 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/LanHostConfigManagement/FritzLanHostConfigManagementService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/LanHostConfigManagement/FritzLanHostConfigManagementService.cs
@@ -12,32 +12,20 @@ public FritzLanHostConfigManagementService(FritzServiceEndpointConfiguration end
     }
 
     public Task<LanHostConfigManagementGetInfoResponse> GetInfoAsync(LanHostConfigManagementGetInfoRequest lanHostConfigManagementGetInfoRequest)
-    {
-        return Channel.GetInfoAsync(lanHostConfigManagementGetInfoRequest);
-    }
+        => Channel.GetInfoAsync(lanHostConfigManagementGetInfoRequest);
 
     public Task<LanHostConfigManagementGetAddressRangeResponse> GetAddressRangeAsync(LanHostConfigManagementGetAddressRangeRequest lanHostConfigManagementGetAddressRangeRequest)
-    {
-        return Channel.GetAddressRangeAsync(lanHostConfigManagementGetAddressRangeRequest);
-    }
+        => Channel.GetAddressRangeAsync(lanHostConfigManagementGetAddressRangeRequest);
 
     public Task<LanHostConfigManagementGetDnsServersResponse> GetDnsServersAsync(LanHostConfigManagementGetDnsServersRequest lanHostConfigManagementGetDnsServersRequest)
-    {
-        return Channel.GetDnsServersAsync(lanHostConfigManagementGetDnsServersRequest);
-    }
+        => Channel.GetDnsServersAsync(lanHostConfigManagementGetDnsServersRequest);
 
     public Task<LanHostConfigManagementGetIpInterfaceNumberOfEntriesResponse> GetIpInterfaceNumberOfEntriesAsync(LanHostConfigManagementGetIpInterfaceNumberOfEntriesRequest lanHostConfigManagementGetIpInterfaceNumberOfEntriesRequest)
-    {
-        return Channel.GetIpInterfaceNumberOfEntriesAsync(lanHostConfigManagementGetIpInterfaceNumberOfEntriesRequest);
-    }
+        => Channel.GetIpInterfaceNumberOfEntriesAsync(lanHostConfigManagementGetIpInterfaceNumberOfEntriesRequest);
 
     public Task<LanHostConfigManagementGetIpRoutersListResponse> GetIpRoutersListAsync(LanHostConfigManagementGetIpRoutersListRequest lanHostConfigManagementGetIpRoutersListRequest)
-    {
-        return Channel.GetIpRoutersListAsync(lanHostConfigManagementGetIpRoutersListRequest);
-    }
+        => Channel.GetIpRoutersListAsync(lanHostConfigManagementGetIpRoutersListRequest);
 
     public Task<LanHostConfigManagementGetSubnetMaskResponse> GetSubnetMaskAsync(LanHostConfigManagementGetSubnetMaskRequest lanHostConfigManagementGetSubnetMaskRequest)
-    {
-        return Channel.GetSubnetMaskAsync(lanHostConfigManagementGetSubnetMaskRequest);
-    }
+        => Channel.GetSubnetMaskAsync(lanHostConfigManagementGetSubnetMaskRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/Layer3Forwarding/FritzLayer3ForwardingService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/Layer3Forwarding/FritzLayer3ForwardingService.cs
index 9a51a78..713861d 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/Layer3Forwarding/FritzLayer3ForwardingService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/Layer3Forwarding/FritzLayer3ForwardingService.cs
@@ -12,17 +12,11 @@ public FritzLayer3ForwardingService(FritzServiceEndpointConfiguration endpointCo
     }
 
     public Task<Layer3ForwardingGetDefaultConnectionServiceResponse> GetDefaultConnectionServiceAsync(Layer3ForwardingGetDefaultConnectionServiceRequest layer3ForwardingGetDefaultConnectionServiceRequest)
-    {
-        return Channel.GetDefaultConnectionServiceAsync(layer3ForwardingGetDefaultConnectionServiceRequest);
-    }
+        => Channel.GetDefaultConnectionServiceAsync(layer3ForwardingGetDefaultConnectionServiceRequest);
 
     public Task<Layer3ForwardingGetForwardNumberOfEntriesResponse> GetForwardNumberOfEntriesAsync(Layer3ForwardingGetForwardNumberOfEntriesRequest layer3ForwardingGetForwardNumberOfEntriesRequest)
-    {
-        return Channel.GetForwardNumberOfEntriesAsync(layer3ForwardingGetForwardNumberOfEntriesRequest);
-    }
+        => Channel.GetForwardNumberOfEntriesAsync(layer3ForwardingGetForwardNumberOfEntriesRequest);
 
     public Task<Layer3ForwardingGetGenericForwardingEntryResponse> GetGenericForwardingEntryAsync(Layer3ForwardingGetGenericForwardingEntryRequest layer3ForwardingGetGenericForwardingEntryRequest)
-    {
-        return Channel.GetGenericForwardingEntryAsync(layer3ForwardingGetGenericForwardingEntryRequest);
-    }
+        => Channel.GetGenericForwardingEntryAsync(layer3ForwardingGetGenericForwardingEntryRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/ManagementServer/FritzManagementServerService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/ManagementServer/FritzManagementServerService.cs
index 3d57b9c..5d3370f 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/ManagementServer/FritzManagementServerService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/ManagementServer/FritzManagementServerService.cs
@@ -12,52 +12,32 @@ public FritzManagementServerService(FritzServiceEndpointConfiguration endpointCo
     }
 
     public Task<ManagementServerGetInfoResponse> GetInfoAsync(ManagementServerGetInfoRequest managementServerGetInfoRequest)
-    {
-        return Channel.GetInfoAsync(managementServerGetInfoRequest);
-    }
+        => Channel.GetInfoAsync(managementServerGetInfoRequest);
 
     public Task<ManagementServerGetTr069FirmwareDownloadEnabledResponse> GetTr069FirmwareDownloadEnabledAsync(ManagementServerGetTr069FirmwareDownloadEnabledRequest managementServerGetTr069FirmwareDownloadEnabledRequest)
-    {
-        return Channel.GetTr069FirmwareDownloadEnabledAsync(managementServerGetTr069FirmwareDownloadEnabledRequest);
-    }
+        => Channel.GetTr069FirmwareDownloadEnabledAsync(managementServerGetTr069FirmwareDownloadEnabledRequest);
 
     public Task<ManagementServerSetConnectionRequestAuthenticationResponse> SetConnectionRequestAuthenticationAsync(ManagementServerSetConnectionRequestAuthenticationRequest managementServerSetConnectionRequestAuthenticationRequest)
-    {
-        return Channel.SetConnectionRequestAuthenticationAsync(managementServerSetConnectionRequestAuthenticationRequest);
-    }
+        => Channel.SetConnectionRequestAuthenticationAsync(managementServerSetConnectionRequestAuthenticationRequest);
 
     public Task<ManagementServerSetManagementServerPasswordResponse> SetManagementServerPasswordAsync(ManagementServerSetManagementServerPasswordRequest managementServerSetManagementServerPasswordRequest)
-    {
-        return Channel.SetManagementServerPasswordAsync(managementServerSetManagementServerPasswordRequest);
-    }
+        => Channel.SetManagementServerPasswordAsync(managementServerSetManagementServerPasswordRequest);
 
     public Task<ManagementServerSetManagementServerUrlResponse> SetManagementServerUrlAsync(ManagementServerSetManagementServerUrlRequest managementServerSetManagementServerUrlRequest)
-    {
-        return Channel.SetManagementServerUrlAsync(managementServerSetManagementServerUrlRequest);
-    }
+        => Channel.SetManagementServerUrlAsync(managementServerSetManagementServerUrlRequest);
 
     public Task<ManagementServerSetManagementServerUsernameResponse> SetManagementServerUsernameAsync(ManagementServerSetManagementServerUsernameRequest managementServerSetManagementServerUsernameRequest)
-    {
-        return Channel.SetManagementServerUsernameAsync(managementServerSetManagementServerUsernameRequest);
-    }
+        => Channel.SetManagementServerUsernameAsync(managementServerSetManagementServerUsernameRequest);
 
     public Task<ManagementServerSetPeriodicInformResponse> SetPeriodicInformAsync(ManagementServerSetPeriodicInformRequest managementServerSetPeriodicInformRequest)
-    {
-        return Channel.SetPeriodicInformAsync(managementServerSetPeriodicInformRequest);
-    }
+        => Channel.SetPeriodicInformAsync(managementServerSetPeriodicInformRequest);
 
     public Task<ManagementServerSetTr069EnableResponse> SetTr069EnableAsync(ManagementServerSetTr069EnableRequest managementServerSetTr069EnableRequest)
-    {
-        return Channel.SetTr069EnableAsync(managementServerSetTr069EnableRequest);
-    }
+        => Channel.SetTr069EnableAsync(managementServerSetTr069EnableRequest);
 
     public Task<ManagementServerSetTr069FirmwareDownloadEnabledResponse> SetTr069FirmwareDownloadEnabledAsync(ManagementServerSetTr069FirmwareDownloadEnabledRequest managementServerSetTr069FirmwareDownloadEnabledRequest)
-    {
-        return Channel.SetTr069FirmwareDownloadEnabledAsync(managementServerSetTr069FirmwareDownloadEnabledRequest);
-    }
+        => Channel.SetTr069FirmwareDownloadEnabledAsync(managementServerSetTr069FirmwareDownloadEnabledRequest);
 
     public Task<ManagementServerSetUpgradeManagementResponse> SetUpgradeManagementAsync(ManagementServerSetUpgradeManagementRequest managementServerSetUpgradeManagementRequest)
-    {
-        return Channel.SetUpgradeManagementAsync(managementServerSetUpgradeManagementRequest);
-    }
+        => Channel.SetUpgradeManagementAsync(managementServerSetUpgradeManagementRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/Time/FritzTimeService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/Time/FritzTimeService.cs
index 9ec51ae..85888d2 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/Time/FritzTimeService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/Time/FritzTimeService.cs
@@ -12,12 +12,8 @@ public FritzTimeService(FritzServiceEndpointConfiguration endpointConfiguration,
     }
 
     public Task<TimeGetInfoResponse> GetInfoAsync(TimeGetInfoRequest timeGetInfoRequest)
-    {
-        return Channel.GetInfoAsync(timeGetInfoRequest);
-    }
+        => Channel.GetInfoAsync(timeGetInfoRequest);
 
     public Task<TimeSetNtpServersResponse> SetNtpServersAsync(TimeSetNtpServersRequest timeSetNtpServersRequest)
-    {
-        return Channel.SetNtpServersAsync(timeSetNtpServersRequest);
-    }
+        => Channel.SetNtpServersAsync(timeSetNtpServersRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/UserInterface/FritzUserInterfaceService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/UserInterface/FritzUserInterfaceService.cs
index 22f40e8..24fda7a 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/UserInterface/FritzUserInterfaceService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/UserInterface/FritzUserInterfaceService.cs
@@ -12,47 +12,29 @@ public FritzUserInterfaceService(FritzServiceEndpointConfiguration endpointConfi
     }
 
     public Task<UserInterfaceGetInfoResponse> GetInfoAsync(UserInterfaceGetInfoRequest userInterfaceGetInfoRequest)
-    {
-        return Channel.GetInfoAsync(userInterfaceGetInfoRequest);
-    }
+        => Channel.GetInfoAsync(userInterfaceGetInfoRequest);
 
     public Task<UserInterfaceCheckUpdateResponse> CheckUpdateAsync(UserInterfaceCheckUpdateRequest userInterfaceCheckUpdateRequest)
-    {
-        return Channel.CheckUpdateAsync(userInterfaceCheckUpdateRequest);
-    }
+        => Channel.CheckUpdateAsync(userInterfaceCheckUpdateRequest);
 
     public Task<UserInterfaceDoPrepareCgiResponse> DoPrepareCgiAsync(UserInterfaceDoPrepareCgiRequest userInterfaceDoPrepareCgiRequest)
-    {
-        return Channel.DoPrepareCgiAsync(userInterfaceDoPrepareCgiRequest);
-    }
+        => Channel.DoPrepareCgiAsync(userInterfaceDoPrepareCgiRequest);
 
     public Task<UserInterfaceDoUpdateResponse> DoUpdateAsync(UserInterfaceDoUpdateRequest userInterfaceDoUpdateRequest)
-    {
-        return Channel.DoUpdateAsync(userInterfaceDoUpdateRequest);
-    }
+        => Channel.DoUpdateAsync(userInterfaceDoUpdateRequest);
 
     public Task<UserInterfaceDoManualUpdateResponse> DoManualUpdateAsync(UserInterfaceDoManualUpdateRequest userInterfaceDoManualUpdateRequest)
-    {
-        return Channel.DoManualUpdateAsync(userInterfaceDoManualUpdateRequest);
-    }
+        => Channel.DoManualUpdateAsync(userInterfaceDoManualUpdateRequest);
 
     public Task<UserInterfaceGetInternationalConfigResponse> GetInternationalConfigAsync(UserInterfaceGetInternationalConfigRequest userInterfaceGetInternationalConfigRequest)
-    {
-        return Channel.GetInternationalConfigAsync(userInterfaceGetInternationalConfigRequest);
-    }
+        => Channel.GetInternationalConfigAsync(userInterfaceGetInternationalConfigRequest);
 
     public Task<UserInterfaceSetInternationalConfigResponse> SetInternationalConfigAsync(UserInterfaceSetInternationalConfigRequest userInterfaceSetInternationalConfigRequest)
-    {
-        return Channel.SetInternationalConfigAsync(userInterfaceSetInternationalConfigRequest);
-    }
+        => Channel.SetInternationalConfigAsync(userInterfaceSetInternationalConfigRequest);
 
     public Task<UserInterfaceAvmGetInfoResponse> AvmGetInfoAsync(UserInterfaceAvmGetInfoRequest userInterfaceAvmGetInfoRequest)
-    {
-        return Channel.AvmGetInfoAsync(userInterfaceAvmGetInfoRequest);
-    }
+        => Channel.AvmGetInfoAsync(userInterfaceAvmGetInfoRequest);
 
     public Task<UserInterfaceSetConfigResponse> SetConfigAsync(UserInterfaceSetConfigRequest userInterfaceSetConfigRequest)
-    {
-        return Channel.SetConfigAsync(userInterfaceSetConfigRequest);
-    }
+        => Channel.SetConfigAsync(userInterfaceSetConfigRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WanCommonInterfaceConfig/FritzWanCommonInterfaceConfigService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WanCommonInterfaceConfig/FritzWanCommonInterfaceConfigService.cs
index 6acf4af..3597ada 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WanCommonInterfaceConfig/FritzWanCommonInterfaceConfigService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WanCommonInterfaceConfig/FritzWanCommonInterfaceConfigService.cs
@@ -12,37 +12,23 @@ public FritzWanCommonInterfaceConfigService(FritzServiceEndpointConfiguration en
     }
 
     public Task<WanCommonInterfaceConfigGetCommonLinkPropertiesResponse> GetCommonLinkPropertiesAsync(WanCommonInterfaceConfigGetCommonLinkPropertiesRequest wanCommonInterfaceConfigGetCommonLinkPropertiesRequest)
-    {
-        return Channel.GetCommonLinkPropertiesAsync(wanCommonInterfaceConfigGetCommonLinkPropertiesRequest);
-    }
+        => Channel.GetCommonLinkPropertiesAsync(wanCommonInterfaceConfigGetCommonLinkPropertiesRequest);
 
     public Task<WanCommonInterfaceConfigGetTotalBytesReceivedResponse> GetTotalBytesReceivedAsync(WanCommonInterfaceConfigGetTotalBytesReceivedRequest wanCommonInterfaceConfigGetTotalBytesReceivedRequest)
-    {
-        return Channel.GetTotalBytesReceivedAsync(wanCommonInterfaceConfigGetTotalBytesReceivedRequest);
-    }
+        => Channel.GetTotalBytesReceivedAsync(wanCommonInterfaceConfigGetTotalBytesReceivedRequest);
 
     public Task<WanCommonInterfaceConfigGetTotalBytesSentResponse> GetTotalBytesSentAsync(WanCommonInterfaceConfigGetTotalBytesSentRequest wanCommonInterfaceConfigGetTotalBytesSentRequest)
-    {
-        return Channel.GetTotalBytesSentAsync(wanCommonInterfaceConfigGetTotalBytesSentRequest);
-    }
+        => Channel.GetTotalBytesSentAsync(wanCommonInterfaceConfigGetTotalBytesSentRequest);
 
     public Task<WanCommonInterfaceConfigGetTotalPacketsReceivedResponse> GetTotalPacketsReceivedAsync(WanCommonInterfaceConfigGetTotalPacketsReceivedRequest wanCommonInterfaceConfigGetTotalPacketsReceivedRequest)
-    {
-        return Channel.GetTotalPacketsReceivedAsync(wanCommonInterfaceConfigGetTotalPacketsReceivedRequest);
-    }
+        => Channel.GetTotalPacketsReceivedAsync(wanCommonInterfaceConfigGetTotalPacketsReceivedRequest);
 
     public Task<WanCommonInterfaceConfigGetTotalPacketsSentResponse> GetTotalPacketsSentAsync(WanCommonInterfaceConfigGetTotalPacketsSentRequest wanCommonInterfaceConfigGetTotalPacketsSentRequest)
-    {
-        return Channel.GetTotalPacketsSentAsync(wanCommonInterfaceConfigGetTotalPacketsSentRequest);
-    }
+        => Channel.GetTotalPacketsSentAsync(wanCommonInterfaceConfigGetTotalPacketsSentRequest);
 
     public Task<WanCommonInterfaceConfigSetWanAccessTypeResponse> SetWanAccessTypeAsync(WanCommonInterfaceConfigSetWanAccessTypeRequest wanCommonInterfaceConfigSetWanAccessTypeRequest)
-    {
-        return Channel.SetWanAccessTypeAsync(wanCommonInterfaceConfigSetWanAccessTypeRequest);
-    }
+        => Channel.SetWanAccessTypeAsync(wanCommonInterfaceConfigSetWanAccessTypeRequest);
 
     public Task<WanCommonInterfaceConfigGetOnlineMonitorResponse> GetOnlineMonitorAsync(WanCommonInterfaceConfigGetOnlineMonitorRequest wanCommonInterfaceConfigGetOnlineMonitorRequest)
-    {
-        return Channel.GetOnlineMonitorAsync(wanCommonInterfaceConfigGetOnlineMonitorRequest);
-    }
+        => Channel.GetOnlineMonitorAsync(wanCommonInterfaceConfigGetOnlineMonitorRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslInterfaceConfig/FritzWanDslInterfaceConfigService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslInterfaceConfig/FritzWanDslInterfaceConfigService.cs
index 5683107..ed432e9 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslInterfaceConfig/FritzWanDslInterfaceConfigService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslInterfaceConfig/FritzWanDslInterfaceConfigService.cs
@@ -12,22 +12,14 @@ public FritzWanDslInterfaceConfigService(FritzServiceEndpointConfiguration endpo
     }
 
     public Task<WanDslInterfaceConfigGetDslDiagnoseInfoResponse> GetDslDiagnoseInfoAsync(WanDslInterfaceConfigGetDslDiagnoseInfoRequest wanDslInterfaceConfigGetDslDiagnoseInfoRequest)
-    {
-        return Channel.GetDslDiagnoseInfoAsync(wanDslInterfaceConfigGetDslDiagnoseInfoRequest);
-    }
+        => Channel.GetDslDiagnoseInfoAsync(wanDslInterfaceConfigGetDslDiagnoseInfoRequest);
 
     public Task<WanDslInterfaceConfigGetDslInfoResponse> GetDslInfoAsync(WanDslInterfaceConfigGetDslInfoRequest wanDslInterfaceConfigGetDslInfoRequest)
-    {
-        return Channel.GetDslInfoAsync(wanDslInterfaceConfigGetDslInfoRequest);
-    }
+        => Channel.GetDslInfoAsync(wanDslInterfaceConfigGetDslInfoRequest);
 
     public Task<WanDslInterfaceConfigGetInfoResponse> GetInfoAsync(WanDslInterfaceConfigGetInfoRequest wanDslInterfaceConfigGetInfo)
-    {
-        return Channel.GetInfoAsync(wanDslInterfaceConfigGetInfo);
-    }
+        => Channel.GetInfoAsync(wanDslInterfaceConfigGetInfo);
 
     public Task<WanDslInterfaceConfigGetStatisticsTotalResponse> GetStatisticsTotalAsync(WanDslInterfaceConfigGetStatisticsTotalRequest wanDslInterfaceConfigGetStatisticsTotalRequest)
-    {
-        return Channel.GetStatisticsTotalAsync(wanDslInterfaceConfigGetStatisticsTotalRequest);
-    }
+        => Channel.GetStatisticsTotalAsync(wanDslInterfaceConfigGetStatisticsTotalRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslLinkConfig/FritzWanDslLinkConfigService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslLinkConfig/FritzWanDslLinkConfigService.cs
index 27aaea7..8fa392a 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslLinkConfig/FritzWanDslLinkConfigService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslLinkConfig/FritzWanDslLinkConfigService.cs
@@ -12,32 +12,20 @@ public FritzWanDslLinkConfigService(FritzServiceEndpointConfiguration endpointCo
     }
 
     public Task<WanDslLinkConfigGetInfoResponse> GetInfoAsync(WanDslLinkConfigGetInfoRequest wanDslLinkConfigGetInfoRequest)
-    {
-        return Channel.GetInfoAsync(wanDslLinkConfigGetInfoRequest);
-    }
+        => Channel.GetInfoAsync(wanDslLinkConfigGetInfoRequest);
 
     public Task<WanDslLinkConfigGetDslLinkInfoResponse> GetDslLinkInfoAsync(WanDslLinkConfigGetDslLinkInfoRequest wanDslLinkConfigGetDslLinkInfoRequest)
-    {
-        return Channel.GetDslLinkInfoAsync(wanDslLinkConfigGetDslLinkInfoRequest);
-    }
+        => Channel.GetDslLinkInfoAsync(wanDslLinkConfigGetDslLinkInfoRequest);
 
     public Task<WanDslLinkConfigGetDestinationAddressResponse> GetDestinationAddressAsync(WanDslLinkConfigGetDestinationAddressRequest wanDslLinkConfigGetDestinationAddressRequest)
-    {
-        return Channel.GetDestinationAddressAsync(wanDslLinkConfigGetDestinationAddressRequest);
-    }
+        => Channel.GetDestinationAddressAsync(wanDslLinkConfigGetDestinationAddressRequest);
 
     public Task<WanDslLinkConfigGetAtmEncapsulationResponse> GetAtmEncapsulationAsync(WanDslLinkConfigGetAtmEncapsulationRequest wanDslLinkConfigGetAtmEncapsulationRequest)
-    {
-        return Channel.GetAtmEncapsulationAsync(wanDslLinkConfigGetAtmEncapsulationRequest);
-    }
+        => Channel.GetAtmEncapsulationAsync(wanDslLinkConfigGetAtmEncapsulationRequest);
 
     public Task<WanDslLinkConfigGetAutoConfigResponse> GetAutoConfigAsync(WanDslLinkConfigGetAutoConfigRequest wanDslLinkConfigGetAutoConfigRequest)
-    {
-        return Channel.GetAutoConfigAsync(wanDslLinkConfigGetAutoConfigRequest);
-    }
+        => Channel.GetAutoConfigAsync(wanDslLinkConfigGetAutoConfigRequest);
 
     public Task<WanDslLinkConfigGetStatisticsResponse> GetStatisticsAsync(WanDslLinkConfigGetStatisticsRequest wanDslLinkConfigGetStatisticsRequest)
-    {
-        return Channel.GetStatisticsAsync(wanDslLinkConfigGetStatisticsRequest);
-    }
+        => Channel.GetStatisticsAsync(wanDslLinkConfigGetStatisticsRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WanEthernetLinkConfig/FritzWanEthernetLinkConfigService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WanEthernetLinkConfig/FritzWanEthernetLinkConfigService.cs
index fa02b23..af8350c 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WanEthernetLinkConfig/FritzWanEthernetLinkConfigService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WanEthernetLinkConfig/FritzWanEthernetLinkConfigService.cs
@@ -12,7 +12,5 @@ public FritzWanEthernetLinkConfigService(FritzServiceEndpointConfiguration endpo
     }
 
     public Task<WanEthernetLinkConfigGetEthernetLinkStatusResponse> GetEthernetLinkStatusAsync(WanEthernetLinkConfigGetEthernetLinkStatusRequest wanEthernetLinkConfigGetEthernetLinkStatusRequest)
-    {
-        return Channel.GetEthernetLinkStatusAsync(wanEthernetLinkConfigGetEthernetLinkStatusRequest);
-    }
+        => Channel.GetEthernetLinkStatusAsync(wanEthernetLinkConfigGetEthernetLinkStatusRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WanIpConnection/FritzWanIpConnectionService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WanIpConnection/FritzWanIpConnectionService.cs
index 219e5cc..ce9589b 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WanIpConnection/FritzWanIpConnectionService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WanIpConnection/FritzWanIpConnectionService.cs
@@ -12,42 +12,26 @@ public FritzWanIpConnectionService(FritzServiceEndpointConfiguration endpointCon
     }
 
     public Task<WanIpConnectionGetInfoResponse> GetInfoAsync(WanConnectionGetInfoRequest wanConnectionGetInfoRequest)
-    {
-        return Channel.GetInfoAsync(wanConnectionGetInfoRequest);
-    }
+        => Channel.GetInfoAsync(wanConnectionGetInfoRequest);
 
     public Task<WanConnectionGetConnectionTypeInfoResponse> GetConnectionTypeInfoAsync(WanConnectionGetConnectionTypeInfoRequest wanConnectionGetConnectionTypeInfoRequest)
-    {
-        return Channel.GetConnectionTypeInfoAsync(wanConnectionGetConnectionTypeInfoRequest);
-    }
+        => Channel.GetConnectionTypeInfoAsync(wanConnectionGetConnectionTypeInfoRequest);
 
     public Task<WanConnectionGetStatusInfoResponse> GetStatusInfoAsync(WanConnectionGetStatusInfoRequest wanConnectionGetStatusInfoRequest)
-    {
-        return Channel.GetStatusInfoAsync(wanConnectionGetStatusInfoRequest);
-    }
+        => Channel.GetStatusInfoAsync(wanConnectionGetStatusInfoRequest);
 
     public Task<WanConnectionGetNatRsipStatusResponse> GetNatRsipStatusAsync(WanConnectionGetNatRsipStatusRequest wanConnectionGetNatRsipStatusRequest)
-    {
-        return Channel.GetNatRsipStatusAsync(wanConnectionGetNatRsipStatusRequest);
-    }
+        => Channel.GetNatRsipStatusAsync(wanConnectionGetNatRsipStatusRequest);
 
     public Task<WanConnectionGetDnsServersResponse> GetDnsServersAsync(WanConnectionGetDnsServersRequest wanConnectionGetDnsServersRequest)
-    {
-        return Channel.GetDnsServersAsync(wanConnectionGetDnsServersRequest);
-    }
+        => Channel.GetDnsServersAsync(wanConnectionGetDnsServersRequest);
 
     public Task<WanConnectionGetPortMappingNumberOfEntriesResponse> GetPortMappingNumberOfEntriesAsync(WanConnectionGetPortMappingNumberOfEntriesRequest wanConnectionGetPortMappingNumberOfEntriesRequest)
-    {
-        return Channel.GetPortMappingNumberOfEntriesAsync(wanConnectionGetPortMappingNumberOfEntriesRequest);
-    }
+        => Channel.GetPortMappingNumberOfEntriesAsync(wanConnectionGetPortMappingNumberOfEntriesRequest);
 
     public Task<WanConnectionGetExternalIpAddressResponse> GetExternalIpAddressAsync(WanConnectionGetExternalIpAddressRequest wanConnectionGetExternalIpAddressRequest)
-    {
-        return Channel.GetExternalIpAddressAsync(wanConnectionGetExternalIpAddressRequest);
-    }
+        => Channel.GetExternalIpAddressAsync(wanConnectionGetExternalIpAddressRequest);
 
     public Task<WanConnectionGetGenericPortMappingEntryResponse> GetGenericPortMappingEntryAsync(WanConnectionGetGenericPortMappingEntryRequest wanConnectionGetGenericPortMappingEntryRequest)
-    {
-        return Channel.GetGenericPortMappingEntryAsync(wanConnectionGetGenericPortMappingEntryRequest);
-    }
+        => Channel.GetGenericPortMappingEntryAsync(wanConnectionGetGenericPortMappingEntryRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WanPppConnection/FritzWanPppConnectionService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WanPppConnection/FritzWanPppConnectionService.cs
index e2482ea..55d0365 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WanPppConnection/FritzWanPppConnectionService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WanPppConnection/FritzWanPppConnectionService.cs
@@ -12,57 +12,35 @@ public FritzWanPppConnectionService(FritzServiceEndpointConfiguration endpointCo
     }
 
     public Task<WanPppConnectionGetInfoResponse> GetInfoAsync(WanConnectionGetInfoRequest wanConnectionGetInfoRequest)
-    {
-        return Channel.GetInfoAsync(wanConnectionGetInfoRequest);
-    }
+        => Channel.GetInfoAsync(wanConnectionGetInfoRequest);
 
     public Task<WanConnectionGetConnectionTypeInfoResponse> GetConnectionTypeInfoAsync(WanConnectionGetConnectionTypeInfoRequest wanConnectionGetConnectionTypeInfoRequest)
-    {
-        return Channel.GetConnectionTypeInfoAsync(wanConnectionGetConnectionTypeInfoRequest);
-    }
+        => Channel.GetConnectionTypeInfoAsync(wanConnectionGetConnectionTypeInfoRequest);
 
     public Task<WanConnectionGetStatusInfoResponse> GetStatusInfoAsync(WanConnectionGetStatusInfoRequest wanConnectionGetStatusInfoRequest)
-    {
-        return Channel.GetStatusInfoAsync(wanConnectionGetStatusInfoRequest);
-    }
+        => Channel.GetStatusInfoAsync(wanConnectionGetStatusInfoRequest);
 
     public Task<WanPppConnectionGetLinkLayerMaxBitRatesResponse> GetLinkLayerMaxBitRatesAsync(WanPppConnectionGetLinkLayerMaxBitRatesRequest wanPppConnectionGetLinkLayerMaxBitRatesRequest)
-    {
-        return Channel.GetLinkLayerMaxBitRatesAsync(wanPppConnectionGetLinkLayerMaxBitRatesRequest);
-    }
+        => Channel.GetLinkLayerMaxBitRatesAsync(wanPppConnectionGetLinkLayerMaxBitRatesRequest);
 
     public Task<WanPppConnectionGetUserNameResponse> GetUserNameAsync(WanPppConnectionGetUserNameRequest wanPppConnectionGetUserNameRequest)
-    {
-        return Channel.GetUserNameAsync(wanPppConnectionGetUserNameRequest);
-    }
+        => Channel.GetUserNameAsync(wanPppConnectionGetUserNameRequest);
 
     public Task<WanConnectionGetNatRsipStatusResponse> GetNatRsipStatusAsync(WanConnectionGetNatRsipStatusRequest wanConnectionGetNatRsipStatusRequest)
-    {
-        return Channel.GetNatRsipStatusAsync(wanConnectionGetNatRsipStatusRequest);
-    }
+        => Channel.GetNatRsipStatusAsync(wanConnectionGetNatRsipStatusRequest);
 
     public Task<WanConnectionGetDnsServersResponse> GetDnsServersAsync(WanConnectionGetDnsServersRequest wanConnectionGetDnsServersRequest)
-    {
-        return Channel.GetDnsServersAsync(wanConnectionGetDnsServersRequest);
-    }
+        => Channel.GetDnsServersAsync(wanConnectionGetDnsServersRequest);
 
     public Task<WanConnectionGetPortMappingNumberOfEntriesResponse> GetPortMappingNumberOfEntriesAsync(WanConnectionGetPortMappingNumberOfEntriesRequest wanConnectionGetPortMappingNumberOfEntriesRequest)
-    {
-        return Channel.GetPortMappingNumberOfEntriesAsync(wanConnectionGetPortMappingNumberOfEntriesRequest);
-    }
+        => Channel.GetPortMappingNumberOfEntriesAsync(wanConnectionGetPortMappingNumberOfEntriesRequest);
 
     public Task<WanConnectionGetExternalIpAddressResponse> GetExternalIpAddressAsync(WanConnectionGetExternalIpAddressRequest wanConnectionGetExternalIpAddressRequest)
-    {
-        return Channel.GetExternalIpAddressAsync(wanConnectionGetExternalIpAddressRequest);
-    }
+        => Channel.GetExternalIpAddressAsync(wanConnectionGetExternalIpAddressRequest);
 
     public Task<WanPppConnectionGetAutoDisconnectTimeSpanResponse> GetAutoDisconnectTimeSpanAsync(WanPppConnectionGetAutoDisconnectTimeSpanRequest wanPppConnectionGetAutoDisconnectTimeSpanRequest)
-    {
-        return Channel.GetAutoDisconnectTimeSpanAsync(wanPppConnectionGetAutoDisconnectTimeSpanRequest);
-    }
+        => Channel.GetAutoDisconnectTimeSpanAsync(wanPppConnectionGetAutoDisconnectTimeSpanRequest);
 
     public Task<WanConnectionGetGenericPortMappingEntryResponse> GetGenericPortMappingEntryAsync(WanConnectionGetGenericPortMappingEntryRequest wanConnectionGetGenericPortMappingEntryRequest)
-    {
-        return Channel.GetGenericPortMappingEntryAsync(wanConnectionGetGenericPortMappingEntryRequest);
-    }
+        => Channel.GetGenericPortMappingEntryAsync(wanConnectionGetGenericPortMappingEntryRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration1Service.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration1Service.cs
index 5a15f7d..c02dc64 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration1Service.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration1Service.cs
@@ -12,87 +12,53 @@ public FritzWlanConfiguration1Service(FritzServiceEndpointConfiguration endpoint
     }
 
     public Task<WlanConfigurationGetInfoResponse> GetInfoAsync(WlanConfigurationGetInfoRequest wlanConfigurationGetInfoRequest)
-    {
-        return Channel.GetInfoAsync(wlanConfigurationGetInfoRequest);
-    }
+        => Channel.GetInfoAsync(wlanConfigurationGetInfoRequest);
 
     public Task<WlanConfigurationGetWlanDeviceListPathResponse> GetWlanDeviceListPathAsync(WlanConfigurationGetWlanDeviceListPathRequest wlanConfigurationGetWlanDeviceListPathRequest)
-    {
-        return Channel.GetWlanDeviceListPathAsync(wlanConfigurationGetWlanDeviceListPathRequest);
-    }
+        => Channel.GetWlanDeviceListPathAsync(wlanConfigurationGetWlanDeviceListPathRequest);
 
     public Task<WlanConfigurationGetBasBeaconSecurityPropertiesResponse> GetBasBeaconSecurityPropertiesAsync(WlanConfigurationGetBasBeaconSecurityPropertiesRequest wlanConfigurationGetBasBeaconSecurityPropertiesRequest)
-    {
-        return Channel.GetBasBeaconSecurityPropertiesAsync(wlanConfigurationGetBasBeaconSecurityPropertiesRequest);
-    }
+        => Channel.GetBasBeaconSecurityPropertiesAsync(wlanConfigurationGetBasBeaconSecurityPropertiesRequest);
 
     public Task<WlanConfigurationGetBssIdResponse> GetBssIdAsync(WlanConfigurationGetBssIdRequest wlanConfigurationGetBssIdRequest)
-    {
-        return Channel.GetBssIdAsync(wlanConfigurationGetBssIdRequest);
-    }
+        => Channel.GetBssIdAsync(wlanConfigurationGetBssIdRequest);
 
     public Task<WlanConfigurationGetSsIdResponse> GetSsIdAsync(WlanConfigurationGetSsIdRequest wlanConfigurationGetSsIdRequest)
-    {
-        return Channel.GetSsIdAsync(wlanConfigurationGetSsIdRequest);
-    }
+        => Channel.GetSsIdAsync(wlanConfigurationGetSsIdRequest);
 
     public Task<WlanConfigurationGetBeaconTypeResponse> GetBeaconTypeAsync(WlanConfigurationGetBeaconTypeRequest wlanConfigurationGetBeaconTypeRequest)
-    {
-        return Channel.GetBeaconTypeAsync(wlanConfigurationGetBeaconTypeRequest);
-    }
+        => Channel.GetBeaconTypeAsync(wlanConfigurationGetBeaconTypeRequest);
 
     public Task<WlanConfigurationGetChannelInfoResponse> GetChannelInfoAsync(WlanConfigurationGetChannelInfoRequest wlanConfigurationGetChannelInfoRequest)
-    {
-        return Channel.GetChannelInfoAsync(wlanConfigurationGetChannelInfoRequest);
-    }
+        => Channel.GetChannelInfoAsync(wlanConfigurationGetChannelInfoRequest);
 
     public Task<WlanConfigurationGetBeaconAdvertisementResponse> GetBeaconAdvertisementAsync(WlanConfigurationGetBeaconAdvertisementRequest wlanConfigurationGetBeaconAdvertisementRequest)
-    {
-        return Channel.GetBeaconAdvertisementAsync(wlanConfigurationGetBeaconAdvertisementRequest);
-    }
+        => Channel.GetBeaconAdvertisementAsync(wlanConfigurationGetBeaconAdvertisementRequest);
 
     public Task<WlanConfigurationGetTotalAssociationsResponse> GetTotalAssociationsAsync(WlanConfigurationGetTotalAssociationsRequest wlanConfigurationGetTotalAssociationsRequest)
-    {
-        return Channel.GetTotalAssociationsAsync(wlanConfigurationGetTotalAssociationsRequest);
-    }
+        => Channel.GetTotalAssociationsAsync(wlanConfigurationGetTotalAssociationsRequest);
 
     public Task<WlanConfigurationGetIpTvOptimizedResponse> GetIpTvOptimizedAsync(WlanConfigurationGetIpTvOptimizedRequest wlanConfigurationGetIpTvOptimizedRequest)
-    {
-        return Channel.GetIpTvOptimizedAsync(wlanConfigurationGetIpTvOptimizedRequest);
-    }
+        => Channel.GetIpTvOptimizedAsync(wlanConfigurationGetIpTvOptimizedRequest);
 
     public Task<WlanConfigurationGetStatisticsResponse> GetStatisticsAsync(WlanConfigurationGetStatisticsRequest wlanConfigurationGetStatisticsRequest)
-    {
-        return Channel.GetStatisticsAsync(wlanConfigurationGetStatisticsRequest);
-    }
+        => Channel.GetStatisticsAsync(wlanConfigurationGetStatisticsRequest);
 
     public Task<WlanConfigurationGetPacketStatisticsResponse> GetPacketStatisticsAsync(WlanConfigurationGetPacketStatisticsRequest wlanConfigurationGetPacketStatisticsRequest)
-    {
-        return Channel.GetPacketStatisticsAsync(wlanConfigurationGetPacketStatisticsRequest);
-    }
+        => Channel.GetPacketStatisticsAsync(wlanConfigurationGetPacketStatisticsRequest);
 
     public Task<WlanConfigurationGetNightControlResponse> GetNightControlAsync(WlanConfigurationGetNightControlRequest wlanConfigurationGetNightControlRequest)
-    {
-        return Channel.GetNightControlAsync(wlanConfigurationGetNightControlRequest);
-    }
+        => Channel.GetNightControlAsync(wlanConfigurationGetNightControlRequest);
 
     public Task<WlanConfigurationGetWlanHybridModeResponse> GetWlanHybridModeAsync(WlanConfigurationGetWlanHybridModeRequest wlanConfigurationGetWlanHybridModeRequest)
-    {
-        return Channel.GetWlanHybridModeAsync(wlanConfigurationGetWlanHybridModeRequest);
-    }
+        => Channel.GetWlanHybridModeAsync(wlanConfigurationGetWlanHybridModeRequest);
 
     public Task<WlanConfigurationGetWlanExtInfoResponse> GetWlanExtInfoAsync(WlanConfigurationGetWlanExtInfoRequest wlanConfigurationGetWlanExtInfoRequest)
-    {
-        return Channel.GetWlanExtInfoAsync(wlanConfigurationGetWlanExtInfoRequest);
-    }
+        => Channel.GetWlanExtInfoAsync(wlanConfigurationGetWlanExtInfoRequest);
 
     public Task<WlanConfigurationGetWpsInfoResponse> GetWpsInfoAsync(WlanConfigurationGetWpsInfoRequest wlanConfigurationGetWpsInfoRequest)
-    {
-        return Channel.GetWpsInfoAsync(wlanConfigurationGetWpsInfoRequest);
-    }
+        => Channel.GetWpsInfoAsync(wlanConfigurationGetWpsInfoRequest);
 
     public Task<WlanConfigurationGetWlanConnectionInfoResponse> GetWlanConnectionInfoAsync(WlanConfigurationGetWlanConnectionInfoRequest wlanConfigurationGetWlanConnectionInfoRequest)
-    {
-        return Channel.GetWlanConnectionInfoAsync(wlanConfigurationGetWlanConnectionInfoRequest);
-    }
+        => Channel.GetWlanConnectionInfoAsync(wlanConfigurationGetWlanConnectionInfoRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration2Service.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration2Service.cs
index adb9668..9a2164a 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration2Service.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration2Service.cs
@@ -12,87 +12,53 @@ public FritzWlanConfiguration2Service(FritzServiceEndpointConfiguration endpoint
     }
 
     public Task<WlanConfigurationGetInfoResponse> GetInfoAsync(WlanConfigurationGetInfoRequest wlanConfigurationGetInfoRequest)
-    {
-        return Channel.GetInfoAsync(wlanConfigurationGetInfoRequest);
-    }
+        => Channel.GetInfoAsync(wlanConfigurationGetInfoRequest);
 
     public Task<WlanConfigurationGetWlanDeviceListPathResponse> GetWlanDeviceListPathAsync(WlanConfigurationGetWlanDeviceListPathRequest wlanConfigurationGetWlanDeviceListPathRequest)
-    {
-        return Channel.GetWlanDeviceListPathAsync(wlanConfigurationGetWlanDeviceListPathRequest);
-    }
+        => Channel.GetWlanDeviceListPathAsync(wlanConfigurationGetWlanDeviceListPathRequest);
 
     public Task<WlanConfigurationGetBasBeaconSecurityPropertiesResponse> GetBasBeaconSecurityPropertiesAsync(WlanConfigurationGetBasBeaconSecurityPropertiesRequest wlanConfigurationGetBasBeaconSecurityPropertiesRequest)
-    {
-        return Channel.GetBasBeaconSecurityPropertiesAsync(wlanConfigurationGetBasBeaconSecurityPropertiesRequest);
-    }
+        => Channel.GetBasBeaconSecurityPropertiesAsync(wlanConfigurationGetBasBeaconSecurityPropertiesRequest);
 
     public Task<WlanConfigurationGetBssIdResponse> GetBssIdAsync(WlanConfigurationGetBssIdRequest wlanConfigurationGetBssIdRequest)
-    {
-        return Channel.GetBssIdAsync(wlanConfigurationGetBssIdRequest);
-    }
+        => Channel.GetBssIdAsync(wlanConfigurationGetBssIdRequest);
 
     public Task<WlanConfigurationGetSsIdResponse> GetSsIdAsync(WlanConfigurationGetSsIdRequest wlanConfigurationGetSsIdRequest)
-    {
-        return Channel.GetSsIdAsync(wlanConfigurationGetSsIdRequest);
-    }
+        => Channel.GetSsIdAsync(wlanConfigurationGetSsIdRequest);
 
     public Task<WlanConfigurationGetBeaconTypeResponse> GetBeaconTypeAsync(WlanConfigurationGetBeaconTypeRequest wlanConfigurationGetBeaconTypeRequest)
-    {
-        return Channel.GetBeaconTypeAsync(wlanConfigurationGetBeaconTypeRequest);
-    }
+        => Channel.GetBeaconTypeAsync(wlanConfigurationGetBeaconTypeRequest);
 
     public Task<WlanConfigurationGetChannelInfoResponse> GetChannelInfoAsync(WlanConfigurationGetChannelInfoRequest wlanConfigurationGetChannelInfoRequest)
-    {
-        return Channel.GetChannelInfoAsync(wlanConfigurationGetChannelInfoRequest);
-    }
+        => Channel.GetChannelInfoAsync(wlanConfigurationGetChannelInfoRequest);
 
     public Task<WlanConfigurationGetBeaconAdvertisementResponse> GetBeaconAdvertisementAsync(WlanConfigurationGetBeaconAdvertisementRequest wlanConfigurationGetBeaconAdvertisementRequest)
-    {
-        return Channel.GetBeaconAdvertisementAsync(wlanConfigurationGetBeaconAdvertisementRequest);
-    }
+        => Channel.GetBeaconAdvertisementAsync(wlanConfigurationGetBeaconAdvertisementRequest);
 
     public Task<WlanConfigurationGetTotalAssociationsResponse> GetTotalAssociationsAsync(WlanConfigurationGetTotalAssociationsRequest wlanConfigurationGetTotalAssociationsRequest)
-    {
-        return Channel.GetTotalAssociationsAsync(wlanConfigurationGetTotalAssociationsRequest);
-    }
+        => Channel.GetTotalAssociationsAsync(wlanConfigurationGetTotalAssociationsRequest);
 
     public Task<WlanConfigurationGetIpTvOptimizedResponse> GetIpTvOptimizedAsync(WlanConfigurationGetIpTvOptimizedRequest wlanConfigurationGetIpTvOptimizedRequest)
-    {
-        return Channel.GetIpTvOptimizedAsync(wlanConfigurationGetIpTvOptimizedRequest);
-    }
+        => Channel.GetIpTvOptimizedAsync(wlanConfigurationGetIpTvOptimizedRequest);
 
     public Task<WlanConfigurationGetStatisticsResponse> GetStatisticsAsync(WlanConfigurationGetStatisticsRequest wlanConfigurationGetStatisticsRequest)
-    {
-        return Channel.GetStatisticsAsync(wlanConfigurationGetStatisticsRequest);
-    }
+        => Channel.GetStatisticsAsync(wlanConfigurationGetStatisticsRequest);
 
     public Task<WlanConfigurationGetPacketStatisticsResponse> GetPacketStatisticsAsync(WlanConfigurationGetPacketStatisticsRequest wlanConfigurationGetPacketStatisticsRequest)
-    {
-        return Channel.GetPacketStatisticsAsync(wlanConfigurationGetPacketStatisticsRequest);
-    }
+        => Channel.GetPacketStatisticsAsync(wlanConfigurationGetPacketStatisticsRequest);
 
     public Task<WlanConfigurationGetNightControlResponse> GetNightControlAsync(WlanConfigurationGetNightControlRequest wlanConfigurationGetNightControlRequest)
-    {
-        return Channel.GetNightControlAsync(wlanConfigurationGetNightControlRequest);
-    }
+        => Channel.GetNightControlAsync(wlanConfigurationGetNightControlRequest);
 
     public Task<WlanConfigurationGetWlanHybridModeResponse> GetWlanHybridModeAsync(WlanConfigurationGetWlanHybridModeRequest wlanConfigurationGetWlanHybridModeRequest)
-    {
-        return Channel.GetWlanHybridModeAsync(wlanConfigurationGetWlanHybridModeRequest);
-    }
+        => Channel.GetWlanHybridModeAsync(wlanConfigurationGetWlanHybridModeRequest);
 
     public Task<WlanConfigurationGetWlanExtInfoResponse> GetWlanExtInfoAsync(WlanConfigurationGetWlanExtInfoRequest wlanConfigurationGetWlanExtInfoRequest)
-    {
-        return Channel.GetWlanExtInfoAsync(wlanConfigurationGetWlanExtInfoRequest);
-    }
+        => Channel.GetWlanExtInfoAsync(wlanConfigurationGetWlanExtInfoRequest);
 
     public Task<WlanConfigurationGetWpsInfoResponse> GetWpsInfoAsync(WlanConfigurationGetWpsInfoRequest wlanConfigurationGetWpsInfoRequest)
-    {
-        return Channel.GetWpsInfoAsync(wlanConfigurationGetWpsInfoRequest);
-    }
+        => Channel.GetWpsInfoAsync(wlanConfigurationGetWpsInfoRequest);
 
     public Task<WlanConfigurationGetWlanConnectionInfoResponse> GetWlanConnectionInfoAsync(WlanConfigurationGetWlanConnectionInfoRequest wlanConfigurationGetWlanConnectionInfoRequest)
-    {
-        return Channel.GetWlanConnectionInfoAsync(wlanConfigurationGetWlanConnectionInfoRequest);
-    }
+        => Channel.GetWlanConnectionInfoAsync(wlanConfigurationGetWlanConnectionInfoRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration3Service.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration3Service.cs
index 73841bd..3886fb9 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration3Service.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration3Service.cs
@@ -12,87 +12,53 @@ public FritzWlanConfiguration3Service(FritzServiceEndpointConfiguration endpoint
     }
 
     public Task<WlanConfigurationGetInfoResponse> GetInfoAsync(WlanConfigurationGetInfoRequest wlanConfigurationGetInfoRequest)
-    {
-        return Channel.GetInfoAsync(wlanConfigurationGetInfoRequest);
-    }
+        => Channel.GetInfoAsync(wlanConfigurationGetInfoRequest);
 
     public Task<WlanConfigurationGetWlanDeviceListPathResponse> GetWlanDeviceListPathAsync(WlanConfigurationGetWlanDeviceListPathRequest wlanConfigurationGetWlanDeviceListPathRequest)
-    {
-        return Channel.GetWlanDeviceListPathAsync(wlanConfigurationGetWlanDeviceListPathRequest);
-    }
+        => Channel.GetWlanDeviceListPathAsync(wlanConfigurationGetWlanDeviceListPathRequest);
 
     public Task<WlanConfigurationGetBasBeaconSecurityPropertiesResponse> GetBasBeaconSecurityPropertiesAsync(WlanConfigurationGetBasBeaconSecurityPropertiesRequest wlanConfigurationGetBasBeaconSecurityPropertiesRequest)
-    {
-        return Channel.GetBasBeaconSecurityPropertiesAsync(wlanConfigurationGetBasBeaconSecurityPropertiesRequest);
-    }
+        => Channel.GetBasBeaconSecurityPropertiesAsync(wlanConfigurationGetBasBeaconSecurityPropertiesRequest);
 
     public Task<WlanConfigurationGetBssIdResponse> GetBssIdAsync(WlanConfigurationGetBssIdRequest wlanConfigurationGetBssIdRequest)
-    {
-        return Channel.GetBssIdAsync(wlanConfigurationGetBssIdRequest);
-    }
+        => Channel.GetBssIdAsync(wlanConfigurationGetBssIdRequest);
 
     public Task<WlanConfigurationGetSsIdResponse> GetSsIdAsync(WlanConfigurationGetSsIdRequest wlanConfigurationGetSsIdRequest)
-    {
-        return Channel.GetSsIdAsync(wlanConfigurationGetSsIdRequest);
-    }
+        => Channel.GetSsIdAsync(wlanConfigurationGetSsIdRequest);
 
     public Task<WlanConfigurationGetBeaconTypeResponse> GetBeaconTypeAsync(WlanConfigurationGetBeaconTypeRequest wlanConfigurationGetBeaconTypeRequest)
-    {
-        return Channel.GetBeaconTypeAsync(wlanConfigurationGetBeaconTypeRequest);
-    }
+        => Channel.GetBeaconTypeAsync(wlanConfigurationGetBeaconTypeRequest);
 
     public Task<WlanConfigurationGetChannelInfoResponse> GetChannelInfoAsync(WlanConfigurationGetChannelInfoRequest wlanConfigurationGetChannelInfoRequest)
-    {
-        return Channel.GetChannelInfoAsync(wlanConfigurationGetChannelInfoRequest);
-    }
+        => Channel.GetChannelInfoAsync(wlanConfigurationGetChannelInfoRequest);
 
     public Task<WlanConfigurationGetBeaconAdvertisementResponse> GetBeaconAdvertisementAsync(WlanConfigurationGetBeaconAdvertisementRequest wlanConfigurationGetBeaconAdvertisementRequest)
-    {
-        return Channel.GetBeaconAdvertisementAsync(wlanConfigurationGetBeaconAdvertisementRequest);
-    }
+        => Channel.GetBeaconAdvertisementAsync(wlanConfigurationGetBeaconAdvertisementRequest);
 
     public Task<WlanConfigurationGetTotalAssociationsResponse> GetTotalAssociationsAsync(WlanConfigurationGetTotalAssociationsRequest wlanConfigurationGetTotalAssociationsRequest)
-    {
-        return Channel.GetTotalAssociationsAsync(wlanConfigurationGetTotalAssociationsRequest);
-    }
+        => Channel.GetTotalAssociationsAsync(wlanConfigurationGetTotalAssociationsRequest);
 
     public Task<WlanConfigurationGetIpTvOptimizedResponse> GetIpTvOptimizedAsync(WlanConfigurationGetIpTvOptimizedRequest wlanConfigurationGetIpTvOptimizedRequest)
-    {
-        return Channel.GetIpTvOptimizedAsync(wlanConfigurationGetIpTvOptimizedRequest);
-    }
+        => Channel.GetIpTvOptimizedAsync(wlanConfigurationGetIpTvOptimizedRequest);
 
     public Task<WlanConfigurationGetStatisticsResponse> GetStatisticsAsync(WlanConfigurationGetStatisticsRequest wlanConfigurationGetStatisticsRequest)
-    {
-        return Channel.GetStatisticsAsync(wlanConfigurationGetStatisticsRequest);
-    }
+        => Channel.GetStatisticsAsync(wlanConfigurationGetStatisticsRequest);
 
     public Task<WlanConfigurationGetPacketStatisticsResponse> GetPacketStatisticsAsync(WlanConfigurationGetPacketStatisticsRequest wlanConfigurationGetPacketStatisticsRequest)
-    {
-        return Channel.GetPacketStatisticsAsync(wlanConfigurationGetPacketStatisticsRequest);
-    }
+        => Channel.GetPacketStatisticsAsync(wlanConfigurationGetPacketStatisticsRequest);
 
     public Task<WlanConfigurationGetNightControlResponse> GetNightControlAsync(WlanConfigurationGetNightControlRequest wlanConfigurationGetNightControlRequest)
-    {
-        return Channel.GetNightControlAsync(wlanConfigurationGetNightControlRequest);
-    }
+        => Channel.GetNightControlAsync(wlanConfigurationGetNightControlRequest);
 
     public Task<WlanConfigurationGetWlanHybridModeResponse> GetWlanHybridModeAsync(WlanConfigurationGetWlanHybridModeRequest wlanConfigurationGetWlanHybridModeRequest)
-    {
-        return Channel.GetWlanHybridModeAsync(wlanConfigurationGetWlanHybridModeRequest);
-    }
+        => Channel.GetWlanHybridModeAsync(wlanConfigurationGetWlanHybridModeRequest);
 
     public Task<WlanConfigurationGetWlanExtInfoResponse> GetWlanExtInfoAsync(WlanConfigurationGetWlanExtInfoRequest wlanConfigurationGetWlanExtInfoRequest)
-    {
-        return Channel.GetWlanExtInfoAsync(wlanConfigurationGetWlanExtInfoRequest);
-    }
+        => Channel.GetWlanExtInfoAsync(wlanConfigurationGetWlanExtInfoRequest);
 
     public Task<WlanConfigurationGetWpsInfoResponse> GetWpsInfoAsync(WlanConfigurationGetWpsInfoRequest wlanConfigurationGetWpsInfoRequest)
-    {
-        return Channel.GetWpsInfoAsync(wlanConfigurationGetWpsInfoRequest);
-    }
+        => Channel.GetWpsInfoAsync(wlanConfigurationGetWpsInfoRequest);
 
     public Task<WlanConfigurationGetWlanConnectionInfoResponse> GetWlanConnectionInfoAsync(WlanConfigurationGetWlanConnectionInfoRequest wlanConfigurationGetWlanConnectionInfoRequest)
-    {
-        return Channel.GetWlanConnectionInfoAsync(wlanConfigurationGetWlanConnectionInfoRequest);
-    }
+        => Channel.GetWlanConnectionInfoAsync(wlanConfigurationGetWlanConnectionInfoRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration4Service.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration4Service.cs
index ba732a1..5542a6b 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration4Service.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration4Service.cs
@@ -12,87 +12,53 @@ public FritzWlanConfiguration4Service(FritzServiceEndpointConfiguration endpoint
     }
 
     public Task<WlanConfigurationGetInfoResponse> GetInfoAsync(WlanConfigurationGetInfoRequest wlanConfigurationGetInfoRequest)
-    {
-        return Channel.GetInfoAsync(wlanConfigurationGetInfoRequest);
-    }
+        => Channel.GetInfoAsync(wlanConfigurationGetInfoRequest);
 
     public Task<WlanConfigurationGetWlanDeviceListPathResponse> GetWlanDeviceListPathAsync(WlanConfigurationGetWlanDeviceListPathRequest wlanConfigurationGetWlanDeviceListPathRequest)
-    {
-        return Channel.GetWlanDeviceListPathAsync(wlanConfigurationGetWlanDeviceListPathRequest);
-    }
+        => Channel.GetWlanDeviceListPathAsync(wlanConfigurationGetWlanDeviceListPathRequest);
 
     public Task<WlanConfigurationGetBasBeaconSecurityPropertiesResponse> GetBasBeaconSecurityPropertiesAsync(WlanConfigurationGetBasBeaconSecurityPropertiesRequest wlanConfigurationGetBasBeaconSecurityPropertiesRequest)
-    {
-        return Channel.GetBasBeaconSecurityPropertiesAsync(wlanConfigurationGetBasBeaconSecurityPropertiesRequest);
-    }
+        => Channel.GetBasBeaconSecurityPropertiesAsync(wlanConfigurationGetBasBeaconSecurityPropertiesRequest);
 
     public Task<WlanConfigurationGetBssIdResponse> GetBssIdAsync(WlanConfigurationGetBssIdRequest wlanConfigurationGetBssIdRequest)
-    {
-        return Channel.GetBssIdAsync(wlanConfigurationGetBssIdRequest);
-    }
+        => Channel.GetBssIdAsync(wlanConfigurationGetBssIdRequest);
 
     public Task<WlanConfigurationGetSsIdResponse> GetSsIdAsync(WlanConfigurationGetSsIdRequest wlanConfigurationGetSsIdRequest)
-    {
-        return Channel.GetSsIdAsync(wlanConfigurationGetSsIdRequest);
-    }
+        => Channel.GetSsIdAsync(wlanConfigurationGetSsIdRequest);
 
     public Task<WlanConfigurationGetBeaconTypeResponse> GetBeaconTypeAsync(WlanConfigurationGetBeaconTypeRequest wlanConfigurationGetBeaconTypeRequest)
-    {
-        return Channel.GetBeaconTypeAsync(wlanConfigurationGetBeaconTypeRequest);
-    }
+        => Channel.GetBeaconTypeAsync(wlanConfigurationGetBeaconTypeRequest);
 
     public Task<WlanConfigurationGetChannelInfoResponse> GetChannelInfoAsync(WlanConfigurationGetChannelInfoRequest wlanConfigurationGetChannelInfoRequest)
-    {
-        return Channel.GetChannelInfoAsync(wlanConfigurationGetChannelInfoRequest);
-    }
+        => Channel.GetChannelInfoAsync(wlanConfigurationGetChannelInfoRequest);
 
     public Task<WlanConfigurationGetBeaconAdvertisementResponse> GetBeaconAdvertisementAsync(WlanConfigurationGetBeaconAdvertisementRequest wlanConfigurationGetBeaconAdvertisementRequest)
-    {
-        return Channel.GetBeaconAdvertisementAsync(wlanConfigurationGetBeaconAdvertisementRequest);
-    }
+        => Channel.GetBeaconAdvertisementAsync(wlanConfigurationGetBeaconAdvertisementRequest);
 
     public Task<WlanConfigurationGetTotalAssociationsResponse> GetTotalAssociationsAsync(WlanConfigurationGetTotalAssociationsRequest wlanConfigurationGetTotalAssociationsRequest)
-    {
-        return Channel.GetTotalAssociationsAsync(wlanConfigurationGetTotalAssociationsRequest);
-    }
+        => Channel.GetTotalAssociationsAsync(wlanConfigurationGetTotalAssociationsRequest);
 
     public Task<WlanConfigurationGetIpTvOptimizedResponse> GetIpTvOptimizedAsync(WlanConfigurationGetIpTvOptimizedRequest wlanConfigurationGetIpTvOptimizedRequest)
-    {
-        return Channel.GetIpTvOptimizedAsync(wlanConfigurationGetIpTvOptimizedRequest);
-    }
+        => Channel.GetIpTvOptimizedAsync(wlanConfigurationGetIpTvOptimizedRequest);
 
     public Task<WlanConfigurationGetStatisticsResponse> GetStatisticsAsync(WlanConfigurationGetStatisticsRequest wlanConfigurationGetStatisticsRequest)
-    {
-        return Channel.GetStatisticsAsync(wlanConfigurationGetStatisticsRequest);
-    }
+        => Channel.GetStatisticsAsync(wlanConfigurationGetStatisticsRequest);
 
     public Task<WlanConfigurationGetPacketStatisticsResponse> GetPacketStatisticsAsync(WlanConfigurationGetPacketStatisticsRequest wlanConfigurationGetPacketStatisticsRequest)
-    {
-        return Channel.GetPacketStatisticsAsync(wlanConfigurationGetPacketStatisticsRequest);
-    }
+        => Channel.GetPacketStatisticsAsync(wlanConfigurationGetPacketStatisticsRequest);
 
     public Task<WlanConfigurationGetNightControlResponse> GetNightControlAsync(WlanConfigurationGetNightControlRequest wlanConfigurationGetNightControlRequest)
-    {
-        return Channel.GetNightControlAsync(wlanConfigurationGetNightControlRequest);
-    }
+        => Channel.GetNightControlAsync(wlanConfigurationGetNightControlRequest);
 
     public Task<WlanConfigurationGetWlanHybridModeResponse> GetWlanHybridModeAsync(WlanConfigurationGetWlanHybridModeRequest wlanConfigurationGetWlanHybridModeRequest)
-    {
-        return Channel.GetWlanHybridModeAsync(wlanConfigurationGetWlanHybridModeRequest);
-    }
+        => Channel.GetWlanHybridModeAsync(wlanConfigurationGetWlanHybridModeRequest);
 
     public Task<WlanConfigurationGetWlanExtInfoResponse> GetWlanExtInfoAsync(WlanConfigurationGetWlanExtInfoRequest wlanConfigurationGetWlanExtInfoRequest)
-    {
-        return Channel.GetWlanExtInfoAsync(wlanConfigurationGetWlanExtInfoRequest);
-    }
+        => Channel.GetWlanExtInfoAsync(wlanConfigurationGetWlanExtInfoRequest);
 
     public Task<WlanConfigurationGetWpsInfoResponse> GetWpsInfoAsync(WlanConfigurationGetWpsInfoRequest wlanConfigurationGetWpsInfoRequest)
-    {
-        return Channel.GetWpsInfoAsync(wlanConfigurationGetWpsInfoRequest);
-    }
+        => Channel.GetWpsInfoAsync(wlanConfigurationGetWpsInfoRequest);
 
     public Task<WlanConfigurationGetWlanConnectionInfoResponse> GetWlanConnectionInfoAsync(WlanConfigurationGetWlanConnectionInfoRequest wlanConfigurationGetWlanConnectionInfoRequest)
-    {
-        return Channel.GetWlanConnectionInfoAsync(wlanConfigurationGetWlanConnectionInfoRequest);
-    }
+        => Channel.GetWlanConnectionInfoAsync(wlanConfigurationGetWlanConnectionInfoRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/ClientFactory.cs b/RS.Fritz.Manager.API/Services/TR-064/SoapClient/ClientFactory.cs
index ecaac66..55fec83 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/ClientFactory.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/SoapClient/ClientFactory.cs
@@ -13,14 +13,10 @@ public ClientFactory(INetworkService networkService)
     }
 
     public T Build(Func<FritzServiceEndpointConfiguration, EndpointAddress, NetworkCredential?, T> createClient, Uri location, bool secure, string controlUrl, ushort? port, NetworkCredential? networkCredential)
-    {
-        return createClient(GetEndpointConfiguration(secure), GetEndpointAddress(location, secure, controlUrl, port), networkCredential);
-    }
+        => createClient(GetEndpointConfiguration(secure), GetEndpointAddress(location, secure, controlUrl, port), networkCredential);
 
     private static FritzServiceEndpointConfiguration GetEndpointConfiguration(bool secure)
-    {
-        return secure ? FritzServiceEndpointConfiguration.BasicHttpsBindingIFritzService : FritzServiceEndpointConfiguration.BasicHttpBindingIFritzService;
-    }
+        => secure ? FritzServiceEndpointConfiguration.BasicHttpsBindingIFritzService : FritzServiceEndpointConfiguration.BasicHttpBindingIFritzService;
 
     private EndpointAddress GetEndpointAddress(Uri location, bool secure, string controlUrl, ushort? port = null)
     {
diff --git a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs b/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs
index cc835be..00f79ea 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs
@@ -73,807 +73,485 @@ public FritzServiceOperationHandler(
     }
 
     public Task<HostsGetHostNumberOfEntriesResponse> HostsGetHostNumberOfEntriesAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.GetHostNumberOfEntriesAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.GetHostNumberOfEntriesAsync(default));
 
     public Task<HostsHostsCheckUpdateResponse> HostsHostsCheckUpdateAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.HostsCheckUpdateAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.HostsCheckUpdateAsync(default));
 
     public Task<HostsGetHostListPathResponse> HostsGetHostListPathAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.GetHostListPathAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.GetHostListPathAsync(default));
 
     public Task<HostsGetGenericHostEntryResponse> HostsGetGenericHostEntryAsync(InternetGatewayDevice internetGatewayDevice, HostsGetGenericHostEntryRequest hostsGetGenericHostEntryRequest)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.GetGenericHostEntryAsync(hostsGetGenericHostEntryRequest));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.GetGenericHostEntryAsync(hostsGetGenericHostEntryRequest));
 
     public Task<HostsGetInfoResponse> HostsGetInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.GetInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.GetInfoAsync(default));
 
     public Task<HostsGetChangeCounterResponse> HostsGetChangeCounterAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.GetChangeCounterAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.GetChangeCounterAsync(default));
 
     public Task<HostsGetMeshListPathResponse> HostsGetMeshListPathAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.GetMeshListPathAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.GetMeshListPathAsync(default));
 
     public Task<HostsGetFriendlyNameResponse> HostsGetFriendlyNameAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.GetFriendlyNameAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.GetFriendlyNameAsync(default));
 
     public Task<WanCommonInterfaceConfigGetCommonLinkPropertiesResponse> WanCommonInterfaceConfigGetCommonLinkPropertiesAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanCommonInterfaceConfigServiceClientFactory, (q, r, t) => new FritzWanCommonInterfaceConfigService(q, r, t!), FritzWanCommonInterfaceConfigService.ControlUrl), q => q.GetCommonLinkPropertiesAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanCommonInterfaceConfigServiceClientFactory, (q, r, t) => new FritzWanCommonInterfaceConfigService(q, r, t!), FritzWanCommonInterfaceConfigService.ControlUrl), q => q.GetCommonLinkPropertiesAsync(default));
 
     public Task<WanCommonInterfaceConfigGetTotalBytesReceivedResponse> WanCommonInterfaceConfigGetTotalBytesReceivedAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanCommonInterfaceConfigServiceClientFactory, (q, r, t) => new FritzWanCommonInterfaceConfigService(q, r, t!), FritzWanCommonInterfaceConfigService.ControlUrl), q => q.GetTotalBytesReceivedAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanCommonInterfaceConfigServiceClientFactory, (q, r, t) => new FritzWanCommonInterfaceConfigService(q, r, t!), FritzWanCommonInterfaceConfigService.ControlUrl), q => q.GetTotalBytesReceivedAsync(default));
 
     public Task<WanCommonInterfaceConfigGetTotalBytesSentResponse> WanCommonInterfaceConfigGetTotalBytesSentAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanCommonInterfaceConfigServiceClientFactory, (q, r, t) => new FritzWanCommonInterfaceConfigService(q, r, t!), FritzWanCommonInterfaceConfigService.ControlUrl), q => q.GetTotalBytesSentAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanCommonInterfaceConfigServiceClientFactory, (q, r, t) => new FritzWanCommonInterfaceConfigService(q, r, t!), FritzWanCommonInterfaceConfigService.ControlUrl), q => q.GetTotalBytesSentAsync(default));
 
     public Task<WanCommonInterfaceConfigGetTotalPacketsReceivedResponse> WanCommonInterfaceConfigGetTotalPacketsReceivedAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanCommonInterfaceConfigServiceClientFactory, (q, r, t) => new FritzWanCommonInterfaceConfigService(q, r, t!), FritzWanCommonInterfaceConfigService.ControlUrl), q => q.GetTotalPacketsReceivedAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanCommonInterfaceConfigServiceClientFactory, (q, r, t) => new FritzWanCommonInterfaceConfigService(q, r, t!), FritzWanCommonInterfaceConfigService.ControlUrl), q => q.GetTotalPacketsReceivedAsync(default));
 
     public Task<WanCommonInterfaceConfigGetTotalPacketsSentResponse> WanCommonInterfaceConfigGetTotalPacketsSentAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanCommonInterfaceConfigServiceClientFactory, (q, r, t) => new FritzWanCommonInterfaceConfigService(q, r, t!), FritzWanCommonInterfaceConfigService.ControlUrl), q => q.GetTotalPacketsSentAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanCommonInterfaceConfigServiceClientFactory, (q, r, t) => new FritzWanCommonInterfaceConfigService(q, r, t!), FritzWanCommonInterfaceConfigService.ControlUrl), q => q.GetTotalPacketsSentAsync(default));
 
     public Task<WanCommonInterfaceConfigGetOnlineMonitorResponse> WanCommonInterfaceConfigGetOnlineMonitorAsync(InternetGatewayDevice internetGatewayDevice, WanCommonInterfaceConfigGetOnlineMonitorRequest wanCommonInterfaceConfigGetOnlineMonitorRequest)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanCommonInterfaceConfigServiceClientFactory, (q, r, t) => new FritzWanCommonInterfaceConfigService(q, r, t!), FritzWanCommonInterfaceConfigService.ControlUrl), q => q.GetOnlineMonitorAsync(wanCommonInterfaceConfigGetOnlineMonitorRequest));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanCommonInterfaceConfigServiceClientFactory, (q, r, t) => new FritzWanCommonInterfaceConfigService(q, r, t!), FritzWanCommonInterfaceConfigService.ControlUrl), q => q.GetOnlineMonitorAsync(wanCommonInterfaceConfigGetOnlineMonitorRequest));
 
     public Task<WanCommonInterfaceConfigSetWanAccessTypeResponse> WanCommonInterfaceConfigSetWanAccessTypeAsync(InternetGatewayDevice internetGatewayDevice, WanCommonInterfaceConfigSetWanAccessTypeRequest wanCommonInterfaceConfigSetWanAccessTypeRequest)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanCommonInterfaceConfigServiceClientFactory, (q, r, t) => new FritzWanCommonInterfaceConfigService(q, r, t!), FritzWanCommonInterfaceConfigService.ControlUrl), q => q.SetWanAccessTypeAsync(wanCommonInterfaceConfigSetWanAccessTypeRequest));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanCommonInterfaceConfigServiceClientFactory, (q, r, t) => new FritzWanCommonInterfaceConfigService(q, r, t!), FritzWanCommonInterfaceConfigService.ControlUrl), q => q.SetWanAccessTypeAsync(wanCommonInterfaceConfigSetWanAccessTypeRequest));
 
     public Task<DeviceInfoGetInfoResponse> DeviceInfoGetInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzDeviceInfoServiceClientFactory, (q, r, t) => new FritzDeviceInfoService(q, r, t), FritzDeviceInfoService.ControlUrl), q => q.GetInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzDeviceInfoServiceClientFactory, (q, r, t) => new FritzDeviceInfoService(q, r, t), FritzDeviceInfoService.ControlUrl), q => q.GetInfoAsync(default));
 
     public Task<DeviceInfoGetDeviceLogResponse> DeviceInfoGetDeviceLogAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzDeviceInfoServiceClientFactory, (q, r, t) => new FritzDeviceInfoService(q, r, t), FritzDeviceInfoService.ControlUrl), q => q.GetDeviceLogAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzDeviceInfoServiceClientFactory, (q, r, t) => new FritzDeviceInfoService(q, r, t), FritzDeviceInfoService.ControlUrl), q => q.GetDeviceLogAsync(default));
 
     public Task<DeviceInfoGetSecurityPortResponse> DeviceInfoGetSecurityPortAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzDeviceInfoServiceClientFactory, (q, r, t) => new FritzDeviceInfoService(q, r, t), FritzDeviceInfoService.ControlUrl, false), q => q.GetSecurityPortAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzDeviceInfoServiceClientFactory, (q, r, t) => new FritzDeviceInfoService(q, r, t), FritzDeviceInfoService.ControlUrl, false), q => q.GetSecurityPortAsync(default));
 
     public Task<DeviceInfoSetProvisioningCodeResponse> DeviceInfoSetProvisioningCodeAsync(InternetGatewayDevice internetGatewayDevice, DeviceInfoSetProvisioningCodeRequest deviceInfoSetProvisioningCodeRequest)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzDeviceInfoServiceClientFactory, (q, r, t) => new FritzDeviceInfoService(q, r, t), FritzDeviceInfoService.ControlUrl), q => q.SetProvisioningCodeAsync(deviceInfoSetProvisioningCodeRequest));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzDeviceInfoServiceClientFactory, (q, r, t) => new FritzDeviceInfoService(q, r, t), FritzDeviceInfoService.ControlUrl), q => q.SetProvisioningCodeAsync(deviceInfoSetProvisioningCodeRequest));
 
     public Task<LanConfigSecurityGetAnonymousLoginResponse> LanConfigSecurityGetAnonymousLoginAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanConfigSecurityServiceClientFactory, (q, r, t) => new FritzLanConfigSecurityService(q, r, t), FritzLanConfigSecurityService.ControlUrl, false), q => q.GetAnonymousLoginAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanConfigSecurityServiceClientFactory, (q, r, t) => new FritzLanConfigSecurityService(q, r, t), FritzLanConfigSecurityService.ControlUrl, false), q => q.GetAnonymousLoginAsync(default));
 
     public Task<LanConfigSecurityGetCurrentUserResponse> LanConfigSecurityGetCurrentUserAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanConfigSecurityServiceClientFactory, (q, r, t) => new FritzLanConfigSecurityService(q, r, t), FritzLanConfigSecurityService.ControlUrl), q => q.GetCurrentUserAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanConfigSecurityServiceClientFactory, (q, r, t) => new FritzLanConfigSecurityService(q, r, t), FritzLanConfigSecurityService.ControlUrl), q => q.GetCurrentUserAsync(default));
 
     public Task<LanConfigSecurityGetInfoResponse> LanConfigSecurityGetInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanConfigSecurityServiceClientFactory, (q, r, t) => new FritzLanConfigSecurityService(q, r, t), FritzLanConfigSecurityService.ControlUrl), q => q.GetInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanConfigSecurityServiceClientFactory, (q, r, t) => new FritzLanConfigSecurityService(q, r, t), FritzLanConfigSecurityService.ControlUrl), q => q.GetInfoAsync(default));
 
     public Task<LanConfigSecurityGetUserListResponse> LanConfigSecurityGetUserListAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanConfigSecurityServiceClientFactory, (q, r, t) => new FritzLanConfigSecurityService(q, r, t), FritzLanConfigSecurityService.ControlUrl), q => q.GetUserListAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanConfigSecurityServiceClientFactory, (q, r, t) => new FritzLanConfigSecurityService(q, r, t), FritzLanConfigSecurityService.ControlUrl), q => q.GetUserListAsync(default));
 
     public Task<LanConfigSecuritySetConfigPasswordResponse> LanConfigSecuritySetConfigPasswordAsync(InternetGatewayDevice internetGatewayDevice, LanConfigSecuritySetConfigPasswordRequest lanConfigSecuritySetConfigPasswordRequest)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanConfigSecurityServiceClientFactory, (q, r, t) => new FritzLanConfigSecurityService(q, r, t), FritzLanConfigSecurityService.ControlUrl), q => q.SetConfigPasswordAsync(lanConfigSecuritySetConfigPasswordRequest));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanConfigSecurityServiceClientFactory, (q, r, t) => new FritzLanConfigSecurityService(q, r, t), FritzLanConfigSecurityService.ControlUrl), q => q.SetConfigPasswordAsync(lanConfigSecuritySetConfigPasswordRequest));
 
     public Task<Layer3ForwardingGetDefaultConnectionServiceResponse> Layer3ForwardingGetDefaultConnectionServiceAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLayer3ForwardingServiceClientFactory, (q, r, t) => new FritzLayer3ForwardingService(q, r, t!), FritzLayer3ForwardingService.ControlUrl), q => q.GetDefaultConnectionServiceAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLayer3ForwardingServiceClientFactory, (q, r, t) => new FritzLayer3ForwardingService(q, r, t!), FritzLayer3ForwardingService.ControlUrl), q => q.GetDefaultConnectionServiceAsync(default));
 
     public Task<Layer3ForwardingGetForwardNumberOfEntriesResponse> Layer3ForwardingGetForwardNumberOfEntriesAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLayer3ForwardingServiceClientFactory, (q, r, t) => new FritzLayer3ForwardingService(q, r, t!), FritzLayer3ForwardingService.ControlUrl), q => q.GetForwardNumberOfEntriesAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLayer3ForwardingServiceClientFactory, (q, r, t) => new FritzLayer3ForwardingService(q, r, t!), FritzLayer3ForwardingService.ControlUrl), q => q.GetForwardNumberOfEntriesAsync(default));
 
     public Task<Layer3ForwardingGetGenericForwardingEntryResponse> Layer3ForwardingGetGenericForwardingEntryAsync(InternetGatewayDevice internetGatewayDevice, Layer3ForwardingGetGenericForwardingEntryRequest layer3ForwardingGetGenericForwardingEntryRequest)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLayer3ForwardingServiceClientFactory, (q, r, t) => new FritzLayer3ForwardingService(q, r, t!), FritzLayer3ForwardingService.ControlUrl), q => q.GetGenericForwardingEntryAsync(layer3ForwardingGetGenericForwardingEntryRequest));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLayer3ForwardingServiceClientFactory, (q, r, t) => new FritzLayer3ForwardingService(q, r, t!), FritzLayer3ForwardingService.ControlUrl), q => q.GetGenericForwardingEntryAsync(layer3ForwardingGetGenericForwardingEntryRequest));
 
     public Task<WanDslInterfaceConfigGetDslDiagnoseInfoResponse> WanDslInterfaceConfigGetDslDiagnoseInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanDslInterfaceConfigServiceClientFactory, (q, r, t) => new FritzWanDslInterfaceConfigService(q, r, t!), FritzWanDslInterfaceConfigService.ControlUrl), q => q.GetDslDiagnoseInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanDslInterfaceConfigServiceClientFactory, (q, r, t) => new FritzWanDslInterfaceConfigService(q, r, t!), FritzWanDslInterfaceConfigService.ControlUrl), q => q.GetDslDiagnoseInfoAsync(default));
 
     public Task<WanDslInterfaceConfigGetDslInfoResponse> WanDslInterfaceConfigGetDslInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanDslInterfaceConfigServiceClientFactory, (q, r, t) => new FritzWanDslInterfaceConfigService(q, r, t!), FritzWanDslInterfaceConfigService.ControlUrl), q => q.GetDslInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanDslInterfaceConfigServiceClientFactory, (q, r, t) => new FritzWanDslInterfaceConfigService(q, r, t!), FritzWanDslInterfaceConfigService.ControlUrl), q => q.GetDslInfoAsync(default));
 
     public Task<WanDslInterfaceConfigGetInfoResponse> WanDslInterfaceConfigGetInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanDslInterfaceConfigServiceClientFactory, (q, r, t) => new FritzWanDslInterfaceConfigService(q, r, t!), FritzWanDslInterfaceConfigService.ControlUrl), q => q.GetInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanDslInterfaceConfigServiceClientFactory, (q, r, t) => new FritzWanDslInterfaceConfigService(q, r, t!), FritzWanDslInterfaceConfigService.ControlUrl), q => q.GetInfoAsync(default));
 
     public Task<WanDslInterfaceConfigGetStatisticsTotalResponse> WanDslInterfaceConfigGetStatisticsTotalAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanDslInterfaceConfigServiceClientFactory, (q, r, t) => new FritzWanDslInterfaceConfigService(q, r, t!), FritzWanDslInterfaceConfigService.ControlUrl), q => q.GetStatisticsTotalAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanDslInterfaceConfigServiceClientFactory, (q, r, t) => new FritzWanDslInterfaceConfigService(q, r, t!), FritzWanDslInterfaceConfigService.ControlUrl), q => q.GetStatisticsTotalAsync(default));
 
     public Task<WanIpConnectionGetInfoResponse> WanIpConnectionGetInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanIpConnectionServiceClientFactory, (q, r, t) => new FritzWanIpConnectionService(q, r, t!), FritzWanIpConnectionService.ControlUrl), q => q.GetInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanIpConnectionServiceClientFactory, (q, r, t) => new FritzWanIpConnectionService(q, r, t!), FritzWanIpConnectionService.ControlUrl), q => q.GetInfoAsync(default));
 
     public Task<WanConnectionGetConnectionTypeInfoResponse> WanIpConnectionGetConnectionTypeInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanIpConnectionServiceClientFactory, (q, r, t) => new FritzWanIpConnectionService(q, r, t!), FritzWanIpConnectionService.ControlUrl), q => q.GetConnectionTypeInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanIpConnectionServiceClientFactory, (q, r, t) => new FritzWanIpConnectionService(q, r, t!), FritzWanIpConnectionService.ControlUrl), q => q.GetConnectionTypeInfoAsync(default));
 
     public Task<WanConnectionGetStatusInfoResponse> WanIpConnectionGetStatusInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanIpConnectionServiceClientFactory, (q, r, t) => new FritzWanIpConnectionService(q, r, t!), FritzWanIpConnectionService.ControlUrl), q => q.GetStatusInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanIpConnectionServiceClientFactory, (q, r, t) => new FritzWanIpConnectionService(q, r, t!), FritzWanIpConnectionService.ControlUrl), q => q.GetStatusInfoAsync(default));
 
     public Task<WanConnectionGetNatRsipStatusResponse> WanIpConnectionGetNatRsipStatusAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanIpConnectionServiceClientFactory, (q, r, t) => new FritzWanIpConnectionService(q, r, t!), FritzWanIpConnectionService.ControlUrl), q => q.GetNatRsipStatusAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanIpConnectionServiceClientFactory, (q, r, t) => new FritzWanIpConnectionService(q, r, t!), FritzWanIpConnectionService.ControlUrl), q => q.GetNatRsipStatusAsync(default));
 
     public Task<WanConnectionGetDnsServersResponse> WanIpConnectionGetDnsServersAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanIpConnectionServiceClientFactory, (q, r, t) => new FritzWanIpConnectionService(q, r, t!), FritzWanIpConnectionService.ControlUrl), q => q.GetDnsServersAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanIpConnectionServiceClientFactory, (q, r, t) => new FritzWanIpConnectionService(q, r, t!), FritzWanIpConnectionService.ControlUrl), q => q.GetDnsServersAsync(default));
 
     public Task<WanConnectionGetPortMappingNumberOfEntriesResponse> WanIpConnectionGetPortMappingNumberOfEntriesAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanIpConnectionServiceClientFactory, (q, r, t) => new FritzWanIpConnectionService(q, r, t!), FritzWanIpConnectionService.ControlUrl), q => q.GetPortMappingNumberOfEntriesAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanIpConnectionServiceClientFactory, (q, r, t) => new FritzWanIpConnectionService(q, r, t!), FritzWanIpConnectionService.ControlUrl), q => q.GetPortMappingNumberOfEntriesAsync(default));
 
     public Task<WanConnectionGetExternalIpAddressResponse> WanIpConnectionGetExternalIpAddressAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanIpConnectionServiceClientFactory, (q, r, t) => new FritzWanIpConnectionService(q, r, t!), FritzWanIpConnectionService.ControlUrl), q => q.GetExternalIpAddressAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanIpConnectionServiceClientFactory, (q, r, t) => new FritzWanIpConnectionService(q, r, t!), FritzWanIpConnectionService.ControlUrl), q => q.GetExternalIpAddressAsync(default));
 
     public Task<WanConnectionGetGenericPortMappingEntryResponse> WanIpConnectionGetGenericPortMappingEntryAsync(InternetGatewayDevice internetGatewayDevice, WanConnectionGetGenericPortMappingEntryRequest wanConnectionGetGenericPortMappingEntryRequest)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanIpConnectionServiceClientFactory, (q, r, t) => new FritzWanIpConnectionService(q, r, t!), FritzWanIpConnectionService.ControlUrl), q => q.GetGenericPortMappingEntryAsync(wanConnectionGetGenericPortMappingEntryRequest));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanIpConnectionServiceClientFactory, (q, r, t) => new FritzWanIpConnectionService(q, r, t!), FritzWanIpConnectionService.ControlUrl), q => q.GetGenericPortMappingEntryAsync(wanConnectionGetGenericPortMappingEntryRequest));
 
     public Task<WanPppConnectionGetInfoResponse> WanPppConnectionGetInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanPppConnectionServiceClientFactory, (q, r, t) => new FritzWanPppConnectionService(q, r, t!), FritzWanPppConnectionService.ControlUrl), q => q.GetInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanPppConnectionServiceClientFactory, (q, r, t) => new FritzWanPppConnectionService(q, r, t!), FritzWanPppConnectionService.ControlUrl), q => q.GetInfoAsync(default));
 
     public Task<WanConnectionGetConnectionTypeInfoResponse> WanPppConnectionGetConnectionTypeInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanPppConnectionServiceClientFactory, (q, r, t) => new FritzWanPppConnectionService(q, r, t!), FritzWanPppConnectionService.ControlUrl), q => q.GetConnectionTypeInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanPppConnectionServiceClientFactory, (q, r, t) => new FritzWanPppConnectionService(q, r, t!), FritzWanPppConnectionService.ControlUrl), q => q.GetConnectionTypeInfoAsync(default));
 
     public Task<WanConnectionGetStatusInfoResponse> WanPppConnectionGetStatusInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanPppConnectionServiceClientFactory, (q, r, t) => new FritzWanPppConnectionService(q, r, t!), FritzWanPppConnectionService.ControlUrl), q => q.GetStatusInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanPppConnectionServiceClientFactory, (q, r, t) => new FritzWanPppConnectionService(q, r, t!), FritzWanPppConnectionService.ControlUrl), q => q.GetStatusInfoAsync(default));
 
     public Task<WanPppConnectionGetLinkLayerMaxBitRatesResponse> WanPppConnectionGetLinkLayerMaxBitRatesAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanPppConnectionServiceClientFactory, (q, r, t) => new FritzWanPppConnectionService(q, r, t!), FritzWanPppConnectionService.ControlUrl), q => q.GetLinkLayerMaxBitRatesAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanPppConnectionServiceClientFactory, (q, r, t) => new FritzWanPppConnectionService(q, r, t!), FritzWanPppConnectionService.ControlUrl), q => q.GetLinkLayerMaxBitRatesAsync(default));
 
     public Task<WanPppConnectionGetUserNameResponse> WanPppConnectionGetUserNameAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanPppConnectionServiceClientFactory, (q, r, t) => new FritzWanPppConnectionService(q, r, t!), FritzWanPppConnectionService.ControlUrl), q => q.GetUserNameAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanPppConnectionServiceClientFactory, (q, r, t) => new FritzWanPppConnectionService(q, r, t!), FritzWanPppConnectionService.ControlUrl), q => q.GetUserNameAsync(default));
 
     public Task<WanConnectionGetNatRsipStatusResponse> WanPppConnectionGetNatRsipStatusAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanPppConnectionServiceClientFactory, (q, r, t) => new FritzWanPppConnectionService(q, r, t!), FritzWanPppConnectionService.ControlUrl), q => q.GetNatRsipStatusAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanPppConnectionServiceClientFactory, (q, r, t) => new FritzWanPppConnectionService(q, r, t!), FritzWanPppConnectionService.ControlUrl), q => q.GetNatRsipStatusAsync(default));
 
     public Task<WanConnectionGetDnsServersResponse> WanPppConnectionGetDnsServersAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanPppConnectionServiceClientFactory, (q, r, t) => new FritzWanPppConnectionService(q, r, t!), FritzWanPppConnectionService.ControlUrl), q => q.GetDnsServersAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanPppConnectionServiceClientFactory, (q, r, t) => new FritzWanPppConnectionService(q, r, t!), FritzWanPppConnectionService.ControlUrl), q => q.GetDnsServersAsync(default));
 
     public Task<WanConnectionGetPortMappingNumberOfEntriesResponse> WanPppConnectionGetPortMappingNumberOfEntriesAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanPppConnectionServiceClientFactory, (q, r, t) => new FritzWanPppConnectionService(q, r, t!), FritzWanPppConnectionService.ControlUrl), q => q.GetPortMappingNumberOfEntriesAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanPppConnectionServiceClientFactory, (q, r, t) => new FritzWanPppConnectionService(q, r, t!), FritzWanPppConnectionService.ControlUrl), q => q.GetPortMappingNumberOfEntriesAsync(default));
 
     public Task<WanConnectionGetExternalIpAddressResponse> WanPppConnectionGetExternalIpAddressAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanPppConnectionServiceClientFactory, (q, r, t) => new FritzWanPppConnectionService(q, r, t!), FritzWanPppConnectionService.ControlUrl), q => q.GetExternalIpAddressAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanPppConnectionServiceClientFactory, (q, r, t) => new FritzWanPppConnectionService(q, r, t!), FritzWanPppConnectionService.ControlUrl), q => q.GetExternalIpAddressAsync(default));
 
     public Task<WanPppConnectionGetAutoDisconnectTimeSpanResponse> WanPppConnectionGetAutoDisconnectTimeSpanAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanPppConnectionServiceClientFactory, (q, r, t) => new FritzWanPppConnectionService(q, r, t!), FritzWanPppConnectionService.ControlUrl), q => q.GetAutoDisconnectTimeSpanAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanPppConnectionServiceClientFactory, (q, r, t) => new FritzWanPppConnectionService(q, r, t!), FritzWanPppConnectionService.ControlUrl), q => q.GetAutoDisconnectTimeSpanAsync(default));
 
     public Task<WanConnectionGetGenericPortMappingEntryResponse> WanPppConnectionGetGenericPortMappingEntryAsync(InternetGatewayDevice internetGatewayDevice, WanConnectionGetGenericPortMappingEntryRequest wanConnectionGetGenericPortMappingEntryRequest)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanPppConnectionServiceClientFactory, (q, r, t) => new FritzWanPppConnectionService(q, r, t!), FritzWanPppConnectionService.ControlUrl), q => q.GetGenericPortMappingEntryAsync(wanConnectionGetGenericPortMappingEntryRequest));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanPppConnectionServiceClientFactory, (q, r, t) => new FritzWanPppConnectionService(q, r, t!), FritzWanPppConnectionService.ControlUrl), q => q.GetGenericPortMappingEntryAsync(wanConnectionGetGenericPortMappingEntryRequest));
 
     public Task<WanEthernetLinkConfigGetEthernetLinkStatusResponse> WanEthernetLinkConfigGetEthernetLinkStatusAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanEthernetLinkConfigServiceClientFactory, (q, r, t) => new FritzWanEthernetLinkConfigService(q, r, t!), FritzWanEthernetLinkConfigService.ControlUrl), q => q.GetEthernetLinkStatusAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanEthernetLinkConfigServiceClientFactory, (q, r, t) => new FritzWanEthernetLinkConfigService(q, r, t!), FritzWanEthernetLinkConfigService.ControlUrl), q => q.GetEthernetLinkStatusAsync(default));
 
     public Task<WanDslLinkConfigGetInfoResponse> WanDslLinkConfigGetInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanDslLinkConfigServiceClientFactory, (q, r, t) => new FritzWanDslLinkConfigService(q, r, t!), FritzWanDslLinkConfigService.ControlUrl), q => q.GetInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanDslLinkConfigServiceClientFactory, (q, r, t) => new FritzWanDslLinkConfigService(q, r, t!), FritzWanDslLinkConfigService.ControlUrl), q => q.GetInfoAsync(default));
 
     public Task<WanDslLinkConfigGetDslLinkInfoResponse> WanDslLinkConfigGetDslLinkInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanDslLinkConfigServiceClientFactory, (q, r, t) => new FritzWanDslLinkConfigService(q, r, t!), FritzWanDslLinkConfigService.ControlUrl), q => q.GetDslLinkInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanDslLinkConfigServiceClientFactory, (q, r, t) => new FritzWanDslLinkConfigService(q, r, t!), FritzWanDslLinkConfigService.ControlUrl), q => q.GetDslLinkInfoAsync(default));
 
     public Task<WanDslLinkConfigGetDestinationAddressResponse> WanDslLinkConfigGetDestinationAddressAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanDslLinkConfigServiceClientFactory, (q, r, t) => new FritzWanDslLinkConfigService(q, r, t!), FritzWanDslLinkConfigService.ControlUrl), q => q.GetDestinationAddressAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanDslLinkConfigServiceClientFactory, (q, r, t) => new FritzWanDslLinkConfigService(q, r, t!), FritzWanDslLinkConfigService.ControlUrl), q => q.GetDestinationAddressAsync(default));
 
     public Task<WanDslLinkConfigGetAtmEncapsulationResponse> WanDslLinkConfigGetAtmEncapsulationAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanDslLinkConfigServiceClientFactory, (q, r, t) => new FritzWanDslLinkConfigService(q, r, t!), FritzWanDslLinkConfigService.ControlUrl), q => q.GetAtmEncapsulationAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanDslLinkConfigServiceClientFactory, (q, r, t) => new FritzWanDslLinkConfigService(q, r, t!), FritzWanDslLinkConfigService.ControlUrl), q => q.GetAtmEncapsulationAsync(default));
 
     public Task<WanDslLinkConfigGetAutoConfigResponse> WanDslLinkConfigGetAutoConfigAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanDslLinkConfigServiceClientFactory, (q, r, t) => new FritzWanDslLinkConfigService(q, r, t!), FritzWanDslLinkConfigService.ControlUrl), q => q.GetAutoConfigAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanDslLinkConfigServiceClientFactory, (q, r, t) => new FritzWanDslLinkConfigService(q, r, t!), FritzWanDslLinkConfigService.ControlUrl), q => q.GetAutoConfigAsync(default));
 
     public Task<WanDslLinkConfigGetStatisticsResponse> WanDslLinkConfigGetStatisticsAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanDslLinkConfigServiceClientFactory, (q, r, t) => new FritzWanDslLinkConfigService(q, r, t!), FritzWanDslLinkConfigService.ControlUrl), q => q.GetStatisticsAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWanDslLinkConfigServiceClientFactory, (q, r, t) => new FritzWanDslLinkConfigService(q, r, t!), FritzWanDslLinkConfigService.ControlUrl), q => q.GetStatisticsAsync(default));
 
     public Task<AvmSpeedtestGetInfoResponse> AvmSpeedtestGetInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzAvmSpeedtestServiceClientFactory, (q, r, t) => new FritzAvmSpeedtestService(q, r, t!), FritzAvmSpeedtestService.ControlUrl), q => q.GetInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzAvmSpeedtestServiceClientFactory, (q, r, t) => new FritzAvmSpeedtestService(q, r, t!), FritzAvmSpeedtestService.ControlUrl), q => q.GetInfoAsync(default));
 
     public Task<AvmSpeedtestGetStatisticsResponse> AvmSpeedtestGetStatisticsAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzAvmSpeedtestServiceClientFactory, (q, r, t) => new FritzAvmSpeedtestService(q, r, t!), FritzAvmSpeedtestService.ControlUrl), q => q.GetStatisticsAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzAvmSpeedtestServiceClientFactory, (q, r, t) => new FritzAvmSpeedtestService(q, r, t!), FritzAvmSpeedtestService.ControlUrl), q => q.GetStatisticsAsync(default));
 
     public Task<LanEthernetInterfaceConfigGetInfoResponse> LanEthernetInterfaceConfigGetInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanEthernetInterfaceConfigServiceClientFactory, (q, r, t) => new FritzLanEthernetInterfaceConfigService(q, r, t!), FritzLanEthernetInterfaceConfigService.ControlUrl), q => q.GetInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanEthernetInterfaceConfigServiceClientFactory, (q, r, t) => new FritzLanEthernetInterfaceConfigService(q, r, t!), FritzLanEthernetInterfaceConfigService.ControlUrl), q => q.GetInfoAsync(default));
 
     public Task<LanEthernetInterfaceConfigGetStatisticsResponse> LanEthernetInterfaceConfigGetStatisticsAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanEthernetInterfaceConfigServiceClientFactory, (q, r, t) => new FritzLanEthernetInterfaceConfigService(q, r, t!), FritzLanEthernetInterfaceConfigService.ControlUrl), q => q.GetStatisticsAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanEthernetInterfaceConfigServiceClientFactory, (q, r, t) => new FritzLanEthernetInterfaceConfigService(q, r, t!), FritzLanEthernetInterfaceConfigService.ControlUrl), q => q.GetStatisticsAsync(default));
 
     public Task<LanHostConfigManagementGetInfoResponse> LanHostConfigManagementGetInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanHostConfigManagementServiceClientFactory, (q, r, t) => new FritzLanHostConfigManagementService(q, r, t!), FritzLanHostConfigManagementService.ControlUrl), q => q.GetInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanHostConfigManagementServiceClientFactory, (q, r, t) => new FritzLanHostConfigManagementService(q, r, t!), FritzLanHostConfigManagementService.ControlUrl), q => q.GetInfoAsync(default));
 
     public Task<LanHostConfigManagementGetAddressRangeResponse> LanHostConfigManagementGetAddressRangeAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanHostConfigManagementServiceClientFactory, (q, r, t) => new FritzLanHostConfigManagementService(q, r, t!), FritzLanHostConfigManagementService.ControlUrl), q => q.GetAddressRangeAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanHostConfigManagementServiceClientFactory, (q, r, t) => new FritzLanHostConfigManagementService(q, r, t!), FritzLanHostConfigManagementService.ControlUrl), q => q.GetAddressRangeAsync(default));
 
     public Task<LanHostConfigManagementGetDnsServersResponse> LanHostConfigManagementGetDnsServersAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanHostConfigManagementServiceClientFactory, (q, r, t) => new FritzLanHostConfigManagementService(q, r, t!), FritzLanHostConfigManagementService.ControlUrl), q => q.GetDnsServersAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanHostConfigManagementServiceClientFactory, (q, r, t) => new FritzLanHostConfigManagementService(q, r, t!), FritzLanHostConfigManagementService.ControlUrl), q => q.GetDnsServersAsync(default));
 
     public Task<LanHostConfigManagementGetIpInterfaceNumberOfEntriesResponse> LanHostConfigManagementGetIpInterfaceNumberOfEntriesAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanHostConfigManagementServiceClientFactory, (q, r, t) => new FritzLanHostConfigManagementService(q, r, t!), FritzLanHostConfigManagementService.ControlUrl), q => q.GetIpInterfaceNumberOfEntriesAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanHostConfigManagementServiceClientFactory, (q, r, t) => new FritzLanHostConfigManagementService(q, r, t!), FritzLanHostConfigManagementService.ControlUrl), q => q.GetIpInterfaceNumberOfEntriesAsync(default));
 
     public Task<LanHostConfigManagementGetIpRoutersListResponse> LanHostConfigManagementGetIpRoutersListAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanHostConfigManagementServiceClientFactory, (q, r, t) => new FritzLanHostConfigManagementService(q, r, t!), FritzLanHostConfigManagementService.ControlUrl), q => q.GetIpRoutersListAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanHostConfigManagementServiceClientFactory, (q, r, t) => new FritzLanHostConfigManagementService(q, r, t!), FritzLanHostConfigManagementService.ControlUrl), q => q.GetIpRoutersListAsync(default));
 
     public Task<LanHostConfigManagementGetSubnetMaskResponse> LanHostConfigManagementGetSubnetMaskAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanHostConfigManagementServiceClientFactory, (q, r, t) => new FritzLanHostConfigManagementService(q, r, t!), FritzLanHostConfigManagementService.ControlUrl), q => q.GetSubnetMaskAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzLanHostConfigManagementServiceClientFactory, (q, r, t) => new FritzLanHostConfigManagementService(q, r, t!), FritzLanHostConfigManagementService.ControlUrl), q => q.GetSubnetMaskAsync(default));
 
     public Task<WlanConfigurationGetInfoResponse> WlanConfiguration1GetInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetInfoAsync(default));
 
     public Task<WlanConfigurationGetInfoResponse> WlanConfiguration2GetInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetInfoAsync(default));
 
     public Task<WlanConfigurationGetInfoResponse> WlanConfiguration3GetInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetInfoAsync(default));
 
     public Task<WlanConfigurationGetInfoResponse> WlanConfiguration4GetInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetInfoAsync(default));
 
     public Task<WlanConfigurationGetWlanDeviceListPathResponse> WlanConfiguration1GetWlanDeviceListPathAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetWlanDeviceListPathAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetWlanDeviceListPathAsync(default));
 
     public Task<WlanConfigurationGetWlanDeviceListPathResponse> WlanConfiguration2GetWlanDeviceListPathAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetWlanDeviceListPathAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetWlanDeviceListPathAsync(default));
 
     public Task<WlanConfigurationGetWlanDeviceListPathResponse> WlanConfiguration3GetWlanDeviceListPathAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetWlanDeviceListPathAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetWlanDeviceListPathAsync(default));
 
     public Task<WlanConfigurationGetWlanDeviceListPathResponse> WlanConfiguration4GetWlanDeviceListPathAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetWlanDeviceListPathAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetWlanDeviceListPathAsync(default));
 
     public Task<WlanConfigurationGetBasBeaconSecurityPropertiesResponse> WlanConfiguration1GetBasBeaconSecurityPropertiesAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetBasBeaconSecurityPropertiesAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetBasBeaconSecurityPropertiesAsync(default));
 
     public Task<WlanConfigurationGetBasBeaconSecurityPropertiesResponse> WlanConfiguration2GetBasBeaconSecurityPropertiesAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetBasBeaconSecurityPropertiesAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetBasBeaconSecurityPropertiesAsync(default));
 
     public Task<WlanConfigurationGetBasBeaconSecurityPropertiesResponse> WlanConfiguration3GetBasBeaconSecurityPropertiesAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetBasBeaconSecurityPropertiesAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetBasBeaconSecurityPropertiesAsync(default));
 
     public Task<WlanConfigurationGetBasBeaconSecurityPropertiesResponse> WlanConfiguration4GetBasBeaconSecurityPropertiesAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetBasBeaconSecurityPropertiesAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetBasBeaconSecurityPropertiesAsync(default));
 
     public Task<WlanConfigurationGetBssIdResponse> WlanConfiguration1GetBssIdAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetBssIdAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetBssIdAsync(default));
 
     public Task<WlanConfigurationGetBssIdResponse> WlanConfiguration2GetBssIdAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetBssIdAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetBssIdAsync(default));
 
     public Task<WlanConfigurationGetBssIdResponse> WlanConfiguration3GetBssIdAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetBssIdAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetBssIdAsync(default));
 
     public Task<WlanConfigurationGetBssIdResponse> WlanConfiguration4GetBssIdAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetBssIdAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetBssIdAsync(default));
 
     public Task<WlanConfigurationGetSsIdResponse> WlanConfiguration1GetSsIdAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetSsIdAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetSsIdAsync(default));
 
     public Task<WlanConfigurationGetSsIdResponse> WlanConfiguration2GetSsIdAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetSsIdAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetSsIdAsync(default));
 
     public Task<WlanConfigurationGetSsIdResponse> WlanConfiguration3GetSsIdAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetSsIdAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetSsIdAsync(default));
 
     public Task<WlanConfigurationGetSsIdResponse> WlanConfiguration4GetSsIdAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetSsIdAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetSsIdAsync(default));
 
     public Task<WlanConfigurationGetBeaconTypeResponse> WlanConfiguration1GetBeaconTypeAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetBeaconTypeAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetBeaconTypeAsync(default));
 
     public Task<WlanConfigurationGetBeaconTypeResponse> WlanConfiguration2GetBeaconTypeAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetBeaconTypeAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetBeaconTypeAsync(default));
 
     public Task<WlanConfigurationGetBeaconTypeResponse> WlanConfiguration3GetBeaconTypeAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetBeaconTypeAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetBeaconTypeAsync(default));
 
     public Task<WlanConfigurationGetBeaconTypeResponse> WlanConfiguration4GetBeaconTypeAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetBeaconTypeAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetBeaconTypeAsync(default));
 
     public Task<WlanConfigurationGetChannelInfoResponse> WlanConfiguration1GetChannelInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetChannelInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetChannelInfoAsync(default));
 
     public Task<WlanConfigurationGetChannelInfoResponse> WlanConfiguration2GetChannelInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetChannelInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetChannelInfoAsync(default));
 
     public Task<WlanConfigurationGetChannelInfoResponse> WlanConfiguration3GetChannelInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetChannelInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetChannelInfoAsync(default));
 
     public Task<WlanConfigurationGetChannelInfoResponse> WlanConfiguration4GetChannelInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetChannelInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetChannelInfoAsync(default));
 
     public Task<WlanConfigurationGetBeaconAdvertisementResponse> WlanConfiguration1GetBeaconAdvertisementAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetBeaconAdvertisementAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetBeaconAdvertisementAsync(default));
 
     public Task<WlanConfigurationGetBeaconAdvertisementResponse> WlanConfiguration2GetBeaconAdvertisementAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetBeaconAdvertisementAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetBeaconAdvertisementAsync(default));
 
     public Task<WlanConfigurationGetBeaconAdvertisementResponse> WlanConfiguration3GetBeaconAdvertisementAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetBeaconAdvertisementAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetBeaconAdvertisementAsync(default));
 
     public Task<WlanConfigurationGetBeaconAdvertisementResponse> WlanConfiguration4GetBeaconAdvertisementAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetBeaconAdvertisementAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetBeaconAdvertisementAsync(default));
 
     public Task<WlanConfigurationGetTotalAssociationsResponse> WlanConfiguration1GetTotalAssociationsAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetTotalAssociationsAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetTotalAssociationsAsync(default));
 
     public Task<WlanConfigurationGetTotalAssociationsResponse> WlanConfiguration2GetTotalAssociationsAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetTotalAssociationsAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetTotalAssociationsAsync(default));
 
     public Task<WlanConfigurationGetTotalAssociationsResponse> WlanConfiguration3GetTotalAssociationsAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetTotalAssociationsAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetTotalAssociationsAsync(default));
 
     public Task<WlanConfigurationGetTotalAssociationsResponse> WlanConfiguration4GetTotalAssociationsAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetTotalAssociationsAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetTotalAssociationsAsync(default));
 
     public Task<WlanConfigurationGetIpTvOptimizedResponse> WlanConfiguration1GetIpTvOptimizedAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetIpTvOptimizedAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetIpTvOptimizedAsync(default));
 
     public Task<WlanConfigurationGetIpTvOptimizedResponse> WlanConfiguration2GetIpTvOptimizedAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetIpTvOptimizedAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetIpTvOptimizedAsync(default));
 
     public Task<WlanConfigurationGetIpTvOptimizedResponse> WlanConfiguration3GetIpTvOptimizedAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetIpTvOptimizedAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetIpTvOptimizedAsync(default));
 
     public Task<WlanConfigurationGetIpTvOptimizedResponse> WlanConfiguration4GetIpTvOptimizedAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetIpTvOptimizedAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetIpTvOptimizedAsync(default));
 
     public Task<WlanConfigurationGetStatisticsResponse> WlanConfiguration1GetStatisticsAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetStatisticsAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetStatisticsAsync(default));
 
     public Task<WlanConfigurationGetStatisticsResponse> WlanConfiguration2GetStatisticsAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetStatisticsAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetStatisticsAsync(default));
 
     public Task<WlanConfigurationGetStatisticsResponse> WlanConfiguration3GetStatisticsAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetStatisticsAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetStatisticsAsync(default));
 
     public Task<WlanConfigurationGetStatisticsResponse> WlanConfiguration4GetStatisticsAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetStatisticsAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetStatisticsAsync(default));
 
     public Task<WlanConfigurationGetPacketStatisticsResponse> WlanConfiguration1GetPacketStatisticsAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetPacketStatisticsAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetPacketStatisticsAsync(default));
 
     public Task<WlanConfigurationGetPacketStatisticsResponse> WlanConfiguration2GetPacketStatisticsAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetPacketStatisticsAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetPacketStatisticsAsync(default));
 
     public Task<WlanConfigurationGetPacketStatisticsResponse> WlanConfiguration3GetPacketStatisticsAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetPacketStatisticsAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetPacketStatisticsAsync(default));
 
     public Task<WlanConfigurationGetPacketStatisticsResponse> WlanConfiguration4GetPacketStatisticsAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetPacketStatisticsAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetPacketStatisticsAsync(default));
 
     public Task<WlanConfigurationGetNightControlResponse> WlanConfiguration1GetNightControlAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetNightControlAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetNightControlAsync(default));
 
     public Task<WlanConfigurationGetNightControlResponse> WlanConfiguration2GetNightControlAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetNightControlAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetNightControlAsync(default));
 
     public Task<WlanConfigurationGetNightControlResponse> WlanConfiguration3GetNightControlAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetNightControlAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetNightControlAsync(default));
 
     public Task<WlanConfigurationGetNightControlResponse> WlanConfiguration4GetNightControlAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetNightControlAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetNightControlAsync(default));
 
     public Task<WlanConfigurationGetWlanHybridModeResponse> WlanConfiguration1GetWlanHybridModeAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetWlanHybridModeAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetWlanHybridModeAsync(default));
 
     public Task<WlanConfigurationGetWlanHybridModeResponse> WlanConfiguration2GetWlanHybridModeAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetWlanHybridModeAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetWlanHybridModeAsync(default));
 
     public Task<WlanConfigurationGetWlanHybridModeResponse> WlanConfiguration3GetWlanHybridModeAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetWlanHybridModeAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetWlanHybridModeAsync(default));
 
     public Task<WlanConfigurationGetWlanHybridModeResponse> WlanConfiguration4GetWlanHybridModeAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetWlanHybridModeAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetWlanHybridModeAsync(default));
 
     public Task<WlanConfigurationGetWlanExtInfoResponse> WlanConfiguration1GetWlanExtInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetWlanExtInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetWlanExtInfoAsync(default));
 
     public Task<WlanConfigurationGetWlanExtInfoResponse> WlanConfiguration2GetWlanExtInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetWlanExtInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetWlanExtInfoAsync(default));
 
     public Task<WlanConfigurationGetWlanExtInfoResponse> WlanConfiguration3GetWlanExtInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetWlanExtInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetWlanExtInfoAsync(default));
 
     public Task<WlanConfigurationGetWlanExtInfoResponse> WlanConfiguration4GetWlanExtInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetWlanExtInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetWlanExtInfoAsync(default));
 
     public Task<WlanConfigurationGetWpsInfoResponse> WlanConfiguration1GetWpsInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetWpsInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetWpsInfoAsync(default));
 
     public Task<WlanConfigurationGetWpsInfoResponse> WlanConfiguration2GetWpsInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetWpsInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetWpsInfoAsync(default));
 
     public Task<WlanConfigurationGetWpsInfoResponse> WlanConfiguration3GetWpsInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetWpsInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetWpsInfoAsync(default));
 
     public Task<WlanConfigurationGetWpsInfoResponse> WlanConfiguration4GetWpsInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetWpsInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetWpsInfoAsync(default));
 
     public Task<WlanConfigurationGetWlanConnectionInfoResponse> WlanConfiguration1GetWlanConnectionInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetWlanConnectionInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration1ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration1Service(q, r, t!), FritzWlanConfiguration1Service.ControlUrl), q => q.GetWlanConnectionInfoAsync(default));
 
     public Task<WlanConfigurationGetWlanConnectionInfoResponse> WlanConfiguration2GetWlanConnectionInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetWlanConnectionInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration2ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration2Service(q, r, t!), FritzWlanConfiguration2Service.ControlUrl), q => q.GetWlanConnectionInfoAsync(default));
 
     public Task<WlanConfigurationGetWlanConnectionInfoResponse> WlanConfiguration3GetWlanConnectionInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetWlanConnectionInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration3ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration3Service(q, r, t!), FritzWlanConfiguration3Service.ControlUrl), q => q.GetWlanConnectionInfoAsync(default));
 
     public Task<WlanConfigurationGetWlanConnectionInfoResponse> WlanConfiguration4GetWlanConnectionInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetWlanConnectionInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzWlanConfiguration4ServiceClientFactory, (q, r, t) => new FritzWlanConfiguration4Service(q, r, t!), FritzWlanConfiguration4Service.ControlUrl), q => q.GetWlanConnectionInfoAsync(default));
 
     public Task<ManagementServerGetInfoResponse> ManagementServerGetInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzManagementServerServiceClientFactory, (q, r, t) => new FritzManagementServerService(q, r, t!), FritzManagementServerService.ControlUrl), q => q.GetInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzManagementServerServiceClientFactory, (q, r, t) => new FritzManagementServerService(q, r, t!), FritzManagementServerService.ControlUrl), q => q.GetInfoAsync(default));
 
     public Task<ManagementServerGetTr069FirmwareDownloadEnabledResponse> ManagementServerGetTr069FirmwareDownloadEnabledAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzManagementServerServiceClientFactory, (q, r, t) => new FritzManagementServerService(q, r, t!), FritzManagementServerService.ControlUrl), q => q.GetTr069FirmwareDownloadEnabledAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzManagementServerServiceClientFactory, (q, r, t) => new FritzManagementServerService(q, r, t!), FritzManagementServerService.ControlUrl), q => q.GetTr069FirmwareDownloadEnabledAsync(default));
 
     public Task<ManagementServerSetManagementServerUrlResponse> ManagementServerSetManagementServerUrlAsync(InternetGatewayDevice internetGatewayDevice, ManagementServerSetManagementServerUrlRequest managementServerSetManagementServerUrlRequest)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzManagementServerServiceClientFactory, (q, r, t) => new FritzManagementServerService(q, r, t!), FritzManagementServerService.ControlUrl), q => q.SetManagementServerUrlAsync(managementServerSetManagementServerUrlRequest));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzManagementServerServiceClientFactory, (q, r, t) => new FritzManagementServerService(q, r, t!), FritzManagementServerService.ControlUrl), q => q.SetManagementServerUrlAsync(managementServerSetManagementServerUrlRequest));
 
     public Task<ManagementServerSetManagementServerUsernameResponse> ManagementServerSetManagementServerUsernameAsync(InternetGatewayDevice internetGatewayDevice, ManagementServerSetManagementServerUsernameRequest managementServerSetManagementServerUsernameRequest)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzManagementServerServiceClientFactory, (q, r, t) => new FritzManagementServerService(q, r, t!), FritzManagementServerService.ControlUrl), q => q.SetManagementServerUsernameAsync(managementServerSetManagementServerUsernameRequest));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzManagementServerServiceClientFactory, (q, r, t) => new FritzManagementServerService(q, r, t!), FritzManagementServerService.ControlUrl), q => q.SetManagementServerUsernameAsync(managementServerSetManagementServerUsernameRequest));
 
     public Task<ManagementServerSetManagementServerPasswordResponse> ManagementServerSetManagementServerPasswordAsync(InternetGatewayDevice internetGatewayDevice, ManagementServerSetManagementServerPasswordRequest managementServerSetManagementServerPasswordRequest)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzManagementServerServiceClientFactory, (q, r, t) => new FritzManagementServerService(q, r, t!), FritzManagementServerService.ControlUrl), q => q.SetManagementServerPasswordAsync(managementServerSetManagementServerPasswordRequest));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzManagementServerServiceClientFactory, (q, r, t) => new FritzManagementServerService(q, r, t!), FritzManagementServerService.ControlUrl), q => q.SetManagementServerPasswordAsync(managementServerSetManagementServerPasswordRequest));
 
     public Task<ManagementServerSetPeriodicInformResponse> ManagementServerSetPeriodicInformAsync(InternetGatewayDevice internetGatewayDevice, ManagementServerSetPeriodicInformRequest managementServerSetPeriodicInformRequest)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzManagementServerServiceClientFactory, (q, r, t) => new FritzManagementServerService(q, r, t!), FritzManagementServerService.ControlUrl), q => q.SetPeriodicInformAsync(managementServerSetPeriodicInformRequest));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzManagementServerServiceClientFactory, (q, r, t) => new FritzManagementServerService(q, r, t!), FritzManagementServerService.ControlUrl), q => q.SetPeriodicInformAsync(managementServerSetPeriodicInformRequest));
 
     public Task<ManagementServerSetConnectionRequestAuthenticationResponse> ManagementServerSetConnectionRequestAuthenticationAsync(InternetGatewayDevice internetGatewayDevice, ManagementServerSetConnectionRequestAuthenticationRequest managementServerSetConnectionRequestAuthenticationRequest)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzManagementServerServiceClientFactory, (q, r, t) => new FritzManagementServerService(q, r, t!), FritzManagementServerService.ControlUrl), q => q.SetConnectionRequestAuthenticationAsync(managementServerSetConnectionRequestAuthenticationRequest));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzManagementServerServiceClientFactory, (q, r, t) => new FritzManagementServerService(q, r, t!), FritzManagementServerService.ControlUrl), q => q.SetConnectionRequestAuthenticationAsync(managementServerSetConnectionRequestAuthenticationRequest));
 
     public Task<ManagementServerSetUpgradeManagementResponse> ManagementServerSetUpgradeManagementAsync(InternetGatewayDevice internetGatewayDevice, ManagementServerSetUpgradeManagementRequest managementServerSetUpgradeManagementRequest)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzManagementServerServiceClientFactory, (q, r, t) => new FritzManagementServerService(q, r, t!), FritzManagementServerService.ControlUrl), q => q.SetUpgradeManagementAsync(managementServerSetUpgradeManagementRequest));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzManagementServerServiceClientFactory, (q, r, t) => new FritzManagementServerService(q, r, t!), FritzManagementServerService.ControlUrl), q => q.SetUpgradeManagementAsync(managementServerSetUpgradeManagementRequest));
 
     public Task<ManagementServerSetTr069EnableResponse> ManagementServerSetTr069EnableAsync(InternetGatewayDevice internetGatewayDevice, ManagementServerSetTr069EnableRequest managementServerSetTr069EnableRequest)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzManagementServerServiceClientFactory, (q, r, t) => new FritzManagementServerService(q, r, t!), FritzManagementServerService.ControlUrl), q => q.SetTr069EnableAsync(managementServerSetTr069EnableRequest));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzManagementServerServiceClientFactory, (q, r, t) => new FritzManagementServerService(q, r, t!), FritzManagementServerService.ControlUrl), q => q.SetTr069EnableAsync(managementServerSetTr069EnableRequest));
 
     public Task<ManagementServerSetTr069FirmwareDownloadEnabledResponse> ManagementServerSetTr069FirmwareDownloadEnabledAsync(InternetGatewayDevice internetGatewayDevice, ManagementServerSetTr069FirmwareDownloadEnabledRequest managementServerSetTr069FirmwareDownloadEnabledRequest)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzManagementServerServiceClientFactory, (q, r, t) => new FritzManagementServerService(q, r, t!), FritzManagementServerService.ControlUrl), q => q.SetTr069FirmwareDownloadEnabledAsync(managementServerSetTr069FirmwareDownloadEnabledRequest));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzManagementServerServiceClientFactory, (q, r, t) => new FritzManagementServerService(q, r, t!), FritzManagementServerService.ControlUrl), q => q.SetTr069FirmwareDownloadEnabledAsync(managementServerSetTr069FirmwareDownloadEnabledRequest));
 
     public Task<TimeGetInfoResponse> TimeGetInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzTimeServiceClientFactory, (q, r, t) => new FritzTimeService(q, r, t!), FritzTimeService.ControlUrl), q => q.GetInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzTimeServiceClientFactory, (q, r, t) => new FritzTimeService(q, r, t!), FritzTimeService.ControlUrl), q => q.GetInfoAsync(default));
 
     public Task<TimeSetNtpServersResponse> TimeSetNtpServersAsync(InternetGatewayDevice internetGatewayDevice, TimeSetNtpServersRequest timeSetNtpServersRequest)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzTimeServiceClientFactory, (q, r, t) => new FritzTimeService(q, r, t!), FritzTimeService.ControlUrl), q => q.SetNtpServersAsync(timeSetNtpServersRequest));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzTimeServiceClientFactory, (q, r, t) => new FritzTimeService(q, r, t!), FritzTimeService.ControlUrl), q => q.SetNtpServersAsync(timeSetNtpServersRequest));
 
     public Task<UserInterfaceGetInfoResponse> UserInterfaceGetInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzUserInterfaceServiceClientFactory, (q, r, t) => new FritzUserInterfaceService(q, r, t!), FritzUserInterfaceService.ControlUrl), q => q.GetInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzUserInterfaceServiceClientFactory, (q, r, t) => new FritzUserInterfaceService(q, r, t!), FritzUserInterfaceService.ControlUrl), q => q.GetInfoAsync(default));
 
     public Task<UserInterfaceCheckUpdateResponse> UserInterfaceCheckUpdateAsync(InternetGatewayDevice internetGatewayDevice, UserInterfaceCheckUpdateRequest userInterfaceCheckUpdateRequest)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzUserInterfaceServiceClientFactory, (q, r, t) => new FritzUserInterfaceService(q, r, t!), FritzUserInterfaceService.ControlUrl), q => q.CheckUpdateAsync(userInterfaceCheckUpdateRequest));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzUserInterfaceServiceClientFactory, (q, r, t) => new FritzUserInterfaceService(q, r, t!), FritzUserInterfaceService.ControlUrl), q => q.CheckUpdateAsync(userInterfaceCheckUpdateRequest));
 
     public Task<UserInterfaceDoPrepareCgiResponse> UserInterfaceDoPrepareCgiAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzUserInterfaceServiceClientFactory, (q, r, t) => new FritzUserInterfaceService(q, r, t!), FritzUserInterfaceService.ControlUrl), q => q.DoPrepareCgiAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzUserInterfaceServiceClientFactory, (q, r, t) => new FritzUserInterfaceService(q, r, t!), FritzUserInterfaceService.ControlUrl), q => q.DoPrepareCgiAsync(default));
 
     public Task<UserInterfaceDoUpdateResponse> UserInterfaceDoUpdateAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzUserInterfaceServiceClientFactory, (q, r, t) => new FritzUserInterfaceService(q, r, t!), FritzUserInterfaceService.ControlUrl), q => q.DoUpdateAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzUserInterfaceServiceClientFactory, (q, r, t) => new FritzUserInterfaceService(q, r, t!), FritzUserInterfaceService.ControlUrl), q => q.DoUpdateAsync(default));
 
     public Task<UserInterfaceDoManualUpdateResponse> UserInterfaceDoManualUpdateAsync(InternetGatewayDevice internetGatewayDevice, UserInterfaceDoManualUpdateRequest userInterfaceDoManualUpdateRequest)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzUserInterfaceServiceClientFactory, (q, r, t) => new FritzUserInterfaceService(q, r, t!), FritzUserInterfaceService.ControlUrl), q => q.DoManualUpdateAsync(userInterfaceDoManualUpdateRequest));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzUserInterfaceServiceClientFactory, (q, r, t) => new FritzUserInterfaceService(q, r, t!), FritzUserInterfaceService.ControlUrl), q => q.DoManualUpdateAsync(userInterfaceDoManualUpdateRequest));
 
     public Task<UserInterfaceGetInternationalConfigResponse> UserInterfaceGetInternationalConfigAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzUserInterfaceServiceClientFactory, (q, r, t) => new FritzUserInterfaceService(q, r, t!), FritzUserInterfaceService.ControlUrl), q => q.GetInternationalConfigAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzUserInterfaceServiceClientFactory, (q, r, t) => new FritzUserInterfaceService(q, r, t!), FritzUserInterfaceService.ControlUrl), q => q.GetInternationalConfigAsync(default));
 
     public Task<UserInterfaceSetInternationalConfigResponse> UserInterfaceSetInternationalConfigAsync(InternetGatewayDevice internetGatewayDevice, UserInterfaceSetInternationalConfigRequest userInterfaceSetInternationalConfigRequest)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzUserInterfaceServiceClientFactory, (q, r, t) => new FritzUserInterfaceService(q, r, t!), FritzUserInterfaceService.ControlUrl), q => q.SetInternationalConfigAsync(userInterfaceSetInternationalConfigRequest));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzUserInterfaceServiceClientFactory, (q, r, t) => new FritzUserInterfaceService(q, r, t!), FritzUserInterfaceService.ControlUrl), q => q.SetInternationalConfigAsync(userInterfaceSetInternationalConfigRequest));
 
     public Task<UserInterfaceAvmGetInfoResponse> UserInterfaceAvmGetInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzUserInterfaceServiceClientFactory, (q, r, t) => new FritzUserInterfaceService(q, r, t!), FritzUserInterfaceService.ControlUrl), q => q.AvmGetInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzUserInterfaceServiceClientFactory, (q, r, t) => new FritzUserInterfaceService(q, r, t!), FritzUserInterfaceService.ControlUrl), q => q.AvmGetInfoAsync(default));
 
     public Task<UserInterfaceSetConfigResponse> UserInterfaceSetConfigAsync(InternetGatewayDevice internetGatewayDevice, UserInterfaceSetConfigRequest userInterfaceSetConfigRequest)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzUserInterfaceServiceClientFactory, (q, r, t) => new FritzUserInterfaceService(q, r, t!), FritzUserInterfaceService.ControlUrl), q => q.SetConfigAsync(userInterfaceSetConfigRequest));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzUserInterfaceServiceClientFactory, (q, r, t) => new FritzUserInterfaceService(q, r, t!), FritzUserInterfaceService.ControlUrl), q => q.SetConfigAsync(userInterfaceSetConfigRequest));
 
     public Task<DeviceConfigGetPersistentDataResponse> DeviceConfigGetPersistentDataAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzDeviceConfigServiceClientFactory, (q, r, t) => new FritzDeviceConfigService(q, r, t!), FritzDeviceConfigService.ControlUrl), q => q.GetPersistentDataAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzDeviceConfigServiceClientFactory, (q, r, t) => new FritzDeviceConfigService(q, r, t!), FritzDeviceConfigService.ControlUrl), q => q.GetPersistentDataAsync(default));
 
     public Task<DeviceConfigGenerateUuIdResponse> DeviceConfigGenerateUuIdAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzDeviceConfigServiceClientFactory, (q, r, t) => new FritzDeviceConfigService(q, r, t!), FritzDeviceConfigService.ControlUrl), q => q.GenerateUuIdAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzDeviceConfigServiceClientFactory, (q, r, t) => new FritzDeviceConfigService(q, r, t!), FritzDeviceConfigService.ControlUrl), q => q.GenerateUuIdAsync(default));
 
     public Task<DeviceConfigCreateUrlSidResponse> DeviceConfigCreateUrlSidAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzDeviceConfigServiceClientFactory, (q, r, t) => new FritzDeviceConfigService(q, r, t!), FritzDeviceConfigService.ControlUrl), q => q.CreateUrlSidAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzDeviceConfigServiceClientFactory, (q, r, t) => new FritzDeviceConfigService(q, r, t!), FritzDeviceConfigService.ControlUrl), q => q.CreateUrlSidAsync(default));
 
     public Task<DeviceConfigGetSupportDataInfoResponse> DeviceConfigGetSupportDataInfoAsync(InternetGatewayDevice internetGatewayDevice)
-    {
-        return ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzDeviceConfigServiceClientFactory, (q, r, t) => new FritzDeviceConfigService(q, r, t!), FritzDeviceConfigService.ControlUrl), q => q.GetSupportDataInfoAsync(default));
-    }
+        => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzDeviceConfigServiceClientFactory, (q, r, t) => new FritzDeviceConfigService(q, r, t!), FritzDeviceConfigService.ControlUrl), q => q.GetSupportDataInfoAsync(default));
 
     private static T GetFritzServiceClient<T>(InternetGatewayDevice internetGatewayDevice, IClientFactory<T> clientFactory, Func<FritzServiceEndpointConfiguration, EndpointAddress, NetworkCredential?, T> createService, string controlUrl, bool secure = true)
-    {
-        return clientFactory.Build(createService, internetGatewayDevice.PreferredLocation, secure, controlUrl, secure ? internetGatewayDevice.SecurityPort : null, internetGatewayDevice.NetworkCredential);
-    }
+        => clientFactory.Build(createService, internetGatewayDevice.PreferredLocation, secure, controlUrl, secure ? internetGatewayDevice.SecurityPort : null, internetGatewayDevice.NetworkCredential);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/Entities/DeviceLoginInfo.cs b/RS.Fritz.Manager.UI/Entities/DeviceLoginInfo.cs
index 4a172f9..ac6ba62 100644
--- a/RS.Fritz.Manager.UI/Entities/DeviceLoginInfo.cs
+++ b/RS.Fritz.Manager.UI/Entities/DeviceLoginInfo.cs
@@ -116,7 +116,5 @@ private void Receive(PropertyChangedMessage<User?> message)
     }
 
     private void SetLoginInfo()
-    {
-        LoginInfoSet = InternetGatewayDevice is not null && User is not null && Password is not null;
-    }
+        => LoginInfoSet = InternetGatewayDevice is not null && User is not null && Password is not null;
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/Infrastructure/FritzServiceViewModel.cs b/RS.Fritz.Manager.UI/Infrastructure/FritzServiceViewModel.cs
index 64c749a..cfcde09 100644
--- a/RS.Fritz.Manager.UI/Infrastructure/FritzServiceViewModel.cs
+++ b/RS.Fritz.Manager.UI/Infrastructure/FritzServiceViewModel.cs
@@ -99,33 +99,23 @@ protected virtual void FritzServiceViewModelPropertyChanged(object? sender, Prop
     }
 
     protected virtual bool GetCanExecuteDefaultCommand()
-    {
-        return (DeviceLoginInfo.InternetGatewayDevice?.Authenticated ?? false) && !DefaultCommandActive && (requiredServiceType is null || ApiDevice.Services.Any(r => r.ServiceType.StartsWith(FormattableString.Invariant($"urn:dslforum-org:service:{requiredServiceType}:"), StringComparison.OrdinalIgnoreCase)));
-    }
+        => (DeviceLoginInfo.InternetGatewayDevice?.Authenticated ?? false) && !DefaultCommandActive && (requiredServiceType is null || ApiDevice.Services.Any(r => r.ServiceType.StartsWith(FormattableString.Invariant($"urn:dslforum-org:service:{requiredServiceType}:"), StringComparison.OrdinalIgnoreCase)));
 
     protected void UpdateCanExecuteDefaultCommand()
-    {
-        CanExecuteDefaultCommand = GetCanExecuteDefaultCommand();
-    }
+        => CanExecuteDefaultCommand = GetCanExecuteDefaultCommand();
 
     protected Task<KeyValuePair<T?, UPnPFault?>> ExecuteApiAsync<T>(Func<InternetGatewayDevice, Task<T>> operation, IDictionary<ushort, string>? errorReasons = null)
         where T : struct
-    {
-        return DoExecuteApiAsync(operation(ApiDevice), errorReasons);
-    }
+        => DoExecuteApiAsync(operation(ApiDevice), errorReasons);
 
     protected Task<KeyValuePair<T?, UPnPFault?>> ExecuteApiAsync<T>(Func<InternetGatewayDevice, int, Task<T>> operation, int interfaceNumber, IDictionary<ushort, string>? errorReasons = null)
         where T : struct
-    {
-        return DoExecuteApiAsync(operation(ApiDevice, interfaceNumber), errorReasons);
-    }
+        => DoExecuteApiAsync(operation(ApiDevice, interfaceNumber), errorReasons);
 
     protected Task<KeyValuePair<TResponse?, UPnPFault?>> ExecuteApiAsync<TRequest, TResponse>(Func<InternetGatewayDevice, TRequest, Task<TResponse>> operation, TRequest request, IDictionary<ushort, string>? errorReasons = null)
         where TRequest : struct
         where TResponse : struct
-    {
-        return DoExecuteApiAsync(operation(ApiDevice, request), errorReasons);
-    }
+        => DoExecuteApiAsync(operation(ApiDevice, request), errorReasons);
 
     private static async Task<KeyValuePair<T?, UPnPFault?>> DoExecuteApiAsync<T>(Task<T> operation, IDictionary<ushort, string>? errorReasons)
         where T : struct
diff --git a/RS.Fritz.Manager.UI/Infrastructure/ManualOperationViewModel.cs b/RS.Fritz.Manager.UI/Infrastructure/ManualOperationViewModel.cs
index 03b4f96..16d40fc 100644
--- a/RS.Fritz.Manager.UI/Infrastructure/ManualOperationViewModel.cs
+++ b/RS.Fritz.Manager.UI/Infrastructure/ManualOperationViewModel.cs
@@ -22,16 +22,11 @@ protected ManualOperationViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logg
     public KeyValuePair<TResponse?, UPnPFault?>? Response
     {
         get => response;
-        private set { _ = SetProperty(ref response, value); }
+        private set => _ = SetProperty(ref response, value);
     }
 
-    protected virtual TRequest BuildRequest()
-    {
-        return default;
-    }
+    protected virtual TRequest BuildRequest() => default;
 
     protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
-    {
-        Response = await ExecuteApiAsync(operation, BuildRequest());
-    }
+        => Response = await ExecuteApiAsync(operation, BuildRequest());
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/Infrastructure/WanAccessTypeAwareFritzServiceViewModel.cs b/RS.Fritz.Manager.UI/Infrastructure/WanAccessTypeAwareFritzServiceViewModel.cs
index 69024b2..37a6359 100644
--- a/RS.Fritz.Manager.UI/Infrastructure/WanAccessTypeAwareFritzServiceViewModel.cs
+++ b/RS.Fritz.Manager.UI/Infrastructure/WanAccessTypeAwareFritzServiceViewModel.cs
@@ -18,9 +18,7 @@ protected WanAccessTypeAwareFritzServiceViewModel(DeviceLoginInfo deviceLoginInf
     }
 
     protected override bool GetCanExecuteDefaultCommand()
-    {
-        return base.GetCanExecuteDefaultCommand() && DeviceLoginInfo.InternetGatewayDevice!.WanAccessType == wanAccessType;
-    }
+        => base.GetCanExecuteDefaultCommand() && DeviceLoginInfo.InternetGatewayDevice!.WanAccessType == wanAccessType;
 
     private void Receive(PropertyChangedMessage<WanAccessType?> message)
     {
diff --git a/RS.Fritz.Manager.UI/MainWindow/MainWindow.xaml.cs b/RS.Fritz.Manager.UI/MainWindow/MainWindow.xaml.cs
index 2c133df..03cf445 100644
--- a/RS.Fritz.Manager.UI/MainWindow/MainWindow.xaml.cs
+++ b/RS.Fritz.Manager.UI/MainWindow/MainWindow.xaml.cs
@@ -12,8 +12,5 @@ public MainWindow(MainWindowViewModel mainWindowViewModel)
         DataContext = mainWindowViewModel;
     }
 
-    private void PasswordBoxPasswordChanged(object sender, RoutedEventArgs e)
-    {
-        ((MainWindowViewModel)DataContext).DeviceLoginInfo.Password = ((PasswordBox)sender).SecurePassword;
-    }
+    private void PasswordBoxPasswordChanged(object sender, RoutedEventArgs e) => ((MainWindowViewModel)DataContext).DeviceLoginInfo.Password = ((PasswordBox)sender).SecurePassword;
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/MainWindow/MainWindowViewModel.cs b/RS.Fritz.Manager.UI/MainWindow/MainWindowViewModel.cs
index 691f23b..5e8273f 100644
--- a/RS.Fritz.Manager.UI/MainWindow/MainWindowViewModel.cs
+++ b/RS.Fritz.Manager.UI/MainWindow/MainWindowViewModel.cs
@@ -146,17 +146,17 @@ public MainWindowViewModel(
 
     public double MainContentOpacity
     {
-        get => mainContentOpacity; set { _ = SetProperty(ref mainContentOpacity, value); }
+        get => mainContentOpacity; set => _ = SetProperty(ref mainContentOpacity, value);
     }
 
     public bool MainContentIsHitTestVisible
     {
-        get => mainContentIsHitTestVisible; set { _ = SetProperty(ref mainContentIsHitTestVisible, value); }
+        get => mainContentIsHitTestVisible; set => _ = SetProperty(ref mainContentIsHitTestVisible, value);
     }
 
     public int MessageZIndex
     {
-        get => messageZIndex; set { _ = SetProperty(ref messageZIndex, value); }
+        get => messageZIndex; set => _ = SetProperty(ref messageZIndex, value);
     }
 
     public string? UserMessage
@@ -184,7 +184,7 @@ private set
 
     public bool DeviceAndLoginControlsEnabled
     {
-        get => deviceAndLoginControlsEnabled; set { _ = SetProperty(ref deviceAndLoginControlsEnabled, value); }
+        get => deviceAndLoginControlsEnabled; set => _ = SetProperty(ref deviceAndLoginControlsEnabled, value);
     }
 
     public ObservableCollection<User> Users
@@ -303,10 +303,7 @@ protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToke
         Devices = new((await deviceSearchService.GetDevicesAsync(cancellationToken: cancellationToken)).Select(q => new ObservableInternetGatewayDevice(q)));
     }
 
-    protected override bool GetCanExecuteDefaultCommand()
-    {
-        return !DefaultCommandActive;
-    }
+    protected override bool GetCanExecuteDefaultCommand() => !DefaultCommandActive;
 
     private void Receive(PropertyChangedMessage<IEnumerable<User>> message)
     {
@@ -339,9 +336,7 @@ private void Receive(PropertyChangedMessage<ObservableInternetGatewayDevice?> me
     }
 
     private void UpdateCanExecuteLoginCommand()
-    {
-        CanExecuteLoginCommand = !LoginCommandActive && DeviceLoginInfo.LoginInfoSet;
-    }
+        => CanExecuteLoginCommand = !LoginCommandActive && DeviceLoginInfo.LoginInfoSet;
 
     private async Task ExecuteLoginCommandAsync(bool? showView)
     {
@@ -368,12 +363,8 @@ private async Task ExecuteLoginCommandAsync(bool? showView)
     }
 
     private void ExecuteCopyMessageCommand()
-    {
-        Clipboard.SetText(UserMessage);
-    }
+        => Clipboard.SetText(UserMessage);
 
     private void ExecuteCloseMessageCommand()
-    {
-        UserMessage = null;
-    }
+        => UserMessage = null;
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/Properties/GlobalUsings.cs b/RS.Fritz.Manager.UI/Properties/GlobalUsings.cs
index 41859ac..10d9c86 100644
--- a/RS.Fritz.Manager.UI/Properties/GlobalUsings.cs
+++ b/RS.Fritz.Manager.UI/Properties/GlobalUsings.cs
@@ -1,6 +1,2 @@
-#pragma warning disable IDE0065 // Misplaced using directive
-#pragma warning disable SA1200 // Using directives should be placed correctly
-global using RS.Fritz.Manager.API;
-global using Microsoft.Extensions.Logging;
-#pragma warning restore SA1200 // Using directives should be placed correctly
-#pragma warning restore IDE0065 // Misplaced using directive
\ No newline at end of file
+global using RS.Fritz.Manager.API;
+global using Microsoft.Extensions.Logging;
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestViewModel.cs b/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestViewModel.cs
index 35f4e7f..d9b53a2 100644
--- a/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestViewModel.cs
@@ -13,13 +13,13 @@ public AvmSpeedtestViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
     public KeyValuePair<AvmSpeedtestGetInfoResponse?, UPnPFault?>? AvmSpeedtestGetInfoResponse
     {
         get => avmSpeedtestGetInfoResponse;
-        private set { _ = SetProperty(ref avmSpeedtestGetInfoResponse, value); }
+        private set => _ = SetProperty(ref avmSpeedtestGetInfoResponse, value);
     }
 
     public KeyValuePair<AvmSpeedtestGetStatisticsResponse?, UPnPFault?>? AvmSpeedtestGetStatisticsResponse
     {
         get => avmSpeedtestGetStatisticsResponse;
-        private set { _ = SetProperty(ref avmSpeedtestGetStatisticsResponse, value); }
+        private set => _ = SetProperty(ref avmSpeedtestGetStatisticsResponse, value);
     }
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
@@ -32,12 +32,8 @@ protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken canc
     }
 
     private async Task GetAvmSpeedtestGetInfoAsync()
-    {
-        AvmSpeedtestGetInfoResponse = await ExecuteApiAsync(q => q.AvmSpeedtestGetInfoAsync());
-    }
+        => AvmSpeedtestGetInfoResponse = await ExecuteApiAsync(q => q.AvmSpeedtestGetInfoAsync());
 
     private async Task GetAvmSpeedtestGetStatisticsAsync()
-    {
-        AvmSpeedtestGetStatisticsResponse = await ExecuteApiAsync(q => q.AvmSpeedtestGetStatisticsAsync());
-    }
+        => AvmSpeedtestGetStatisticsResponse = await ExecuteApiAsync(q => q.AvmSpeedtestGetStatisticsAsync());
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/Capture/CaptureControlCaptureViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Capture/CaptureControlCaptureViewModel.cs
index b1f3f68..2e7e739 100644
--- a/RS.Fritz.Manager.UI/UserControls/Capture/CaptureControlCaptureViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Capture/CaptureControlCaptureViewModel.cs
@@ -4,9 +4,9 @@
 using System.IO;
 using System.Windows;
 using System.Windows.Interop;
+using CommunityToolkit.Mvvm.Input;
 using Windows.Storage;
 using Windows.Storage.Pickers;
-using CommunityToolkit.Mvvm.Input;
 using WinRT.Interop;
 
 internal sealed class CaptureControlCaptureViewModel : FritzServiceViewModel
@@ -73,19 +73,13 @@ private static void SetCaptureInterfaceStatus(UserInterfaceCaptureInterface user
     }
 
     private void NotifyAllStartCommandsCanExecuteChanged()
-    {
-        CaptureInterfaceGroups?.ToList().ForEach(q => q.CaptureInterfaces.ForEach(r => r.StartCommand.NotifyCanExecuteChanged()));
-    }
+        => CaptureInterfaceGroups?.ToList().ForEach(q => q.CaptureInterfaces.ForEach(r => r.StartCommand.NotifyCanExecuteChanged()));
 
     private bool CanExecuteCaptureInterfaceStartCommand(CaptureInterface captureInterface)
-    {
-        return PacketCaptureSizeLimit > 0 && !string.IsNullOrWhiteSpace(FolderName) && (!CaptureInterfaceGroups?.SelectMany(q => q.CaptureInterfaces).Single(q => q.CaptureInterface == captureInterface).Active ?? false);
-    }
+        => PacketCaptureSizeLimit > 0 && !string.IsNullOrWhiteSpace(FolderName) && (!CaptureInterfaceGroups?.SelectMany(q => q.CaptureInterfaces).Single(q => q.CaptureInterface == captureInterface).Active ?? false);
 
     private bool CanExecuteCaptureInterfaceStopCommand(CaptureInterface captureInterface)
-    {
-        return CaptureInterfaceGroups?.SelectMany(q => q.CaptureInterfaces).Single(q => q.CaptureInterface == captureInterface).Active ?? false;
-    }
+        => CaptureInterfaceGroups?.SelectMany(q => q.CaptureInterfaces).Single(q => q.CaptureInterface == captureInterface).Active ?? false;
 
     private async Task DoExecuteSelectTargetFolderCommandAsync()
     {
@@ -107,7 +101,7 @@ private async void DoExecuteCaptureInterfaceStartCommand(UserInterfaceCaptureInt
     {
         SetCaptureInterfaceStatus(userInterfaceCaptureInterface!, true);
 
-        var fileInfo = new FileInfo(FormattableString.Invariant($"{FolderName}\\{userInterfaceCaptureInterface!.CaptureInterface.Name}_{DateTime.Now.ToString("s").Replace(":", string.Empty)}.eth"));
+        var fileInfo = new FileInfo(FormattableString.Invariant($"{FolderName}\\{userInterfaceCaptureInterface!.CaptureInterface.Name}_{DateTime.Now.ToString("s").Replace(":", string.Empty, StringComparison.OrdinalIgnoreCase)}.eth"));
 
         await StartBackgroundCaptureAsync(userInterfaceCaptureInterface, fileInfo);
     }
diff --git a/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigViewModel.cs
index c637f10..26b7e79 100644
--- a/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigViewModel.cs
@@ -19,13 +19,13 @@ public DeviceConfigViewModel(
     public KeyValuePair<DeviceConfigGetPersistentDataResponse?, UPnPFault?>? DeviceConfigGetPersistentDataResponse
     {
         get => deviceConfigGetPersistentDataResponse;
-        private set { _ = SetProperty(ref deviceConfigGetPersistentDataResponse, value); }
+        private set => _ = SetProperty(ref deviceConfigGetPersistentDataResponse, value);
     }
 
     public KeyValuePair<DeviceConfigGetSupportDataInfoResponse?, UPnPFault?>? DeviceConfigGetSupportDataInfoResponse
     {
         get => deviceConfigGetSupportDataInfoResponse;
-        private set { _ = SetProperty(ref deviceConfigGetSupportDataInfoResponse, value); }
+        private set => _ = SetProperty(ref deviceConfigGetSupportDataInfoResponse, value);
     }
 
     public DeviceConfigGenerateUuIdViewModel DeviceConfigGenerateUuIdViewModel { get; }
@@ -42,12 +42,8 @@ protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken canc
     }
 
     private async Task GetDeviceConfigGetPersistentDataAsync()
-    {
-        DeviceConfigGetPersistentDataResponse = await ExecuteApiAsync(q => q.DeviceConfigGetPersistentDataAsync());
-    }
+        => DeviceConfigGetPersistentDataResponse = await ExecuteApiAsync(q => q.DeviceConfigGetPersistentDataAsync());
 
     private async Task GetDeviceConfigGetSupportDataInfoResponseAsync()
-    {
-        DeviceConfigGetSupportDataInfoResponse = await ExecuteApiAsync(q => q.DeviceConfigGetSupportDataInfoAsync());
-    }
+        => DeviceConfigGetSupportDataInfoResponse = await ExecuteApiAsync(q => q.DeviceConfigGetSupportDataInfoAsync());
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoSetProvisioningCodeViewModel.cs b/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoSetProvisioningCodeViewModel.cs
index 424a361..20f4052 100644
--- a/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoSetProvisioningCodeViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoSetProvisioningCodeViewModel.cs
@@ -21,10 +21,7 @@ public string? ProvisioningCode
         }
     }
 
-    protected override DeviceInfoSetProvisioningCodeRequest BuildRequest()
-    {
-        return new(ProvisioningCode!);
-    }
+    protected override DeviceInfoSetProvisioningCodeRequest BuildRequest() => new(ProvisioningCode!);
 
     protected override void FritzServiceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoViewModel.cs b/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoViewModel.cs
index 6e9911b..20872a7 100644
--- a/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoViewModel.cs
@@ -15,19 +15,19 @@ public DeviceInfoViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger, Devi
     public KeyValuePair<DeviceInfoGetSecurityPortResponse?, UPnPFault?>? DeviceInfoGetSecurityPortResponse
     {
         get => deviceInfoGetSecurityPortResponse;
-        private set { _ = SetProperty(ref deviceInfoGetSecurityPortResponse, value); }
+        private set => _ = SetProperty(ref deviceInfoGetSecurityPortResponse, value);
     }
 
     public KeyValuePair<DeviceInfoGetInfoResponse?, UPnPFault?>? DeviceInfoGetInfoResponse
     {
         get => deviceInfoGetInfoResponse;
-        private set { _ = SetProperty(ref deviceInfoGetInfoResponse, value); }
+        private set => _ = SetProperty(ref deviceInfoGetInfoResponse, value);
     }
 
     public KeyValuePair<DeviceInfoGetDeviceLogResponse?, UPnPFault?>? DeviceInfoGetDeviceLogResponse
     {
         get => deviceInfoGetDeviceLogResponse;
-        private set { _ = SetProperty(ref deviceInfoGetDeviceLogResponse, value); }
+        private set => _ = SetProperty(ref deviceInfoGetDeviceLogResponse, value);
     }
 
     public DeviceInfoSetProvisioningCodeViewModel DeviceInfoSetProvisioningCodeViewModel { get; }
@@ -42,18 +42,9 @@ protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken canc
             });
     }
 
-    private async Task GetDeviceInfoGetSecurityPortAsync()
-    {
-        DeviceInfoGetSecurityPortResponse = await ExecuteApiAsync(q => q.DeviceInfoGetSecurityPortAsync());
-    }
+    private async Task GetDeviceInfoGetSecurityPortAsync() => DeviceInfoGetSecurityPortResponse = await ExecuteApiAsync(q => q.DeviceInfoGetSecurityPortAsync());
 
-    private async Task GetDeviceInfoGetInfoAsync()
-    {
-        DeviceInfoGetInfoResponse = await ExecuteApiAsync(q => q.DeviceInfoGetInfoAsync());
-    }
+    private async Task GetDeviceInfoGetInfoAsync() => DeviceInfoGetInfoResponse = await ExecuteApiAsync(q => q.DeviceInfoGetInfoAsync());
 
-    private async Task GetDeviceInfoGetDeviceLogAsync()
-    {
-        DeviceInfoGetDeviceLogResponse = await ExecuteApiAsync(q => q.DeviceInfoGetDeviceLogAsync());
-    }
+    private async Task GetDeviceInfoGetDeviceLogAsync() => DeviceInfoGetDeviceLogResponse = await ExecuteApiAsync(q => q.DeviceInfoGetDeviceLogAsync());
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsGetGenericHostEntryViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsGetGenericHostEntryViewModel.cs
index 164e249..0b4ec84 100644
--- a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsGetGenericHostEntryViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsGetGenericHostEntryViewModel.cs
@@ -36,13 +36,11 @@ public ushort? HostNumberOfEntries
     public KeyValuePair<HostsGetGenericHostEntryResponse?, UPnPFault?>? HostsGetGenericHostEntryResponse
     {
         get => hostsGetGenericHostEntryResponse;
-        private set { _ = SetProperty(ref hostsGetGenericHostEntryResponse, value); }
+        private set => _ = SetProperty(ref hostsGetGenericHostEntryResponse, value);
     }
 
     protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
-    {
-        HostsGetGenericHostEntryResponse = await ExecuteApiAsync(q => q.HostsGetGenericHostEntryAsync(new(Index!.Value)));
-    }
+        => HostsGetGenericHostEntryResponse = await ExecuteApiAsync(q => q.HostsGetGenericHostEntryAsync(new(Index!.Value)));
 
     protected override void FritzServiceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
@@ -59,7 +57,5 @@ protected override void FritzServiceViewModelPropertyChanged(object? sender, Pro
     }
 
     protected override bool GetCanExecuteDefaultCommand()
-    {
-        return base.GetCanExecuteDefaultCommand() && Index >= 0 && Index < HostNumberOfEntries;
-    }
+        => base.GetCanExecuteDefaultCommand() && Index >= 0 && Index < HostNumberOfEntries;
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs
index 0bdce10..d3d3e36 100644
--- a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs
@@ -41,37 +41,37 @@ private set
     public KeyValuePair<HostsGetInfoResponse?, UPnPFault?>? HostsGetInfoResponse
     {
         get => hostsGetInfoResponse;
-        private set { _ = SetProperty(ref hostsGetInfoResponse, value); }
+        private set => _ = SetProperty(ref hostsGetInfoResponse, value);
     }
 
     public KeyValuePair<HostsGetChangeCounterResponse?, UPnPFault?>? HostsGetChangeCounterResponse
     {
         get => hostsGetChangeCounterResponse;
-        private set { _ = SetProperty(ref hostsGetChangeCounterResponse, value); }
+        private set => _ = SetProperty(ref hostsGetChangeCounterResponse, value);
     }
 
     public KeyValuePair<HostsGetFriendlyNameResponse?, UPnPFault?>? HostsGetFriendlyNameResponse
     {
         get => hostsGetFriendlyNameResponse;
-        private set { _ = SetProperty(ref hostsGetFriendlyNameResponse, value); }
+        private set => _ = SetProperty(ref hostsGetFriendlyNameResponse, value);
     }
 
     public DeviceHostInfo? DeviceHostInfo
     {
         get => deviceHostInfo;
-        private set { _ = SetProperty(ref deviceHostInfo, value); }
+        private set => _ = SetProperty(ref deviceHostInfo, value);
     }
 
     public DeviceMeshInfo? DeviceMeshInfo
     {
         get => deviceMeshInfo;
-        private set { _ = SetProperty(ref deviceMeshInfo, value); }
+        private set => _ = SetProperty(ref deviceMeshInfo, value);
     }
 
     public ObservableCollection<HostsGetGenericHostEntryResponse>? HostsGetGenericHostEntryResponses
     {
         get => hostsGetGenericHostEntryResponses;
-        private set { _ = SetProperty(ref hostsGetGenericHostEntryResponses, value); }
+        private set => _ = SetProperty(ref hostsGetGenericHostEntryResponses, value);
     }
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
@@ -107,27 +107,17 @@ private async Task GetHostsGetHostNumberOfEntriesAsync()
     }
 
     private async Task GetHostsGetInfoAsync()
-    {
-        HostsGetInfoResponse = await ExecuteApiAsync(q => q.HostsGetInfoAsync());
-    }
+        => HostsGetInfoResponse = await ExecuteApiAsync(q => q.HostsGetInfoAsync());
 
     private async Task GetHostsGetChangeCounterAsync()
-    {
-        HostsGetChangeCounterResponse = await ExecuteApiAsync(q => q.HostsGetChangeCounterAsync());
-    }
+        => HostsGetChangeCounterResponse = await ExecuteApiAsync(q => q.HostsGetChangeCounterAsync());
 
     private async Task GetHostsGetFriendlyNameAsync()
-    {
-        HostsGetFriendlyNameResponse = await ExecuteApiAsync(q => q.HostsGetFriendlyNameAsync());
-    }
+        => HostsGetFriendlyNameResponse = await ExecuteApiAsync(q => q.HostsGetFriendlyNameAsync());
 
     private async Task GetHostsGetHostListPathAsync(CancellationToken cancellationToken)
-    {
-        DeviceHostInfo = await deviceHostsService.GetDeviceHostsAsync(ApiDevice, cancellationToken);
-    }
+        => DeviceHostInfo = await deviceHostsService.GetDeviceHostsAsync(ApiDevice, cancellationToken);
 
     private async Task GetHostsGetMeshListPathAsync(CancellationToken cancellationToken)
-    {
-        DeviceMeshInfo = await deviceMeshService.GetDeviceMeshAsync(ApiDevice, cancellationToken);
-    }
+        => DeviceMeshInfo = await deviceMeshService.GetDeviceMeshAsync(ApiDevice, cancellationToken);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecuritySetConfigPasswordViewModel.cs b/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecuritySetConfigPasswordViewModel.cs
index 9bfae64..b95e35f 100644
--- a/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecuritySetConfigPasswordViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecuritySetConfigPasswordViewModel.cs
@@ -22,9 +22,7 @@ public string? Password
     }
 
     protected override LanConfigSecuritySetConfigPasswordRequest BuildRequest()
-    {
-        return new(Password!);
-    }
+        => new(Password!);
 
     protected override void FritzServiceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecurityViewModel.cs b/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecurityViewModel.cs
index bfaf318..5775fee 100644
--- a/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecurityViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecurityViewModel.cs
@@ -18,25 +18,25 @@ public LanConfigSecurityViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logge
     public KeyValuePair<LanConfigSecurityGetAnonymousLoginResponse?, UPnPFault?>? LanConfigSecurityGetAnonymousLoginResponse
     {
         get => lanConfigSecurityGetAnonymousLoginResponse;
-        private set { _ = SetProperty(ref lanConfigSecurityGetAnonymousLoginResponse, value); }
+        private set => _ = SetProperty(ref lanConfigSecurityGetAnonymousLoginResponse, value);
     }
 
     public KeyValuePair<LanConfigSecurityGetCurrentUserResponse?, UPnPFault?>? LanConfigSecurityGetCurrentUserResponse
     {
         get => lanConfigSecurityGetCurrentUserResponse;
-        private set { _ = SetProperty(ref lanConfigSecurityGetCurrentUserResponse, value); }
+        private set => _ = SetProperty(ref lanConfigSecurityGetCurrentUserResponse, value);
     }
 
     public KeyValuePair<LanConfigSecurityGetInfoResponse?, UPnPFault?>? LanConfigSecurityGetInfoResponse
     {
         get => lanConfigSecurityGetInfoResponse;
-        private set { _ = SetProperty(ref lanConfigSecurityGetInfoResponse, value); }
+        private set => _ = SetProperty(ref lanConfigSecurityGetInfoResponse, value);
     }
 
     public KeyValuePair<LanConfigSecurityGetUserListResponse?, UPnPFault?>? LanConfigSecurityGetUserListResponse
     {
         get => lanConfigSecurityGetUserListResponse;
-        private set { _ = SetProperty(ref lanConfigSecurityGetUserListResponse, value); }
+        private set => _ = SetProperty(ref lanConfigSecurityGetUserListResponse, value);
     }
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
@@ -51,22 +51,14 @@ protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken canc
     }
 
     private async Task GetLanConfigSecurityGetAnonymousLoginAsync()
-    {
-        LanConfigSecurityGetAnonymousLoginResponse = await ExecuteApiAsync(q => q.LanConfigSecurityGetAnonymousLoginAsync());
-    }
+        => LanConfigSecurityGetAnonymousLoginResponse = await ExecuteApiAsync(q => q.LanConfigSecurityGetAnonymousLoginAsync());
 
     private async Task GetLanConfigSecurityGetCurrentUserAsync()
-    {
-        LanConfigSecurityGetCurrentUserResponse = await ExecuteApiAsync(q => q.LanConfigSecurityGetCurrentUserAsync());
-    }
+        => LanConfigSecurityGetCurrentUserResponse = await ExecuteApiAsync(q => q.LanConfigSecurityGetCurrentUserAsync());
 
     private async Task GetLanConfigSecurityGetInfoAsync()
-    {
-        LanConfigSecurityGetInfoResponse = await ExecuteApiAsync(q => q.LanConfigSecurityGetInfoAsync());
-    }
+        => LanConfigSecurityGetInfoResponse = await ExecuteApiAsync(q => q.LanConfigSecurityGetInfoAsync());
 
     private async Task GetLanConfigSecurityGetUserListAsync()
-    {
-        LanConfigSecurityGetUserListResponse = await ExecuteApiAsync(q => q.LanConfigSecurityGetUserListAsync());
-    }
+        => LanConfigSecurityGetUserListResponse = await ExecuteApiAsync(q => q.LanConfigSecurityGetUserListAsync());
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/LanEthernetInterfaceConfig/LanEthernetInterfaceConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/LanEthernetInterfaceConfig/LanEthernetInterfaceConfigViewModel.cs
index c8a38b7..f731cbc 100644
--- a/RS.Fritz.Manager.UI/UserControls/LanEthernetInterfaceConfig/LanEthernetInterfaceConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/LanEthernetInterfaceConfig/LanEthernetInterfaceConfigViewModel.cs
@@ -13,13 +13,13 @@ public LanEthernetInterfaceConfigViewModel(DeviceLoginInfo deviceLoginInfo, ILog
     public KeyValuePair<LanEthernetInterfaceConfigGetInfoResponse?, UPnPFault?>? LanEthernetInterfaceConfigGetInfoResponse
     {
         get => lanEthernetInterfaceConfigGetInfoResponse;
-        private set { _ = SetProperty(ref lanEthernetInterfaceConfigGetInfoResponse, value); }
+        private set => _ = SetProperty(ref lanEthernetInterfaceConfigGetInfoResponse, value);
     }
 
     public KeyValuePair<LanEthernetInterfaceConfigGetStatisticsResponse?, UPnPFault?>? LanEthernetInterfaceConfigGetStatisticsResponse
     {
         get => lanEthernetInterfaceConfigGetStatisticsResponse;
-        private set { _ = SetProperty(ref lanEthernetInterfaceConfigGetStatisticsResponse, value); }
+        private set => _ = SetProperty(ref lanEthernetInterfaceConfigGetStatisticsResponse, value);
     }
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
@@ -32,12 +32,8 @@ protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken canc
     }
 
     private async Task GetLanEthernetInterfaceConfigGetInfoAsync()
-    {
-        LanEthernetInterfaceConfigGetInfoResponse = await ExecuteApiAsync(q => q.LanEthernetInterfaceConfigGetInfoAsync());
-    }
+        => LanEthernetInterfaceConfigGetInfoResponse = await ExecuteApiAsync(q => q.LanEthernetInterfaceConfigGetInfoAsync());
 
     private async Task GetLanEthernetInterfaceConfigGetStatisticsAsync()
-    {
-        LanEthernetInterfaceConfigGetStatisticsResponse = await ExecuteApiAsync(q => q.LanEthernetInterfaceConfigGetStatisticsAsync());
-    }
+        => LanEthernetInterfaceConfigGetStatisticsResponse = await ExecuteApiAsync(q => q.LanEthernetInterfaceConfigGetStatisticsAsync());
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/LanHostConfigManagement/LanHostConfigManagementViewModel.cs b/RS.Fritz.Manager.UI/UserControls/LanHostConfigManagement/LanHostConfigManagementViewModel.cs
index 7e50d9c..5682736 100644
--- a/RS.Fritz.Manager.UI/UserControls/LanHostConfigManagement/LanHostConfigManagementViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/LanHostConfigManagement/LanHostConfigManagementViewModel.cs
@@ -17,37 +17,37 @@ public LanHostConfigManagementViewModel(DeviceLoginInfo deviceLoginInfo, ILogger
     public KeyValuePair<LanHostConfigManagementGetInfoResponse?, UPnPFault?>? LanHostConfigManagementGetInfoResponse
     {
         get => lanHostConfigManagementGetInfoResponse;
-        private set { _ = SetProperty(ref lanHostConfigManagementGetInfoResponse, value); }
+        private set => _ = SetProperty(ref lanHostConfigManagementGetInfoResponse, value);
     }
 
     public KeyValuePair<LanHostConfigManagementGetSubnetMaskResponse?, UPnPFault?>? LanHostConfigManagementGetSubnetMaskResponse
     {
         get => lanHostConfigManagementGetSubnetMaskResponse;
-        private set { _ = SetProperty(ref lanHostConfigManagementGetSubnetMaskResponse, value); }
+        private set => _ = SetProperty(ref lanHostConfigManagementGetSubnetMaskResponse, value);
     }
 
     public KeyValuePair<LanHostConfigManagementGetIpRoutersListResponse?, UPnPFault?>? LanHostConfigManagementGetIpRoutersListResponse
     {
         get => lanHostConfigManagementGetIpRoutersListResponse;
-        private set { _ = SetProperty(ref lanHostConfigManagementGetIpRoutersListResponse, value); }
+        private set => _ = SetProperty(ref lanHostConfigManagementGetIpRoutersListResponse, value);
     }
 
     public KeyValuePair<LanHostConfigManagementGetAddressRangeResponse?, UPnPFault?>? LanHostConfigManagementGetAddressRangeResponse
     {
         get => lanHostConfigManagementGetAddressRangeResponse;
-        private set { _ = SetProperty(ref lanHostConfigManagementGetAddressRangeResponse, value); }
+        private set => _ = SetProperty(ref lanHostConfigManagementGetAddressRangeResponse, value);
     }
 
     public KeyValuePair<LanHostConfigManagementGetIpInterfaceNumberOfEntriesResponse?, UPnPFault?>? LanHostConfigManagementGetIpInterfaceNumberOfEntriesResponse
     {
         get => lanHostConfigManagementGetIpInterfaceNumberOfEntriesResponse;
-        private set { _ = SetProperty(ref lanHostConfigManagementGetIpInterfaceNumberOfEntriesResponse, value); }
+        private set => _ = SetProperty(ref lanHostConfigManagementGetIpInterfaceNumberOfEntriesResponse, value);
     }
 
     public KeyValuePair<LanHostConfigManagementGetDnsServersResponse?, UPnPFault?>? LanHostConfigManagementGetDnsServersResponse
     {
         get => lanHostConfigManagementGetDnsServersResponse;
-        private set { _ = SetProperty(ref lanHostConfigManagementGetDnsServersResponse, value); }
+        private set => _ = SetProperty(ref lanHostConfigManagementGetDnsServersResponse, value);
     }
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
@@ -64,32 +64,20 @@ protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken canc
     }
 
     private async Task GetLanHostConfigManagementGetInfoAsync()
-    {
-        LanHostConfigManagementGetInfoResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetInfoAsync());
-    }
+        => LanHostConfigManagementGetInfoResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetInfoAsync());
 
     private async Task LanHostConfigManagementGetSubnetMaskAsync()
-    {
-        LanHostConfigManagementGetSubnetMaskResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetSubnetMaskAsync());
-    }
+        => LanHostConfigManagementGetSubnetMaskResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetSubnetMaskAsync());
 
     private async Task LanHostConfigManagementGetIpRoutersListAsync()
-    {
-        LanHostConfigManagementGetIpRoutersListResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetIpRoutersListAsync());
-    }
+        => LanHostConfigManagementGetIpRoutersListResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetIpRoutersListAsync());
 
     private async Task LanHostConfigManagementGetAddressRangeAsync()
-    {
-        LanHostConfigManagementGetAddressRangeResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetAddressRangeAsync());
-    }
+        => LanHostConfigManagementGetAddressRangeResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetAddressRangeAsync());
 
     private async Task LanHostConfigManagementGetIpInterfaceNumberOfEntriesAsync()
-    {
-        LanHostConfigManagementGetIpInterfaceNumberOfEntriesResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetIpInterfaceNumberOfEntriesAsync());
-    }
+        => LanHostConfigManagementGetIpInterfaceNumberOfEntriesResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetIpInterfaceNumberOfEntriesAsync());
 
     private async Task LanHostConfigManagementGetDnsServersAsync()
-    {
-        LanHostConfigManagementGetDnsServersResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetDnsServersAsync());
-    }
+        => LanHostConfigManagementGetDnsServersResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetDnsServersAsync());
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingGetGenericForwardingEntryViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingGetGenericForwardingEntryViewModel.cs
index 932a4b9..c5c10bb 100644
--- a/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingGetGenericForwardingEntryViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingGetGenericForwardingEntryViewModel.cs
@@ -36,13 +36,11 @@ public ushort? ForwardNumberOfEntries
     public KeyValuePair<Layer3ForwardingGetGenericForwardingEntryResponse?, UPnPFault?>? Layer3ForwardingGetGenericForwardingEntryResponse
     {
         get => layer3ForwardingGetGenericForwardingEntryResponse;
-        private set { _ = SetProperty(ref layer3ForwardingGetGenericForwardingEntryResponse, value); }
+        private set => _ = SetProperty(ref layer3ForwardingGetGenericForwardingEntryResponse, value);
     }
 
     protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
-    {
-        Layer3ForwardingGetGenericForwardingEntryResponse = await ExecuteApiAsync(q => q.Layer3ForwardingGetGenericForwardingEntryAsync(new(Index!.Value)));
-    }
+        => Layer3ForwardingGetGenericForwardingEntryResponse = await ExecuteApiAsync(q => q.Layer3ForwardingGetGenericForwardingEntryAsync(new(Index!.Value)));
 
     protected override void FritzServiceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
@@ -59,7 +57,5 @@ protected override void FritzServiceViewModelPropertyChanged(object? sender, Pro
     }
 
     protected override bool GetCanExecuteDefaultCommand()
-    {
-        return base.GetCanExecuteDefaultCommand() && Index >= 0 && Index < ForwardNumberOfEntries;
-    }
+        => base.GetCanExecuteDefaultCommand() && Index >= 0 && Index < ForwardNumberOfEntries;
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingViewModel.cs
index 5a0bf21..506441d 100644
--- a/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingViewModel.cs
@@ -19,7 +19,7 @@ public Layer3ForwardingViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger
     public KeyValuePair<Layer3ForwardingGetDefaultConnectionServiceResponse?, UPnPFault?>? Layer3ForwardingGetDefaultConnectionServiceResponse
     {
         get => layer3ForwardingGetDefaultConnectionServiceResponse;
-        private set { _ = SetProperty(ref layer3ForwardingGetDefaultConnectionServiceResponse, value); }
+        private set => _ = SetProperty(ref layer3ForwardingGetDefaultConnectionServiceResponse, value);
     }
 
     public KeyValuePair<Layer3ForwardingGetForwardNumberOfEntriesResponse?, UPnPFault?>? Layer3ForwardingGetForwardNumberOfEntriesResponse
@@ -35,7 +35,7 @@ private set
     public ObservableCollection<Layer3ForwardingGetGenericForwardingEntryResponse>? Layer3ForwardingGetGenericForwardingEntryResponses
     {
         get => layer3ForwardingGetGenericForwardingEntryResponses;
-        private set { _ = SetProperty(ref layer3ForwardingGetGenericForwardingEntryResponses, value); }
+        private set => _ = SetProperty(ref layer3ForwardingGetGenericForwardingEntryResponses, value);
     }
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
@@ -48,9 +48,7 @@ protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken canc
     }
 
     private async Task GetLayer3ForwardingGetDefaultConnectionServiceAsync()
-    {
-        Layer3ForwardingGetDefaultConnectionServiceResponse = await ExecuteApiAsync(q => q.Layer3ForwardingGetDefaultConnectionServiceAsync());
-    }
+        => Layer3ForwardingGetDefaultConnectionServiceResponse = await ExecuteApiAsync(q => q.Layer3ForwardingGetDefaultConnectionServiceAsync());
 
     private async Task GetLayer3ForwardingGetForwardNumberOfEntriesResponseAsync()
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetConnectionRequestAuthenticationViewModel.cs b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetConnectionRequestAuthenticationViewModel.cs
index aa6172f..4d57343 100644
--- a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetConnectionRequestAuthenticationViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetConnectionRequestAuthenticationViewModel.cs
@@ -33,9 +33,7 @@ public string? ConnectionRequestPassword
     }
 
     protected override ManagementServerSetConnectionRequestAuthenticationRequest BuildRequest()
-    {
-        return new(ConnectionRequestUsername!, ConnectionRequestPassword!);
-    }
+        => new(ConnectionRequestUsername!, ConnectionRequestPassword!);
 
     protected override void FritzServiceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerPasswordViewModel.cs b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerPasswordViewModel.cs
index a1f2ce9..2b57b1c 100644
--- a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerPasswordViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerPasswordViewModel.cs
@@ -22,9 +22,7 @@ public string? Password
     }
 
     protected override ManagementServerSetManagementServerPasswordRequest BuildRequest()
-    {
-        return new(Password!);
-    }
+        => new(Password!);
 
     protected override void FritzServiceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerUrlViewModel.cs b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerUrlViewModel.cs
index 3c4133a..09d32b0 100644
--- a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerUrlViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerUrlViewModel.cs
@@ -22,9 +22,7 @@ public string? Url
     }
 
     protected override ManagementServerSetManagementServerUrlRequest BuildRequest()
-    {
-        return new(Url!);
-    }
+        => new(Url!);
 
     protected override void FritzServiceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerUsernameViewModel.cs b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerUsernameViewModel.cs
index f426226..da098e8 100644
--- a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerUsernameViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerUsernameViewModel.cs
@@ -22,9 +22,7 @@ public string? Username
     }
 
     protected override ManagementServerSetManagementServerUsernameRequest BuildRequest()
-    {
-        return new(Username!);
-    }
+        => new(Username!);
 
     protected override void FritzServiceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetPeriodicInformViewModel.cs b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetPeriodicInformViewModel.cs
index 5293bfa..b730d7f 100644
--- a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetPeriodicInformViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetPeriodicInformViewModel.cs
@@ -44,9 +44,7 @@ public DateTime? PeriodicInformTime
     }
 
     protected override ManagementServerSetPeriodicInformRequest BuildRequest()
-    {
-        return new(PeriodicInformEnable!.Value, PeriodicInformInterval!.Value, PeriodicInformTime!.Value);
-    }
+        => new(PeriodicInformEnable!.Value, PeriodicInformInterval!.Value, PeriodicInformTime!.Value);
 
     protected override void FritzServiceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
@@ -65,7 +63,5 @@ protected override void FritzServiceViewModelPropertyChanged(object? sender, Pro
     }
 
     protected override bool GetCanExecuteDefaultCommand()
-    {
-        return base.GetCanExecuteDefaultCommand() && PeriodicInformEnable.HasValue && PeriodicInformInterval.HasValue && PeriodicInformTime.HasValue;
-    }
+        => base.GetCanExecuteDefaultCommand() && PeriodicInformEnable.HasValue && PeriodicInformInterval.HasValue && PeriodicInformTime.HasValue;
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetTr069EnableViewModel.cs b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetTr069EnableViewModel.cs
index 77c26a1..c8f1fa9 100644
--- a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetTr069EnableViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetTr069EnableViewModel.cs
@@ -22,9 +22,7 @@ public bool? Tr069Enabled
     }
 
     protected override ManagementServerSetTr069EnableRequest BuildRequest()
-    {
-        return new(Tr069Enabled!.Value);
-    }
+        => new(Tr069Enabled!.Value);
 
     protected override void FritzServiceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
@@ -41,7 +39,5 @@ protected override void FritzServiceViewModelPropertyChanged(object? sender, Pro
     }
 
     protected override bool GetCanExecuteDefaultCommand()
-    {
-        return base.GetCanExecuteDefaultCommand() && Tr069Enabled.HasValue;
-    }
+        => base.GetCanExecuteDefaultCommand() && Tr069Enabled.HasValue;
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetTr069FirmwareDownloadEnabledViewModel.cs b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetTr069FirmwareDownloadEnabledViewModel.cs
index b1fedb3..28afee1 100644
--- a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetTr069FirmwareDownloadEnabledViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetTr069FirmwareDownloadEnabledViewModel.cs
@@ -22,9 +22,7 @@ public bool? Tr069FirmwareDownloadEnabled
     }
 
     protected override ManagementServerSetTr069FirmwareDownloadEnabledRequest BuildRequest()
-    {
-        return new(Tr069FirmwareDownloadEnabled!.Value);
-    }
+        => new(Tr069FirmwareDownloadEnabled!.Value);
 
     protected override void FritzServiceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
@@ -41,7 +39,5 @@ protected override void FritzServiceViewModelPropertyChanged(object? sender, Pro
     }
 
     protected override bool GetCanExecuteDefaultCommand()
-    {
-        return base.GetCanExecuteDefaultCommand() && Tr069FirmwareDownloadEnabled.HasValue;
-    }
+        => base.GetCanExecuteDefaultCommand() && Tr069FirmwareDownloadEnabled.HasValue;
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetUpgradeManagementViewModel.cs b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetUpgradeManagementViewModel.cs
index 4613851..febebb2 100644
--- a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetUpgradeManagementViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetUpgradeManagementViewModel.cs
@@ -22,9 +22,7 @@ public bool? UpgradesManaged
     }
 
     protected override ManagementServerSetUpgradeManagementRequest BuildRequest()
-    {
-        return new(UpgradesManaged!.Value);
-    }
+        => new(UpgradesManaged!.Value);
 
     protected override void FritzServiceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
@@ -41,7 +39,5 @@ protected override void FritzServiceViewModelPropertyChanged(object? sender, Pro
     }
 
     protected override bool GetCanExecuteDefaultCommand()
-    {
-        return base.GetCanExecuteDefaultCommand() && UpgradesManaged.HasValue;
-    }
+        => base.GetCanExecuteDefaultCommand() && UpgradesManaged.HasValue;
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerViewModel.cs b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerViewModel.cs
index b5d7f86..b8bb79d 100644
--- a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerViewModel.cs
@@ -31,13 +31,13 @@ public ManagementServerViewModel(
     public KeyValuePair<ManagementServerGetInfoResponse?, UPnPFault?>? ManagementServerGetInfoResponse
     {
         get => managementServerGetInfoResponse;
-        private set { _ = SetProperty(ref managementServerGetInfoResponse, value); }
+        private set => _ = SetProperty(ref managementServerGetInfoResponse, value);
     }
 
     public KeyValuePair<ManagementServerGetTr069FirmwareDownloadEnabledResponse?, UPnPFault?>? ManagementServerGetTr069FirmwareDownloadEnabledResponse
     {
         get => managementServerGetTr069FirmwareDownloadEnabledResponse;
-        private set { _ = SetProperty(ref managementServerGetTr069FirmwareDownloadEnabledResponse, value); }
+        private set => _ = SetProperty(ref managementServerGetTr069FirmwareDownloadEnabledResponse, value);
     }
 
     public ManagementServerSetManagementServerUrlViewModel ManagementServerSetManagementServerUrlViewModel { get; }
@@ -66,12 +66,8 @@ protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken canc
     }
 
     private async Task GetManagementServerGetInfoAsync()
-    {
-        ManagementServerGetInfoResponse = await ExecuteApiAsync(q => q.ManagementServerGetInfoAsync());
-    }
+        => ManagementServerGetInfoResponse = await ExecuteApiAsync(q => q.ManagementServerGetInfoAsync());
 
     private async Task GetManagementServerGetTr069FirmwareDownloadEnabledAsync()
-    {
-        ManagementServerGetTr069FirmwareDownloadEnabledResponse = await ExecuteApiAsync(q => q.ManagementServerGetTr069FirmwareDownloadEnabledAsync());
-    }
+        => ManagementServerGetTr069FirmwareDownloadEnabledResponse = await ExecuteApiAsync(q => q.ManagementServerGetTr069FirmwareDownloadEnabledAsync());
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/Time/TimeSetNtpServersViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Time/TimeSetNtpServersViewModel.cs
index 83f235b..8f110de 100644
--- a/RS.Fritz.Manager.UI/UserControls/Time/TimeSetNtpServersViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Time/TimeSetNtpServersViewModel.cs
@@ -33,9 +33,7 @@ public string? NtpServer2
     }
 
     protected override TimeSetNtpServersRequest BuildRequest()
-    {
-        return new(NtpServer1!, NtpServer2!);
-    }
+        => new(NtpServer1!, NtpServer2!);
 
     protected override void FritzServiceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/Time/TimeViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Time/TimeViewModel.cs
index 9022720..d7221ce 100644
--- a/RS.Fritz.Manager.UI/UserControls/Time/TimeViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Time/TimeViewModel.cs
@@ -15,11 +15,9 @@ public TimeViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger, TimeSetNtp
     public KeyValuePair<TimeGetInfoResponse?, UPnPFault?>? TimeGetInfoResponse
     {
         get => timeGetInfoResponse;
-        private set { _ = SetProperty(ref timeGetInfoResponse, value); }
+        private set => _ = SetProperty(ref timeGetInfoResponse, value);
     }
 
     protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
-    {
-        TimeGetInfoResponse = await ExecuteApiAsync(q => q.TimeGetInfoAsync());
-    }
+        => TimeGetInfoResponse = await ExecuteApiAsync(q => q.TimeGetInfoAsync());
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceDoManualUpdateViewModel.cs b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceDoManualUpdateViewModel.cs
index d7c5ab8..afbeb74 100644
--- a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceDoManualUpdateViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceDoManualUpdateViewModel.cs
@@ -33,9 +33,7 @@ public bool? AllowDowngrade
     }
 
     protected override UserInterfaceDoManualUpdateRequest BuildRequest()
-    {
-        return new(DownloadUrl!, AllowDowngrade!.Value);
-    }
+        => new(DownloadUrl!, AllowDowngrade!.Value);
 
     protected override void FritzServiceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
@@ -53,7 +51,5 @@ protected override void FritzServiceViewModelPropertyChanged(object? sender, Pro
     }
 
     protected override bool GetCanExecuteDefaultCommand()
-    {
-        return base.GetCanExecuteDefaultCommand() && AllowDowngrade.HasValue;
-    }
+        => base.GetCanExecuteDefaultCommand() && AllowDowngrade.HasValue;
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceSetConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceSetConfigViewModel.cs
index df5363b..1774ba1 100644
--- a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceSetConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceSetConfigViewModel.cs
@@ -22,9 +22,7 @@ public string? AutoUpdateMode
     }
 
     protected override UserInterfaceSetConfigRequest BuildRequest()
-    {
-        return new(AutoUpdateMode!);
-    }
+        => new(AutoUpdateMode!);
 
     protected override void FritzServiceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceSetInternationalConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceSetInternationalConfigViewModel.cs
index 658bff0..b399825 100644
--- a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceSetInternationalConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceSetInternationalConfigViewModel.cs
@@ -44,9 +44,7 @@ public string? Annex
     }
 
     protected override UserInterfaceSetInternationalConfigRequest BuildRequest()
-    {
-        return new(Language!, Country!, Annex!);
-    }
+        => new(Language!, Country!, Annex!);
 
     protected override void FritzServiceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceViewModel.cs b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceViewModel.cs
index 75f68d0..6f6d80c 100644
--- a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceViewModel.cs
@@ -28,19 +28,19 @@ public UserInterfaceViewModel(
     public KeyValuePair<UserInterfaceGetInfoResponse?, UPnPFault?>? UserInterfaceGetInfoResponse
     {
         get => userInterfaceGetInfoResponse;
-        private set { _ = SetProperty(ref userInterfaceGetInfoResponse, value); }
+        private set => _ = SetProperty(ref userInterfaceGetInfoResponse, value);
     }
 
     public KeyValuePair<UserInterfaceGetInternationalConfigResponse?, UPnPFault?>? UserInterfaceGetInternationalConfigResponse
     {
         get => userInterfaceGetInternationalConfigResponse;
-        private set { _ = SetProperty(ref userInterfaceGetInternationalConfigResponse, value); }
+        private set => _ = SetProperty(ref userInterfaceGetInternationalConfigResponse, value);
     }
 
     public KeyValuePair<UserInterfaceAvmGetInfoResponse?, UPnPFault?>? UserInterfaceAvmGetInfoResponse
     {
         get => userInterfaceAvmGetInfoResponse;
-        private set { _ = SetProperty(ref userInterfaceAvmGetInfoResponse, value); }
+        private set => _ = SetProperty(ref userInterfaceAvmGetInfoResponse, value);
     }
 
     public UserInterfaceCheckUpdateViewModel UserInterfaceCheckUpdateViewModel { get; }
@@ -66,17 +66,11 @@ protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken canc
     }
 
     private async Task GetUserInterfaceGetInfoAsync()
-    {
-        UserInterfaceGetInfoResponse = await ExecuteApiAsync(q => q.UserInterfaceGetInfoAsync());
-    }
+        => UserInterfaceGetInfoResponse = await ExecuteApiAsync(q => q.UserInterfaceGetInfoAsync());
 
     private async Task GetUserInterfaceGetInternationalConfigAsync()
-    {
-        UserInterfaceGetInternationalConfigResponse = await ExecuteApiAsync(q => q.UserInterfaceGetInternationalConfigAsync());
-    }
+        => UserInterfaceGetInternationalConfigResponse = await ExecuteApiAsync(q => q.UserInterfaceGetInternationalConfigAsync());
 
     private async Task GetUserInterfaceAvmGetInfoAsync()
-    {
-        UserInterfaceAvmGetInfoResponse = await ExecuteApiAsync(q => q.UserInterfaceAvmGetInfoAsync());
-    }
+        => UserInterfaceAvmGetInfoResponse = await ExecuteApiAsync(q => q.UserInterfaceAvmGetInfoAsync());
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigGetOnlineMonitorViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigGetOnlineMonitorViewModel.cs
index a9f8815..1b01c38 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigGetOnlineMonitorViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigGetOnlineMonitorViewModel.cs
@@ -87,49 +87,49 @@ private set
     public List<UIElement>? OnlineMonitorUpstreamElements
     {
         get => onlineMonitorUpstreamElements;
-        private set { _ = SetProperty(ref onlineMonitorUpstreamElements, value); }
+        private set => _ = SetProperty(ref onlineMonitorUpstreamElements, value);
     }
 
     public uint? CurrentDownstreamInternetBps
     {
         get => currentDownstreamInternetBps;
-        private set { _ = SetProperty(ref currentDownstreamInternetBps, value); }
+        private set => _ = SetProperty(ref currentDownstreamInternetBps, value);
     }
 
     public uint? CurrentDownstreamIpTvBps
     {
         get => currentDownstreamIpTvBps;
-        private set { _ = SetProperty(ref currentDownstreamIpTvBps, value); }
+        private set => _ = SetProperty(ref currentDownstreamIpTvBps, value);
     }
 
     public uint? CurrentUpstreamTotalBps
     {
         get => currentUpstreamTotalBps;
-        private set { _ = SetProperty(ref currentUpstreamTotalBps, value); }
+        private set => _ = SetProperty(ref currentUpstreamTotalBps, value);
     }
 
     public uint? CurrentUpstreamRealTimeApplicationsBps
     {
         get => currentUpstreamRealTimeApplicationsBps;
-        private set { _ = SetProperty(ref currentUpstreamRealTimeApplicationsBps, value); }
+        private set => _ = SetProperty(ref currentUpstreamRealTimeApplicationsBps, value);
     }
 
     public uint? CurrentUpstreamPrioritizedApplicationsBps
     {
         get => currentUpstreamPrioritizedApplicationsBps;
-        private set { _ = SetProperty(ref currentUpstreamPrioritizedApplicationsBps, value); }
+        private set => _ = SetProperty(ref currentUpstreamPrioritizedApplicationsBps, value);
     }
 
     public uint? CurrentUpstreamNormalApplicationsBps
     {
         get => currentUpstreamNormalApplicationsBps;
-        private set { _ = SetProperty(ref currentUpstreamNormalApplicationsBps, value); }
+        private set => _ = SetProperty(ref currentUpstreamNormalApplicationsBps, value);
     }
 
     public uint? CurrentUpstreamBackgroundApplicationsBps
     {
         get => currentUpstreamBackgroundApplicationsBps;
-        private set { _ = SetProperty(ref currentUpstreamBackgroundApplicationsBps, value); }
+        private set => _ = SetProperty(ref currentUpstreamBackgroundApplicationsBps, value);
     }
 
     public KeyValuePair<WanCommonInterfaceConfigGetOnlineMonitorResponse?, UPnPFault?>? WanCommonInterfaceConfigGetOnlineMonitorResponse
@@ -153,9 +153,7 @@ public uint? CurrentUpstreamBackgroundApplicationsBps
     }
 
     protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
-    {
-        WanCommonInterfaceConfigGetOnlineMonitorResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetOnlineMonitorAsync(new(SyncGroupIndex)));
-    }
+        => WanCommonInterfaceConfigGetOnlineMonitorResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetOnlineMonitorAsync(new(SyncGroupIndex)));
 
     protected override void FritzServiceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
@@ -172,9 +170,7 @@ protected override void FritzServiceViewModelPropertyChanged(object? sender, Pro
     }
 
     protected override bool GetCanExecuteDefaultCommand()
-    {
-        return base.GetCanExecuteDefaultCommand() && (WanCommonInterfaceConfigGetOnlineMonitorResponse is null || SyncGroupIndex < WanCommonInterfaceConfigGetOnlineMonitorResponse!.Value.Key!.Value.TotalNumberSyncGroups);
-    }
+        => base.GetCanExecuteDefaultCommand() && (WanCommonInterfaceConfigGetOnlineMonitorResponse is null || SyncGroupIndex < WanCommonInterfaceConfigGetOnlineMonitorResponse!.Value.Key!.Value.TotalNumberSyncGroups);
 
     private static void CreateUiElements(double yScale, double xScale, uint min, uint range, ICollection<UIElement> uiElements, IReadOnlyList<uint> values, Brush brush)
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigSetWanAccessTypeViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigSetWanAccessTypeViewModel.cs
index 2ca9127..5b6e488 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigSetWanAccessTypeViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigSetWanAccessTypeViewModel.cs
@@ -22,9 +22,7 @@ public string? WanAccessType
     }
 
     protected override WanCommonInterfaceConfigSetWanAccessTypeRequest BuildRequest()
-    {
-        return new(WanAccessType!);
-    }
+        => new(WanAccessType!);
 
     protected override void FritzServiceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigViewModel.cs
index bebbd95..b29aace 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigViewModel.cs
@@ -47,31 +47,31 @@ public bool AutoRefresh
     public KeyValuePair<WanCommonInterfaceConfigGetTotalBytesReceivedResponse?, UPnPFault?>? WanCommonInterfaceConfigGetTotalBytesReceivedResponse
     {
         get => wanCommonInterfaceConfigGetTotalBytesReceivedResponse;
-        private set { _ = SetProperty(ref wanCommonInterfaceConfigGetTotalBytesReceivedResponse, value); }
+        private set => _ = SetProperty(ref wanCommonInterfaceConfigGetTotalBytesReceivedResponse, value);
     }
 
     public KeyValuePair<WanCommonInterfaceConfigGetTotalBytesSentResponse?, UPnPFault?>? WanCommonInterfaceConfigGetTotalBytesSentResponse
     {
         get => wanCommonInterfaceConfigGetTotalBytesSentResponse;
-        private set { _ = SetProperty(ref wanCommonInterfaceConfigGetTotalBytesSentResponse, value); }
+        private set => _ = SetProperty(ref wanCommonInterfaceConfigGetTotalBytesSentResponse, value);
     }
 
     public KeyValuePair<WanCommonInterfaceConfigGetTotalPacketsReceivedResponse?, UPnPFault?>? WanCommonInterfaceConfigGetTotalPacketsReceivedResponse
     {
         get => wanCommonInterfaceConfigGetTotalPacketsReceivedResponse;
-        private set { _ = SetProperty(ref wanCommonInterfaceConfigGetTotalPacketsReceivedResponse, value); }
+        private set => _ = SetProperty(ref wanCommonInterfaceConfigGetTotalPacketsReceivedResponse, value);
     }
 
     public KeyValuePair<WanCommonInterfaceConfigGetTotalPacketsSentResponse?, UPnPFault?>? WanCommonInterfaceConfigGetTotalPacketsSentResponse
     {
         get => wanCommonInterfaceConfigGetTotalPacketsSentResponse;
-        private set { _ = SetProperty(ref wanCommonInterfaceConfigGetTotalPacketsSentResponse, value); }
+        private set => _ = SetProperty(ref wanCommonInterfaceConfigGetTotalPacketsSentResponse, value);
     }
 
     public KeyValuePair<WanCommonInterfaceConfigGetCommonLinkPropertiesResponse?, UPnPFault?>? WanCommonInterfaceConfigGetCommonLinkPropertiesResponse
     {
         get => wanCommonInterfaceConfigGetCommonLinkPropertiesResponse;
-        private set { _ = SetProperty(ref wanCommonInterfaceConfigGetCommonLinkPropertiesResponse, value); }
+        private set => _ = SetProperty(ref wanCommonInterfaceConfigGetCommonLinkPropertiesResponse, value);
     }
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
@@ -103,32 +103,20 @@ private async void AutoRefreshTimerTick(object? sender, EventArgs e)
     }
 
     private async Task GetWanCommonInterfaceConfigGetCommonLinkPropertiesAsync()
-    {
-        WanCommonInterfaceConfigGetCommonLinkPropertiesResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetCommonLinkPropertiesAsync());
-    }
+        => WanCommonInterfaceConfigGetCommonLinkPropertiesResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetCommonLinkPropertiesAsync());
 
     private async Task GetWanCommonInterfaceConfigGetTotalBytesReceivedAsync()
-    {
-        WanCommonInterfaceConfigGetTotalBytesReceivedResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetTotalBytesReceivedAsync());
-    }
+        => WanCommonInterfaceConfigGetTotalBytesReceivedResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetTotalBytesReceivedAsync());
 
     private async Task GetWanCommonInterfaceConfigGetTotalBytesSentAsync()
-    {
-        WanCommonInterfaceConfigGetTotalBytesSentResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetTotalBytesSentAsync());
-    }
+        => WanCommonInterfaceConfigGetTotalBytesSentResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetTotalBytesSentAsync());
 
     private async Task GetWanCommonInterfaceConfigGetTotalPacketsReceivedAsync()
-    {
-        WanCommonInterfaceConfigGetTotalPacketsReceivedResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetTotalPacketsReceivedAsync());
-    }
+        => WanCommonInterfaceConfigGetTotalPacketsReceivedResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetTotalPacketsReceivedAsync());
 
     private async Task GetWanCommonInterfaceConfigGetTotalPacketsSentAsync()
-    {
-        WanCommonInterfaceConfigGetTotalPacketsSentResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetTotalPacketsSentAsync());
-    }
+        => WanCommonInterfaceConfigGetTotalPacketsSentResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetTotalPacketsSentAsync());
 
     private async Task GetWanCommonInterfaceConfigGetOnlineMonitorAsync()
-    {
-        WanCommonInterfaceConfigGetOnlineMonitorViewModel.WanCommonInterfaceConfigGetOnlineMonitorResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetOnlineMonitorAsync(new(0)));
-    }
+        => WanCommonInterfaceConfigGetOnlineMonitorViewModel.WanCommonInterfaceConfigGetOnlineMonitorResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetOnlineMonitorAsync(new(0)));
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/WanConnectionSharedUserControls/WanConnectionGetGenericPortMappingEntryViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanConnectionSharedUserControls/WanConnectionGetGenericPortMappingEntryViewModel.cs
index 17e4835..6273df9 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanConnectionSharedUserControls/WanConnectionGetGenericPortMappingEntryViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanConnectionSharedUserControls/WanConnectionGetGenericPortMappingEntryViewModel.cs
@@ -36,7 +36,7 @@ public ushort? PortMappingNumberOfEntries
     public KeyValuePair<WanConnectionGetGenericPortMappingEntryResponse?, UPnPFault?>? WanConnectionGetGenericPortMappingEntryResponse
     {
         get => wanConnectionGetGenericPortMappingEntryResponse;
-        protected set { _ = SetProperty(ref wanConnectionGetGenericPortMappingEntryResponse, value); }
+        protected set => _ = SetProperty(ref wanConnectionGetGenericPortMappingEntryResponse, value);
     }
 
     protected override void FritzServiceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
@@ -54,7 +54,5 @@ protected override void FritzServiceViewModelPropertyChanged(object? sender, Pro
     }
 
     protected override bool GetCanExecuteDefaultCommand()
-    {
-        return base.GetCanExecuteDefaultCommand() && Index >= 0 && Index < PortMappingNumberOfEntries;
-    }
+        => base.GetCanExecuteDefaultCommand() && Index >= 0 && Index < PortMappingNumberOfEntries;
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigInfoViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigInfoViewModel.cs
index cfac51b..734ca6e 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigInfoViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigInfoViewModel.cs
@@ -72,61 +72,61 @@ public WanDslInterfaceConfigInfoViewModel()
     public List<UIElement>? UpstreamCurrRateHistory
     {
         get => upstreamCurrRateHistory;
-        private set { _ = SetProperty(ref upstreamCurrRateHistory, value); }
+        private set => _ = SetProperty(ref upstreamCurrRateHistory, value);
     }
 
     public List<UIElement>? DownstreamCurrRateHistory
     {
         get => downstreamCurrRateHistory;
-        private set { _ = SetProperty(ref downstreamCurrRateHistory, value); }
+        private set => _ = SetProperty(ref downstreamCurrRateHistory, value);
     }
 
     public List<UIElement>? UpstreamMaxRateHistory
     {
         get => upstreamMaxRateHistory;
-        private set { _ = SetProperty(ref upstreamMaxRateHistory, value); }
+        private set => _ = SetProperty(ref upstreamMaxRateHistory, value);
     }
 
     public List<UIElement>? DownstreamMaxRateHistory
     {
         get => downstreamMaxRateHistory;
-        private set { _ = SetProperty(ref downstreamMaxRateHistory, value); }
+        private set => _ = SetProperty(ref downstreamMaxRateHistory, value);
     }
 
     public List<UIElement>? UpstreamNoiseMarginHistory
     {
         get => upstreamMaxRateHistory;
-        private set { _ = SetProperty(ref upstreamMaxRateHistory, value); }
+        private set => _ = SetProperty(ref upstreamMaxRateHistory, value);
     }
 
     public List<UIElement>? DownstreamNoiseMarginHistory
     {
         get => downstreamNoiseMarginHistory;
-        private set { _ = SetProperty(ref downstreamNoiseMarginHistory, value); }
+        private set => _ = SetProperty(ref downstreamNoiseMarginHistory, value);
     }
 
     public List<UIElement>? UpstreamAttenuationHistory
     {
         get => upstreamAttenuationHistory;
-        private set { _ = SetProperty(ref upstreamAttenuationHistory, value); }
+        private set => _ = SetProperty(ref upstreamAttenuationHistory, value);
     }
 
     public List<UIElement>? DownstreamAttenuationHistory
     {
         get => downstreamAttenuationHistory;
-        private set { _ = SetProperty(ref downstreamAttenuationHistory, value); }
+        private set => _ = SetProperty(ref downstreamAttenuationHistory, value);
     }
 
     public List<UIElement>? UpstreamPowerHistory
     {
         get => upstreamPowerHistory;
-        private set { _ = SetProperty(ref upstreamPowerHistory, value); }
+        private set => _ = SetProperty(ref upstreamPowerHistory, value);
     }
 
     public List<UIElement>? DownstreamPowerHistory
     {
         get => downstreamPowerHistory;
-        private set { _ = SetProperty(ref downstreamPowerHistory, value); }
+        private set => _ = SetProperty(ref downstreamPowerHistory, value);
     }
 
     private List<UIElement> UpdateHistory(IReadOnlyList<uint> values)
diff --git a/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigViewModel.cs
index e000978..c64c5d9 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigViewModel.cs
@@ -41,13 +41,13 @@ public bool AutoRefresh
     public KeyValuePair<WanDslInterfaceConfigGetDslDiagnoseInfoResponse?, UPnPFault?>? WanDslInterfaceConfigGetDslDiagnoseInfoResponse
     {
         get => wanDslInterfaceConfigGetDslDiagnoseInfoResponse;
-        private set { _ = SetProperty(ref wanDslInterfaceConfigGetDslDiagnoseInfoResponse, value); }
+        private set => _ = SetProperty(ref wanDslInterfaceConfigGetDslDiagnoseInfoResponse, value);
     }
 
     public KeyValuePair<WanDslInterfaceConfigGetStatisticsTotalResponse?, UPnPFault?>? WanDslInterfaceConfigGetStatisticsTotalResponse
     {
         get => wanDslInterfaceConfigGetStatisticsTotalResponse;
-        private set { _ = SetProperty(ref wanDslInterfaceConfigGetStatisticsTotalResponse, value); }
+        private set => _ = SetProperty(ref wanDslInterfaceConfigGetStatisticsTotalResponse, value);
     }
 
     public WanDslInterfaceConfigInfoViewModel WanDslInterfaceConfigInfoViewModel { get; }
@@ -99,22 +99,14 @@ private async void AutoRefreshTimerTick(object? sender, EventArgs e)
     }
 
     private async Task GetWanDslInterfaceConfigGetDslDiagnoseInfoAsync()
-    {
-        WanDslInterfaceConfigGetDslDiagnoseInfoResponse = await ExecuteApiAsync(q => q.WanDslInterfaceConfigGetDslDiagnoseInfoAsync());
-    }
+        => WanDslInterfaceConfigGetDslDiagnoseInfoResponse = await ExecuteApiAsync(q => q.WanDslInterfaceConfigGetDslDiagnoseInfoAsync());
 
     private async Task GetWanDslInterfaceConfigGetDslInfoAsync()
-    {
-        WanDslInterfaceConfigDslInfoViewModel.WanDslInterfaceConfigGetDslInfoResponse = await ExecuteApiAsync(q => q.WanDslInterfaceConfigGetDslInfoAsync());
-    }
+        => WanDslInterfaceConfigDslInfoViewModel.WanDslInterfaceConfigGetDslInfoResponse = await ExecuteApiAsync(q => q.WanDslInterfaceConfigGetDslInfoAsync());
 
     private async Task GetWanDslInterfaceConfigGetInfoAsync()
-    {
-        WanDslInterfaceConfigInfoViewModel.WanDslInterfaceConfigGetInfoResponse = await ExecuteApiAsync(q => q.WanDslInterfaceConfigGetInfoAsync());
-    }
+        => WanDslInterfaceConfigInfoViewModel.WanDslInterfaceConfigGetInfoResponse = await ExecuteApiAsync(q => q.WanDslInterfaceConfigGetInfoAsync());
 
     private async Task GetWanDslInterfaceConfigGetStatisticsTotalAsync()
-    {
-        WanDslInterfaceConfigGetStatisticsTotalResponse = await ExecuteApiAsync(q => q.WanDslInterfaceConfigGetStatisticsTotalAsync());
-    }
+        => WanDslInterfaceConfigGetStatisticsTotalResponse = await ExecuteApiAsync(q => q.WanDslInterfaceConfigGetStatisticsTotalAsync());
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/WanDslLinkConfig/WanDslLinkConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanDslLinkConfig/WanDslLinkConfigViewModel.cs
index af67db9..2ae8d6b 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanDslLinkConfig/WanDslLinkConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanDslLinkConfig/WanDslLinkConfigViewModel.cs
@@ -17,37 +17,37 @@ public WanDslLinkConfigViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger
     public KeyValuePair<WanDslLinkConfigGetInfoResponse?, UPnPFault?>? WanDslLinkConfigGetInfoResponse
     {
         get => wanDslLinkConfigGetInfoResponse;
-        private set { _ = SetProperty(ref wanDslLinkConfigGetInfoResponse, value); }
+        private set => _ = SetProperty(ref wanDslLinkConfigGetInfoResponse, value);
     }
 
     public KeyValuePair<WanDslLinkConfigGetDslLinkInfoResponse?, UPnPFault?>? WanDslLinkConfigGetDslLinkInfoResponse
     {
         get => wanDslLinkConfigGetDslLinkInfoResponse;
-        private set { _ = SetProperty(ref wanDslLinkConfigGetDslLinkInfoResponse, value); }
+        private set => _ = SetProperty(ref wanDslLinkConfigGetDslLinkInfoResponse, value);
     }
 
     public KeyValuePair<WanDslLinkConfigGetDestinationAddressResponse?, UPnPFault?>? WanDslLinkConfigGetDestinationAddressResponse
     {
         get => wanDslLinkConfigGetDestinationAddressResponse;
-        private set { _ = SetProperty(ref wanDslLinkConfigGetDestinationAddressResponse, value); }
+        private set => _ = SetProperty(ref wanDslLinkConfigGetDestinationAddressResponse, value);
     }
 
     public KeyValuePair<WanDslLinkConfigGetAtmEncapsulationResponse?, UPnPFault?>? WanDslLinkConfigGetAtmEncapsulationResponse
     {
         get => wanDslLinkConfigGetAtmEncapsulationResponse;
-        private set { _ = SetProperty(ref wanDslLinkConfigGetAtmEncapsulationResponse, value); }
+        private set => _ = SetProperty(ref wanDslLinkConfigGetAtmEncapsulationResponse, value);
     }
 
     public KeyValuePair<WanDslLinkConfigGetAutoConfigResponse?, UPnPFault?>? WanDslLinkConfigGetAutoConfigResponse
     {
         get => wanDslLinkConfigGetAutoConfigResponse;
-        private set { _ = SetProperty(ref wanDslLinkConfigGetAutoConfigResponse, value); }
+        private set => _ = SetProperty(ref wanDslLinkConfigGetAutoConfigResponse, value);
     }
 
     public KeyValuePair<WanDslLinkConfigGetStatisticsResponse?, UPnPFault?>? WanDslLinkConfigGetStatisticsResponse
     {
         get => wanDslLinkConfigGetStatisticsResponse;
-        private set { _ = SetProperty(ref wanDslLinkConfigGetStatisticsResponse, value); }
+        private set => _ = SetProperty(ref wanDslLinkConfigGetStatisticsResponse, value);
     }
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
@@ -64,32 +64,20 @@ protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken canc
     }
 
     private async Task GetWanDslLinkConfigGetInfoAsync()
-    {
-        WanDslLinkConfigGetInfoResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetInfoAsync());
-    }
+        => WanDslLinkConfigGetInfoResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetInfoAsync());
 
     private async Task GetWanDslLinkConfigGetDslLinkInfoAsync()
-    {
-        WanDslLinkConfigGetDslLinkInfoResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetDslLinkInfoAsync());
-    }
+        => WanDslLinkConfigGetDslLinkInfoResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetDslLinkInfoAsync());
 
     private async Task GetWanDslLinkConfigGetDestinationAddressAsync()
-    {
-        WanDslLinkConfigGetDestinationAddressResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetDestinationAddressAsync());
-    }
+        => WanDslLinkConfigGetDestinationAddressResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetDestinationAddressAsync());
 
     private async Task GetWanDslLinkConfigGetAtmEncapsulationAsync()
-    {
-        WanDslLinkConfigGetAtmEncapsulationResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetAtmEncapsulationAsync());
-    }
+        => WanDslLinkConfigGetAtmEncapsulationResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetAtmEncapsulationAsync());
 
     private async Task GetWanDslLinkConfigGetAutoConfigAsync()
-    {
-        WanDslLinkConfigGetAutoConfigResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetAutoConfigAsync());
-    }
+        => WanDslLinkConfigGetAutoConfigResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetAutoConfigAsync());
 
     private async Task GetWanDslLinkConfigGetStatisticsAsync()
-    {
-        WanDslLinkConfigGetStatisticsResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetStatisticsAsync());
-    }
+        => WanDslLinkConfigGetStatisticsResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetStatisticsAsync());
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/WanEthernetLinkConfig/WanEthernetLinkConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanEthernetLinkConfig/WanEthernetLinkConfigViewModel.cs
index cd90307..0d4051a 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanEthernetLinkConfig/WanEthernetLinkConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanEthernetLinkConfig/WanEthernetLinkConfigViewModel.cs
@@ -12,11 +12,9 @@ public WanEthernetLinkConfigViewModel(DeviceLoginInfo deviceLoginInfo, ILogger l
     public KeyValuePair<WanEthernetLinkConfigGetEthernetLinkStatusResponse?, UPnPFault?>? WanEthernetLinkConfigGetEthernetLinkStatusResponse
     {
         get => wanEthernetLinkConfigGetEthernetLinkStatusResponse;
-        private set { _ = SetProperty(ref wanEthernetLinkConfigGetEthernetLinkStatusResponse, value); }
+        private set => _ = SetProperty(ref wanEthernetLinkConfigGetEthernetLinkStatusResponse, value);
     }
 
     protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
-    {
-        WanEthernetLinkConfigGetEthernetLinkStatusResponse = await ExecuteApiAsync(q => q.WanEthernetLinkConfigGetEthernetLinkStatusAsync());
-    }
+        => WanEthernetLinkConfigGetEthernetLinkStatusResponse = await ExecuteApiAsync(q => q.WanEthernetLinkConfigGetEthernetLinkStatusAsync());
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionGetGenericPortMappingEntryViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionGetGenericPortMappingEntryViewModel.cs
index f8f8548..c33c7a3 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionGetGenericPortMappingEntryViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionGetGenericPortMappingEntryViewModel.cs
@@ -8,7 +8,5 @@ public WanIpConnectionGetGenericPortMappingEntryViewModel(DeviceLoginInfo device
     }
 
     protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
-    {
-        WanConnectionGetGenericPortMappingEntryResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetGenericPortMappingEntryAsync(new(Index!.Value)));
-    }
+        => WanConnectionGetGenericPortMappingEntryResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetGenericPortMappingEntryAsync(new(Index!.Value)));
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionViewModel.cs
index f74b166..f226acb 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionViewModel.cs
@@ -24,31 +24,31 @@ public WanIpConnectionViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger,
     public KeyValuePair<WanIpConnectionGetInfoResponse?, UPnPFault?>? WanIpConnectionGetInfoResponse
     {
         get => wanIpConnectionGetInfoResponse;
-        private set { _ = SetProperty(ref wanIpConnectionGetInfoResponse, value); }
+        private set => _ = SetProperty(ref wanIpConnectionGetInfoResponse, value);
     }
 
     public KeyValuePair<WanConnectionGetConnectionTypeInfoResponse?, UPnPFault?>? WanConnectionGetConnectionTypeInfoResponse
     {
         get => wanConnectionGetConnectionTypeInfoResponse;
-        private set { _ = SetProperty(ref wanConnectionGetConnectionTypeInfoResponse, value); }
+        private set => _ = SetProperty(ref wanConnectionGetConnectionTypeInfoResponse, value);
     }
 
     public KeyValuePair<WanConnectionGetStatusInfoResponse?, UPnPFault?>? WanConnectionGetStatusInfoResponse
     {
         get => wanConnectionGetStatusInfoResponse;
-        private set { _ = SetProperty(ref wanConnectionGetStatusInfoResponse, value); }
+        private set => _ = SetProperty(ref wanConnectionGetStatusInfoResponse, value);
     }
 
     public KeyValuePair<WanConnectionGetNatRsipStatusResponse?, UPnPFault?>? WanConnectionGetNatRsipStatusResponse
     {
         get => wanConnectionGetNatRsipStatusResponse;
-        private set { _ = SetProperty(ref wanConnectionGetNatRsipStatusResponse, value); }
+        private set => _ = SetProperty(ref wanConnectionGetNatRsipStatusResponse, value);
     }
 
     public KeyValuePair<WanConnectionGetDnsServersResponse?, UPnPFault?>? WanConnectionGetDnsServersResponse
     {
         get => wanConnectionGetDnsServersResponse;
-        private set { _ = SetProperty(ref wanConnectionGetDnsServersResponse, value); }
+        private set => _ = SetProperty(ref wanConnectionGetDnsServersResponse, value);
     }
 
     public KeyValuePair<WanConnectionGetPortMappingNumberOfEntriesResponse?, UPnPFault?>? WanConnectionGetPortMappingNumberOfEntriesResponse
@@ -64,13 +64,13 @@ private set
     public KeyValuePair<WanConnectionGetExternalIpAddressResponse?, UPnPFault?>? WanConnectionGetExternalIpAddressResponse
     {
         get => wanConnectionGetExternalIpAddressResponse;
-        private set { _ = SetProperty(ref wanConnectionGetExternalIpAddressResponse, value); }
+        private set => _ = SetProperty(ref wanConnectionGetExternalIpAddressResponse, value);
     }
 
     public ObservableCollection<WanConnectionGetGenericPortMappingEntryResponse>? WanConnectionGetGenericPortMappingEntryResponses
     {
         get => wanConnectionGetGenericPortMappingEntryResponses;
-        private set { _ = SetProperty(ref wanConnectionGetGenericPortMappingEntryResponses, value); }
+        private set => _ = SetProperty(ref wanConnectionGetGenericPortMappingEntryResponses, value);
     }
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
@@ -88,29 +88,19 @@ protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken canc
     }
 
     private async Task GetWanIpConnectionGetInfoAsync()
-    {
-        WanIpConnectionGetInfoResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetInfoAsync());
-    }
+        => WanIpConnectionGetInfoResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetInfoAsync());
 
     private async Task GetWanIpConnectionGetConnectionTypeInfoAsync()
-    {
-        WanConnectionGetConnectionTypeInfoResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetConnectionTypeInfoAsync());
-    }
+        => WanConnectionGetConnectionTypeInfoResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetConnectionTypeInfoAsync());
 
     private async Task GetWanIpConnectionGetStatusInfoAsync()
-    {
-        WanConnectionGetStatusInfoResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetStatusInfoAsync());
-    }
+        => WanConnectionGetStatusInfoResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetStatusInfoAsync());
 
     private async Task GetWanIpConnectionGetNatRsipStatusAsync()
-    {
-        WanConnectionGetNatRsipStatusResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetNatRsipStatusAsync());
-    }
+        => WanConnectionGetNatRsipStatusResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetNatRsipStatusAsync());
 
     private async Task GetWanIpConnectionGetDnsServersAsync()
-    {
-        WanConnectionGetDnsServersResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetDnsServersAsync());
-    }
+        => WanConnectionGetDnsServersResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetDnsServersAsync());
 
     private async Task GetWanIpConnectionGetPortMappingNumberOfEntriesAsync()
     {
@@ -132,7 +122,5 @@ private async Task GetWanIpConnectionGetPortMappingNumberOfEntriesAsync()
     }
 
     private async Task GetWanIpConnectionGetExternalIpAddressAsync()
-    {
-        WanConnectionGetExternalIpAddressResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetExternalIpAddressAsync());
-    }
+        => WanConnectionGetExternalIpAddressResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetExternalIpAddressAsync());
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionGetGenericPortMappingEntryViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionGetGenericPortMappingEntryViewModel.cs
index aaf8da8..7d58502 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionGetGenericPortMappingEntryViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionGetGenericPortMappingEntryViewModel.cs
@@ -8,7 +8,5 @@ public WanPppConnectionGetGenericPortMappingEntryViewModel(DeviceLoginInfo devic
     }
 
     protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
-    {
-        WanConnectionGetGenericPortMappingEntryResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetGenericPortMappingEntryAsync(new(Index!.Value)));
-    }
+        => WanConnectionGetGenericPortMappingEntryResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetGenericPortMappingEntryAsync(new(Index!.Value)));
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionViewModel.cs
index 0ee86c3..fe97178 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionViewModel.cs
@@ -27,43 +27,43 @@ public WanPppConnectionViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger
     public KeyValuePair<WanPppConnectionGetInfoResponse?, UPnPFault?>? WanPppConnectionGetInfoResponse
     {
         get => wanPppConnectionGetInfoResponse;
-        private set { _ = SetProperty(ref wanPppConnectionGetInfoResponse, value); }
+        private set => _ = SetProperty(ref wanPppConnectionGetInfoResponse, value);
     }
 
     public KeyValuePair<WanConnectionGetConnectionTypeInfoResponse?, UPnPFault?>? WanConnectionGetConnectionTypeInfoResponse
     {
         get => wanConnectionGetConnectionTypeInfoResponse;
-        private set { _ = SetProperty(ref wanConnectionGetConnectionTypeInfoResponse, value); }
+        private set => _ = SetProperty(ref wanConnectionGetConnectionTypeInfoResponse, value);
     }
 
     public KeyValuePair<WanConnectionGetStatusInfoResponse?, UPnPFault?>? WanConnectionGetStatusInfoResponse
     {
         get => wanConnectionGetStatusInfoResponse;
-        private set { _ = SetProperty(ref wanConnectionGetStatusInfoResponse, value); }
+        private set => _ = SetProperty(ref wanConnectionGetStatusInfoResponse, value);
     }
 
     public KeyValuePair<WanPppConnectionGetLinkLayerMaxBitRatesResponse?, UPnPFault?>? WanPppConnectionGetLinkLayerMaxBitRatesResponse
     {
         get => wanPppConnectionGetLinkLayerMaxBitRatesResponse;
-        private set { _ = SetProperty(ref wanPppConnectionGetLinkLayerMaxBitRatesResponse, value); }
+        private set => _ = SetProperty(ref wanPppConnectionGetLinkLayerMaxBitRatesResponse, value);
     }
 
     public KeyValuePair<WanPppConnectionGetUserNameResponse?, UPnPFault?>? WanPppConnectionGetUserNameResponse
     {
         get => wanPppConnectionGetUserNameResponse;
-        private set { _ = SetProperty(ref wanPppConnectionGetUserNameResponse, value); }
+        private set => _ = SetProperty(ref wanPppConnectionGetUserNameResponse, value);
     }
 
     public KeyValuePair<WanConnectionGetNatRsipStatusResponse?, UPnPFault?>? WanConnectionGetNatRsipStatusResponse
     {
         get => wanConnectionGetNatRsipStatusResponse;
-        private set { _ = SetProperty(ref wanConnectionGetNatRsipStatusResponse, value); }
+        private set => _ = SetProperty(ref wanConnectionGetNatRsipStatusResponse, value);
     }
 
     public KeyValuePair<WanConnectionGetDnsServersResponse?, UPnPFault?>? WanConnectionGetDnsServersResponse
     {
         get => wanConnectionGetDnsServersResponse;
-        private set { _ = SetProperty(ref wanConnectionGetDnsServersResponse, value); }
+        private set => _ = SetProperty(ref wanConnectionGetDnsServersResponse, value);
     }
 
     public KeyValuePair<WanConnectionGetPortMappingNumberOfEntriesResponse?, UPnPFault?>? WanConnectionGetPortMappingNumberOfEntriesResponse
@@ -79,19 +79,19 @@ private set
     public KeyValuePair<WanConnectionGetExternalIpAddressResponse?, UPnPFault?>? WanConnectionGetExternalIpAddressResponse
     {
         get => wanConnectionGetExternalIpAddressResponse;
-        private set { _ = SetProperty(ref wanConnectionGetExternalIpAddressResponse, value); }
+        private set => _ = SetProperty(ref wanConnectionGetExternalIpAddressResponse, value);
     }
 
     public KeyValuePair<WanPppConnectionGetAutoDisconnectTimeSpanResponse?, UPnPFault?>? WanPppConnectionGetAutoDisconnectTimeSpanResponse
     {
         get => wanPppConnectionGetAutoDisconnectTimeSpanResponse;
-        private set { _ = SetProperty(ref wanPppConnectionGetAutoDisconnectTimeSpanResponse, value); }
+        private set => _ = SetProperty(ref wanPppConnectionGetAutoDisconnectTimeSpanResponse, value);
     }
 
     public ObservableCollection<WanConnectionGetGenericPortMappingEntryResponse>? WanConnectionGetGenericPortMappingEntryResponses
     {
         get => wanConnectionGetGenericPortMappingEntryResponses;
-        private set { _ = SetProperty(ref wanConnectionGetGenericPortMappingEntryResponses, value); }
+        private set => _ = SetProperty(ref wanConnectionGetGenericPortMappingEntryResponses, value);
     }
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
@@ -112,39 +112,25 @@ protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken canc
     }
 
     private async Task GetWanPppConnectionGetInfoAsync()
-    {
-        WanPppConnectionGetInfoResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetInfoAsync());
-    }
+        => WanPppConnectionGetInfoResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetInfoAsync());
 
     private async Task GetWanPppConnectionGetConnectionTypeInfoAsync()
-    {
-        WanConnectionGetConnectionTypeInfoResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetConnectionTypeInfoAsync());
-    }
+        => WanConnectionGetConnectionTypeInfoResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetConnectionTypeInfoAsync());
 
     private async Task GetWanPppConnectionGetStatusInfoAsync()
-    {
-        WanConnectionGetStatusInfoResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetStatusInfoAsync());
-    }
+        => WanConnectionGetStatusInfoResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetStatusInfoAsync());
 
     private async Task GetWanPppConnectionGetLinkLayerMaxBitRatesAsync()
-    {
-        WanPppConnectionGetLinkLayerMaxBitRatesResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetLinkLayerMaxBitRatesAsync());
-    }
+        => WanPppConnectionGetLinkLayerMaxBitRatesResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetLinkLayerMaxBitRatesAsync());
 
     private async Task GetWanPppConnectionGetUserNameAsync()
-    {
-        WanPppConnectionGetUserNameResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetUserNameAsync());
-    }
+        => WanPppConnectionGetUserNameResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetUserNameAsync());
 
     private async Task GetWanPppConnectionGetNatRsipStatusAsync()
-    {
-        WanConnectionGetNatRsipStatusResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetNatRsipStatusAsync());
-    }
+        => WanConnectionGetNatRsipStatusResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetNatRsipStatusAsync());
 
     private async Task GetWanPppConnectionGetDnsServersAsync()
-    {
-        WanConnectionGetDnsServersResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetDnsServersAsync());
-    }
+        => WanConnectionGetDnsServersResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetDnsServersAsync());
 
     private async Task GetWanPppConnectionGetPortMappingNumberOfEntriesAsync()
     {
@@ -166,12 +152,8 @@ private async Task GetWanPppConnectionGetPortMappingNumberOfEntriesAsync()
     }
 
     private async Task GetWanPppConnectionGetExternalIpAddressAsync()
-    {
-        WanConnectionGetExternalIpAddressResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetExternalIpAddressAsync());
-    }
+        => WanConnectionGetExternalIpAddressResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetExternalIpAddressAsync());
 
     private async Task GetWanPppConnectionGetAutoDisconnectTimeSpanAsync()
-    {
-        WanPppConnectionGetAutoDisconnectTimeSpanResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetAutoDisconnectTimeSpanAsync());
-    }
+        => WanPppConnectionGetAutoDisconnectTimeSpanResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetAutoDisconnectTimeSpanAsync());
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/WlanConfiguration/WlanConfigurationViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WlanConfiguration/WlanConfigurationViewModel.cs
index d00e0ff..7fc766d 100644
--- a/RS.Fritz.Manager.UI/UserControls/WlanConfiguration/WlanConfigurationViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WlanConfiguration/WlanConfigurationViewModel.cs
@@ -36,119 +36,110 @@ public WlanConfigurationViewModel(DeviceLoginInfo deviceLoginInfo, IWlanDeviceSe
     public WlanDeviceInfo? WlanDeviceInfo
     {
         get => wlanDeviceInfo;
-        private set { _ = SetProperty(ref wlanDeviceInfo, value); }
+        private set => _ = SetProperty(ref wlanDeviceInfo, value);
     }
 
     public KeyValuePair<WlanConfigurationGetInfoResponse?, UPnPFault?>?[]? WlanConfigurationGetInfoResponses
     {
         get => wlanConfigurationGetInfoResponses;
-        private set { _ = SetProperty(ref wlanConfigurationGetInfoResponses, value); }
+        private set => _ = SetProperty(ref wlanConfigurationGetInfoResponses, value);
     }
 
     public KeyValuePair<WlanConfigurationGetBasBeaconSecurityPropertiesResponse?, UPnPFault?>?[]? WlanConfigurationGetBasBeaconSecurityPropertiesResponses
     {
         get => wlanConfigurationGetBasBeaconSecurityPropertiesResponses;
-        private set { _ = SetProperty(ref wlanConfigurationGetBasBeaconSecurityPropertiesResponses, value); }
+        private set => _ = SetProperty(ref wlanConfigurationGetBasBeaconSecurityPropertiesResponses, value);
     }
 
     public KeyValuePair<WlanConfigurationGetBssIdResponse?, UPnPFault?>?[]? WlanConfigurationGetBssIdResponses
     {
         get => wlanConfigurationGetBssIdResponses;
-        private set { _ = SetProperty(ref wlanConfigurationGetBssIdResponses, value); }
+        private set => _ = SetProperty(ref wlanConfigurationGetBssIdResponses, value);
     }
 
     public KeyValuePair<WlanConfigurationGetSsIdResponse?, UPnPFault?>?[]? WlanConfigurationGetSsIdResponses
     {
         get => wlanConfigurationGetSsIdResponses;
-        private set { _ = SetProperty(ref wlanConfigurationGetSsIdResponses, value); }
+        private set => _ = SetProperty(ref wlanConfigurationGetSsIdResponses, value);
     }
 
     public KeyValuePair<WlanConfigurationGetBeaconTypeResponse?, UPnPFault?>?[]? WlanConfigurationGetBeaconTypeResponses
     {
         get => wlanConfigurationGetBeaconTypeResponses;
-        private set { _ = SetProperty(ref wlanConfigurationGetBeaconTypeResponses, value); }
+        private set => _ = SetProperty(ref wlanConfigurationGetBeaconTypeResponses, value);
     }
 
     public KeyValuePair<WlanConfigurationGetChannelInfoResponse?, UPnPFault?>?[]? WlanConfigurationGetChannelInfoResponses
     {
         get => wlanConfigurationGetChannelInfoResponses;
-        private set { _ = SetProperty(ref wlanConfigurationGetChannelInfoResponses, value); }
+        private set => _ = SetProperty(ref wlanConfigurationGetChannelInfoResponses, value);
     }
 
     public KeyValuePair<WlanConfigurationGetBeaconAdvertisementResponse?, UPnPFault?>?[]? WlanConfigurationGetBeaconAdvertisementResponses
     {
         get => wlanConfigurationGetBeaconAdvertisementResponses;
-        private set { _ = SetProperty(ref wlanConfigurationGetBeaconAdvertisementResponses, value); }
+        private set => _ = SetProperty(ref wlanConfigurationGetBeaconAdvertisementResponses, value);
     }
 
     public KeyValuePair<WlanConfigurationGetTotalAssociationsResponse?, UPnPFault?>?[]? WlanConfigurationGetTotalAssociationsResponses
     {
         get => wlanConfigurationGetTotalAssociationsResponses;
-        private set { _ = SetProperty(ref wlanConfigurationGetTotalAssociationsResponses, value); }
+        private set => _ = SetProperty(ref wlanConfigurationGetTotalAssociationsResponses, value);
     }
 
     public KeyValuePair<WlanConfigurationGetIpTvOptimizedResponse?, UPnPFault?>?[]? WlanConfigurationGetIpTvOptimizedResponses
     {
         get => wlanConfigurationGetIpTvOptimizedResponses;
-        private set { _ = SetProperty(ref wlanConfigurationGetIpTvOptimizedResponses, value); }
+        private set => _ = SetProperty(ref wlanConfigurationGetIpTvOptimizedResponses, value);
     }
 
     public KeyValuePair<WlanConfigurationGetStatisticsResponse?, UPnPFault?>?[]? WlanConfigurationGetStatisticsResponses
     {
         get => wlanConfigurationGetStatisticsResponses;
-        private set { _ = SetProperty(ref wlanConfigurationGetStatisticsResponses, value); }
+        private set => _ = SetProperty(ref wlanConfigurationGetStatisticsResponses, value);
     }
 
     public KeyValuePair<WlanConfigurationGetPacketStatisticsResponse?, UPnPFault?>?[]? WlanConfigurationGetPacketStatisticsResponses
     {
         get => wlanConfigurationGetPacketStatisticsResponses;
-        private set { _ = SetProperty(ref wlanConfigurationGetPacketStatisticsResponses, value); }
+        private set => _ = SetProperty(ref wlanConfigurationGetPacketStatisticsResponses, value);
     }
 
     public KeyValuePair<WlanConfigurationGetNightControlResponse?, UPnPFault?>?[]? WlanConfigurationGetNightControlResponses
     {
         get => wlanConfigurationGetNightControlResponses;
-        private set { _ = SetProperty(ref wlanConfigurationGetNightControlResponses, value); }
+        private set => _ = SetProperty(ref wlanConfigurationGetNightControlResponses, value);
     }
 
     public KeyValuePair<WlanConfigurationGetWlanHybridModeResponse?, UPnPFault?>?[]? WlanConfigurationGetWlanHybridModeResponses
     {
         get => wlanConfigurationGetWlanHybridModeResponses;
-        private set { _ = SetProperty(ref wlanConfigurationGetWlanHybridModeResponses, value); }
+        private set => _ = SetProperty(ref wlanConfigurationGetWlanHybridModeResponses, value);
     }
 
     public KeyValuePair<WlanConfigurationGetWlanExtInfoResponse?, UPnPFault?>?[]? WlanConfigurationGetWlanExtInfoResponses
     {
         get => wlanConfigurationGetWlanExtInfoResponses;
-        private set { _ = SetProperty(ref wlanConfigurationGetWlanExtInfoResponses, value); }
+        private set => _ = SetProperty(ref wlanConfigurationGetWlanExtInfoResponses, value);
     }
 
     public KeyValuePair<WlanConfigurationGetWpsInfoResponse?, UPnPFault?>?[]? WlanConfigurationGetWpsInfoResponses
     {
         get => wlanConfigurationGetWpsInfoResponses;
-        private set { _ = SetProperty(ref wlanConfigurationGetWpsInfoResponses, value); }
+        private set => _ = SetProperty(ref wlanConfigurationGetWpsInfoResponses, value);
     }
 
     public KeyValuePair<WlanConfigurationGetWlanConnectionInfoResponse?, UPnPFault?>?[]? WlanConfigurationGetWlanConnectionInfoResponses
     {
         get => wlanConfigurationGetWlanConnectionInfoResponses;
-        private set { _ = SetProperty(ref wlanConfigurationGetWlanConnectionInfoResponses, value); }
+        private set => _ = SetProperty(ref wlanConfigurationGetWlanConnectionInfoResponses, value);
     }
 
-    public Visibility Interface2Visibility
-    {
-        get => interface2Visibility ??= HasWlanConfigurationService(2) ? Visibility.Visible : Visibility.Hidden;
-    }
+    public Visibility Interface2Visibility => interface2Visibility ??= HasWlanConfigurationService(2) ? Visibility.Visible : Visibility.Hidden;
 
-    public Visibility Interface3Visibility
-    {
-        get => interface3Visibility ??= HasWlanConfigurationService(3) ? Visibility.Visible : Visibility.Hidden;
-    }
+    public Visibility Interface3Visibility => interface3Visibility ??= HasWlanConfigurationService(3) ? Visibility.Visible : Visibility.Hidden;
 
-    public Visibility Interface4Visibility
-    {
-        get => interface4Visibility ??= HasWlanConfigurationService(4) ? Visibility.Visible : Visibility.Hidden;
-    }
+    public Visibility Interface4Visibility => interface4Visibility ??= HasWlanConfigurationService(4) ? Visibility.Visible : Visibility.Hidden;
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
@@ -175,89 +166,55 @@ protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken canc
     }
 
     private async Task GetWlanConfigurationGetHostListPathAsync(CancellationToken cancellationToken)
-    {
-        WlanDeviceInfo = await wlanDeviceService.GetWlanDevicesAsync(ApiDevice, cancellationToken);
-    }
+        => WlanDeviceInfo = await wlanDeviceService.GetWlanDevicesAsync(ApiDevice, cancellationToken);
 
     private async Task GetWlanConfigurationGetInfoAsync()
-    {
-        WlanConfigurationGetInfoResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetInfoAsync(i));
-    }
+        => WlanConfigurationGetInfoResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetInfoAsync(i));
 
     private async Task GetWlanConfigurationGetBasBeaconSecurityPropertiesAsync()
-    {
-        WlanConfigurationGetBasBeaconSecurityPropertiesResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetBasBeaconSecurityPropertiesAsync(i));
-    }
+        => WlanConfigurationGetBasBeaconSecurityPropertiesResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetBasBeaconSecurityPropertiesAsync(i));
 
     private async Task GetWlanConfigurationGetBssIdAsync()
-    {
-        WlanConfigurationGetBssIdResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetBssIdAsync(i));
-    }
+        => WlanConfigurationGetBssIdResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetBssIdAsync(i));
 
     private async Task GetWlanConfigurationGetSsIdAsync()
-    {
-        WlanConfigurationGetSsIdResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetSsIdAsync(i));
-    }
+        => WlanConfigurationGetSsIdResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetSsIdAsync(i));
 
     private async Task GetWlanConfigurationGetBeaconTypeAsync()
-    {
-        WlanConfigurationGetBeaconTypeResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetBeaconTypeAsync(i));
-    }
+        => WlanConfigurationGetBeaconTypeResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetBeaconTypeAsync(i));
 
     private async Task GetWlanConfigurationGetChannelInfoAsync()
-    {
-        WlanConfigurationGetChannelInfoResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetChannelInfoAsync(i));
-    }
+        => WlanConfigurationGetChannelInfoResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetChannelInfoAsync(i));
 
     private async Task GetWlanConfigurationGetBeaconAdvertisementAsync()
-    {
-        WlanConfigurationGetBeaconAdvertisementResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetBeaconAdvertisementAsync(i));
-    }
+        => WlanConfigurationGetBeaconAdvertisementResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetBeaconAdvertisementAsync(i));
 
     private async Task GetWlanConfigurationGetTotalAssociationsAsync()
-    {
-        WlanConfigurationGetTotalAssociationsResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetTotalAssociationsAsync(i));
-    }
+        => WlanConfigurationGetTotalAssociationsResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetTotalAssociationsAsync(i));
 
     private async Task GetWlanConfigurationGetIpTvOptimizedAsync()
-    {
-        WlanConfigurationGetIpTvOptimizedResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetIpTvOptimizedAsync(i));
-    }
+        => WlanConfigurationGetIpTvOptimizedResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetIpTvOptimizedAsync(i));
 
     private async Task GetWlanConfigurationGetStatisticsAsync()
-    {
-        WlanConfigurationGetStatisticsResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetStatisticsAsync(i));
-    }
+        => WlanConfigurationGetStatisticsResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetStatisticsAsync(i));
 
     private async Task GetWlanConfigurationGetPacketStatisticsAsync()
-    {
-        WlanConfigurationGetPacketStatisticsResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetPacketStatisticsAsync(i));
-    }
+        => WlanConfigurationGetPacketStatisticsResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetPacketStatisticsAsync(i));
 
     private async Task GetWlanConfigurationGetNightControlAsync()
-    {
-        WlanConfigurationGetNightControlResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetNightControlAsync(i));
-    }
+        => WlanConfigurationGetNightControlResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetNightControlAsync(i));
 
     private async Task GetWlanConfigurationGetWlanHybridModeAsync()
-    {
-        WlanConfigurationGetWlanHybridModeResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetWlanHybridModeAsync(i));
-    }
+        => WlanConfigurationGetWlanHybridModeResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetWlanHybridModeAsync(i));
 
     private async Task GetWlanConfigurationGetWlanExtInfoAsync()
-    {
-        WlanConfigurationGetWlanExtInfoResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetWlanExtInfoAsync(i));
-    }
+        => WlanConfigurationGetWlanExtInfoResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetWlanExtInfoAsync(i));
 
     private async Task GetWlanConfigurationGetWpsInfoAsync()
-    {
-        WlanConfigurationGetWpsInfoResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetWpsInfoAsync(i));
-    }
+        => WlanConfigurationGetWpsInfoResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetWpsInfoAsync(i));
 
     private async Task GetWlanConfigurationGetWlanConnectionInfoAsync()
-    {
-        WlanConfigurationGetWlanConnectionInfoResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetWlanConnectionInfoAsync(i), new Dictionary<ushort, string> { { 714, "Current device is not directly connected to any of the access points." } });
-    }
+        => WlanConfigurationGetWlanConnectionInfoResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetWlanConnectionInfoAsync(i), new Dictionary<ushort, string> { { 714, "Current device is not directly connected to any of the access points." } });
 
     private async ValueTask<KeyValuePair<T?, UPnPFault?>?[]> ExecuteApiWlanConfigurationAsync<T>(Func<InternetGatewayDevice, int, Task<T>> operation, IDictionary<ushort, string>? errorReasons = null)
         where T : struct
@@ -274,7 +231,5 @@ private async Task GetWlanConfigurationGetWlanConnectionInfoAsync()
     }
 
     private bool HasWlanConfigurationService(int interfaceNumber)
-    {
-        return ApiDevice.Services.Any(r => FormattableString.Invariant($"urn:dslforum-org:service:WLANConfiguration:{interfaceNumber}").Equals(r.ServiceType, StringComparison.OrdinalIgnoreCase));
-    }
+        => ApiDevice.Services.Any(r => FormattableString.Invariant($"urn:dslforum-org:service:WLANConfiguration:{interfaceNumber}").Equals(r.ServiceType, StringComparison.OrdinalIgnoreCase));
 }
\ No newline at end of file

From af592e3dbe4a53918be3dc671d1530aacef94272 Mon Sep 17 00:00:00 2001
From: Rans4ckeR <ransacker@outlook.com>
Date: Sun, 4 Jun 2023 19:15:57 +0200
Subject: [PATCH 12/15] ConfigureAwait

---
 .../Entities/InternetGatewayDevice.cs         |  4 +-
 .../Extensions/ServiceCollectionExtensions.cs |  2 +-
 .../Extensions/TaskExtensions.cs              | 10 +++--
 .../Services/Capture/CaptureControlService.cs | 26 +++++------
 .../DeviceHosts/DeviceHostsService.cs         |  2 +-
 .../Services/Discovery/DeviceSearchService.cs | 14 +++---
 .../Services/MeshHosts/DeviceMeshService.cs   |  4 +-
 ...shStreamConfigurationArrayJsonConverter.cs | 12 ++---
 .../Services/Shared/NetworkService.cs         |  2 +-
 ...terfaceConfigGetDSLDiagnoseInfoResponse.cs | 22 +++++-----
 .../Services/Users/UsersService.cs            |  2 +-
 .../Services/WebUi/WebUiService.cs            |  8 ++--
 .../Services/WlanDevice/WlanDeviceService.cs  |  2 +-
 RS.Fritz.Manager.UI/App.xaml.cs               |  4 +-
 .../Entities/DeviceLoginInfo.cs               |  2 +-
 .../ObservableInternetGatewayDevice.cs        |  2 +-
 .../Infrastructure/FritzServiceViewModel.cs   |  6 +--
 .../ManualOperationViewModel.cs               |  2 +-
 .../MainWindow/MainWindowViewModel.cs         |  4 +-
 .../AvmSpeedtest/AvmSpeedtestViewModel.cs     | 10 +++--
 .../Capture/CaptureControlCaptureViewModel.cs |  8 ++--
 .../DeviceConfig/DeviceConfigViewModel.cs     | 10 +++--
 .../DeviceInfo/DeviceInfoViewModel.cs         | 12 ++---
 .../HostsGetGenericHostEntryViewModel.cs      |  2 +-
 .../UserControls/Hosts/HostsViewModel.cs      | 20 +++++----
 .../LanConfigSecurityViewModel.cs             | 14 +++---
 .../LanEthernetInterfaceConfigViewModel.cs    | 10 +++--
 .../LanHostConfigManagementViewModel.cs       | 18 ++++----
 ...rdingGetGenericForwardingEntryViewModel.cs |  2 +-
 .../Layer3ForwardingViewModel.cs              | 12 ++---
 .../ManagementServerViewModel.cs              | 10 +++--
 .../UserControls/Time/TimeViewModel.cs        |  2 +-
 .../UserInterface/UserInterfaceViewModel.cs   | 12 ++---
 ...nterfaceConfigGetOnlineMonitorViewModel.cs |  6 +--
 .../WanCommonInterfaceConfigViewModel.cs      | 20 +++++----
 .../WanDslInterfaceConfigDslInfoViewModel.cs  |  2 +-
 .../WanDslInterfaceConfigInfoViewModel.cs     |  2 +-
 .../WanDslInterfaceConfigViewModel.cs         | 16 ++++---
 .../WanDslLinkConfigViewModel.cs              | 20 +++++----
 .../WanEthernetLinkConfigViewModel.cs         |  2 +-
 ...tionGetGenericPortMappingEntryViewModel.cs |  2 +-
 .../WanIpConnectionViewModel.cs               | 24 +++++-----
 ...tionGetGenericPortMappingEntryViewModel.cs |  2 +-
 .../WanPppConnectionViewModel.cs              | 30 +++++++------
 .../WlanConfigurationViewModel.cs             | 44 ++++++++++---------
 45 files changed, 238 insertions(+), 204 deletions(-)

diff --git a/RS.Fritz.Manager.API/Entities/InternetGatewayDevice.cs b/RS.Fritz.Manager.API/Entities/InternetGatewayDevice.cs
index f1aff88..ee26907 100644
--- a/RS.Fritz.Manager.API/Entities/InternetGatewayDevice.cs
+++ b/RS.Fritz.Manager.API/Entities/InternetGatewayDevice.cs
@@ -20,7 +20,7 @@ internal Task<TResult> ExecuteAsync<TResult>(Func<IFritzServiceOperationHandler,
 
     public async ValueTask InitializeAsync()
     {
-        SecurityPort = (await this.DeviceInfoGetSecurityPortAsync()).SecurityPort;
-        Users = (await UsersService.GetUsersAsync(this)).ToArray();
+        SecurityPort = (await this.DeviceInfoGetSecurityPortAsync().ConfigureAwait(false)).SecurityPort;
+        Users = (await UsersService.GetUsersAsync(this).ConfigureAwait(false)).ToArray();
     }
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Extensions/ServiceCollectionExtensions.cs b/RS.Fritz.Manager.API/Extensions/ServiceCollectionExtensions.cs
index fd612f5..6bef4e8 100644
--- a/RS.Fritz.Manager.API/Extensions/ServiceCollectionExtensions.cs
+++ b/RS.Fritz.Manager.API/Extensions/ServiceCollectionExtensions.cs
@@ -53,7 +53,7 @@ private static IServiceCollection ConfigureHttpClients(this IServiceCollection s
             {
                 SslOptions = new()
                 {
-                    RemoteCertificateValidationCallback = (_, _, _, sslPolicyErrors) => (sslPolicyErrors & SslPolicyErrors.RemoteCertificateNotAvailable) == 0,
+                    RemoteCertificateValidationCallback = (_, _, _, sslPolicyErrors) => (sslPolicyErrors & SslPolicyErrors.RemoteCertificateNotAvailable) is 0,
                     CertificateChainPolicy = new()
                     {
                         DisableCertificateDownloads = true
diff --git a/RS.Fritz.Manager.API/Extensions/TaskExtensions.cs b/RS.Fritz.Manager.API/Extensions/TaskExtensions.cs
index 47dfeb1..0a0b250 100644
--- a/RS.Fritz.Manager.API/Extensions/TaskExtensions.cs
+++ b/RS.Fritz.Manager.API/Extensions/TaskExtensions.cs
@@ -8,14 +8,15 @@ public static class TaskExtensions
     /// </summary>
     /// <typeparam name="T">The type of <paramref name="tasks"/>'s return value.</typeparam>
     /// <param name="tasks">The list of <see cref="Task"/>s who's exceptions will be handled.</param>
+    /// <param name="continueOnCapturedContext">true to attempt to marshal the continuation back to the original context captured; otherwise, false.</param>
     /// <returns>Returns a <see cref="ValueTask"/> that awaited and handled the original <paramref name="tasks"/>.</returns>
-    public static async ValueTask<T[]> WhenAllSafe<T>(IEnumerable<Task<T>> tasks)
+    public static async ValueTask<T[]> WhenAllSafe<T>(IEnumerable<Task<T>> tasks, bool continueOnCapturedContext = false)
     {
         var whenAllTask = Task.WhenAll(tasks);
 
         try
         {
-            return await whenAllTask;
+            return await whenAllTask.ConfigureAwait(continueOnCapturedContext);
         }
         catch
         {
@@ -31,14 +32,15 @@ public static async ValueTask<T[]> WhenAllSafe<T>(IEnumerable<Task<T>> tasks)
     /// When using <see cref="Task.WhenAll(IEnumerable{Task})"/> only the first thrown exception from a single <see cref="Task"/> may be observed.
     /// </summary>
     /// <param name="tasks">The list of <see cref="Task"/>s who's exceptions will be handled.</param>
+    /// <param name="continueOnCapturedContext">true to attempt to marshal the continuation back to the original context captured; otherwise, false.</param>
     /// <returns>Returns a <see cref="ValueTask"/> that awaited and handled the original <paramref name="tasks"/>.</returns>
-    public static async ValueTask WhenAllSafe(IEnumerable<Task> tasks)
+    public static async ValueTask WhenAllSafe(IEnumerable<Task> tasks, bool continueOnCapturedContext = false)
     {
         var whenAllTask = Task.WhenAll(tasks);
 
         try
         {
-            await whenAllTask;
+            await whenAllTask.ConfigureAwait(continueOnCapturedContext);
         }
         catch
         {
diff --git a/RS.Fritz.Manager.API/Services/Capture/CaptureControlService.cs b/RS.Fritz.Manager.API/Services/Capture/CaptureControlService.cs
index 2f17eae..945ce21 100644
--- a/RS.Fritz.Manager.API/Services/Capture/CaptureControlService.cs
+++ b/RS.Fritz.Manager.API/Services/Capture/CaptureControlService.cs
@@ -15,22 +15,22 @@ public CaptureControlService(IHttpClientFactory httpClientFactory, INetworkServi
 
     public async ValueTask<IEnumerable<CaptureInterfaceGroup>> GetInterfacesAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
     {
-        string sid = await GetSidAsync(internetGatewayDevice);
+        string sid = await GetSidAsync(internetGatewayDevice).ConfigureAwait(false);
         Uri captureUri = networkService.FormatUri(Uri.UriSchemeHttps, internetGatewayDevice.PreferredLocation, 443, "/data.lua");
         HttpClient httpClient = httpClientFactory.CreateClient(Constants.DefaultHttpClientName);
-        var content = new FormUrlEncodedContent(new Dictionary<string, string>
+        using var content = new FormUrlEncodedContent(new Dictionary<string, string>
         {
             { "xhr", "1" },
             { "sid", sid },
             { "oldpage", "/capture.lua" },
             { "page", "cap" }
         });
-        using HttpResponseMessage httpResponseMessage = await httpClient.PostAsync(captureUri, content, cancellationToken);
-        string responseContent = await httpResponseMessage.EnsureSuccessStatusCode().Content.ReadAsStringAsync(cancellationToken);
+        using HttpResponseMessage httpResponseMessage = await httpClient.PostAsync(captureUri, content, cancellationToken).ConfigureAwait(false);
+        string responseContent = await httpResponseMessage.EnsureSuccessStatusCode().Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
         var captureInterfaceGroups = new List<CaptureInterfaceGroup>();
         int groupNameBeginPosition = -1;
 
-        while ((groupNameBeginPosition = responseContent.IndexOf("<h3>", groupNameBeginPosition + 1, StringComparison.OrdinalIgnoreCase)) != -1)
+        while ((groupNameBeginPosition = responseContent.IndexOf("<h3>", groupNameBeginPosition + 1, StringComparison.OrdinalIgnoreCase)) is not -1)
         {
             int groupNameEndPosition = responseContent.IndexOf("</h3>", groupNameBeginPosition + 1, StringComparison.OrdinalIgnoreCase);
             string groupName = responseContent[(groupNameBeginPosition + "<h3>".Length)..groupNameEndPosition];
@@ -38,7 +38,7 @@ public async ValueTask<IEnumerable<CaptureInterfaceGroup>> GetInterfacesAsync(In
             int nextGroupNameBeginPosition = responseContent.IndexOf("<h3>", groupNameBeginPosition + 1, StringComparison.OrdinalIgnoreCase);
             var captureInterfaces = new List<CaptureInterface>();
 
-            while ((interfaceNameBeginPosition = responseContent.IndexOf("<th>", interfaceNameBeginPosition + 1, StringComparison.OrdinalIgnoreCase)) != -1 && interfaceNameBeginPosition < nextGroupNameBeginPosition)
+            while ((interfaceNameBeginPosition = responseContent.IndexOf("<th>", interfaceNameBeginPosition + 1, StringComparison.OrdinalIgnoreCase)) is not -1 && interfaceNameBeginPosition < nextGroupNameBeginPosition)
             {
                 int interfaceNameEndPosition = responseContent.IndexOf("</th>", interfaceNameBeginPosition + 1, StringComparison.OrdinalIgnoreCase);
                 string interfaceName = responseContent[(interfaceNameBeginPosition + "<th>".Length)..interfaceNameEndPosition];
@@ -53,7 +53,7 @@ public async ValueTask<IEnumerable<CaptureInterfaceGroup>> GetInterfacesAsync(In
                 captureInterfaces.Add(new(interfaceName, startParameter, stopParameterParts[0], stopParameterParts[1], stopParameterParts[2]));
             }
 
-            if (captureInterfaces.Any())
+            if (captureInterfaces.Count is not 0)
                 captureInterfaceGroups.Add(new(groupName, captureInterfaces));
         }
 
@@ -62,10 +62,10 @@ public async ValueTask<IEnumerable<CaptureInterfaceGroup>> GetInterfacesAsync(In
 
     public async ValueTask StartCaptureAsync(InternetGatewayDevice internetGatewayDevice, FileInfo fileInfo, CaptureInterface captureInterface, int packetCaptureSizeLimit = 1600, CancellationToken cancellationToken = default)
     {
-        string sid = await GetSidAsync(internetGatewayDevice);
+        string sid = await GetSidAsync(internetGatewayDevice).ConfigureAwait(false);
         Uri captureUri = networkService.FormatUri(Uri.UriSchemeHttps, internetGatewayDevice.PreferredLocation, 443, FormattableString.Invariant($"/cgi-bin/capture_notimeout?sid={sid}&capture=Start&snaplen={packetCaptureSizeLimit}&ifaceorminor={captureInterface.InterfaceOrMinor}"));
         HttpClient httpClient = httpClientFactory.CreateClient(Constants.DefaultHttpClientName);
-        using HttpResponseMessage httpResponseMessage = await httpClient.GetAsync(captureUri, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
+        using HttpResponseMessage httpResponseMessage = await httpClient.GetAsync(captureUri, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
         Stream downloadStream = await httpResponseMessage.EnsureSuccessStatusCode().Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
 
         await using (downloadStream.ConfigureAwait(false))
@@ -74,26 +74,26 @@ public async ValueTask StartCaptureAsync(InternetGatewayDevice internetGatewayDe
 
             await using (fileStream.ConfigureAwait(false))
             {
-                await downloadStream.CopyToAsync(fileStream, cancellationToken);
+                await downloadStream.CopyToAsync(fileStream, cancellationToken).ConfigureAwait(false);
             }
         }
     }
 
     public async ValueTask StopCaptureAsync(InternetGatewayDevice internetGatewayDevice, CaptureInterface captureInterface, CancellationToken cancellationToken = default)
     {
-        string sid = await GetSidAsync(internetGatewayDevice);
+        string sid = await GetSidAsync(internetGatewayDevice).ConfigureAwait(false);
         string timeString20 = DateTime.UtcNow.Ticks.ToString("D20", CultureInfo.InvariantCulture);
         string timeId = FormattableString.Invariant($"t{timeString20[^13..]}");
         Uri captureUri = networkService.FormatUri(Uri.UriSchemeHttps, internetGatewayDevice.PreferredLocation, 443, FormattableString.Invariant($"/cgi-bin/capture_notimeout?iface={captureInterface.Interface}&minor={captureInterface.Minor}&type={captureInterface.Type}&capture=Stop&sid={sid}&useajax=1&xhr=1&{timeId}=nocache"));
         HttpClient httpClient = httpClientFactory.CreateClient(Constants.DefaultHttpClientName);
-        using HttpResponseMessage httpResponseMessage = await httpClient.GetAsync(captureUri, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
+        using HttpResponseMessage httpResponseMessage = await httpClient.GetAsync(captureUri, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false);
 
         _ = httpResponseMessage.EnsureSuccessStatusCode();
     }
 
     private static async ValueTask<string> GetSidAsync(InternetGatewayDevice internetGatewayDevice)
     {
-        DeviceConfigCreateUrlSidResponse deviceConfigCreateUrlSidResponse = await internetGatewayDevice.DeviceConfigCreateUrlSidAsync();
+        DeviceConfigCreateUrlSidResponse deviceConfigCreateUrlSidResponse = await internetGatewayDevice.DeviceConfigCreateUrlSidAsync().ConfigureAwait(false);
 
         return deviceConfigCreateUrlSidResponse.UrlSid.Replace("sid=", null, StringComparison.OrdinalIgnoreCase);
     }
diff --git a/RS.Fritz.Manager.API/Services/DeviceHosts/DeviceHostsService.cs b/RS.Fritz.Manager.API/Services/DeviceHosts/DeviceHostsService.cs
index 4b420ec..27d94ed 100644
--- a/RS.Fritz.Manager.API/Services/DeviceHosts/DeviceHostsService.cs
+++ b/RS.Fritz.Manager.API/Services/DeviceHosts/DeviceHostsService.cs
@@ -16,7 +16,7 @@ public DeviceHostsService(IHttpClientFactory httpClientFactory, INetworkService
 
     public async ValueTask<DeviceHostInfo> GetDeviceHostsAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
     {
-        HostsGetHostListPathResponse hostsGetHostListPathResponse = await internetGatewayDevice.HostsGetHostListPathAsync();
+        HostsGetHostListPathResponse hostsGetHostListPathResponse = await internetGatewayDevice.HostsGetHostListPathAsync().ConfigureAwait(false);
         string hostListPath = hostsGetHostListPathResponse.HostListPath;
         Uri hostListPathUri = networkService.FormatUri(Uri.UriSchemeHttps, internetGatewayDevice.PreferredLocation, internetGatewayDevice.SecurityPort!.Value, hostListPath);
         Stream deviceHostsListXmlStream = await httpClientFactory.CreateClient(Constants.DefaultHttpClientName).GetStreamAsync(hostListPathUri, cancellationToken).ConfigureAwait(false);
diff --git a/RS.Fritz.Manager.API/Services/Discovery/DeviceSearchService.cs b/RS.Fritz.Manager.API/Services/Discovery/DeviceSearchService.cs
index 38444fb..b2deb73 100644
--- a/RS.Fritz.Manager.API/Services/Discovery/DeviceSearchService.cs
+++ b/RS.Fritz.Manager.API/Services/Discovery/DeviceSearchService.cs
@@ -33,13 +33,13 @@ public async ValueTask<IEnumerable<InternetGatewayDevice>> GetDevicesAsync(strin
         timeout ??= ReceiveTimeoutInSeconds * 1000;
         sendCount ??= DefaultSendCount;
 
-        IEnumerable<(IPAddress LocalIpAddress, IEnumerable<string> Responses)> rawDeviceResponses = await GetRawDeviceResponses(deviceType, sendCount.Value, timeout.Value, cancellationToken);
+        IEnumerable<(IPAddress LocalIpAddress, IEnumerable<string> Responses)> rawDeviceResponses = await GetRawDeviceResponses(deviceType, sendCount.Value, timeout.Value, cancellationToken).ConfigureAwait(false);
         IEnumerable<(IPAddress LocalIpAddress, IEnumerable<Dictionary<string, string>> Responses)> formattedDeviceResponses =
             rawDeviceResponses.Select(q => (q.LocalIpAddress, GetFormattedDeviceResponses(q.Responses)));
         IEnumerable<IGrouping<string, InternetGatewayDeviceResponse>> groupedInternetGatewayDeviceResponses =
             GetGroupedInternetGatewayDeviceResponses(formattedDeviceResponses);
 
-        return await TaskExtensions.WhenAllSafe(groupedInternetGatewayDeviceResponses.Select(q => GetInternetGatewayDeviceAsync(q, cancellationToken)));
+        return await TaskExtensions.WhenAllSafe(groupedInternetGatewayDeviceResponses.Select(q => GetInternetGatewayDeviceAsync(q, cancellationToken))).ConfigureAwait(false);
     }
 
     private static IEnumerable<IGrouping<string, InternetGatewayDeviceResponse>> GetGroupedInternetGatewayDeviceResponses(
@@ -78,7 +78,7 @@ private static async ValueTask ReceiveAsync(Socket socket, ICollection<string> r
 
             try
             {
-                int bytesReceived = await socket.ReceiveAsync(buffer, SocketFlags.None, linkedCancellationTokenSource.Token);
+                int bytesReceived = await socket.ReceiveAsync(buffer, SocketFlags.None, linkedCancellationTokenSource.Token).ConfigureAwait(false);
 
                 responses.Add(Encoding.UTF8.GetString(buffer.Span[..bytesReceived]));
             }
@@ -122,10 +122,10 @@ private Uri ParseLocation((IPAddress LocalIpAddress, Uri Location) location)
 
         for (int i = 0; i < sendCount; i++)
         {
-            _ = await socket.SendToAsync(buffer, SocketFlags.None, multiCastIpEndPoint, cancellationToken);
+            _ = await socket.SendToAsync(buffer, SocketFlags.None, multiCastIpEndPoint, cancellationToken).ConfigureAwait(false);
         }
 
-        await ReceiveAsync(socket, responses, receiveTimeout, cancellationToken);
+        await ReceiveAsync(socket, responses, receiveTimeout, cancellationToken).ConfigureAwait(false);
 
         return new(unicastAddress, responses);
     }
@@ -136,7 +136,7 @@ private Uri ParseLocation((IPAddress LocalIpAddress, Uri Location) location)
         IEnumerable<IPAddress> multicastAddresses = networkService.GetMulticastAddresses();
         (IPAddress LocalIpAddress, IEnumerable<string> Responses)[] localAddressesDeviceResponses = await TaskExtensions.WhenAllSafe(multicastAddresses.SelectMany(q => unicastAddresses.Where(r => r.AddressFamily == q.AddressFamily).Select(r => SearchDevicesAsync(r, q, deviceType, sendCount, timeout, cancellationToken)))).ConfigureAwait(false);
 
-        return localAddressesDeviceResponses.Where(q => q.Responses.Any(r => r.Any())).Select(q => (q.LocalIpAddress, q.Responses)).Distinct();
+        return localAddressesDeviceResponses.Where(q => q.Responses.Any(r => r.Length is not 0)).Select(q => (q.LocalIpAddress, q.Responses)).Distinct();
     }
 
     private async ValueTask<UPnPDescription> GetUPnPDescription(Uri uri, CancellationToken cancellationToken)
@@ -165,7 +165,7 @@ private async Task<InternetGatewayDevice> GetInternetGatewayDeviceAsync(IGroupin
             internetGatewayDeviceResponses.Select(r => r.Ext).Distinct().Single(),
             internetGatewayDeviceResponses.Select(r => r.SearchTarget).Distinct().Single(),
             internetGatewayDeviceResponses.Key,
-            await GetUPnPDescription(preferredLocation, cancellationToken),
+            await GetUPnPDescription(preferredLocation, cancellationToken).ConfigureAwait(false),
             preferredLocation,
             internetGatewayDeviceResponses.Select(r => r.LocalIpAddress).Distinct().ToList().AsReadOnly());
     }
diff --git a/RS.Fritz.Manager.API/Services/MeshHosts/DeviceMeshService.cs b/RS.Fritz.Manager.API/Services/MeshHosts/DeviceMeshService.cs
index caf5c62..d3ed5e2 100644
--- a/RS.Fritz.Manager.API/Services/MeshHosts/DeviceMeshService.cs
+++ b/RS.Fritz.Manager.API/Services/MeshHosts/DeviceMeshService.cs
@@ -15,14 +15,14 @@ public DeviceMeshService(IHttpClientFactory httpClientFactory, INetworkService n
 
     public async ValueTask<DeviceMeshInfo> GetDeviceMeshAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
     {
-        HostsGetMeshListPathResponse hostsGetMeshListPathResponse = await internetGatewayDevice.HostsGetMeshListPathAsync();
+        HostsGetMeshListPathResponse hostsGetMeshListPathResponse = await internetGatewayDevice.HostsGetMeshListPathAsync().ConfigureAwait(false);
         string meshListPath = hostsGetMeshListPathResponse.MeshListPath;
         Uri meshListPathUri = networkService.FormatUri(Uri.UriSchemeHttps, internetGatewayDevice.PreferredLocation, internetGatewayDevice.SecurityPort!.Value, meshListPath);
         Stream deviceMeshJsonStream = await httpClientFactory.CreateClient(Constants.DefaultHttpClientName).GetStreamAsync(meshListPathUri, cancellationToken).ConfigureAwait(false);
 
         await using (deviceMeshJsonStream.ConfigureAwait(false))
         {
-            var deviceMesh = (DeviceMesh)(await JsonSerializer.DeserializeAsync(deviceMeshJsonStream, typeof(DeviceMesh), cancellationToken: cancellationToken))!;
+            var deviceMesh = (DeviceMesh)(await JsonSerializer.DeserializeAsync(deviceMeshJsonStream, typeof(DeviceMesh), cancellationToken: cancellationToken).ConfigureAwait(false))!;
 
             return new(meshListPath, meshListPathUri, deviceMesh);
         }
diff --git a/RS.Fritz.Manager.API/Services/MeshHosts/DeviceMeshStreamConfigurationArrayJsonConverter.cs b/RS.Fritz.Manager.API/Services/MeshHosts/DeviceMeshStreamConfigurationArrayJsonConverter.cs
index 337fdbe..2589365 100644
--- a/RS.Fritz.Manager.API/Services/MeshHosts/DeviceMeshStreamConfigurationArrayJsonConverter.cs
+++ b/RS.Fritz.Manager.API/Services/MeshHosts/DeviceMeshStreamConfigurationArrayJsonConverter.cs
@@ -11,36 +11,36 @@ public override bool CanConvert(Type typeToConvert) =>
 
     public override DeviceMeshStreamConfiguration[] Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        if (reader.TokenType != JsonTokenType.StartArray)
+        if (reader.TokenType is not JsonTokenType.StartArray)
             throw new JsonException();
 
         var deviceMeshStreamConfigurations = new Collection<DeviceMeshStreamConfiguration>();
 
         while (reader.Read())
         {
-            if (reader.TokenType == JsonTokenType.EndArray)
+            if (reader.TokenType is JsonTokenType.EndArray)
                 return deviceMeshStreamConfigurations.ToArray();
 
-            if (reader.TokenType != JsonTokenType.StartArray)
+            if (reader.TokenType is not JsonTokenType.StartArray)
                 throw new JsonException();
 
             _ = reader.Read();
 
-            if (reader.TokenType != JsonTokenType.String)
+            if (reader.TokenType is not JsonTokenType.String)
                 throw new JsonException();
 
             string channelWidth = reader.GetString()!;
 
             _ = reader.Read();
 
-            if (reader.TokenType != JsonTokenType.Number)
+            if (reader.TokenType is not JsonTokenType.Number)
                 throw new JsonException();
 
             int supportedStreamCount = reader.GetInt32();
 
             _ = reader.Read();
 
-            if (reader.TokenType != JsonTokenType.EndArray)
+            if (reader.TokenType is not JsonTokenType.EndArray)
                 throw new JsonException();
 
             deviceMeshStreamConfigurations.Add(new(channelWidth, supportedStreamCount));
diff --git a/RS.Fritz.Manager.API/Services/Shared/NetworkService.cs b/RS.Fritz.Manager.API/Services/Shared/NetworkService.cs
index 85eadec..3c30ffa 100644
--- a/RS.Fritz.Manager.API/Services/Shared/NetworkService.cs
+++ b/RS.Fritz.Manager.API/Services/Shared/NetworkService.cs
@@ -72,5 +72,5 @@ private static IEnumerable<IPInterfaceProperties> GetIpInterfaces()
         => NetworkInterface.GetAllNetworkInterfaces()
             .Where(q => q.OperationalStatus is OperationalStatus.Up && q.NetworkInterfaceType is not NetworkInterfaceType.Loopback)
             .Select(q => q.GetIPProperties())
-            .Where(q => q.GatewayAddresses.Any());
+            .Where(q => q.GatewayAddresses.Count is not 0);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslInterfaceConfig/Entities/WanDslInterfaceConfigGetDSLDiagnoseInfoResponse.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslInterfaceConfig/Entities/WanDslInterfaceConfigGetDSLDiagnoseInfoResponse.cs
index 2864b57..48b5490 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslInterfaceConfig/Entities/WanDslInterfaceConfigGetDSLDiagnoseInfoResponse.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslInterfaceConfig/Entities/WanDslInterfaceConfigGetDSLDiagnoseInfoResponse.cs
@@ -13,29 +13,29 @@ public string? Status
     {
         get
         {
-            if ("NONE".Equals(DslDiagnoseState, StringComparison.OrdinalIgnoreCase) && CableNokDistance == -1 && DslLastDiagnoseTime == 0 && DslSignalLossTime == 0 && DslActive && DslSync)
+            if ("NONE".Equals(DslDiagnoseState, StringComparison.OrdinalIgnoreCase) && CableNokDistance is -1 && DslLastDiagnoseTime is 0 && DslSignalLossTime is 0 && DslActive && DslSync)
                 return "The DSL connection is ready for data traffic. The Customer Premises Equipment (CPE) has set DSL to Active and the DSL chip could sync to ISP destination device.";
 
-            if ("NONE".Equals(DslDiagnoseState, StringComparison.OrdinalIgnoreCase) && CableNokDistance == -1 && DslLastDiagnoseTime == 0 && DslSignalLossTime > 0 && DslSignalLossTime < 300 && DslActive && !DslSync)
-                return "The Customer Premises Equipment (CPE) Device has lost the sync state since DSLSignalLossTime(in seconds).";
+            if ("NONE".Equals(DslDiagnoseState, StringComparison.OrdinalIgnoreCase) && CableNokDistance is -1 && DslLastDiagnoseTime is 0 && DslSignalLossTime is > 0 and < 300 && DslActive && !DslSync)
+                return FormattableString.CurrentCulture($"The Customer Premises Equipment (CPE) Device has lost the sync state since {DslSignalLossTime} (in seconds).");
 
-            if ("RUNNING".Equals(DslDiagnoseState, StringComparison.OrdinalIgnoreCase) && CableNokDistance == -1 && DslLastDiagnoseTime == 0 && DslSignalLossTime > 300 && DslActive && !DslSync)
-                return "5 minutes passed since the last DSLSync = 1, the Customer Premises Equipment (CPE) device is now instantiating a cable cut measurement. While the diagnose is running the DSLDiagnoseState is set to 'RUNNING'.";
+            if ("RUNNING".Equals(DslDiagnoseState, StringComparison.OrdinalIgnoreCase) && CableNokDistance is -1 && DslLastDiagnoseTime is 0 && DslSignalLossTime > 300 && DslActive && !DslSync)
+                return FormattableString.CurrentCulture($"5 minutes passed since the last {nameof(DslSync)} = 1, the Customer Premises Equipment (CPE) device is now instantiating a cable cut measurement. While the diagnose is running the {nameof(DslDiagnoseState)} is set to 'RUNNING'.");
 
-            if ("NO_CALIB".Equals(DslDiagnoseState, StringComparison.OrdinalIgnoreCase) && CableNokDistance == -1 && DslLastDiagnoseTime == 0 && DslSignalLossTime > 300 && DslActive && !DslSync)
-                return "The Customer Premises Equipment (CPE) has tried to start a cable cut measurement, but could not initiate the measurement.Therefore no calibration has passed.";
+            if ("NO_CALIB".Equals(DslDiagnoseState, StringComparison.OrdinalIgnoreCase) && CableNokDistance is -1 && DslLastDiagnoseTime is 0 && DslSignalLossTime > 300 && DslActive && !DslSync)
+                return "The Customer Premises Equipment (CPE) has tried to start a cable cut measurement, but could not initiate the measurement. Therefore no calibration has passed.";
 
-            if ("DONE_CABLE_OK".Equals(DslDiagnoseState, StringComparison.OrdinalIgnoreCase) && CableNokDistance == -1 && DslLastDiagnoseTime > 0 && DslSignalLossTime > 300 && DslActive && !DslSync)
+            if ("DONE_CABLE_OK".Equals(DslDiagnoseState, StringComparison.OrdinalIgnoreCase) && CableNokDistance is -1 && DslLastDiagnoseTime > 0 && DslSignalLossTime > 300 && DslActive && !DslSync)
                 return "The cable cut measurement is finished and no cable cut could be detected.";
 
             if ("DONE_CABLE_NOK".Equals(DslDiagnoseState, StringComparison.OrdinalIgnoreCase) && CableNokDistance > 0 && DslLastDiagnoseTime > 0 && DslSignalLossTime > 300 && DslActive && !DslSync)
                 return FormattableString.CurrentCulture($"The cable cut measurement is finished and a problem with the cable connection could be detected at {CableNokDistance} meters.");
 
-            if ("DONE_CABLE_OK".Equals(DslDiagnoseState, StringComparison.OrdinalIgnoreCase) && CableNokDistance == -1 && DslLastDiagnoseTime > 0 && DslSignalLossTime > 300 && DslActive && !DslSync)
+            if ("DONE_CABLE_OK".Equals(DslDiagnoseState, StringComparison.OrdinalIgnoreCase) && CableNokDistance is -1 && DslLastDiagnoseTime > 0 && DslSignalLossTime > 300 && DslActive && !DslSync)
                 return "The measurement for cable cut is finished but the distance could not be detected or is too inaccurate.";
 
-            if ("NONE".Equals(DslDiagnoseState, StringComparison.OrdinalIgnoreCase) && CableNokDistance == -1 && DslLastDiagnoseTime > 0 && DslSignalLossTime == 0 && DslActive && DslSync)
-                return "When the DSL signal is sync again, all values will be set to default values. Except the DSLLastDiagnoseTime which remains at the value of time in seconds between the last measurement and the resync.";
+            if ("NONE".Equals(DslDiagnoseState, StringComparison.OrdinalIgnoreCase) && CableNokDistance is -1 && DslLastDiagnoseTime > 0 && DslSignalLossTime is 0 && DslActive && DslSync)
+                return FormattableString.CurrentCulture($"When the DSL signal is sync again, all values will be set to default values. Except the {nameof(DslLastDiagnoseTime)} which remains at the value of time in seconds between the last measurement and the resync.");
 
             return null;
         }
diff --git a/RS.Fritz.Manager.API/Services/Users/UsersService.cs b/RS.Fritz.Manager.API/Services/Users/UsersService.cs
index b57b508..93590c0 100644
--- a/RS.Fritz.Manager.API/Services/Users/UsersService.cs
+++ b/RS.Fritz.Manager.API/Services/Users/UsersService.cs
@@ -14,7 +14,7 @@ public UsersService(IFritzServiceOperationHandler fritzServiceOperationHandler)
 
     public async ValueTask<IEnumerable<User>> GetUsersAsync(InternetGatewayDevice internetGatewayDevice)
     {
-        LanConfigSecurityGetUserListResponse lanConfigSecurityGetUserListResponse = await fritzServiceOperationHandler.LanConfigSecurityGetUserListAsync(internetGatewayDevice);
+        LanConfigSecurityGetUserListResponse lanConfigSecurityGetUserListResponse = await fritzServiceOperationHandler.LanConfigSecurityGetUserListAsync(internetGatewayDevice).ConfigureAwait(false);
         using var stringReader = new StringReader(lanConfigSecurityGetUserListResponse.UserList);
         using var xmlTextReader = new XmlTextReader(stringReader);
         var userList = (UserList)new XmlSerializer(typeof(UserList)).Deserialize(xmlTextReader)!;
diff --git a/RS.Fritz.Manager.API/Services/WebUi/WebUiService.cs b/RS.Fritz.Manager.API/Services/WebUi/WebUiService.cs
index 4ddfb18..7c50a88 100644
--- a/RS.Fritz.Manager.API/Services/WebUi/WebUiService.cs
+++ b/RS.Fritz.Manager.API/Services/WebUi/WebUiService.cs
@@ -32,7 +32,7 @@ public async ValueTask<WebUiSessionInfo> GetUsersAsync(InternetGatewayDevice int
 
     public async ValueTask<WebUiSessionInfo> LogonAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
     {
-        WebUiSessionInfo webUiSessionInfo = await GetUsersAsync(internetGatewayDevice, cancellationToken);
+        WebUiSessionInfo webUiSessionInfo = await GetUsersAsync(internetGatewayDevice, cancellationToken).ConfigureAwait(false);
         string[] challengeParts = webUiSessionInfo.Challenge.Split('$');
         int firstIterationCount = int.Parse(challengeParts[1], CultureInfo.InvariantCulture);
         byte[] firstSalt = Convert.FromHexString(challengeParts[2]);
@@ -44,7 +44,7 @@ public async ValueTask<WebUiSessionInfo> LogonAsync(InternetGatewayDevice intern
         string challengeResponse = FormattableString.Invariant($"{challengeParts[4]}${Convert.ToHexString(secondHash)}");
         var parameters = new Dictionary<string, string> { { "username", internetGatewayDevice.NetworkCredential.UserName }, { "response", challengeResponse } };
 
-        return await GetResponseAsync(internetGatewayDevice, parameters, cancellationToken);
+        return await GetResponseAsync(internetGatewayDevice, parameters, cancellationToken).ConfigureAwait(false);
     }
 
     public ValueTask<WebUiSessionInfo> LogoffAsync(InternetGatewayDevice internetGatewayDevice, string sessionId, CancellationToken cancellationToken = default)
@@ -80,9 +80,9 @@ private Uri GetLoginUri(InternetGatewayDevice internetGatewayDevice)
 
     private async ValueTask<WebUiSessionInfo> GetResponseAsync(InternetGatewayDevice internetGatewayDevice, IDictionary<string, string> parameters, CancellationToken cancellationToken)
     {
-        var formContent = new FormUrlEncodedContent(parameters);
+        using var formContent = new FormUrlEncodedContent(parameters);
         Uri loginUri = GetLoginUri(internetGatewayDevice);
-        using HttpResponseMessage loginResponse = await httpClientFactory.CreateClient(Constants.DefaultHttpClientName).PostAsync(loginUri, formContent, cancellationToken);
+        using HttpResponseMessage loginResponse = await httpClientFactory.CreateClient(Constants.DefaultHttpClientName).PostAsync(loginUri, formContent, cancellationToken).ConfigureAwait(false);
         Stream xmlResponseStream = await loginResponse.EnsureSuccessStatusCode().Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
 
         await using (xmlResponseStream.ConfigureAwait(false))
diff --git a/RS.Fritz.Manager.API/Services/WlanDevice/WlanDeviceService.cs b/RS.Fritz.Manager.API/Services/WlanDevice/WlanDeviceService.cs
index b413b6a..de48842 100644
--- a/RS.Fritz.Manager.API/Services/WlanDevice/WlanDeviceService.cs
+++ b/RS.Fritz.Manager.API/Services/WlanDevice/WlanDeviceService.cs
@@ -16,7 +16,7 @@ public WlanDeviceService(IHttpClientFactory httpClientFactory, INetworkService n
 
     public async ValueTask<WlanDeviceInfo> GetWlanDevicesAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
     {
-        WlanConfigurationGetWlanDeviceListPathResponse wlanConfigurationGetWlanDeviceListPathResponse = await internetGatewayDevice.WlanConfigurationGetWlanDeviceListPathAsync(1);
+        WlanConfigurationGetWlanDeviceListPathResponse wlanConfigurationGetWlanDeviceListPathResponse = await internetGatewayDevice.WlanConfigurationGetWlanDeviceListPathAsync(1).ConfigureAwait(false);
         string wlanDeviceListPath = wlanConfigurationGetWlanDeviceListPathResponse.WlanDeviceListPath;
         Uri wlanDeviceListPathUri = networkService.FormatUri(Uri.UriSchemeHttps, internetGatewayDevice.PreferredLocation, internetGatewayDevice.SecurityPort!.Value, wlanDeviceListPath);
         Stream wlanDeviceListXmlStream = await httpClientFactory.CreateClient(Constants.DefaultHttpClientName).GetStreamAsync(wlanDeviceListPathUri, cancellationToken).ConfigureAwait(false);
diff --git a/RS.Fritz.Manager.UI/App.xaml.cs b/RS.Fritz.Manager.UI/App.xaml.cs
index 95053ad..d32f622 100644
--- a/RS.Fritz.Manager.UI/App.xaml.cs
+++ b/RS.Fritz.Manager.UI/App.xaml.cs
@@ -33,7 +33,7 @@ public App()
 
     protected override async void OnStartup(StartupEventArgs e)
     {
-        await host.StartAsync();
+        await host.StartAsync().ConfigureAwait(true);
 
         SetUiCulture();
 
@@ -52,7 +52,7 @@ protected override async void OnExit(ExitEventArgs e)
 
         using (host)
         {
-            await host.StopAsync();
+            await host.StopAsync().ConfigureAwait(true);
         }
 
         base.OnExit(e);
diff --git a/RS.Fritz.Manager.UI/Entities/DeviceLoginInfo.cs b/RS.Fritz.Manager.UI/Entities/DeviceLoginInfo.cs
index ac6ba62..fb7057b 100644
--- a/RS.Fritz.Manager.UI/Entities/DeviceLoginInfo.cs
+++ b/RS.Fritz.Manager.UI/Entities/DeviceLoginInfo.cs
@@ -71,7 +71,7 @@ private async void Receive(PropertyChangedMessage<ObservableInternetGatewayDevic
                     }
                     else
                     {
-                        await message.NewValue.ApiDevice.InitializeAsync();
+                        await message.NewValue.ApiDevice.InitializeAsync().ConfigureAwait(true);
 
                         message.NewValue.Users = message.NewValue.ApiDevice.Users!;
                     }
diff --git a/RS.Fritz.Manager.UI/Entities/ObservableInternetGatewayDevice.cs b/RS.Fritz.Manager.UI/Entities/ObservableInternetGatewayDevice.cs
index 671e20f..c117dc7 100644
--- a/RS.Fritz.Manager.UI/Entities/ObservableInternetGatewayDevice.cs
+++ b/RS.Fritz.Manager.UI/Entities/ObservableInternetGatewayDevice.cs
@@ -42,7 +42,7 @@ public async ValueTask GetDeviceTypeAsync()
 
         try
         {
-            wanCommonInterfaceConfigGetCommonLinkProperties = await ApiDevice.WanCommonInterfaceConfigGetCommonLinkPropertiesAsync();
+            wanCommonInterfaceConfigGetCommonLinkProperties = await ApiDevice.WanCommonInterfaceConfigGetCommonLinkPropertiesAsync().ConfigureAwait(true);
         }
         catch (MessageSecurityException)
         {
diff --git a/RS.Fritz.Manager.UI/Infrastructure/FritzServiceViewModel.cs b/RS.Fritz.Manager.UI/Infrastructure/FritzServiceViewModel.cs
index cfcde09..e06c875 100644
--- a/RS.Fritz.Manager.UI/Infrastructure/FritzServiceViewModel.cs
+++ b/RS.Fritz.Manager.UI/Infrastructure/FritzServiceViewModel.cs
@@ -62,7 +62,7 @@ private set
 
     protected virtual void Receive(PropertyChangedMessage<bool> message)
     {
-        if (message.Sender == DeviceLoginInfo)
+        if (message.Sender is DeviceLoginInfo)
         {
             switch (message.PropertyName)
             {
@@ -124,7 +124,7 @@ protected void UpdateCanExecuteDefaultCommand()
 
         try
         {
-            return new(await operation, null);
+            return new(await operation.ConfigureAwait(true), null);
         }
         catch (FaultException<UPnPFault1> ex)
         {
@@ -147,7 +147,7 @@ private async Task ExecuteDefaultCommandAsync(bool? showView, CancellationToken
         {
             DefaultCommandActive = true;
 
-            await DoExecuteDefaultCommandAsync(cancellationToken);
+            await DoExecuteDefaultCommandAsync(cancellationToken).ConfigureAwait(true);
 
             if (showView ?? true)
                 _ = StrongReferenceMessenger.Default.Send(new ActiveViewValueChangedMessage(this));
diff --git a/RS.Fritz.Manager.UI/Infrastructure/ManualOperationViewModel.cs b/RS.Fritz.Manager.UI/Infrastructure/ManualOperationViewModel.cs
index 16d40fc..28c8256 100644
--- a/RS.Fritz.Manager.UI/Infrastructure/ManualOperationViewModel.cs
+++ b/RS.Fritz.Manager.UI/Infrastructure/ManualOperationViewModel.cs
@@ -28,5 +28,5 @@ protected ManualOperationViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logg
     protected virtual TRequest BuildRequest() => default;
 
     protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
-        => Response = await ExecuteApiAsync(operation, BuildRequest());
+        => Response = await ExecuteApiAsync(operation, BuildRequest()).ConfigureAwait(true);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/MainWindow/MainWindowViewModel.cs b/RS.Fritz.Manager.UI/MainWindow/MainWindowViewModel.cs
index 5e8273f..fcb63af 100644
--- a/RS.Fritz.Manager.UI/MainWindow/MainWindowViewModel.cs
+++ b/RS.Fritz.Manager.UI/MainWindow/MainWindowViewModel.cs
@@ -300,7 +300,7 @@ protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToke
     {
         ActiveView = null;
         DeviceLoginInfo.InternetGatewayDevice = null;
-        Devices = new((await deviceSearchService.GetDevicesAsync(cancellationToken: cancellationToken)).Select(q => new ObservableInternetGatewayDevice(q)));
+        Devices = new((await deviceSearchService.GetDevicesAsync(cancellationToken: cancellationToken).ConfigureAwait(true)).Select(q => new ObservableInternetGatewayDevice(q)));
     }
 
     protected override bool GetCanExecuteDefaultCommand() => !DefaultCommandActive;
@@ -344,7 +344,7 @@ private async Task ExecuteLoginCommandAsync(bool? showView)
         {
             LoginCommandActive = true;
 
-            await DeviceLoginInfo.InternetGatewayDevice!.GetDeviceTypeAsync();
+            await DeviceLoginInfo.InternetGatewayDevice!.GetDeviceTypeAsync().ConfigureAwait(true);
 
             LoginButtonImage = new BitmapImage(new("pack://application:,,,/Images/Success.png"));
         }
diff --git a/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestViewModel.cs b/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestViewModel.cs
index d9b53a2..ce23216 100644
--- a/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestViewModel.cs
@@ -24,16 +24,18 @@ public AvmSpeedtestViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
-        return API.TaskExtensions.WhenAllSafe(new[]
+        return API.TaskExtensions.WhenAllSafe(
+            new[]
             {
                 GetAvmSpeedtestGetInfoAsync(),
                 GetAvmSpeedtestGetStatisticsAsync()
-            });
+            },
+            true);
     }
 
     private async Task GetAvmSpeedtestGetInfoAsync()
-        => AvmSpeedtestGetInfoResponse = await ExecuteApiAsync(q => q.AvmSpeedtestGetInfoAsync());
+        => AvmSpeedtestGetInfoResponse = await ExecuteApiAsync(q => q.AvmSpeedtestGetInfoAsync()).ConfigureAwait(true);
 
     private async Task GetAvmSpeedtestGetStatisticsAsync()
-        => AvmSpeedtestGetStatisticsResponse = await ExecuteApiAsync(q => q.AvmSpeedtestGetStatisticsAsync());
+        => AvmSpeedtestGetStatisticsResponse = await ExecuteApiAsync(q => q.AvmSpeedtestGetStatisticsAsync()).ConfigureAwait(true);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/Capture/CaptureControlCaptureViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Capture/CaptureControlCaptureViewModel.cs
index 2e7e739..4d81513 100644
--- a/RS.Fritz.Manager.UI/UserControls/Capture/CaptureControlCaptureViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Capture/CaptureControlCaptureViewModel.cs
@@ -57,7 +57,7 @@ protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToke
         if (CaptureInterfaceGroups is not null)
             return;
 
-        IEnumerable<UserInterfaceCaptureInterfaceGroup> newCaptureInterfaceGroups = (await captureControlService.GetInterfacesAsync(ApiDevice, cancellationToken)).Select(q => new UserInterfaceCaptureInterfaceGroup(q, q.CaptureInterfaces.Select(r => new UserInterfaceCaptureInterface(r, new(DoExecuteCaptureInterfaceStartCommand, _ => CanExecuteCaptureInterfaceStartCommand(r)), new(DoExecuteCaptureInterfaceStopCommandAsync, _ => CanExecuteCaptureInterfaceStopCommand(r)))).ToList()));
+        IEnumerable<UserInterfaceCaptureInterfaceGroup> newCaptureInterfaceGroups = (await captureControlService.GetInterfacesAsync(ApiDevice, cancellationToken).ConfigureAwait(true)).Select(q => new UserInterfaceCaptureInterfaceGroup(q, q.CaptureInterfaces.Select(r => new UserInterfaceCaptureInterface(r, new(DoExecuteCaptureInterfaceStartCommand, _ => CanExecuteCaptureInterfaceStartCommand(r)), new(DoExecuteCaptureInterfaceStopCommandAsync, _ => CanExecuteCaptureInterfaceStopCommand(r)))).ToList()));
 
         CaptureInterfaceGroups = new(newCaptureInterfaceGroups);
 
@@ -103,14 +103,14 @@ private async void DoExecuteCaptureInterfaceStartCommand(UserInterfaceCaptureInt
 
         var fileInfo = new FileInfo(FormattableString.Invariant($"{FolderName}\\{userInterfaceCaptureInterface!.CaptureInterface.Name}_{DateTime.Now.ToString("s").Replace(":", string.Empty, StringComparison.OrdinalIgnoreCase)}.eth"));
 
-        await StartBackgroundCaptureAsync(userInterfaceCaptureInterface, fileInfo);
+        await StartBackgroundCaptureAsync(userInterfaceCaptureInterface, fileInfo).ConfigureAwait(true);
     }
 
     private async ValueTask StartBackgroundCaptureAsync(UserInterfaceCaptureInterface userInterfaceCaptureInterface, FileInfo fileInfo)
     {
         try
         {
-            await captureControlService.StartCaptureAsync(ApiDevice, fileInfo, userInterfaceCaptureInterface.CaptureInterface, PacketCaptureSizeLimit);
+            await captureControlService.StartCaptureAsync(ApiDevice, fileInfo, userInterfaceCaptureInterface.CaptureInterface, PacketCaptureSizeLimit).ConfigureAwait(true);
         }
         catch (Exception ex)
         {
@@ -121,7 +121,7 @@ private async ValueTask StartBackgroundCaptureAsync(UserInterfaceCaptureInterfac
 
     private async Task DoExecuteCaptureInterfaceStopCommandAsync(UserInterfaceCaptureInterface? userInterfaceCaptureInterface, CancellationToken cancellationToken)
     {
-        await captureControlService.StopCaptureAsync(ApiDevice, userInterfaceCaptureInterface!.CaptureInterface, cancellationToken);
+        await captureControlService.StopCaptureAsync(ApiDevice, userInterfaceCaptureInterface!.CaptureInterface, cancellationToken).ConfigureAwait(true);
         SetCaptureInterfaceStatus(userInterfaceCaptureInterface, false);
     }
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigViewModel.cs
index 26b7e79..18d310a 100644
--- a/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigViewModel.cs
@@ -34,16 +34,18 @@ public DeviceConfigViewModel(
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
-        return API.TaskExtensions.WhenAllSafe(new[]
+        return API.TaskExtensions.WhenAllSafe(
+            new[]
             {
                 GetDeviceConfigGetPersistentDataAsync(),
                 GetDeviceConfigGetSupportDataInfoResponseAsync()
-            });
+            },
+            true);
     }
 
     private async Task GetDeviceConfigGetPersistentDataAsync()
-        => DeviceConfigGetPersistentDataResponse = await ExecuteApiAsync(q => q.DeviceConfigGetPersistentDataAsync());
+        => DeviceConfigGetPersistentDataResponse = await ExecuteApiAsync(q => q.DeviceConfigGetPersistentDataAsync()).ConfigureAwait(true);
 
     private async Task GetDeviceConfigGetSupportDataInfoResponseAsync()
-        => DeviceConfigGetSupportDataInfoResponse = await ExecuteApiAsync(q => q.DeviceConfigGetSupportDataInfoAsync());
+        => DeviceConfigGetSupportDataInfoResponse = await ExecuteApiAsync(q => q.DeviceConfigGetSupportDataInfoAsync()).ConfigureAwait(true);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoViewModel.cs b/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoViewModel.cs
index 20872a7..b475d73 100644
--- a/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoViewModel.cs
@@ -34,17 +34,19 @@ public DeviceInfoViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger, Devi
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
-        return API.TaskExtensions.WhenAllSafe(new[]
+        return API.TaskExtensions.WhenAllSafe(
+            new[]
             {
                 GetDeviceInfoGetSecurityPortAsync(),
                 GetDeviceInfoGetInfoAsync(),
                 GetDeviceInfoGetDeviceLogAsync()
-            });
+            },
+            true);
     }
 
-    private async Task GetDeviceInfoGetSecurityPortAsync() => DeviceInfoGetSecurityPortResponse = await ExecuteApiAsync(q => q.DeviceInfoGetSecurityPortAsync());
+    private async Task GetDeviceInfoGetSecurityPortAsync() => DeviceInfoGetSecurityPortResponse = await ExecuteApiAsync(q => q.DeviceInfoGetSecurityPortAsync()).ConfigureAwait(true);
 
-    private async Task GetDeviceInfoGetInfoAsync() => DeviceInfoGetInfoResponse = await ExecuteApiAsync(q => q.DeviceInfoGetInfoAsync());
+    private async Task GetDeviceInfoGetInfoAsync() => DeviceInfoGetInfoResponse = await ExecuteApiAsync(q => q.DeviceInfoGetInfoAsync()).ConfigureAwait(true);
 
-    private async Task GetDeviceInfoGetDeviceLogAsync() => DeviceInfoGetDeviceLogResponse = await ExecuteApiAsync(q => q.DeviceInfoGetDeviceLogAsync());
+    private async Task GetDeviceInfoGetDeviceLogAsync() => DeviceInfoGetDeviceLogResponse = await ExecuteApiAsync(q => q.DeviceInfoGetDeviceLogAsync()).ConfigureAwait(true);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsGetGenericHostEntryViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsGetGenericHostEntryViewModel.cs
index 0b4ec84..61ade18 100644
--- a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsGetGenericHostEntryViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsGetGenericHostEntryViewModel.cs
@@ -40,7 +40,7 @@ public ushort? HostNumberOfEntries
     }
 
     protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
-        => HostsGetGenericHostEntryResponse = await ExecuteApiAsync(q => q.HostsGetGenericHostEntryAsync(new(Index!.Value)));
+        => HostsGetGenericHostEntryResponse = await ExecuteApiAsync(q => q.HostsGetGenericHostEntryAsync(new(Index!.Value))).ConfigureAwait(true);
 
     protected override void FritzServiceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs
index d3d3e36..8ba73b7 100644
--- a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs
@@ -76,7 +76,8 @@ public ObservableCollection<HostsGetGenericHostEntryResponse>? HostsGetGenericHo
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
-        return API.TaskExtensions.WhenAllSafe(new[]
+        return API.TaskExtensions.WhenAllSafe(
+            new[]
             {
                 GetHostsGetHostListPathAsync(cancellationToken),
                 GetHostsGetMeshListPathAsync(cancellationToken),
@@ -84,12 +85,13 @@ protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken canc
                 GetHostsGetInfoAsync(),
                 GetHostsGetChangeCounterAsync(),
                 GetHostsGetFriendlyNameAsync()
-            });
+            },
+            true);
     }
 
     private async Task GetHostsGetHostNumberOfEntriesAsync()
     {
-        HostsGetHostNumberOfEntriesResponse = await ExecuteApiAsync(q => q.HostsGetHostNumberOfEntriesAsync());
+        HostsGetHostNumberOfEntriesResponse = await ExecuteApiAsync(q => q.HostsGetHostNumberOfEntriesAsync()).ConfigureAwait(true);
 
         ushort numberOfEntries = HostsGetHostNumberOfEntriesResponse!.Value.Key!.Value.HostNumberOfEntries;
         var tasks = new List<Task<KeyValuePair<HostsGetGenericHostEntryResponse?, UPnPFault?>>>();
@@ -101,23 +103,23 @@ private async Task GetHostsGetHostNumberOfEntriesAsync()
             tasks.Add(ExecuteApiAsync(q => q.HostsGetGenericHostEntryAsync(new(capturedIndex))));
         }
 
-        KeyValuePair<HostsGetGenericHostEntryResponse?, UPnPFault?>[] responses = await API.TaskExtensions.WhenAllSafe(tasks);
+        KeyValuePair<HostsGetGenericHostEntryResponse?, UPnPFault?>[] responses = await API.TaskExtensions.WhenAllSafe(tasks, true).ConfigureAwait(true);
 
         HostsGetGenericHostEntryResponses = new(responses.Select(q => q.Key!.Value));
     }
 
     private async Task GetHostsGetInfoAsync()
-        => HostsGetInfoResponse = await ExecuteApiAsync(q => q.HostsGetInfoAsync());
+        => HostsGetInfoResponse = await ExecuteApiAsync(q => q.HostsGetInfoAsync()).ConfigureAwait(true);
 
     private async Task GetHostsGetChangeCounterAsync()
-        => HostsGetChangeCounterResponse = await ExecuteApiAsync(q => q.HostsGetChangeCounterAsync());
+        => HostsGetChangeCounterResponse = await ExecuteApiAsync(q => q.HostsGetChangeCounterAsync()).ConfigureAwait(true);
 
     private async Task GetHostsGetFriendlyNameAsync()
-        => HostsGetFriendlyNameResponse = await ExecuteApiAsync(q => q.HostsGetFriendlyNameAsync());
+        => HostsGetFriendlyNameResponse = await ExecuteApiAsync(q => q.HostsGetFriendlyNameAsync()).ConfigureAwait(true);
 
     private async Task GetHostsGetHostListPathAsync(CancellationToken cancellationToken)
-        => DeviceHostInfo = await deviceHostsService.GetDeviceHostsAsync(ApiDevice, cancellationToken);
+        => DeviceHostInfo = await deviceHostsService.GetDeviceHostsAsync(ApiDevice, cancellationToken).ConfigureAwait(true);
 
     private async Task GetHostsGetMeshListPathAsync(CancellationToken cancellationToken)
-        => DeviceMeshInfo = await deviceMeshService.GetDeviceMeshAsync(ApiDevice, cancellationToken);
+        => DeviceMeshInfo = await deviceMeshService.GetDeviceMeshAsync(ApiDevice, cancellationToken).ConfigureAwait(true);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecurityViewModel.cs b/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecurityViewModel.cs
index 5775fee..1f542b3 100644
--- a/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecurityViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecurityViewModel.cs
@@ -41,24 +41,26 @@ public LanConfigSecurityViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logge
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
-        return API.TaskExtensions.WhenAllSafe(new[]
+        return API.TaskExtensions.WhenAllSafe(
+            new[]
             {
                 GetLanConfigSecurityGetAnonymousLoginAsync(),
                 GetLanConfigSecurityGetCurrentUserAsync(),
                 GetLanConfigSecurityGetInfoAsync(),
                 GetLanConfigSecurityGetUserListAsync()
-            });
+            },
+            true);
     }
 
     private async Task GetLanConfigSecurityGetAnonymousLoginAsync()
-        => LanConfigSecurityGetAnonymousLoginResponse = await ExecuteApiAsync(q => q.LanConfigSecurityGetAnonymousLoginAsync());
+        => LanConfigSecurityGetAnonymousLoginResponse = await ExecuteApiAsync(q => q.LanConfigSecurityGetAnonymousLoginAsync()).ConfigureAwait(true);
 
     private async Task GetLanConfigSecurityGetCurrentUserAsync()
-        => LanConfigSecurityGetCurrentUserResponse = await ExecuteApiAsync(q => q.LanConfigSecurityGetCurrentUserAsync());
+        => LanConfigSecurityGetCurrentUserResponse = await ExecuteApiAsync(q => q.LanConfigSecurityGetCurrentUserAsync()).ConfigureAwait(true);
 
     private async Task GetLanConfigSecurityGetInfoAsync()
-        => LanConfigSecurityGetInfoResponse = await ExecuteApiAsync(q => q.LanConfigSecurityGetInfoAsync());
+        => LanConfigSecurityGetInfoResponse = await ExecuteApiAsync(q => q.LanConfigSecurityGetInfoAsync()).ConfigureAwait(true);
 
     private async Task GetLanConfigSecurityGetUserListAsync()
-        => LanConfigSecurityGetUserListResponse = await ExecuteApiAsync(q => q.LanConfigSecurityGetUserListAsync());
+        => LanConfigSecurityGetUserListResponse = await ExecuteApiAsync(q => q.LanConfigSecurityGetUserListAsync()).ConfigureAwait(true);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/LanEthernetInterfaceConfig/LanEthernetInterfaceConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/LanEthernetInterfaceConfig/LanEthernetInterfaceConfigViewModel.cs
index f731cbc..8da8875 100644
--- a/RS.Fritz.Manager.UI/UserControls/LanEthernetInterfaceConfig/LanEthernetInterfaceConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/LanEthernetInterfaceConfig/LanEthernetInterfaceConfigViewModel.cs
@@ -24,16 +24,18 @@ public LanEthernetInterfaceConfigViewModel(DeviceLoginInfo deviceLoginInfo, ILog
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
-        return API.TaskExtensions.WhenAllSafe(new[]
+        return API.TaskExtensions.WhenAllSafe(
+            new[]
             {
                 GetLanEthernetInterfaceConfigGetInfoAsync(),
                 GetLanEthernetInterfaceConfigGetStatisticsAsync()
-            });
+            },
+            true);
     }
 
     private async Task GetLanEthernetInterfaceConfigGetInfoAsync()
-        => LanEthernetInterfaceConfigGetInfoResponse = await ExecuteApiAsync(q => q.LanEthernetInterfaceConfigGetInfoAsync());
+        => LanEthernetInterfaceConfigGetInfoResponse = await ExecuteApiAsync(q => q.LanEthernetInterfaceConfigGetInfoAsync()).ConfigureAwait(true);
 
     private async Task GetLanEthernetInterfaceConfigGetStatisticsAsync()
-        => LanEthernetInterfaceConfigGetStatisticsResponse = await ExecuteApiAsync(q => q.LanEthernetInterfaceConfigGetStatisticsAsync());
+        => LanEthernetInterfaceConfigGetStatisticsResponse = await ExecuteApiAsync(q => q.LanEthernetInterfaceConfigGetStatisticsAsync()).ConfigureAwait(true);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/LanHostConfigManagement/LanHostConfigManagementViewModel.cs b/RS.Fritz.Manager.UI/UserControls/LanHostConfigManagement/LanHostConfigManagementViewModel.cs
index 5682736..562dbd6 100644
--- a/RS.Fritz.Manager.UI/UserControls/LanHostConfigManagement/LanHostConfigManagementViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/LanHostConfigManagement/LanHostConfigManagementViewModel.cs
@@ -52,7 +52,8 @@ public LanHostConfigManagementViewModel(DeviceLoginInfo deviceLoginInfo, ILogger
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
-        return API.TaskExtensions.WhenAllSafe(new[]
+        return API.TaskExtensions.WhenAllSafe(
+            new[]
             {
                 GetLanHostConfigManagementGetInfoAsync(),
                 LanHostConfigManagementGetSubnetMaskAsync(),
@@ -60,24 +61,25 @@ protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken canc
                 LanHostConfigManagementGetAddressRangeAsync(),
                 LanHostConfigManagementGetIpInterfaceNumberOfEntriesAsync(),
                 LanHostConfigManagementGetDnsServersAsync()
-            });
+            },
+            true);
     }
 
     private async Task GetLanHostConfigManagementGetInfoAsync()
-        => LanHostConfigManagementGetInfoResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetInfoAsync());
+        => LanHostConfigManagementGetInfoResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetInfoAsync()).ConfigureAwait(true);
 
     private async Task LanHostConfigManagementGetSubnetMaskAsync()
-        => LanHostConfigManagementGetSubnetMaskResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetSubnetMaskAsync());
+        => LanHostConfigManagementGetSubnetMaskResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetSubnetMaskAsync()).ConfigureAwait(true);
 
     private async Task LanHostConfigManagementGetIpRoutersListAsync()
-        => LanHostConfigManagementGetIpRoutersListResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetIpRoutersListAsync());
+        => LanHostConfigManagementGetIpRoutersListResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetIpRoutersListAsync()).ConfigureAwait(true);
 
     private async Task LanHostConfigManagementGetAddressRangeAsync()
-        => LanHostConfigManagementGetAddressRangeResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetAddressRangeAsync());
+        => LanHostConfigManagementGetAddressRangeResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetAddressRangeAsync()).ConfigureAwait(true);
 
     private async Task LanHostConfigManagementGetIpInterfaceNumberOfEntriesAsync()
-        => LanHostConfigManagementGetIpInterfaceNumberOfEntriesResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetIpInterfaceNumberOfEntriesAsync());
+        => LanHostConfigManagementGetIpInterfaceNumberOfEntriesResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetIpInterfaceNumberOfEntriesAsync()).ConfigureAwait(true);
 
     private async Task LanHostConfigManagementGetDnsServersAsync()
-        => LanHostConfigManagementGetDnsServersResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetDnsServersAsync());
+        => LanHostConfigManagementGetDnsServersResponse = await ExecuteApiAsync(q => q.LanHostConfigManagementGetDnsServersAsync()).ConfigureAwait(true);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingGetGenericForwardingEntryViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingGetGenericForwardingEntryViewModel.cs
index c5c10bb..dedd777 100644
--- a/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingGetGenericForwardingEntryViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingGetGenericForwardingEntryViewModel.cs
@@ -40,7 +40,7 @@ public ushort? ForwardNumberOfEntries
     }
 
     protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
-        => Layer3ForwardingGetGenericForwardingEntryResponse = await ExecuteApiAsync(q => q.Layer3ForwardingGetGenericForwardingEntryAsync(new(Index!.Value)));
+        => Layer3ForwardingGetGenericForwardingEntryResponse = await ExecuteApiAsync(q => q.Layer3ForwardingGetGenericForwardingEntryAsync(new(Index!.Value))).ConfigureAwait(true);
 
     protected override void FritzServiceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingViewModel.cs
index 506441d..7bc120d 100644
--- a/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingViewModel.cs
@@ -40,19 +40,21 @@ public ObservableCollection<Layer3ForwardingGetGenericForwardingEntryResponse>?
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
-        return API.TaskExtensions.WhenAllSafe(new[]
+        return API.TaskExtensions.WhenAllSafe(
+            new[]
             {
                 GetLayer3ForwardingGetDefaultConnectionServiceAsync(),
                 GetLayer3ForwardingGetForwardNumberOfEntriesResponseAsync()
-            });
+            },
+            true);
     }
 
     private async Task GetLayer3ForwardingGetDefaultConnectionServiceAsync()
-        => Layer3ForwardingGetDefaultConnectionServiceResponse = await ExecuteApiAsync(q => q.Layer3ForwardingGetDefaultConnectionServiceAsync());
+        => Layer3ForwardingGetDefaultConnectionServiceResponse = await ExecuteApiAsync(q => q.Layer3ForwardingGetDefaultConnectionServiceAsync()).ConfigureAwait(true);
 
     private async Task GetLayer3ForwardingGetForwardNumberOfEntriesResponseAsync()
     {
-        Layer3ForwardingGetForwardNumberOfEntriesResponse = await ExecuteApiAsync(q => q.Layer3ForwardingGetForwardNumberOfEntriesAsync());
+        Layer3ForwardingGetForwardNumberOfEntriesResponse = await ExecuteApiAsync(q => q.Layer3ForwardingGetForwardNumberOfEntriesAsync()).ConfigureAwait(true);
 
         ushort numberOfEntries = Layer3ForwardingGetForwardNumberOfEntriesResponse!.Value.Key!.Value.ForwardNumberOfEntries;
         var tasks = new List<Task<KeyValuePair<Layer3ForwardingGetGenericForwardingEntryResponse?, UPnPFault?>>>();
@@ -64,7 +66,7 @@ private async Task GetLayer3ForwardingGetForwardNumberOfEntriesResponseAsync()
             tasks.Add(ExecuteApiAsync(q => q.Layer3ForwardingGetGenericForwardingEntryAsync(new(capturedIndex))));
         }
 
-        KeyValuePair<Layer3ForwardingGetGenericForwardingEntryResponse?, UPnPFault?>[] responses = await API.TaskExtensions.WhenAllSafe(tasks);
+        KeyValuePair<Layer3ForwardingGetGenericForwardingEntryResponse?, UPnPFault?>[] responses = await API.TaskExtensions.WhenAllSafe(tasks, true).ConfigureAwait(true);
 
         Layer3ForwardingGetGenericForwardingEntryResponses = new(responses.Select(q => q.Key!.Value));
     }
diff --git a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerViewModel.cs b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerViewModel.cs
index b8bb79d..c990a3e 100644
--- a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerViewModel.cs
@@ -58,16 +58,18 @@ public ManagementServerViewModel(
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
-        return API.TaskExtensions.WhenAllSafe(new[]
+        return API.TaskExtensions.WhenAllSafe(
+            new[]
             {
                GetManagementServerGetInfoAsync(),
                GetManagementServerGetTr069FirmwareDownloadEnabledAsync()
-            });
+            },
+            true);
     }
 
     private async Task GetManagementServerGetInfoAsync()
-        => ManagementServerGetInfoResponse = await ExecuteApiAsync(q => q.ManagementServerGetInfoAsync());
+        => ManagementServerGetInfoResponse = await ExecuteApiAsync(q => q.ManagementServerGetInfoAsync()).ConfigureAwait(true);
 
     private async Task GetManagementServerGetTr069FirmwareDownloadEnabledAsync()
-        => ManagementServerGetTr069FirmwareDownloadEnabledResponse = await ExecuteApiAsync(q => q.ManagementServerGetTr069FirmwareDownloadEnabledAsync());
+        => ManagementServerGetTr069FirmwareDownloadEnabledResponse = await ExecuteApiAsync(q => q.ManagementServerGetTr069FirmwareDownloadEnabledAsync()).ConfigureAwait(true);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/Time/TimeViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Time/TimeViewModel.cs
index d7221ce..1783bb9 100644
--- a/RS.Fritz.Manager.UI/UserControls/Time/TimeViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Time/TimeViewModel.cs
@@ -19,5 +19,5 @@ public TimeViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger, TimeSetNtp
     }
 
     protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
-        => TimeGetInfoResponse = await ExecuteApiAsync(q => q.TimeGetInfoAsync());
+        => TimeGetInfoResponse = await ExecuteApiAsync(q => q.TimeGetInfoAsync()).ConfigureAwait(true);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceViewModel.cs b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceViewModel.cs
index 6f6d80c..da539c0 100644
--- a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceViewModel.cs
@@ -57,20 +57,22 @@ public UserInterfaceViewModel(
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
-        return API.TaskExtensions.WhenAllSafe(new[]
+        return API.TaskExtensions.WhenAllSafe(
+            new[]
             {
                GetUserInterfaceGetInfoAsync(),
                GetUserInterfaceGetInternationalConfigAsync(),
                GetUserInterfaceAvmGetInfoAsync()
-            });
+            },
+            true);
     }
 
     private async Task GetUserInterfaceGetInfoAsync()
-        => UserInterfaceGetInfoResponse = await ExecuteApiAsync(q => q.UserInterfaceGetInfoAsync());
+        => UserInterfaceGetInfoResponse = await ExecuteApiAsync(q => q.UserInterfaceGetInfoAsync()).ConfigureAwait(true);
 
     private async Task GetUserInterfaceGetInternationalConfigAsync()
-        => UserInterfaceGetInternationalConfigResponse = await ExecuteApiAsync(q => q.UserInterfaceGetInternationalConfigAsync());
+        => UserInterfaceGetInternationalConfigResponse = await ExecuteApiAsync(q => q.UserInterfaceGetInternationalConfigAsync()).ConfigureAwait(true);
 
     private async Task GetUserInterfaceAvmGetInfoAsync()
-        => UserInterfaceAvmGetInfoResponse = await ExecuteApiAsync(q => q.UserInterfaceAvmGetInfoAsync());
+        => UserInterfaceAvmGetInfoResponse = await ExecuteApiAsync(q => q.UserInterfaceAvmGetInfoAsync()).ConfigureAwait(true);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigGetOnlineMonitorViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigGetOnlineMonitorViewModel.cs
index 1b01c38..ed8dde0 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigGetOnlineMonitorViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigGetOnlineMonitorViewModel.cs
@@ -153,7 +153,7 @@ public uint? CurrentUpstreamBackgroundApplicationsBps
     }
 
     protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
-        => WanCommonInterfaceConfigGetOnlineMonitorResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetOnlineMonitorAsync(new(SyncGroupIndex)));
+        => WanCommonInterfaceConfigGetOnlineMonitorResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetOnlineMonitorAsync(new(SyncGroupIndex))).ConfigureAwait(true);
 
     protected override void FritzServiceViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
     {
@@ -200,7 +200,7 @@ private void UpdateOnlineMonitorDownstreamElements()
         uint max = streamBps.Max();
         uint range = max - min;
 
-        if (range == 0)
+        if (range is 0)
             range = 1;
 
         var uiElements = new List<UIElement>();
@@ -234,7 +234,7 @@ private void UpdateOnlineMonitorUpstreamElements()
         uint max = upstreamTotalBps!.Max();
         uint range = max - min;
 
-        if (range == 0)
+        if (range is 0)
             range = 1;
 
         var uiElements = new List<UIElement>();
diff --git a/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigViewModel.cs
index b29aace..75c8830 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigViewModel.cs
@@ -76,7 +76,8 @@ public bool AutoRefresh
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
-        return API.TaskExtensions.WhenAllSafe(new[]
+        return API.TaskExtensions.WhenAllSafe(
+            new[]
             {
                GetWanCommonInterfaceConfigGetCommonLinkPropertiesAsync(),
                GetWanCommonInterfaceConfigGetTotalBytesReceivedAsync(),
@@ -84,7 +85,8 @@ protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken canc
                GetWanCommonInterfaceConfigGetTotalPacketsReceivedAsync(),
                GetWanCommonInterfaceConfigGetTotalPacketsSentAsync(),
                GetWanCommonInterfaceConfigGetOnlineMonitorAsync()
-            });
+            },
+            true);
     }
 
     private async void AutoRefreshTimerTick(object? sender, EventArgs e)
@@ -92,7 +94,7 @@ private async void AutoRefreshTimerTick(object? sender, EventArgs e)
         try
         {
             if (CanExecuteDefaultCommand)
-                await DefaultCommand.ExecuteAsync(false);
+                await DefaultCommand.ExecuteAsync(false).ConfigureAwait(true);
         }
         catch (Exception ex)
         {
@@ -103,20 +105,20 @@ private async void AutoRefreshTimerTick(object? sender, EventArgs e)
     }
 
     private async Task GetWanCommonInterfaceConfigGetCommonLinkPropertiesAsync()
-        => WanCommonInterfaceConfigGetCommonLinkPropertiesResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetCommonLinkPropertiesAsync());
+        => WanCommonInterfaceConfigGetCommonLinkPropertiesResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetCommonLinkPropertiesAsync()).ConfigureAwait(true);
 
     private async Task GetWanCommonInterfaceConfigGetTotalBytesReceivedAsync()
-        => WanCommonInterfaceConfigGetTotalBytesReceivedResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetTotalBytesReceivedAsync());
+        => WanCommonInterfaceConfigGetTotalBytesReceivedResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetTotalBytesReceivedAsync()).ConfigureAwait(true);
 
     private async Task GetWanCommonInterfaceConfigGetTotalBytesSentAsync()
-        => WanCommonInterfaceConfigGetTotalBytesSentResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetTotalBytesSentAsync());
+        => WanCommonInterfaceConfigGetTotalBytesSentResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetTotalBytesSentAsync()).ConfigureAwait(true);
 
     private async Task GetWanCommonInterfaceConfigGetTotalPacketsReceivedAsync()
-        => WanCommonInterfaceConfigGetTotalPacketsReceivedResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetTotalPacketsReceivedAsync());
+        => WanCommonInterfaceConfigGetTotalPacketsReceivedResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetTotalPacketsReceivedAsync()).ConfigureAwait(true);
 
     private async Task GetWanCommonInterfaceConfigGetTotalPacketsSentAsync()
-        => WanCommonInterfaceConfigGetTotalPacketsSentResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetTotalPacketsSentAsync());
+        => WanCommonInterfaceConfigGetTotalPacketsSentResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetTotalPacketsSentAsync()).ConfigureAwait(true);
 
     private async Task GetWanCommonInterfaceConfigGetOnlineMonitorAsync()
-        => WanCommonInterfaceConfigGetOnlineMonitorViewModel.WanCommonInterfaceConfigGetOnlineMonitorResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetOnlineMonitorAsync(new(0)));
+        => WanCommonInterfaceConfigGetOnlineMonitorViewModel.WanCommonInterfaceConfigGetOnlineMonitorResponse = await ExecuteApiAsync(q => q.WanCommonInterfaceConfigGetOnlineMonitorAsync(new(0))).ConfigureAwait(true);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigDslInfoViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigDslInfoViewModel.cs
index 6349346..59d0e0d 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigDslInfoViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigDslInfoViewModel.cs
@@ -71,7 +71,7 @@ private void UpdateDownstreamSnrElements()
         uint max = downstreamSnrValues.Max();
         uint range = max - min;
 
-        if (range == 0)
+        if (range is 0)
             range = 1;
 
         var uiElements = new List<UIElement>();
diff --git a/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigInfoViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigInfoViewModel.cs
index 734ca6e..b263e36 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigInfoViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigInfoViewModel.cs
@@ -141,7 +141,7 @@ private List<UIElement> UpdateHistory(IReadOnlyList<uint> values)
         uint labelMaxValue = values.Max();
         uint range = max - min;
 
-        if (range == 0)
+        if (range is 0)
             range = 1;
 
         var uiElements = new List<UIElement>();
diff --git a/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigViewModel.cs
index c64c5d9..42e5cf3 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigViewModel.cs
@@ -74,13 +74,15 @@ protected override void Receive(PropertyChangedMessage<bool> message)
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
-        return API.TaskExtensions.WhenAllSafe(new[]
+        return API.TaskExtensions.WhenAllSafe(
+            new[]
             {
                 GetWanDslInterfaceConfigGetDslDiagnoseInfoAsync(),
                 GetWanDslInterfaceConfigGetDslInfoAsync(),
                 GetWanDslInterfaceConfigGetInfoAsync(),
                 GetWanDslInterfaceConfigGetStatisticsTotalAsync()
-            });
+            },
+            true);
     }
 
     private async void AutoRefreshTimerTick(object? sender, EventArgs e)
@@ -88,7 +90,7 @@ private async void AutoRefreshTimerTick(object? sender, EventArgs e)
         try
         {
             if (CanExecuteDefaultCommand)
-                await DefaultCommand.ExecuteAsync(false);
+                await DefaultCommand.ExecuteAsync(false).ConfigureAwait(true);
         }
         catch (Exception ex)
         {
@@ -99,14 +101,14 @@ private async void AutoRefreshTimerTick(object? sender, EventArgs e)
     }
 
     private async Task GetWanDslInterfaceConfigGetDslDiagnoseInfoAsync()
-        => WanDslInterfaceConfigGetDslDiagnoseInfoResponse = await ExecuteApiAsync(q => q.WanDslInterfaceConfigGetDslDiagnoseInfoAsync());
+        => WanDslInterfaceConfigGetDslDiagnoseInfoResponse = await ExecuteApiAsync(q => q.WanDslInterfaceConfigGetDslDiagnoseInfoAsync()).ConfigureAwait(true);
 
     private async Task GetWanDslInterfaceConfigGetDslInfoAsync()
-        => WanDslInterfaceConfigDslInfoViewModel.WanDslInterfaceConfigGetDslInfoResponse = await ExecuteApiAsync(q => q.WanDslInterfaceConfigGetDslInfoAsync());
+        => WanDslInterfaceConfigDslInfoViewModel.WanDslInterfaceConfigGetDslInfoResponse = await ExecuteApiAsync(q => q.WanDslInterfaceConfigGetDslInfoAsync()).ConfigureAwait(true);
 
     private async Task GetWanDslInterfaceConfigGetInfoAsync()
-        => WanDslInterfaceConfigInfoViewModel.WanDslInterfaceConfigGetInfoResponse = await ExecuteApiAsync(q => q.WanDslInterfaceConfigGetInfoAsync());
+        => WanDslInterfaceConfigInfoViewModel.WanDslInterfaceConfigGetInfoResponse = await ExecuteApiAsync(q => q.WanDslInterfaceConfigGetInfoAsync()).ConfigureAwait(true);
 
     private async Task GetWanDslInterfaceConfigGetStatisticsTotalAsync()
-        => WanDslInterfaceConfigGetStatisticsTotalResponse = await ExecuteApiAsync(q => q.WanDslInterfaceConfigGetStatisticsTotalAsync());
+        => WanDslInterfaceConfigGetStatisticsTotalResponse = await ExecuteApiAsync(q => q.WanDslInterfaceConfigGetStatisticsTotalAsync()).ConfigureAwait(true);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/WanDslLinkConfig/WanDslLinkConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanDslLinkConfig/WanDslLinkConfigViewModel.cs
index 2ae8d6b..4349519 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanDslLinkConfig/WanDslLinkConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanDslLinkConfig/WanDslLinkConfigViewModel.cs
@@ -52,32 +52,34 @@ public WanDslLinkConfigViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
-        return API.TaskExtensions.WhenAllSafe(new[]
-          {
+        return API.TaskExtensions.WhenAllSafe(
+            new[]
+            {
                 GetWanDslLinkConfigGetInfoAsync(),
                 GetWanDslLinkConfigGetDslLinkInfoAsync(),
                 GetWanDslLinkConfigGetDestinationAddressAsync(),
                 GetWanDslLinkConfigGetAtmEncapsulationAsync(),
                 GetWanDslLinkConfigGetAutoConfigAsync(),
                 GetWanDslLinkConfigGetStatisticsAsync()
-          });
+            },
+            true);
     }
 
     private async Task GetWanDslLinkConfigGetInfoAsync()
-        => WanDslLinkConfigGetInfoResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetInfoAsync());
+        => WanDslLinkConfigGetInfoResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetInfoAsync()).ConfigureAwait(true);
 
     private async Task GetWanDslLinkConfigGetDslLinkInfoAsync()
-        => WanDslLinkConfigGetDslLinkInfoResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetDslLinkInfoAsync());
+        => WanDslLinkConfigGetDslLinkInfoResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetDslLinkInfoAsync()).ConfigureAwait(true);
 
     private async Task GetWanDslLinkConfigGetDestinationAddressAsync()
-        => WanDslLinkConfigGetDestinationAddressResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetDestinationAddressAsync());
+        => WanDslLinkConfigGetDestinationAddressResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetDestinationAddressAsync()).ConfigureAwait(true);
 
     private async Task GetWanDslLinkConfigGetAtmEncapsulationAsync()
-        => WanDslLinkConfigGetAtmEncapsulationResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetAtmEncapsulationAsync());
+        => WanDslLinkConfigGetAtmEncapsulationResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetAtmEncapsulationAsync()).ConfigureAwait(true);
 
     private async Task GetWanDslLinkConfigGetAutoConfigAsync()
-        => WanDslLinkConfigGetAutoConfigResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetAutoConfigAsync());
+        => WanDslLinkConfigGetAutoConfigResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetAutoConfigAsync()).ConfigureAwait(true);
 
     private async Task GetWanDslLinkConfigGetStatisticsAsync()
-        => WanDslLinkConfigGetStatisticsResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetStatisticsAsync());
+        => WanDslLinkConfigGetStatisticsResponse = await ExecuteApiAsync(q => q.WanDslLinkConfigGetStatisticsAsync()).ConfigureAwait(true);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/WanEthernetLinkConfig/WanEthernetLinkConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanEthernetLinkConfig/WanEthernetLinkConfigViewModel.cs
index 0d4051a..db3f771 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanEthernetLinkConfig/WanEthernetLinkConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanEthernetLinkConfig/WanEthernetLinkConfigViewModel.cs
@@ -16,5 +16,5 @@ public WanEthernetLinkConfigViewModel(DeviceLoginInfo deviceLoginInfo, ILogger l
     }
 
     protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
-        => WanEthernetLinkConfigGetEthernetLinkStatusResponse = await ExecuteApiAsync(q => q.WanEthernetLinkConfigGetEthernetLinkStatusAsync());
+        => WanEthernetLinkConfigGetEthernetLinkStatusResponse = await ExecuteApiAsync(q => q.WanEthernetLinkConfigGetEthernetLinkStatusAsync()).ConfigureAwait(true);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionGetGenericPortMappingEntryViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionGetGenericPortMappingEntryViewModel.cs
index c33c7a3..b54cbb1 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionGetGenericPortMappingEntryViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionGetGenericPortMappingEntryViewModel.cs
@@ -8,5 +8,5 @@ public WanIpConnectionGetGenericPortMappingEntryViewModel(DeviceLoginInfo device
     }
 
     protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
-        => WanConnectionGetGenericPortMappingEntryResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetGenericPortMappingEntryAsync(new(Index!.Value)));
+        => WanConnectionGetGenericPortMappingEntryResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetGenericPortMappingEntryAsync(new(Index!.Value))).ConfigureAwait(true);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionViewModel.cs
index f226acb..862947f 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionViewModel.cs
@@ -75,8 +75,9 @@ public ObservableCollection<WanConnectionGetGenericPortMappingEntryResponse>? Wa
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
-        return API.TaskExtensions.WhenAllSafe(new[]
-          {
+        return API.TaskExtensions.WhenAllSafe(
+            new[]
+            {
                 GetWanIpConnectionGetInfoAsync(),
                 GetWanIpConnectionGetConnectionTypeInfoAsync(),
                 GetWanIpConnectionGetStatusInfoAsync(),
@@ -84,27 +85,28 @@ protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken canc
                 GetWanIpConnectionGetDnsServersAsync(),
                 GetWanIpConnectionGetPortMappingNumberOfEntriesAsync(),
                 GetWanIpConnectionGetExternalIpAddressAsync()
-          });
+            },
+            true);
     }
 
     private async Task GetWanIpConnectionGetInfoAsync()
-        => WanIpConnectionGetInfoResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetInfoAsync());
+        => WanIpConnectionGetInfoResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetInfoAsync()).ConfigureAwait(true);
 
     private async Task GetWanIpConnectionGetConnectionTypeInfoAsync()
-        => WanConnectionGetConnectionTypeInfoResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetConnectionTypeInfoAsync());
+        => WanConnectionGetConnectionTypeInfoResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetConnectionTypeInfoAsync()).ConfigureAwait(true);
 
     private async Task GetWanIpConnectionGetStatusInfoAsync()
-        => WanConnectionGetStatusInfoResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetStatusInfoAsync());
+        => WanConnectionGetStatusInfoResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetStatusInfoAsync()).ConfigureAwait(true);
 
     private async Task GetWanIpConnectionGetNatRsipStatusAsync()
-        => WanConnectionGetNatRsipStatusResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetNatRsipStatusAsync());
+        => WanConnectionGetNatRsipStatusResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetNatRsipStatusAsync()).ConfigureAwait(true);
 
     private async Task GetWanIpConnectionGetDnsServersAsync()
-        => WanConnectionGetDnsServersResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetDnsServersAsync());
+        => WanConnectionGetDnsServersResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetDnsServersAsync()).ConfigureAwait(true);
 
     private async Task GetWanIpConnectionGetPortMappingNumberOfEntriesAsync()
     {
-        WanConnectionGetPortMappingNumberOfEntriesResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetPortMappingNumberOfEntriesAsync());
+        WanConnectionGetPortMappingNumberOfEntriesResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetPortMappingNumberOfEntriesAsync()).ConfigureAwait(true);
 
         ushort numberOfEntries = WanConnectionGetPortMappingNumberOfEntriesResponse!.Value.Key!.Value.PortMappingNumberOfEntries;
         var tasks = new List<Task<KeyValuePair<WanConnectionGetGenericPortMappingEntryResponse?, UPnPFault?>>>();
@@ -116,11 +118,11 @@ private async Task GetWanIpConnectionGetPortMappingNumberOfEntriesAsync()
             tasks.Add(ExecuteApiAsync(q => q.WanIpConnectionGetGenericPortMappingEntryAsync(new(capturedIndex))));
         }
 
-        KeyValuePair<WanConnectionGetGenericPortMappingEntryResponse?, UPnPFault?>[] responses = await API.TaskExtensions.WhenAllSafe(tasks);
+        KeyValuePair<WanConnectionGetGenericPortMappingEntryResponse?, UPnPFault?>[] responses = await API.TaskExtensions.WhenAllSafe(tasks, true).ConfigureAwait(true);
 
         WanConnectionGetGenericPortMappingEntryResponses = new(responses.Select(q => q.Key!.Value));
     }
 
     private async Task GetWanIpConnectionGetExternalIpAddressAsync()
-        => WanConnectionGetExternalIpAddressResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetExternalIpAddressAsync());
+        => WanConnectionGetExternalIpAddressResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetExternalIpAddressAsync()).ConfigureAwait(true);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionGetGenericPortMappingEntryViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionGetGenericPortMappingEntryViewModel.cs
index 7d58502..15c1b36 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionGetGenericPortMappingEntryViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionGetGenericPortMappingEntryViewModel.cs
@@ -8,5 +8,5 @@ public WanPppConnectionGetGenericPortMappingEntryViewModel(DeviceLoginInfo devic
     }
 
     protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
-        => WanConnectionGetGenericPortMappingEntryResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetGenericPortMappingEntryAsync(new(Index!.Value)));
+        => WanConnectionGetGenericPortMappingEntryResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetGenericPortMappingEntryAsync(new(Index!.Value))).ConfigureAwait(true);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionViewModel.cs
index fe97178..80dd0a5 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionViewModel.cs
@@ -96,8 +96,9 @@ public ObservableCollection<WanConnectionGetGenericPortMappingEntryResponse>? Wa
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
-        return API.TaskExtensions.WhenAllSafe(new[]
-          {
+        return API.TaskExtensions.WhenAllSafe(
+            new[]
+            {
                 GetWanPppConnectionGetInfoAsync(),
                 GetWanPppConnectionGetConnectionTypeInfoAsync(),
                 GetWanPppConnectionGetStatusInfoAsync(),
@@ -108,33 +109,34 @@ protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken canc
                 GetWanPppConnectionGetPortMappingNumberOfEntriesAsync(),
                 GetWanPppConnectionGetExternalIpAddressAsync(),
                 GetWanPppConnectionGetAutoDisconnectTimeSpanAsync()
-          });
+            },
+            true);
     }
 
     private async Task GetWanPppConnectionGetInfoAsync()
-        => WanPppConnectionGetInfoResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetInfoAsync());
+        => WanPppConnectionGetInfoResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetInfoAsync()).ConfigureAwait(true);
 
     private async Task GetWanPppConnectionGetConnectionTypeInfoAsync()
-        => WanConnectionGetConnectionTypeInfoResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetConnectionTypeInfoAsync());
+        => WanConnectionGetConnectionTypeInfoResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetConnectionTypeInfoAsync()).ConfigureAwait(true);
 
     private async Task GetWanPppConnectionGetStatusInfoAsync()
-        => WanConnectionGetStatusInfoResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetStatusInfoAsync());
+        => WanConnectionGetStatusInfoResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetStatusInfoAsync()).ConfigureAwait(true);
 
     private async Task GetWanPppConnectionGetLinkLayerMaxBitRatesAsync()
-        => WanPppConnectionGetLinkLayerMaxBitRatesResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetLinkLayerMaxBitRatesAsync());
+        => WanPppConnectionGetLinkLayerMaxBitRatesResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetLinkLayerMaxBitRatesAsync()).ConfigureAwait(true);
 
     private async Task GetWanPppConnectionGetUserNameAsync()
-        => WanPppConnectionGetUserNameResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetUserNameAsync());
+        => WanPppConnectionGetUserNameResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetUserNameAsync()).ConfigureAwait(true);
 
     private async Task GetWanPppConnectionGetNatRsipStatusAsync()
-        => WanConnectionGetNatRsipStatusResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetNatRsipStatusAsync());
+        => WanConnectionGetNatRsipStatusResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetNatRsipStatusAsync()).ConfigureAwait(true);
 
     private async Task GetWanPppConnectionGetDnsServersAsync()
-        => WanConnectionGetDnsServersResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetDnsServersAsync());
+        => WanConnectionGetDnsServersResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetDnsServersAsync()).ConfigureAwait(true);
 
     private async Task GetWanPppConnectionGetPortMappingNumberOfEntriesAsync()
     {
-        WanConnectionGetPortMappingNumberOfEntriesResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetPortMappingNumberOfEntriesAsync());
+        WanConnectionGetPortMappingNumberOfEntriesResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetPortMappingNumberOfEntriesAsync()).ConfigureAwait(true);
 
         ushort numberOfEntries = WanConnectionGetPortMappingNumberOfEntriesResponse!.Value.Key!.Value.PortMappingNumberOfEntries;
         var tasks = new List<Task<KeyValuePair<WanConnectionGetGenericPortMappingEntryResponse?, UPnPFault?>>>();
@@ -146,14 +148,14 @@ private async Task GetWanPppConnectionGetPortMappingNumberOfEntriesAsync()
             tasks.Add(ExecuteApiAsync(q => q.WanPppConnectionGetGenericPortMappingEntryAsync(new(capturedIndex))));
         }
 
-        KeyValuePair<WanConnectionGetGenericPortMappingEntryResponse?, UPnPFault?>[] responses = await API.TaskExtensions.WhenAllSafe(tasks);
+        KeyValuePair<WanConnectionGetGenericPortMappingEntryResponse?, UPnPFault?>[] responses = await API.TaskExtensions.WhenAllSafe(tasks, true).ConfigureAwait(true);
 
         WanConnectionGetGenericPortMappingEntryResponses = new(responses.Select(q => q.Key!.Value));
     }
 
     private async Task GetWanPppConnectionGetExternalIpAddressAsync()
-        => WanConnectionGetExternalIpAddressResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetExternalIpAddressAsync());
+        => WanConnectionGetExternalIpAddressResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetExternalIpAddressAsync()).ConfigureAwait(true);
 
     private async Task GetWanPppConnectionGetAutoDisconnectTimeSpanAsync()
-        => WanPppConnectionGetAutoDisconnectTimeSpanResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetAutoDisconnectTimeSpanAsync());
+        => WanPppConnectionGetAutoDisconnectTimeSpanResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetAutoDisconnectTimeSpanAsync()).ConfigureAwait(true);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/WlanConfiguration/WlanConfigurationViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WlanConfiguration/WlanConfigurationViewModel.cs
index 7fc766d..2797825 100644
--- a/RS.Fritz.Manager.UI/UserControls/WlanConfiguration/WlanConfigurationViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WlanConfiguration/WlanConfigurationViewModel.cs
@@ -143,8 +143,9 @@ public WlanDeviceInfo? WlanDeviceInfo
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
-        return API.TaskExtensions.WhenAllSafe(new[]
-          {
+        return API.TaskExtensions.WhenAllSafe(
+            new[]
+            {
                 GetWlanConfigurationGetHostListPathAsync(cancellationToken),
                 GetWlanConfigurationGetInfoAsync(),
                 GetWlanConfigurationGetBasBeaconSecurityPropertiesAsync(),
@@ -162,59 +163,60 @@ protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken canc
                 GetWlanConfigurationGetWlanExtInfoAsync(),
                 GetWlanConfigurationGetWpsInfoAsync(),
                 GetWlanConfigurationGetWlanConnectionInfoAsync()
-          });
+            },
+            true);
     }
 
     private async Task GetWlanConfigurationGetHostListPathAsync(CancellationToken cancellationToken)
-        => WlanDeviceInfo = await wlanDeviceService.GetWlanDevicesAsync(ApiDevice, cancellationToken);
+        => WlanDeviceInfo = await wlanDeviceService.GetWlanDevicesAsync(ApiDevice, cancellationToken).ConfigureAwait(true);
 
     private async Task GetWlanConfigurationGetInfoAsync()
-        => WlanConfigurationGetInfoResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetInfoAsync(i));
+        => WlanConfigurationGetInfoResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetInfoAsync(i)).ConfigureAwait(true);
 
     private async Task GetWlanConfigurationGetBasBeaconSecurityPropertiesAsync()
-        => WlanConfigurationGetBasBeaconSecurityPropertiesResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetBasBeaconSecurityPropertiesAsync(i));
+        => WlanConfigurationGetBasBeaconSecurityPropertiesResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetBasBeaconSecurityPropertiesAsync(i)).ConfigureAwait(true);
 
     private async Task GetWlanConfigurationGetBssIdAsync()
-        => WlanConfigurationGetBssIdResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetBssIdAsync(i));
+        => WlanConfigurationGetBssIdResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetBssIdAsync(i)).ConfigureAwait(true);
 
     private async Task GetWlanConfigurationGetSsIdAsync()
-        => WlanConfigurationGetSsIdResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetSsIdAsync(i));
+        => WlanConfigurationGetSsIdResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetSsIdAsync(i)).ConfigureAwait(true);
 
     private async Task GetWlanConfigurationGetBeaconTypeAsync()
-        => WlanConfigurationGetBeaconTypeResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetBeaconTypeAsync(i));
+        => WlanConfigurationGetBeaconTypeResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetBeaconTypeAsync(i)).ConfigureAwait(true);
 
     private async Task GetWlanConfigurationGetChannelInfoAsync()
-        => WlanConfigurationGetChannelInfoResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetChannelInfoAsync(i));
+        => WlanConfigurationGetChannelInfoResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetChannelInfoAsync(i)).ConfigureAwait(true);
 
     private async Task GetWlanConfigurationGetBeaconAdvertisementAsync()
-        => WlanConfigurationGetBeaconAdvertisementResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetBeaconAdvertisementAsync(i));
+        => WlanConfigurationGetBeaconAdvertisementResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetBeaconAdvertisementAsync(i)).ConfigureAwait(true);
 
     private async Task GetWlanConfigurationGetTotalAssociationsAsync()
-        => WlanConfigurationGetTotalAssociationsResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetTotalAssociationsAsync(i));
+        => WlanConfigurationGetTotalAssociationsResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetTotalAssociationsAsync(i)).ConfigureAwait(true);
 
     private async Task GetWlanConfigurationGetIpTvOptimizedAsync()
-        => WlanConfigurationGetIpTvOptimizedResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetIpTvOptimizedAsync(i));
+        => WlanConfigurationGetIpTvOptimizedResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetIpTvOptimizedAsync(i)).ConfigureAwait(true);
 
     private async Task GetWlanConfigurationGetStatisticsAsync()
-        => WlanConfigurationGetStatisticsResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetStatisticsAsync(i));
+        => WlanConfigurationGetStatisticsResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetStatisticsAsync(i)).ConfigureAwait(true);
 
     private async Task GetWlanConfigurationGetPacketStatisticsAsync()
-        => WlanConfigurationGetPacketStatisticsResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetPacketStatisticsAsync(i));
+        => WlanConfigurationGetPacketStatisticsResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetPacketStatisticsAsync(i)).ConfigureAwait(true);
 
     private async Task GetWlanConfigurationGetNightControlAsync()
-        => WlanConfigurationGetNightControlResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetNightControlAsync(i));
+        => WlanConfigurationGetNightControlResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetNightControlAsync(i)).ConfigureAwait(true);
 
     private async Task GetWlanConfigurationGetWlanHybridModeAsync()
-        => WlanConfigurationGetWlanHybridModeResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetWlanHybridModeAsync(i));
+        => WlanConfigurationGetWlanHybridModeResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetWlanHybridModeAsync(i)).ConfigureAwait(true);
 
     private async Task GetWlanConfigurationGetWlanExtInfoAsync()
-        => WlanConfigurationGetWlanExtInfoResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetWlanExtInfoAsync(i));
+        => WlanConfigurationGetWlanExtInfoResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetWlanExtInfoAsync(i)).ConfigureAwait(true);
 
     private async Task GetWlanConfigurationGetWpsInfoAsync()
-        => WlanConfigurationGetWpsInfoResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetWpsInfoAsync(i));
+        => WlanConfigurationGetWpsInfoResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetWpsInfoAsync(i)).ConfigureAwait(true);
 
     private async Task GetWlanConfigurationGetWlanConnectionInfoAsync()
-        => WlanConfigurationGetWlanConnectionInfoResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetWlanConnectionInfoAsync(i), new Dictionary<ushort, string> { { 714, "Current device is not directly connected to any of the access points." } });
+        => WlanConfigurationGetWlanConnectionInfoResponses = await ExecuteApiWlanConfigurationAsync((q, i) => q.WlanConfigurationGetWlanConnectionInfoAsync(i), new Dictionary<ushort, string> { { 714, "Current device is not directly connected to any of the access points." } }).ConfigureAwait(true);
 
     private async ValueTask<KeyValuePair<T?, UPnPFault?>?[]> ExecuteApiWlanConfigurationAsync<T>(Func<InternetGatewayDevice, int, Task<T>> operation, IDictionary<ushort, string>? errorReasons = null)
         where T : struct
@@ -224,7 +226,7 @@ private async Task GetWlanConfigurationGetWlanConnectionInfoAsync()
         for (int i = 0; i < 4; i++)
         {
             if (HasWlanConfigurationService(i + 1))
-                responses[i] = await ExecuteApiAsync(operation, i + 1, errorReasons);
+                responses[i] = await ExecuteApiAsync(operation, i + 1, errorReasons).ConfigureAwait(true);
         }
 
         return responses;

From 8f40d14f6c77e07705041c038312670582305eff Mon Sep 17 00:00:00 2001
From: Rans4ckeR <ransacker@outlook.com>
Date: Fri, 23 Jun 2023 21:57:38 +0200
Subject: [PATCH 13/15] Primary constructor

---
 NuGet.config                                  | 12 +++
 .../RS.Fritz.Manager.API.csproj               |  2 +-
 .../Services/Capture/CaptureControlService.cs | 11 +--
 .../DeviceHosts/DeviceHostsService.cs         | 11 +--
 .../Services/Discovery/DeviceSearchService.cs | 16 +---
 .../Services/MeshHosts/DeviceMeshService.cs   | 11 +--
 .../AvmSpeedtest/FritzAvmSpeedtestService.cs  |  8 +-
 .../DeviceConfig/FritzDeviceConfigService.cs  |  8 +-
 .../DeviceInfo/FritzDeviceInfoService.cs      |  8 +-
 .../Services/Hosts/FritzHostsService.cs       |  8 +-
 .../FritzLanConfigSecurityService.cs          |  8 +-
 .../FritzLanEthernetInterfaceConfigService.cs |  8 +-
 .../FritzLanHostConfigManagementService.cs    |  8 +-
 .../FritzLayer3ForwardingService.cs           |  8 +-
 .../FritzManagementServerService.cs           |  8 +-
 .../TR-064/Services/Time/FritzTimeService.cs  |  8 +-
 .../FritzUserInterfaceService.cs              |  8 +-
 .../FritzWanCommonInterfaceConfigService.cs   |  8 +-
 .../FritzWanDslInterfaceConfigService.cs      |  8 +-
 .../FritzWanDslLinkConfigService.cs           |  8 +-
 .../FritzWanEthernetLinkConfigService.cs      |  8 +-
 .../FritzWanIpConnectionService.cs            |  8 +-
 .../FritzWanPppConnectionService.cs           |  8 +-
 .../FritzWlanConfiguration1Service.cs         |  8 +-
 .../FritzWlanConfiguration2Service.cs         |  8 +-
 .../FritzWlanConfiguration3Service.cs         |  8 +-
 .../FritzWlanConfiguration4Service.cs         |  8 +-
 .../TR-064/SoapClient/ClientFactory.cs        |  9 +-
 .../FritzServiceOperationHandler.cs           | 92 +++++--------------
 .../Services/Users/UsersService.cs            |  9 +-
 .../Services/WebUi/WebUiService.cs            | 11 +--
 .../Services/WlanDevice/WlanDeviceService.cs  | 11 +--
 .../ObservableInternetGatewayDevice.cs        | 10 +-
 .../ActiveViewValueChangedMessage.cs          |  6 +-
 .../UserMessageValueChangedMessage.cs         |  6 +-
 .../RS.Fritz.Manager.UI.csproj                |  2 +-
 .../AvmSpeedtest/AvmSpeedtestViewModel.cs     |  8 +-
 .../DeviceConfigCreateUrlSidViewModel.cs      |  7 +-
 .../DeviceConfigGenerateUuIdViewModel.cs      |  7 +-
 .../DeviceConfig/DeviceConfigViewModel.cs     | 22 ++---
 .../DeviceInfoSetProvisioningCodeViewModel.cs |  8 +-
 .../DeviceInfo/DeviceInfoViewModel.cs         | 11 +--
 .../HostsGetGenericHostEntryViewModel.cs      |  8 +-
 .../Hosts/HostsHostsCheckUpdateViewModel.cs   |  7 +-
 .../UserControls/Hosts/HostsViewModel.cs      | 25 ++---
 ...onfigSecuritySetConfigPasswordViewModel.cs |  8 +-
 .../LanConfigSecurityViewModel.cs             | 11 +--
 .../LanEthernetInterfaceConfigViewModel.cs    |  8 +-
 .../LanHostConfigManagementViewModel.cs       |  8 +-
 ...rdingGetGenericForwardingEntryViewModel.cs |  8 +-
 .../Layer3ForwardingViewModel.cs              | 11 +--
 ...onnectionRequestAuthenticationViewModel.cs |  8 +-
 ...verSetManagementServerPasswordViewModel.cs |  8 +-
 ...ntServerSetManagementServerUrlViewModel.cs |  8 +-
 ...verSetManagementServerUsernameViewModel.cs |  8 +-
 ...agementServerSetPeriodicInformViewModel.cs |  8 +-
 ...ManagementServerSetTr069EnableViewModel.cs |  8 +-
 ...etTr069FirmwareDownloadEnabledViewModel.cs |  8 +-
 ...mentServerSetUpgradeManagementViewModel.cs |  8 +-
 .../ManagementServerViewModel.cs              | 52 ++++-------
 .../Time/TimeSetNtpServersViewModel.cs        |  8 +-
 .../UserControls/Time/TimeViewModel.cs        | 11 +--
 .../UserInterfaceCheckUpdateViewModel.cs      |  7 +-
 .../UserInterfaceDoManualUpdateViewModel.cs   |  8 +-
 .../UserInterfaceDoPrepareCgiViewModel.cs     |  8 +-
 .../UserInterfaceDoUpdateViewModel.cs         |  8 +-
 .../UserInterfaceSetConfigViewModel.cs        |  8 +-
 ...nterfaceSetInternationalConfigViewModel.cs |  8 +-
 .../UserInterface/UserInterfaceViewModel.cs   | 42 ++++-----
 ...nterfaceConfigSetWanAccessTypeViewModel.cs |  8 +-
 .../WanDslLinkConfigViewModel.cs              |  8 +-
 .../WanEthernetLinkConfigViewModel.cs         |  8 +-
 ...tionGetGenericPortMappingEntryViewModel.cs |  8 +-
 .../WanIpConnectionViewModel.cs               | 11 +--
 ...tionGetGenericPortMappingEntryViewModel.cs |  8 +-
 .../WanPppConnectionViewModel.cs              | 11 +--
 .../WlanConfigurationViewModel.cs             | 11 +--
 77 files changed, 228 insertions(+), 613 deletions(-)
 create mode 100644 NuGet.config

diff --git a/NuGet.config b/NuGet.config
new file mode 100644
index 0000000..d5a645d
--- /dev/null
+++ b/NuGet.config
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear/>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+  <packageSourceMapping>
+    <packageSource key="nuget.org">
+      <package pattern="*" />
+    </packageSource>
+  </packageSourceMapping>
+</configuration>
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj b/RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj
index 35e2263..af65a90 100644
--- a/RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj
+++ b/RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj
@@ -39,7 +39,7 @@
     <None Include="..\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/RS.Fritz.Manager.API/Services/Capture/CaptureControlService.cs b/RS.Fritz.Manager.API/Services/Capture/CaptureControlService.cs
index 945ce21..b458bb7 100644
--- a/RS.Fritz.Manager.API/Services/Capture/CaptureControlService.cs
+++ b/RS.Fritz.Manager.API/Services/Capture/CaptureControlService.cs
@@ -2,17 +2,8 @@
 
 using System.Globalization;
 
-internal sealed class CaptureControlService : ICaptureControlService
+internal sealed class CaptureControlService(IHttpClientFactory httpClientFactory, INetworkService networkService) : ICaptureControlService
 {
-    private readonly IHttpClientFactory httpClientFactory;
-    private readonly INetworkService networkService;
-
-    public CaptureControlService(IHttpClientFactory httpClientFactory, INetworkService networkService)
-    {
-        this.httpClientFactory = httpClientFactory;
-        this.networkService = networkService;
-    }
-
     public async ValueTask<IEnumerable<CaptureInterfaceGroup>> GetInterfacesAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
     {
         string sid = await GetSidAsync(internetGatewayDevice).ConfigureAwait(false);
diff --git a/RS.Fritz.Manager.API/Services/DeviceHosts/DeviceHostsService.cs b/RS.Fritz.Manager.API/Services/DeviceHosts/DeviceHostsService.cs
index 27d94ed..9920ab0 100644
--- a/RS.Fritz.Manager.API/Services/DeviceHosts/DeviceHostsService.cs
+++ b/RS.Fritz.Manager.API/Services/DeviceHosts/DeviceHostsService.cs
@@ -3,17 +3,8 @@
 using System.Runtime.Serialization;
 using System.Xml;
 
-internal sealed class DeviceHostsService : IDeviceHostsService
+internal sealed class DeviceHostsService(IHttpClientFactory httpClientFactory, INetworkService networkService) : IDeviceHostsService
 {
-    private readonly IHttpClientFactory httpClientFactory;
-    private readonly INetworkService networkService;
-
-    public DeviceHostsService(IHttpClientFactory httpClientFactory, INetworkService networkService)
-    {
-        this.httpClientFactory = httpClientFactory;
-        this.networkService = networkService;
-    }
-
     public async ValueTask<DeviceHostInfo> GetDeviceHostsAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
     {
         HostsGetHostListPathResponse hostsGetHostListPathResponse = await internetGatewayDevice.HostsGetHostListPathAsync().ConfigureAwait(false);
diff --git a/RS.Fritz.Manager.API/Services/Discovery/DeviceSearchService.cs b/RS.Fritz.Manager.API/Services/Discovery/DeviceSearchService.cs
index b2deb73..f022005 100644
--- a/RS.Fritz.Manager.API/Services/Discovery/DeviceSearchService.cs
+++ b/RS.Fritz.Manager.API/Services/Discovery/DeviceSearchService.cs
@@ -7,26 +7,14 @@
 using System.Text;
 using System.Xml;
 
-internal sealed class DeviceSearchService : IDeviceSearchService
+internal sealed class DeviceSearchService(IHttpClientFactory httpClientFactory, IFritzServiceOperationHandler fritzServiceOperationHandler, IUsersService usersService, INetworkService networkService)
+    : IDeviceSearchService
 {
     private const string InternetGatewayDeviceDeviceType = "urn:dslforum-org:device:InternetGatewayDevice:1";
     private const int UPnPMultiCastPort = 1900;
     private const int ReceiveTimeoutInSeconds = 2;
     private const int DefaultSendCount = 1;
 
-    private readonly IHttpClientFactory httpClientFactory;
-    private readonly IFritzServiceOperationHandler fritzServiceOperationHandler;
-    private readonly IUsersService usersService;
-    private readonly INetworkService networkService;
-
-    public DeviceSearchService(IHttpClientFactory httpClientFactory, IFritzServiceOperationHandler fritzServiceOperationHandler, IUsersService usersService, INetworkService networkService)
-    {
-        this.httpClientFactory = httpClientFactory;
-        this.fritzServiceOperationHandler = fritzServiceOperationHandler;
-        this.usersService = usersService;
-        this.networkService = networkService;
-    }
-
     public async ValueTask<IEnumerable<InternetGatewayDevice>> GetDevicesAsync(string? deviceType = null, int? sendCount = null, int? timeout = null, CancellationToken cancellationToken = default)
     {
         deviceType ??= InternetGatewayDeviceDeviceType;
diff --git a/RS.Fritz.Manager.API/Services/MeshHosts/DeviceMeshService.cs b/RS.Fritz.Manager.API/Services/MeshHosts/DeviceMeshService.cs
index d3ed5e2..6274b46 100644
--- a/RS.Fritz.Manager.API/Services/MeshHosts/DeviceMeshService.cs
+++ b/RS.Fritz.Manager.API/Services/MeshHosts/DeviceMeshService.cs
@@ -2,17 +2,8 @@
 
 using System.Text.Json;
 
-internal sealed class DeviceMeshService : IDeviceMeshService
+internal sealed class DeviceMeshService(IHttpClientFactory httpClientFactory, INetworkService networkService) : IDeviceMeshService
 {
-    private readonly IHttpClientFactory httpClientFactory;
-    private readonly INetworkService networkService;
-
-    public DeviceMeshService(IHttpClientFactory httpClientFactory, INetworkService networkService)
-    {
-        this.httpClientFactory = httpClientFactory;
-        this.networkService = networkService;
-    }
-
     public async ValueTask<DeviceMeshInfo> GetDeviceMeshAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
     {
         HostsGetMeshListPathResponse hostsGetMeshListPathResponse = await internetGatewayDevice.HostsGetMeshListPathAsync().ConfigureAwait(false);
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/FritzAvmSpeedtestService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/FritzAvmSpeedtestService.cs
index b43e761..9b6d8e1 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/FritzAvmSpeedtestService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/FritzAvmSpeedtestService.cs
@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzAvmSpeedtestService : FritzServiceClient<IFritzAvmSpeedtestService>, IFritzAvmSpeedtestService
+internal sealed class FritzAvmSpeedtestService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzAvmSpeedtestService>(endpointConfiguration, remoteAddress, networkCredential), IFritzAvmSpeedtestService
 {
     public const string ControlUrl = "/upnp/control/x_speedtest";
 
-    public FritzAvmSpeedtestService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<AvmSpeedtestGetInfoResponse> GetInfoAsync(AvmSpeedtestGetInfoRequest avmSpeedtestGetInfoRequest)
         => Channel.GetInfoAsync(avmSpeedtestGetInfoRequest);
 
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceConfig/FritzDeviceConfigService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceConfig/FritzDeviceConfigService.cs
index 4b8b376..c91d583 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceConfig/FritzDeviceConfigService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceConfig/FritzDeviceConfigService.cs
@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzDeviceConfigService : FritzServiceClient<IFritzDeviceConfigService>, IFritzDeviceConfigService
+internal sealed class FritzDeviceConfigService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzDeviceConfigService>(endpointConfiguration, remoteAddress, networkCredential), IFritzDeviceConfigService
 {
     public const string ControlUrl = "/upnp/control/deviceconfig";
 
-    public FritzDeviceConfigService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<DeviceConfigGetPersistentDataResponse> GetPersistentDataAsync(DeviceConfigGetPersistentDataRequest deviceConfigGetPersistentDataRequest)
         => Channel.GetPersistentDataAsync(deviceConfigGetPersistentDataRequest);
 
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceInfo/FritzDeviceInfoService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceInfo/FritzDeviceInfoService.cs
index 7bcb7c0..c25c944 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceInfo/FritzDeviceInfoService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceInfo/FritzDeviceInfoService.cs
@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzDeviceInfoService : FritzServiceClient<IFritzDeviceInfoService>, IFritzDeviceInfoService
+internal sealed class FritzDeviceInfoService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential? networkCredential = null)
+    : FritzServiceClient<IFritzDeviceInfoService>(endpointConfiguration, remoteAddress, networkCredential), IFritzDeviceInfoService
 {
     public const string ControlUrl = "/upnp/control/deviceinfo";
 
-    public FritzDeviceInfoService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential? networkCredential = null)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<DeviceInfoGetSecurityPortResponse> GetSecurityPortAsync(DeviceInfoGetSecurityPortRequest deviceInfoGetSecurityPortRequest)
         => Channel.GetSecurityPortAsync(deviceInfoGetSecurityPortRequest);
 
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/FritzHostsService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/FritzHostsService.cs
index 330bcad..30bffc5 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/FritzHostsService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/FritzHostsService.cs
@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzHostsService : FritzServiceClient<IFritzHostsService>, IFritzHostsService
+internal sealed class FritzHostsService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzHostsService>(endpointConfiguration, remoteAddress, networkCredential), IFritzHostsService
 {
     public const string ControlUrl = "/upnp/control/hosts";
 
-    public FritzHostsService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<HostsGetHostNumberOfEntriesResponse> GetHostNumberOfEntriesAsync(HostsGetHostNumberOfEntriesRequest hostsGetHostNumberOfEntriesRequest)
         => Channel.GetHostNumberOfEntriesAsync(hostsGetHostNumberOfEntriesRequest);
 
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/LanConfigSecurity/FritzLanConfigSecurityService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/LanConfigSecurity/FritzLanConfigSecurityService.cs
index 510dd51..02247af 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/LanConfigSecurity/FritzLanConfigSecurityService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/LanConfigSecurity/FritzLanConfigSecurityService.cs
@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzLanConfigSecurityService : FritzServiceClient<IFritzLanConfigSecurityService>, IFritzLanConfigSecurityService
+internal sealed class FritzLanConfigSecurityService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential? networkCredential = null)
+    : FritzServiceClient<IFritzLanConfigSecurityService>(endpointConfiguration, remoteAddress, networkCredential), IFritzLanConfigSecurityService
 {
     public const string ControlUrl = "/upnp/control/lanconfigsecurity";
 
-    public FritzLanConfigSecurityService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential? networkCredential = null)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<LanConfigSecurityGetAnonymousLoginResponse> GetAnonymousLoginAsync(LanConfigSecurityGetAnonymousLoginRequest lanConfigSecurityGetAnonymousLoginRequest)
         => Channel.GetAnonymousLoginAsync(lanConfigSecurityGetAnonymousLoginRequest);
 
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/LanEthernetInterfaceConfig/FritzLanEthernetInterfaceConfigService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/LanEthernetInterfaceConfig/FritzLanEthernetInterfaceConfigService.cs
index 7120653..542a7a6 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/LanEthernetInterfaceConfig/FritzLanEthernetInterfaceConfigService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/LanEthernetInterfaceConfig/FritzLanEthernetInterfaceConfigService.cs
@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzLanEthernetInterfaceConfigService : FritzServiceClient<IFritzLanEthernetInterfaceConfigService>, IFritzLanEthernetInterfaceConfigService
+internal sealed class FritzLanEthernetInterfaceConfigService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzLanEthernetInterfaceConfigService>(endpointConfiguration, remoteAddress, networkCredential), IFritzLanEthernetInterfaceConfigService
 {
     public const string ControlUrl = "/upnp/control/lanethernetifcfg";
 
-    public FritzLanEthernetInterfaceConfigService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<LanEthernetInterfaceConfigGetInfoResponse> GetInfoAsync(LanEthernetInterfaceConfigGetInfoRequest lanEthernetInterfaceConfigGetInfoRequest)
         => Channel.GetInfoAsync(lanEthernetInterfaceConfigGetInfoRequest);
 
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/LanHostConfigManagement/FritzLanHostConfigManagementService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/LanHostConfigManagement/FritzLanHostConfigManagementService.cs
index f383744..033599f 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/LanHostConfigManagement/FritzLanHostConfigManagementService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/LanHostConfigManagement/FritzLanHostConfigManagementService.cs
@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzLanHostConfigManagementService : FritzServiceClient<IFritzLanHostConfigManagementService>, IFritzLanHostConfigManagementService
+internal sealed class FritzLanHostConfigManagementService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzLanHostConfigManagementService>(endpointConfiguration, remoteAddress, networkCredential), IFritzLanHostConfigManagementService
 {
     public const string ControlUrl = "/upnp/control/lanhostconfigmgm";
 
-    public FritzLanHostConfigManagementService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<LanHostConfigManagementGetInfoResponse> GetInfoAsync(LanHostConfigManagementGetInfoRequest lanHostConfigManagementGetInfoRequest)
         => Channel.GetInfoAsync(lanHostConfigManagementGetInfoRequest);
 
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/Layer3Forwarding/FritzLayer3ForwardingService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/Layer3Forwarding/FritzLayer3ForwardingService.cs
index 713861d..fd6f1c0 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/Layer3Forwarding/FritzLayer3ForwardingService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/Layer3Forwarding/FritzLayer3ForwardingService.cs
@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzLayer3ForwardingService : FritzServiceClient<IFritzLayer3ForwardingService>, IFritzLayer3ForwardingService
+internal sealed class FritzLayer3ForwardingService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzLayer3ForwardingService>(endpointConfiguration, remoteAddress, networkCredential), IFritzLayer3ForwardingService
 {
     public const string ControlUrl = "/upnp/control/layer3forwarding";
 
-    public FritzLayer3ForwardingService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<Layer3ForwardingGetDefaultConnectionServiceResponse> GetDefaultConnectionServiceAsync(Layer3ForwardingGetDefaultConnectionServiceRequest layer3ForwardingGetDefaultConnectionServiceRequest)
         => Channel.GetDefaultConnectionServiceAsync(layer3ForwardingGetDefaultConnectionServiceRequest);
 
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/ManagementServer/FritzManagementServerService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/ManagementServer/FritzManagementServerService.cs
index 5d3370f..a8a5c65 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/ManagementServer/FritzManagementServerService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/ManagementServer/FritzManagementServerService.cs
@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzManagementServerService : FritzServiceClient<IFritzManagementServerService>, IFritzManagementServerService
+internal sealed class FritzManagementServerService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzManagementServerService>(endpointConfiguration, remoteAddress, networkCredential), IFritzManagementServerService
 {
     public const string ControlUrl = "/upnp/control/mgmsrv";
 
-    public FritzManagementServerService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<ManagementServerGetInfoResponse> GetInfoAsync(ManagementServerGetInfoRequest managementServerGetInfoRequest)
         => Channel.GetInfoAsync(managementServerGetInfoRequest);
 
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/Time/FritzTimeService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/Time/FritzTimeService.cs
index 85888d2..56292e3 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/Time/FritzTimeService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/Time/FritzTimeService.cs
@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzTimeService : FritzServiceClient<IFritzTimeService>, IFritzTimeService
+internal sealed class FritzTimeService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzTimeService>(endpointConfiguration, remoteAddress, networkCredential), IFritzTimeService
 {
     public const string ControlUrl = "/upnp/control/time";
 
-    public FritzTimeService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<TimeGetInfoResponse> GetInfoAsync(TimeGetInfoRequest timeGetInfoRequest)
         => Channel.GetInfoAsync(timeGetInfoRequest);
 
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/UserInterface/FritzUserInterfaceService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/UserInterface/FritzUserInterfaceService.cs
index 24fda7a..17a2660 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/UserInterface/FritzUserInterfaceService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/UserInterface/FritzUserInterfaceService.cs
@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzUserInterfaceService : FritzServiceClient<IFritzUserInterfaceService>, IFritzUserInterfaceService
+internal sealed class FritzUserInterfaceService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzUserInterfaceService>(endpointConfiguration, remoteAddress, networkCredential), IFritzUserInterfaceService
 {
     public const string ControlUrl = "/upnp/control/userif";
 
-    public FritzUserInterfaceService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<UserInterfaceGetInfoResponse> GetInfoAsync(UserInterfaceGetInfoRequest userInterfaceGetInfoRequest)
         => Channel.GetInfoAsync(userInterfaceGetInfoRequest);
 
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WanCommonInterfaceConfig/FritzWanCommonInterfaceConfigService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WanCommonInterfaceConfig/FritzWanCommonInterfaceConfigService.cs
index 3597ada..ee32511 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WanCommonInterfaceConfig/FritzWanCommonInterfaceConfigService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WanCommonInterfaceConfig/FritzWanCommonInterfaceConfigService.cs
@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzWanCommonInterfaceConfigService : FritzServiceClient<IFritzWanCommonInterfaceConfigService>, IFritzWanCommonInterfaceConfigService
+internal sealed class FritzWanCommonInterfaceConfigService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzWanCommonInterfaceConfigService>(endpointConfiguration, remoteAddress, networkCredential), IFritzWanCommonInterfaceConfigService
 {
     public const string ControlUrl = "/upnp/control/wancommonifconfig1";
 
-    public FritzWanCommonInterfaceConfigService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<WanCommonInterfaceConfigGetCommonLinkPropertiesResponse> GetCommonLinkPropertiesAsync(WanCommonInterfaceConfigGetCommonLinkPropertiesRequest wanCommonInterfaceConfigGetCommonLinkPropertiesRequest)
         => Channel.GetCommonLinkPropertiesAsync(wanCommonInterfaceConfigGetCommonLinkPropertiesRequest);
 
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslInterfaceConfig/FritzWanDslInterfaceConfigService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslInterfaceConfig/FritzWanDslInterfaceConfigService.cs
index ed432e9..5f19585 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslInterfaceConfig/FritzWanDslInterfaceConfigService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslInterfaceConfig/FritzWanDslInterfaceConfigService.cs
@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzWanDslInterfaceConfigService : FritzServiceClient<IFritzWanDslInterfaceConfigService>, IFritzWanDslInterfaceConfigService
+internal sealed class FritzWanDslInterfaceConfigService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzWanDslInterfaceConfigService>(endpointConfiguration, remoteAddress, networkCredential), IFritzWanDslInterfaceConfigService
 {
     public const string ControlUrl = "/upnp/control/wandslifconfig1";
 
-    public FritzWanDslInterfaceConfigService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<WanDslInterfaceConfigGetDslDiagnoseInfoResponse> GetDslDiagnoseInfoAsync(WanDslInterfaceConfigGetDslDiagnoseInfoRequest wanDslInterfaceConfigGetDslDiagnoseInfoRequest)
         => Channel.GetDslDiagnoseInfoAsync(wanDslInterfaceConfigGetDslDiagnoseInfoRequest);
 
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslLinkConfig/FritzWanDslLinkConfigService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslLinkConfig/FritzWanDslLinkConfigService.cs
index 8fa392a..9f8c812 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslLinkConfig/FritzWanDslLinkConfigService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslLinkConfig/FritzWanDslLinkConfigService.cs
@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzWanDslLinkConfigService : FritzServiceClient<IFritzWanDslLinkConfigService>, IFritzWanDslLinkConfigService
+internal sealed class FritzWanDslLinkConfigService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzWanDslLinkConfigService>(endpointConfiguration, remoteAddress, networkCredential), IFritzWanDslLinkConfigService
 {
     public const string ControlUrl = "/upnp/control/wandsllinkconfig1";
 
-    public FritzWanDslLinkConfigService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<WanDslLinkConfigGetInfoResponse> GetInfoAsync(WanDslLinkConfigGetInfoRequest wanDslLinkConfigGetInfoRequest)
         => Channel.GetInfoAsync(wanDslLinkConfigGetInfoRequest);
 
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WanEthernetLinkConfig/FritzWanEthernetLinkConfigService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WanEthernetLinkConfig/FritzWanEthernetLinkConfigService.cs
index af8350c..1131385 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WanEthernetLinkConfig/FritzWanEthernetLinkConfigService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WanEthernetLinkConfig/FritzWanEthernetLinkConfigService.cs
@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzWanEthernetLinkConfigService : FritzServiceClient<IFritzWanEthernetLinkConfigService>, IFritzWanEthernetLinkConfigService
+internal sealed class FritzWanEthernetLinkConfigService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzWanEthernetLinkConfigService>(endpointConfiguration, remoteAddress, networkCredential), IFritzWanEthernetLinkConfigService
 {
     public const string ControlUrl = "/upnp/control/wanethlinkconfig1";
 
-    public FritzWanEthernetLinkConfigService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<WanEthernetLinkConfigGetEthernetLinkStatusResponse> GetEthernetLinkStatusAsync(WanEthernetLinkConfigGetEthernetLinkStatusRequest wanEthernetLinkConfigGetEthernetLinkStatusRequest)
         => Channel.GetEthernetLinkStatusAsync(wanEthernetLinkConfigGetEthernetLinkStatusRequest);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WanIpConnection/FritzWanIpConnectionService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WanIpConnection/FritzWanIpConnectionService.cs
index ce9589b..cdfff1a 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WanIpConnection/FritzWanIpConnectionService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WanIpConnection/FritzWanIpConnectionService.cs
@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzWanIpConnectionService : FritzServiceClient<IFritzWanIpConnectionService>, IFritzWanIpConnectionService
+internal sealed class FritzWanIpConnectionService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzWanIpConnectionService>(endpointConfiguration, remoteAddress, networkCredential), IFritzWanIpConnectionService
 {
     public const string ControlUrl = "/upnp/control/wanipconnection1";
 
-    public FritzWanIpConnectionService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<WanIpConnectionGetInfoResponse> GetInfoAsync(WanConnectionGetInfoRequest wanConnectionGetInfoRequest)
         => Channel.GetInfoAsync(wanConnectionGetInfoRequest);
 
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WanPppConnection/FritzWanPppConnectionService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WanPppConnection/FritzWanPppConnectionService.cs
index 55d0365..9d3fbc1 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WanPppConnection/FritzWanPppConnectionService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WanPppConnection/FritzWanPppConnectionService.cs
@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzWanPppConnectionService : FritzServiceClient<IFritzWanPppConnectionService>, IFritzWanPppConnectionService
+internal sealed class FritzWanPppConnectionService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzWanPppConnectionService>(endpointConfiguration, remoteAddress, networkCredential), IFritzWanPppConnectionService
 {
     public const string ControlUrl = "/upnp/control/wanpppconn1";
 
-    public FritzWanPppConnectionService(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<WanPppConnectionGetInfoResponse> GetInfoAsync(WanConnectionGetInfoRequest wanConnectionGetInfoRequest)
         => Channel.GetInfoAsync(wanConnectionGetInfoRequest);
 
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration1Service.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration1Service.cs
index c02dc64..0064a64 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration1Service.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration1Service.cs
@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzWlanConfiguration1Service : FritzServiceClient<IFritzWlanConfiguration1Service>, IFritzWlanConfiguration1Service
+internal sealed class FritzWlanConfiguration1Service(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzWlanConfiguration1Service>(endpointConfiguration, remoteAddress, networkCredential), IFritzWlanConfiguration1Service
 {
     public const string ControlUrl = "/upnp/control/wlanconfig1";
 
-    public FritzWlanConfiguration1Service(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<WlanConfigurationGetInfoResponse> GetInfoAsync(WlanConfigurationGetInfoRequest wlanConfigurationGetInfoRequest)
         => Channel.GetInfoAsync(wlanConfigurationGetInfoRequest);
 
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration2Service.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration2Service.cs
index 9a2164a..23763f3 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration2Service.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration2Service.cs
@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzWlanConfiguration2Service : FritzServiceClient<IFritzWlanConfiguration2Service>, IFritzWlanConfiguration2Service
+internal sealed class FritzWlanConfiguration2Service(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzWlanConfiguration2Service>(endpointConfiguration, remoteAddress, networkCredential), IFritzWlanConfiguration2Service
 {
     public const string ControlUrl = "/upnp/control/wlanconfig2";
 
-    public FritzWlanConfiguration2Service(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<WlanConfigurationGetInfoResponse> GetInfoAsync(WlanConfigurationGetInfoRequest wlanConfigurationGetInfoRequest)
         => Channel.GetInfoAsync(wlanConfigurationGetInfoRequest);
 
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration3Service.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration3Service.cs
index 3886fb9..1bc6473 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration3Service.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration3Service.cs
@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzWlanConfiguration3Service : FritzServiceClient<IFritzWlanConfiguration3Service>, IFritzWlanConfiguration3Service
+internal sealed class FritzWlanConfiguration3Service(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzWlanConfiguration3Service>(endpointConfiguration, remoteAddress, networkCredential), IFritzWlanConfiguration3Service
 {
     public const string ControlUrl = "/upnp/control/wlanconfig3";
 
-    public FritzWlanConfiguration3Service(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<WlanConfigurationGetInfoResponse> GetInfoAsync(WlanConfigurationGetInfoRequest wlanConfigurationGetInfoRequest)
         => Channel.GetInfoAsync(wlanConfigurationGetInfoRequest);
 
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration4Service.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration4Service.cs
index 5542a6b..ac67591 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration4Service.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/FritzWlanConfiguration4Service.cs
@@ -2,15 +2,11 @@
 
 using System.Net;
 
-internal sealed class FritzWlanConfiguration4Service : FritzServiceClient<IFritzWlanConfiguration4Service>, IFritzWlanConfiguration4Service
+internal sealed class FritzWlanConfiguration4Service(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
+    : FritzServiceClient<IFritzWlanConfiguration4Service>(endpointConfiguration, remoteAddress, networkCredential), IFritzWlanConfiguration4Service
 {
     public const string ControlUrl = "/upnp/control/wlanconfig4";
 
-    public FritzWlanConfiguration4Service(FritzServiceEndpointConfiguration endpointConfiguration, EndpointAddress remoteAddress, NetworkCredential networkCredential)
-        : base(endpointConfiguration, remoteAddress, networkCredential)
-    {
-    }
-
     public Task<WlanConfigurationGetInfoResponse> GetInfoAsync(WlanConfigurationGetInfoRequest wlanConfigurationGetInfoRequest)
         => Channel.GetInfoAsync(wlanConfigurationGetInfoRequest);
 
diff --git a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/ClientFactory.cs b/RS.Fritz.Manager.API/Services/TR-064/SoapClient/ClientFactory.cs
index 55fec83..118abb3 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/ClientFactory.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/SoapClient/ClientFactory.cs
@@ -2,16 +2,9 @@
 
 using System.Net;
 
-internal sealed class ClientFactory<T> : IClientFactory<T>
+internal sealed class ClientFactory<T>(INetworkService networkService) : IClientFactory<T>
     where T : class
 {
-    private readonly INetworkService networkService;
-
-    public ClientFactory(INetworkService networkService)
-    {
-        this.networkService = networkService;
-    }
-
     public T Build(Func<FritzServiceEndpointConfiguration, EndpointAddress, NetworkCredential?, T> createClient, Uri location, bool secure, string controlUrl, ushort? port, NetworkCredential? networkCredential)
         => createClient(GetEndpointConfiguration(secure), GetEndpointAddress(location, secure, controlUrl, port), networkCredential);
 
diff --git a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs b/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs
index 00f79ea..42fad02 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs
@@ -2,76 +2,30 @@
 
 using System.Net;
 
-internal sealed class FritzServiceOperationHandler : ServiceOperationHandler, IFritzServiceOperationHandler
+internal sealed class FritzServiceOperationHandler(
+    IClientFactory<IFritzHostsService> fritzHostsServiceClientFactory,
+    IClientFactory<IFritzWanCommonInterfaceConfigService> fritzWanCommonInterfaceConfigServiceClientFactory,
+    IClientFactory<IFritzDeviceInfoService> fritzDeviceInfoServiceClientFactory,
+    IClientFactory<IFritzLanConfigSecurityService> fritzLanConfigSecurityServiceClientFactory,
+    IClientFactory<IFritzLayer3ForwardingService> fritzLayer3ForwardingServiceClientFactory,
+    IClientFactory<IFritzWanDslInterfaceConfigService> fritzWanDslInterfaceConfigServiceClientFactory,
+    IClientFactory<IFritzWanPppConnectionService> fritzWanPppConnectionServiceClientFactory,
+    IClientFactory<IFritzWanIpConnectionService> fritzWanIpConnectionServiceClientFactory,
+    IClientFactory<IFritzWanEthernetLinkConfigService> fritzWanEthernetLinkConfigServiceClientFactory,
+    IClientFactory<IFritzWanDslLinkConfigService> fritzWanDslLinkConfigServiceClientFactory,
+    IClientFactory<IFritzAvmSpeedtestService> fritzAvmSpeedtestServiceClientFactory,
+    IClientFactory<IFritzLanEthernetInterfaceConfigService> fritzLanEthernetInterfaceConfigServiceClientFactory,
+    IClientFactory<IFritzLanHostConfigManagementService> fritzLanHostConfigManagementServiceClientFactory,
+    IClientFactory<IFritzWlanConfiguration1Service> fritzWlanConfiguration1ServiceClientFactory,
+    IClientFactory<IFritzWlanConfiguration2Service> fritzWlanConfiguration2ServiceClientFactory,
+    IClientFactory<IFritzWlanConfiguration3Service> fritzWlanConfiguration3ServiceClientFactory,
+    IClientFactory<IFritzWlanConfiguration4Service> fritzWlanConfiguration4ServiceClientFactory,
+    IClientFactory<IFritzManagementServerService> fritzManagementServerServiceClientFactory,
+    IClientFactory<IFritzTimeService> fritzTimeServiceClientFactory,
+    IClientFactory<IFritzUserInterfaceService> fritzUserInterfaceServiceClientFactory,
+    IClientFactory<IFritzDeviceConfigService> fritzDeviceConfigServiceClientFactory)
+    : ServiceOperationHandler, IFritzServiceOperationHandler
 {
-    private readonly IClientFactory<IFritzHostsService> fritzHostsServiceClientFactory;
-    private readonly IClientFactory<IFritzWanCommonInterfaceConfigService> fritzWanCommonInterfaceConfigServiceClientFactory;
-    private readonly IClientFactory<IFritzDeviceInfoService> fritzDeviceInfoServiceClientFactory;
-    private readonly IClientFactory<IFritzLanConfigSecurityService> fritzLanConfigSecurityServiceClientFactory;
-    private readonly IClientFactory<IFritzLayer3ForwardingService> fritzLayer3ForwardingServiceClientFactory;
-    private readonly IClientFactory<IFritzWanDslInterfaceConfigService> fritzWanDslInterfaceConfigServiceClientFactory;
-    private readonly IClientFactory<IFritzWanPppConnectionService> fritzWanPppConnectionServiceClientFactory;
-    private readonly IClientFactory<IFritzWanIpConnectionService> fritzWanIpConnectionServiceClientFactory;
-    private readonly IClientFactory<IFritzWanEthernetLinkConfigService> fritzWanEthernetLinkConfigServiceClientFactory;
-    private readonly IClientFactory<IFritzWanDslLinkConfigService> fritzWanDslLinkConfigServiceClientFactory;
-    private readonly IClientFactory<IFritzAvmSpeedtestService> fritzAvmSpeedtestServiceClientFactory;
-    private readonly IClientFactory<IFritzLanEthernetInterfaceConfigService> fritzLanEthernetInterfaceConfigServiceClientFactory;
-    private readonly IClientFactory<IFritzLanHostConfigManagementService> fritzLanHostConfigManagementServiceClientFactory;
-    private readonly IClientFactory<IFritzWlanConfiguration1Service> fritzWlanConfiguration1ServiceClientFactory;
-    private readonly IClientFactory<IFritzWlanConfiguration2Service> fritzWlanConfiguration2ServiceClientFactory;
-    private readonly IClientFactory<IFritzWlanConfiguration3Service> fritzWlanConfiguration3ServiceClientFactory;
-    private readonly IClientFactory<IFritzWlanConfiguration4Service> fritzWlanConfiguration4ServiceClientFactory;
-    private readonly IClientFactory<IFritzManagementServerService> fritzManagementServerServiceClientFactory;
-    private readonly IClientFactory<IFritzTimeService> fritzTimeServiceClientFactory;
-    private readonly IClientFactory<IFritzUserInterfaceService> fritzUserInterfaceServiceClientFactory;
-    private readonly IClientFactory<IFritzDeviceConfigService> fritzDeviceConfigServiceClientFactory;
-
-    public FritzServiceOperationHandler(
-        IClientFactory<IFritzHostsService> fritzHostsServiceClientFactory,
-        IClientFactory<IFritzWanCommonInterfaceConfigService> fritzWanCommonInterfaceConfigServiceClientFactory,
-        IClientFactory<IFritzDeviceInfoService> fritzDeviceInfoServiceClientFactory,
-        IClientFactory<IFritzLanConfigSecurityService> fritzLanConfigSecurityServiceClientFactory,
-        IClientFactory<IFritzLayer3ForwardingService> fritzLayer3ForwardingServiceClientFactory,
-        IClientFactory<IFritzWanDslInterfaceConfigService> fritzWanDslInterfaceConfigServiceClientFactory,
-        IClientFactory<IFritzWanPppConnectionService> fritzWanPppConnectionServiceClientFactory,
-        IClientFactory<IFritzWanIpConnectionService> fritzWanIpConnectionServiceClientFactory,
-        IClientFactory<IFritzWanEthernetLinkConfigService> fritzWanEthernetLinkConfigServiceClientFactory,
-        IClientFactory<IFritzWanDslLinkConfigService> fritzWanDslLinkConfigServiceClientFactory,
-        IClientFactory<IFritzAvmSpeedtestService> fritzAvmSpeedtestServiceClientFactory,
-        IClientFactory<IFritzLanEthernetInterfaceConfigService> fritzLanEthernetInterfaceConfigServiceClientFactory,
-        IClientFactory<IFritzLanHostConfigManagementService> fritzLanHostConfigManagementServiceClientFactory,
-        IClientFactory<IFritzWlanConfiguration1Service> fritzWlanConfiguration1ServiceClientFactory,
-        IClientFactory<IFritzWlanConfiguration2Service> fritzWlanConfiguration2ServiceClientFactory,
-        IClientFactory<IFritzWlanConfiguration3Service> fritzWlanConfiguration3ServiceClientFactory,
-        IClientFactory<IFritzWlanConfiguration4Service> fritzWlanConfiguration4ServiceClientFactory,
-        IClientFactory<IFritzManagementServerService> fritzManagementServerServiceClientFactory,
-        IClientFactory<IFritzTimeService> fritzTimeServiceClientFactory,
-        IClientFactory<IFritzUserInterfaceService> fritzUserInterfaceServiceClientFactory,
-        IClientFactory<IFritzDeviceConfigService> fritzDeviceConfigServiceClientFactory)
-    {
-        this.fritzHostsServiceClientFactory = fritzHostsServiceClientFactory;
-        this.fritzWanCommonInterfaceConfigServiceClientFactory = fritzWanCommonInterfaceConfigServiceClientFactory;
-        this.fritzDeviceInfoServiceClientFactory = fritzDeviceInfoServiceClientFactory;
-        this.fritzLanConfigSecurityServiceClientFactory = fritzLanConfigSecurityServiceClientFactory;
-        this.fritzLayer3ForwardingServiceClientFactory = fritzLayer3ForwardingServiceClientFactory;
-        this.fritzWanDslInterfaceConfigServiceClientFactory = fritzWanDslInterfaceConfigServiceClientFactory;
-        this.fritzWanPppConnectionServiceClientFactory = fritzWanPppConnectionServiceClientFactory;
-        this.fritzWanIpConnectionServiceClientFactory = fritzWanIpConnectionServiceClientFactory;
-        this.fritzWanEthernetLinkConfigServiceClientFactory = fritzWanEthernetLinkConfigServiceClientFactory;
-        this.fritzWanDslLinkConfigServiceClientFactory = fritzWanDslLinkConfigServiceClientFactory;
-        this.fritzAvmSpeedtestServiceClientFactory = fritzAvmSpeedtestServiceClientFactory;
-        this.fritzLanEthernetInterfaceConfigServiceClientFactory = fritzLanEthernetInterfaceConfigServiceClientFactory;
-        this.fritzLanHostConfigManagementServiceClientFactory = fritzLanHostConfigManagementServiceClientFactory;
-        this.fritzWlanConfiguration1ServiceClientFactory = fritzWlanConfiguration1ServiceClientFactory;
-        this.fritzWlanConfiguration2ServiceClientFactory = fritzWlanConfiguration2ServiceClientFactory;
-        this.fritzWlanConfiguration3ServiceClientFactory = fritzWlanConfiguration3ServiceClientFactory;
-        this.fritzWlanConfiguration4ServiceClientFactory = fritzWlanConfiguration4ServiceClientFactory;
-        this.fritzManagementServerServiceClientFactory = fritzManagementServerServiceClientFactory;
-        this.fritzTimeServiceClientFactory = fritzTimeServiceClientFactory;
-        this.fritzUserInterfaceServiceClientFactory = fritzUserInterfaceServiceClientFactory;
-        this.fritzDeviceConfigServiceClientFactory = fritzDeviceConfigServiceClientFactory;
-    }
-
     public Task<HostsGetHostNumberOfEntriesResponse> HostsGetHostNumberOfEntriesAsync(InternetGatewayDevice internetGatewayDevice)
         => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.GetHostNumberOfEntriesAsync(default));
 
diff --git a/RS.Fritz.Manager.API/Services/Users/UsersService.cs b/RS.Fritz.Manager.API/Services/Users/UsersService.cs
index 93590c0..fd77691 100644
--- a/RS.Fritz.Manager.API/Services/Users/UsersService.cs
+++ b/RS.Fritz.Manager.API/Services/Users/UsersService.cs
@@ -3,15 +3,8 @@
 using System.Xml;
 using System.Xml.Serialization;
 
-internal sealed class UsersService : IUsersService
+internal sealed class UsersService(IFritzServiceOperationHandler fritzServiceOperationHandler) : IUsersService
 {
-    private readonly IFritzServiceOperationHandler fritzServiceOperationHandler;
-
-    public UsersService(IFritzServiceOperationHandler fritzServiceOperationHandler)
-    {
-        this.fritzServiceOperationHandler = fritzServiceOperationHandler;
-    }
-
     public async ValueTask<IEnumerable<User>> GetUsersAsync(InternetGatewayDevice internetGatewayDevice)
     {
         LanConfigSecurityGetUserListResponse lanConfigSecurityGetUserListResponse = await fritzServiceOperationHandler.LanConfigSecurityGetUserListAsync(internetGatewayDevice).ConfigureAwait(false);
diff --git a/RS.Fritz.Manager.API/Services/WebUi/WebUiService.cs b/RS.Fritz.Manager.API/Services/WebUi/WebUiService.cs
index 7c50a88..457874e 100644
--- a/RS.Fritz.Manager.API/Services/WebUi/WebUiService.cs
+++ b/RS.Fritz.Manager.API/Services/WebUi/WebUiService.cs
@@ -6,19 +6,10 @@
 using System.Xml;
 using System.Xml.Serialization;
 
-internal sealed class WebUiService : IWebUiService
+internal sealed class WebUiService(IHttpClientFactory httpClientFactory, INetworkService networkService) : IWebUiService
 {
     private const string LoginPath = "//login_sid.lua?version=2";
 
-    private readonly IHttpClientFactory httpClientFactory;
-    private readonly INetworkService networkService;
-
-    public WebUiService(IHttpClientFactory httpClientFactory, INetworkService networkService)
-    {
-        this.httpClientFactory = httpClientFactory;
-        this.networkService = networkService;
-    }
-
     public async ValueTask<WebUiSessionInfo> GetUsersAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
     {
         Uri loginUri = GetLoginUri(internetGatewayDevice);
diff --git a/RS.Fritz.Manager.API/Services/WlanDevice/WlanDeviceService.cs b/RS.Fritz.Manager.API/Services/WlanDevice/WlanDeviceService.cs
index de48842..c7540aa 100644
--- a/RS.Fritz.Manager.API/Services/WlanDevice/WlanDeviceService.cs
+++ b/RS.Fritz.Manager.API/Services/WlanDevice/WlanDeviceService.cs
@@ -3,17 +3,8 @@
 using System.Xml;
 using System.Xml.Serialization;
 
-internal sealed class WlanDeviceService : IWlanDeviceService
+internal sealed class WlanDeviceService(IHttpClientFactory httpClientFactory, INetworkService networkService) : IWlanDeviceService
 {
-    private readonly IHttpClientFactory httpClientFactory;
-    private readonly INetworkService networkService;
-
-    public WlanDeviceService(IHttpClientFactory httpClientFactory, INetworkService networkService)
-    {
-        this.httpClientFactory = httpClientFactory;
-        this.networkService = networkService;
-    }
-
     public async ValueTask<WlanDeviceInfo> GetWlanDevicesAsync(InternetGatewayDevice internetGatewayDevice, CancellationToken cancellationToken = default)
     {
         WlanConfigurationGetWlanDeviceListPathResponse wlanConfigurationGetWlanDeviceListPathResponse = await internetGatewayDevice.WlanConfigurationGetWlanDeviceListPathAsync(1).ConfigureAwait(false);
diff --git a/RS.Fritz.Manager.UI/Entities/ObservableInternetGatewayDevice.cs b/RS.Fritz.Manager.UI/Entities/ObservableInternetGatewayDevice.cs
index c117dc7..4ca3174 100644
--- a/RS.Fritz.Manager.UI/Entities/ObservableInternetGatewayDevice.cs
+++ b/RS.Fritz.Manager.UI/Entities/ObservableInternetGatewayDevice.cs
@@ -4,19 +4,13 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
 
-internal sealed class ObservableInternetGatewayDevice : ObservableRecipient
+internal sealed class ObservableInternetGatewayDevice(InternetGatewayDevice internetGatewayDevice) : ObservableRecipient(StrongReferenceMessenger.Default)
 {
     private IEnumerable<User> users = Enumerable.Empty<User>();
     private WanAccessType? wanAccessType;
     private bool authenticated;
 
-    public ObservableInternetGatewayDevice(InternetGatewayDevice internetGatewayDevice)
-        : base(StrongReferenceMessenger.Default)
-    {
-        ApiDevice = internetGatewayDevice;
-    }
-
-    public InternetGatewayDevice ApiDevice { get; }
+    public InternetGatewayDevice ApiDevice { get; } = internetGatewayDevice;
 
     public IEnumerable<User> Users
     {
diff --git a/RS.Fritz.Manager.UI/Messaging/ActiveViewValueChangedMessage.cs b/RS.Fritz.Manager.UI/Messaging/ActiveViewValueChangedMessage.cs
index fda0f8f..4f9af45 100644
--- a/RS.Fritz.Manager.UI/Messaging/ActiveViewValueChangedMessage.cs
+++ b/RS.Fritz.Manager.UI/Messaging/ActiveViewValueChangedMessage.cs
@@ -3,10 +3,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging.Messages;
 
-internal sealed class ActiveViewValueChangedMessage : ValueChangedMessage<ObservableObject>
+internal sealed class ActiveViewValueChangedMessage(ObservableObject activeView) : ValueChangedMessage<ObservableObject>(activeView)
 {
-    public ActiveViewValueChangedMessage(ObservableObject activeView)
-        : base(activeView)
-    {
-    }
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/Messaging/UserMessageValueChangedMessage.cs b/RS.Fritz.Manager.UI/Messaging/UserMessageValueChangedMessage.cs
index cd80591..3c1c1a3 100644
--- a/RS.Fritz.Manager.UI/Messaging/UserMessageValueChangedMessage.cs
+++ b/RS.Fritz.Manager.UI/Messaging/UserMessageValueChangedMessage.cs
@@ -2,10 +2,6 @@
 
 using CommunityToolkit.Mvvm.Messaging.Messages;
 
-internal sealed class UserMessageValueChangedMessage : ValueChangedMessage<UserMessage>
+internal sealed class UserMessageValueChangedMessage(UserMessage userMessage) : ValueChangedMessage<UserMessage>(userMessage)
 {
-    public UserMessageValueChangedMessage(UserMessage userMessage)
-        : base(userMessage)
-    {
-    }
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj b/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj
index e1f7028..a2ac54e 100644
--- a/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj
+++ b/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj
@@ -41,7 +41,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.435">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestViewModel.cs b/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestViewModel.cs
index ce23216..916faa2 100644
--- a/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/AvmSpeedtest/AvmSpeedtestViewModel.cs
@@ -1,15 +1,11 @@
 namespace RS.Fritz.Manager.UI;
 
-internal sealed class AvmSpeedtestViewModel : FritzServiceViewModel
+internal sealed class AvmSpeedtestViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : FritzServiceViewModel(deviceLoginInfo, logger, "X_AVM-DE_Speedtest")
 {
     private KeyValuePair<AvmSpeedtestGetInfoResponse?, UPnPFault?>? avmSpeedtestGetInfoResponse;
     private KeyValuePair<AvmSpeedtestGetStatisticsResponse?, UPnPFault?>? avmSpeedtestGetStatisticsResponse;
 
-    public AvmSpeedtestViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "X_AVM-DE_Speedtest")
-    {
-    }
-
     public KeyValuePair<AvmSpeedtestGetInfoResponse?, UPnPFault?>? AvmSpeedtestGetInfoResponse
     {
         get => avmSpeedtestGetInfoResponse;
diff --git a/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigCreateUrlSidViewModel.cs b/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigCreateUrlSidViewModel.cs
index 058bec2..ff55228 100644
--- a/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigCreateUrlSidViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigCreateUrlSidViewModel.cs
@@ -1,9 +1,6 @@
 namespace RS.Fritz.Manager.UI;
 
-internal sealed class DeviceConfigCreateUrlSidViewModel : ManualOperationViewModel<DeviceConfigCreateUrlSidRequest, DeviceConfigCreateUrlSidResponse>
+internal sealed class DeviceConfigCreateUrlSidViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : ManualOperationViewModel<DeviceConfigCreateUrlSidRequest, DeviceConfigCreateUrlSidResponse>(deviceLoginInfo, logger, "CreateUrlSid", "Create Url Sid", (d, _) => d.DeviceConfigCreateUrlSidAsync())
 {
-    public DeviceConfigCreateUrlSidViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "CreateUrlSid", "Create Url Sid", (d, _) => d.DeviceConfigCreateUrlSidAsync())
-    {
-    }
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigGenerateUuIdViewModel.cs b/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigGenerateUuIdViewModel.cs
index 9624c0a..585d935 100644
--- a/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigGenerateUuIdViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigGenerateUuIdViewModel.cs
@@ -1,9 +1,6 @@
 namespace RS.Fritz.Manager.UI;
 
-internal sealed class DeviceConfigGenerateUuIdViewModel : ManualOperationViewModel<DeviceConfigGenerateUuIdRequest, DeviceConfigGenerateUuIdResponse>
+internal sealed class DeviceConfigGenerateUuIdViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : ManualOperationViewModel<DeviceConfigGenerateUuIdRequest, DeviceConfigGenerateUuIdResponse>(deviceLoginInfo, logger, "GenerateUuId", "Generate UuId", (d, _) => d.DeviceConfigGenerateUuIdAsync())
 {
-    public DeviceConfigGenerateUuIdViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "GenerateUuId", "Generate UuId", (d, _) => d.DeviceConfigGenerateUuIdAsync())
-    {
-    }
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigViewModel.cs
index 18d310a..f249758 100644
--- a/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/DeviceConfig/DeviceConfigViewModel.cs
@@ -1,21 +1,15 @@
 namespace RS.Fritz.Manager.UI;
 
-internal sealed class DeviceConfigViewModel : FritzServiceViewModel
+internal sealed class DeviceConfigViewModel(
+    DeviceLoginInfo deviceLoginInfo,
+    ILogger logger,
+    DeviceConfigGenerateUuIdViewModel deviceConfigGenerateUuIdViewModel,
+    DeviceConfigCreateUrlSidViewModel deviceConfigCreateUrlSidViewModel)
+    : FritzServiceViewModel(deviceLoginInfo, logger, "DeviceConfig")
 {
     private KeyValuePair<DeviceConfigGetPersistentDataResponse?, UPnPFault?>? deviceConfigGetPersistentDataResponse;
     private KeyValuePair<DeviceConfigGetSupportDataInfoResponse?, UPnPFault?>? deviceConfigGetSupportDataInfoResponse;
 
-    public DeviceConfigViewModel(
-        DeviceLoginInfo deviceLoginInfo,
-        ILogger logger,
-        DeviceConfigGenerateUuIdViewModel deviceConfigGenerateUuIdViewModel,
-        DeviceConfigCreateUrlSidViewModel deviceConfigCreateUrlSidViewModel)
-        : base(deviceLoginInfo, logger, "DeviceConfig")
-    {
-        DeviceConfigGenerateUuIdViewModel = deviceConfigGenerateUuIdViewModel;
-        DeviceConfigCreateUrlSidViewModel = deviceConfigCreateUrlSidViewModel;
-    }
-
     public KeyValuePair<DeviceConfigGetPersistentDataResponse?, UPnPFault?>? DeviceConfigGetPersistentDataResponse
     {
         get => deviceConfigGetPersistentDataResponse;
@@ -28,9 +22,9 @@ public DeviceConfigViewModel(
         private set => _ = SetProperty(ref deviceConfigGetSupportDataInfoResponse, value);
     }
 
-    public DeviceConfigGenerateUuIdViewModel DeviceConfigGenerateUuIdViewModel { get; }
+    public DeviceConfigGenerateUuIdViewModel DeviceConfigGenerateUuIdViewModel { get; } = deviceConfigGenerateUuIdViewModel;
 
-    public DeviceConfigCreateUrlSidViewModel DeviceConfigCreateUrlSidViewModel { get; }
+    public DeviceConfigCreateUrlSidViewModel DeviceConfigCreateUrlSidViewModel { get; } = deviceConfigCreateUrlSidViewModel;
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoSetProvisioningCodeViewModel.cs b/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoSetProvisioningCodeViewModel.cs
index 20f4052..389beab 100644
--- a/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoSetProvisioningCodeViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoSetProvisioningCodeViewModel.cs
@@ -2,15 +2,11 @@
 
 using System.ComponentModel;
 
-internal sealed class DeviceInfoSetProvisioningCodeViewModel : ManualOperationViewModel<DeviceInfoSetProvisioningCodeRequest, DeviceInfoSetProvisioningCodeResponse>
+internal sealed class DeviceInfoSetProvisioningCodeViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : ManualOperationViewModel<DeviceInfoSetProvisioningCodeRequest, DeviceInfoSetProvisioningCodeResponse>(deviceLoginInfo, logger, "SetProvisioningCode", "Update ProvisioningCode", (d, r) => d.DeviceInfoSetProvisioningCodeAsync(r))
 {
     private string? provisioningCode;
 
-    public DeviceInfoSetProvisioningCodeViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "SetProvisioningCode", "Update ProvisioningCode", (d, r) => d.DeviceInfoSetProvisioningCodeAsync(r))
-    {
-    }
-
     public string? ProvisioningCode
     {
         get => provisioningCode;
diff --git a/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoViewModel.cs b/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoViewModel.cs
index b475d73..d1a44e2 100644
--- a/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/DeviceInfo/DeviceInfoViewModel.cs
@@ -1,17 +1,12 @@
 namespace RS.Fritz.Manager.UI;
 
-internal sealed class DeviceInfoViewModel : FritzServiceViewModel
+internal sealed class DeviceInfoViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger, DeviceInfoSetProvisioningCodeViewModel deviceInfoSetProvisioningCodeViewModel)
+    : FritzServiceViewModel(deviceLoginInfo, logger, "DeviceInfo")
 {
     private KeyValuePair<DeviceInfoGetSecurityPortResponse?, UPnPFault?>? deviceInfoGetSecurityPortResponse;
     private KeyValuePair<DeviceInfoGetInfoResponse?, UPnPFault?>? deviceInfoGetInfoResponse;
     private KeyValuePair<DeviceInfoGetDeviceLogResponse?, UPnPFault?>? deviceInfoGetDeviceLogResponse;
 
-    public DeviceInfoViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger, DeviceInfoSetProvisioningCodeViewModel deviceInfoSetProvisioningCodeViewModel)
-        : base(deviceLoginInfo, logger, "DeviceInfo")
-    {
-        DeviceInfoSetProvisioningCodeViewModel = deviceInfoSetProvisioningCodeViewModel;
-    }
-
     public KeyValuePair<DeviceInfoGetSecurityPortResponse?, UPnPFault?>? DeviceInfoGetSecurityPortResponse
     {
         get => deviceInfoGetSecurityPortResponse;
@@ -30,7 +25,7 @@ public DeviceInfoViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger, Devi
         private set => _ = SetProperty(ref deviceInfoGetDeviceLogResponse, value);
     }
 
-    public DeviceInfoSetProvisioningCodeViewModel DeviceInfoSetProvisioningCodeViewModel { get; }
+    public DeviceInfoSetProvisioningCodeViewModel DeviceInfoSetProvisioningCodeViewModel { get; } = deviceInfoSetProvisioningCodeViewModel;
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsGetGenericHostEntryViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsGetGenericHostEntryViewModel.cs
index 61ade18..5c34d9b 100644
--- a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsGetGenericHostEntryViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsGetGenericHostEntryViewModel.cs
@@ -2,17 +2,13 @@
 
 using System.ComponentModel;
 
-internal sealed class HostsGetGenericHostEntryViewModel : FritzServiceViewModel
+internal sealed class HostsGetGenericHostEntryViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : FritzServiceViewModel(deviceLoginInfo, logger)
 {
     private ushort? index;
     private ushort? hostNumberOfEntries;
     private KeyValuePair<HostsGetGenericHostEntryResponse?, UPnPFault?>? hostsGetGenericHostEntryResponse;
 
-    public HostsGetGenericHostEntryViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger)
-    {
-    }
-
     public ushort? Index
     {
         get => index;
diff --git a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsHostsCheckUpdateViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsHostsCheckUpdateViewModel.cs
index 4e27021..1ee1b1c 100644
--- a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsHostsCheckUpdateViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsHostsCheckUpdateViewModel.cs
@@ -1,9 +1,6 @@
 namespace RS.Fritz.Manager.UI;
 
-internal sealed class HostsHostsCheckUpdateViewModel : ManualOperationViewModel<HostsHostsCheckUpdateRequest, HostsHostsCheckUpdateResponse>
+internal sealed class HostsHostsCheckUpdateViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : ManualOperationViewModel<HostsHostsCheckUpdateRequest, HostsHostsCheckUpdateResponse>(deviceLoginInfo, logger, "HostsHostsCheckUpdate", "Check Hosts Update", (d, _) => d.HostsHostsCheckUpdateAsync())
 {
-    public HostsHostsCheckUpdateViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "HostsHostsCheckUpdate", "Check Hosts Update", (d, _) => d.HostsHostsCheckUpdateAsync())
-    {
-    }
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs
index 8ba73b7..e045248 100644
--- a/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Hosts/HostsViewModel.cs
@@ -2,11 +2,15 @@
 
 using System.Collections.ObjectModel;
 
-internal sealed class HostsViewModel : FritzServiceViewModel
+internal sealed class HostsViewModel(
+    DeviceLoginInfo deviceLoginInfo,
+    ILogger logger,
+    IDeviceHostsService deviceHostsService,
+    IDeviceMeshService deviceMeshService,
+    HostsGetGenericHostEntryViewModel hostsGetGenericHostEntryViewModel,
+    HostsHostsCheckUpdateViewModel hostsHostsCheckUpdateViewModel)
+    : FritzServiceViewModel(deviceLoginInfo, logger, "Hosts")
 {
-    private readonly IDeviceHostsService deviceHostsService;
-    private readonly IDeviceMeshService deviceMeshService;
-
     private KeyValuePair<HostsGetHostNumberOfEntriesResponse?, UPnPFault?>? hostsGetHostNumberOfEntriesResponse;
     private KeyValuePair<HostsGetInfoResponse?, UPnPFault?>? hostsGetInfoResponse;
     private KeyValuePair<HostsGetChangeCounterResponse?, UPnPFault?>? hostsGetChangeCounterResponse;
@@ -15,18 +19,9 @@ internal sealed class HostsViewModel : FritzServiceViewModel
     private DeviceMeshInfo? deviceMeshInfo;
     private ObservableCollection<HostsGetGenericHostEntryResponse>? hostsGetGenericHostEntryResponses;
 
-    public HostsViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger, IDeviceHostsService deviceHostsService, IDeviceMeshService deviceMeshService, HostsGetGenericHostEntryViewModel hostsGetGenericHostEntryViewModel, HostsHostsCheckUpdateViewModel hostsHostsCheckUpdateViewModel)
-        : base(deviceLoginInfo, logger, "Hosts")
-    {
-        HostsGetGenericHostEntryViewModel = hostsGetGenericHostEntryViewModel;
-        HostsHostsCheckUpdateViewModel = hostsHostsCheckUpdateViewModel;
-        this.deviceHostsService = deviceHostsService;
-        this.deviceMeshService = deviceMeshService;
-    }
-
-    public HostsGetGenericHostEntryViewModel HostsGetGenericHostEntryViewModel { get; }
+    public HostsGetGenericHostEntryViewModel HostsGetGenericHostEntryViewModel { get; } = hostsGetGenericHostEntryViewModel;
 
-    public HostsHostsCheckUpdateViewModel HostsHostsCheckUpdateViewModel { get; }
+    public HostsHostsCheckUpdateViewModel HostsHostsCheckUpdateViewModel { get; } = hostsHostsCheckUpdateViewModel;
 
     public KeyValuePair<HostsGetHostNumberOfEntriesResponse?, UPnPFault?>? HostsGetHostNumberOfEntriesResponse
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecuritySetConfigPasswordViewModel.cs b/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecuritySetConfigPasswordViewModel.cs
index b95e35f..14eafa3 100644
--- a/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecuritySetConfigPasswordViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecuritySetConfigPasswordViewModel.cs
@@ -2,15 +2,11 @@
 
 using System.ComponentModel;
 
-internal sealed class LanConfigSecuritySetConfigPasswordViewModel : ManualOperationViewModel<LanConfigSecuritySetConfigPasswordRequest, LanConfigSecuritySetConfigPasswordResponse>
+internal sealed class LanConfigSecuritySetConfigPasswordViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : ManualOperationViewModel<LanConfigSecuritySetConfigPasswordRequest, LanConfigSecuritySetConfigPasswordResponse>(deviceLoginInfo, logger, "SetConfigPassword", "Update Password", (d, r) => d.LanConfigSecuritySetConfigPasswordAsync(r))
 {
     private string? password;
 
-    public LanConfigSecuritySetConfigPasswordViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "SetConfigPassword", "Update Password", (d, r) => d.LanConfigSecuritySetConfigPasswordAsync(r))
-    {
-    }
-
     public string? Password
     {
         get => password;
diff --git a/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecurityViewModel.cs b/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecurityViewModel.cs
index 1f542b3..e655e21 100644
--- a/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecurityViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/LanConfigSecurity/LanConfigSecurityViewModel.cs
@@ -1,19 +1,14 @@
 namespace RS.Fritz.Manager.UI;
 
-internal sealed class LanConfigSecurityViewModel : FritzServiceViewModel
+internal sealed class LanConfigSecurityViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger, LanConfigSecuritySetConfigPasswordViewModel lanConfigSecuritySetConfigPasswordViewModel)
+    : FritzServiceViewModel(deviceLoginInfo, logger, "LANConfigSecurity")
 {
     private KeyValuePair<LanConfigSecurityGetAnonymousLoginResponse?, UPnPFault?>? lanConfigSecurityGetAnonymousLoginResponse;
     private KeyValuePair<LanConfigSecurityGetCurrentUserResponse?, UPnPFault?>? lanConfigSecurityGetCurrentUserResponse;
     private KeyValuePair<LanConfigSecurityGetInfoResponse?, UPnPFault?>? lanConfigSecurityGetInfoResponse;
     private KeyValuePair<LanConfigSecurityGetUserListResponse?, UPnPFault?>? lanConfigSecurityGetUserListResponse;
 
-    public LanConfigSecurityViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger, LanConfigSecuritySetConfigPasswordViewModel lanConfigSecuritySetConfigPasswordViewModel)
-        : base(deviceLoginInfo, logger, "LANConfigSecurity")
-    {
-        LanConfigSecuritySetConfigPasswordViewModel = lanConfigSecuritySetConfigPasswordViewModel;
-    }
-
-    public LanConfigSecuritySetConfigPasswordViewModel LanConfigSecuritySetConfigPasswordViewModel { get; }
+    public LanConfigSecuritySetConfigPasswordViewModel LanConfigSecuritySetConfigPasswordViewModel { get; } = lanConfigSecuritySetConfigPasswordViewModel;
 
     public KeyValuePair<LanConfigSecurityGetAnonymousLoginResponse?, UPnPFault?>? LanConfigSecurityGetAnonymousLoginResponse
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/LanEthernetInterfaceConfig/LanEthernetInterfaceConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/LanEthernetInterfaceConfig/LanEthernetInterfaceConfigViewModel.cs
index 8da8875..841671c 100644
--- a/RS.Fritz.Manager.UI/UserControls/LanEthernetInterfaceConfig/LanEthernetInterfaceConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/LanEthernetInterfaceConfig/LanEthernetInterfaceConfigViewModel.cs
@@ -1,15 +1,11 @@
 namespace RS.Fritz.Manager.UI;
 
-internal sealed class LanEthernetInterfaceConfigViewModel : FritzServiceViewModel
+internal sealed class LanEthernetInterfaceConfigViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : FritzServiceViewModel(deviceLoginInfo, logger, "LANEthernetInterfaceConfig")
 {
     private KeyValuePair<LanEthernetInterfaceConfigGetInfoResponse?, UPnPFault?>? lanEthernetInterfaceConfigGetInfoResponse;
     private KeyValuePair<LanEthernetInterfaceConfigGetStatisticsResponse?, UPnPFault?>? lanEthernetInterfaceConfigGetStatisticsResponse;
 
-    public LanEthernetInterfaceConfigViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "LANEthernetInterfaceConfig")
-    {
-    }
-
     public KeyValuePair<LanEthernetInterfaceConfigGetInfoResponse?, UPnPFault?>? LanEthernetInterfaceConfigGetInfoResponse
     {
         get => lanEthernetInterfaceConfigGetInfoResponse;
diff --git a/RS.Fritz.Manager.UI/UserControls/LanHostConfigManagement/LanHostConfigManagementViewModel.cs b/RS.Fritz.Manager.UI/UserControls/LanHostConfigManagement/LanHostConfigManagementViewModel.cs
index 562dbd6..c031dc7 100644
--- a/RS.Fritz.Manager.UI/UserControls/LanHostConfigManagement/LanHostConfigManagementViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/LanHostConfigManagement/LanHostConfigManagementViewModel.cs
@@ -1,6 +1,7 @@
 namespace RS.Fritz.Manager.UI;
 
-internal sealed class LanHostConfigManagementViewModel : FritzServiceViewModel
+internal sealed class LanHostConfigManagementViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : FritzServiceViewModel(deviceLoginInfo, logger, "LANHostConfigManagement")
 {
     private KeyValuePair<LanHostConfigManagementGetInfoResponse?, UPnPFault?>? lanHostConfigManagementGetInfoResponse;
     private KeyValuePair<LanHostConfigManagementGetSubnetMaskResponse?, UPnPFault?>? lanHostConfigManagementGetSubnetMaskResponse;
@@ -9,11 +10,6 @@ internal sealed class LanHostConfigManagementViewModel : FritzServiceViewModel
     private KeyValuePair<LanHostConfigManagementGetIpInterfaceNumberOfEntriesResponse?, UPnPFault?>? lanHostConfigManagementGetIpInterfaceNumberOfEntriesResponse;
     private KeyValuePair<LanHostConfigManagementGetDnsServersResponse?, UPnPFault?>? lanHostConfigManagementGetDnsServersResponse;
 
-    public LanHostConfigManagementViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "LANHostConfigManagement")
-    {
-    }
-
     public KeyValuePair<LanHostConfigManagementGetInfoResponse?, UPnPFault?>? LanHostConfigManagementGetInfoResponse
     {
         get => lanHostConfigManagementGetInfoResponse;
diff --git a/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingGetGenericForwardingEntryViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingGetGenericForwardingEntryViewModel.cs
index dedd777..6cb3092 100644
--- a/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingGetGenericForwardingEntryViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingGetGenericForwardingEntryViewModel.cs
@@ -2,17 +2,13 @@
 
 using System.ComponentModel;
 
-internal sealed class Layer3ForwardingGetGenericForwardingEntryViewModel : FritzServiceViewModel
+internal sealed class Layer3ForwardingGetGenericForwardingEntryViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : FritzServiceViewModel(deviceLoginInfo, logger)
 {
     private ushort? index;
     private ushort? forwardNumberOfEntries;
     private KeyValuePair<Layer3ForwardingGetGenericForwardingEntryResponse?, UPnPFault?>? layer3ForwardingGetGenericForwardingEntryResponse;
 
-    public Layer3ForwardingGetGenericForwardingEntryViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger)
-    {
-    }
-
     public ushort? Index
     {
         get => index;
diff --git a/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingViewModel.cs
index 7bc120d..babf16b 100644
--- a/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Layer3Forwarding/Layer3ForwardingViewModel.cs
@@ -2,19 +2,14 @@
 
 using System.Collections.ObjectModel;
 
-internal sealed class Layer3ForwardingViewModel : FritzServiceViewModel
+internal sealed class Layer3ForwardingViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger, Layer3ForwardingGetGenericForwardingEntryViewModel layer3ForwardingGetGenericForwardingEntryViewModel)
+    : FritzServiceViewModel(deviceLoginInfo, logger, "Layer3Forwarding")
 {
     private KeyValuePair<Layer3ForwardingGetDefaultConnectionServiceResponse?, UPnPFault?>? layer3ForwardingGetDefaultConnectionServiceResponse;
     private KeyValuePair<Layer3ForwardingGetForwardNumberOfEntriesResponse?, UPnPFault?>? layer3ForwardingGetForwardNumberOfEntriesResponse;
     private ObservableCollection<Layer3ForwardingGetGenericForwardingEntryResponse>? layer3ForwardingGetGenericForwardingEntryResponses;
 
-    public Layer3ForwardingViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger, Layer3ForwardingGetGenericForwardingEntryViewModel layer3ForwardingGetGenericForwardingEntryViewModel)
-        : base(deviceLoginInfo, logger, "Layer3Forwarding")
-    {
-        Layer3ForwardingGetGenericForwardingEntryViewModel = layer3ForwardingGetGenericForwardingEntryViewModel;
-    }
-
-    public Layer3ForwardingGetGenericForwardingEntryViewModel Layer3ForwardingGetGenericForwardingEntryViewModel { get; }
+    public Layer3ForwardingGetGenericForwardingEntryViewModel Layer3ForwardingGetGenericForwardingEntryViewModel { get; } = layer3ForwardingGetGenericForwardingEntryViewModel;
 
     public KeyValuePair<Layer3ForwardingGetDefaultConnectionServiceResponse?, UPnPFault?>? Layer3ForwardingGetDefaultConnectionServiceResponse
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetConnectionRequestAuthenticationViewModel.cs b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetConnectionRequestAuthenticationViewModel.cs
index 4d57343..a236f96 100644
--- a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetConnectionRequestAuthenticationViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetConnectionRequestAuthenticationViewModel.cs
@@ -2,16 +2,12 @@
 
 using System.ComponentModel;
 
-internal sealed class ManagementServerSetConnectionRequestAuthenticationViewModel : ManualOperationViewModel<ManagementServerSetConnectionRequestAuthenticationRequest, ManagementServerSetConnectionRequestAuthenticationResponse>
+internal sealed class ManagementServerSetConnectionRequestAuthenticationViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : ManualOperationViewModel<ManagementServerSetConnectionRequestAuthenticationRequest, ManagementServerSetConnectionRequestAuthenticationResponse>(deviceLoginInfo, logger, "SetConnectionRequestAuthentication", "Update ConnectionRequestAuthentication", (d, r) => d.ManagementServerSetConnectionRequestAuthenticationAsync(r))
 {
     private string? connectionRequestUsername;
     private string? connectionRequestPassword;
 
-    public ManagementServerSetConnectionRequestAuthenticationViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "SetConnectionRequestAuthentication", "Update ConnectionRequestAuthentication", (d, r) => d.ManagementServerSetConnectionRequestAuthenticationAsync(r))
-    {
-    }
-
     public string? ConnectionRequestUsername
     {
         get => connectionRequestUsername;
diff --git a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerPasswordViewModel.cs b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerPasswordViewModel.cs
index 2b57b1c..cb8112d 100644
--- a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerPasswordViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerPasswordViewModel.cs
@@ -2,15 +2,11 @@
 
 using System.ComponentModel;
 
-internal sealed class ManagementServerSetManagementServerPasswordViewModel : ManualOperationViewModel<ManagementServerSetManagementServerPasswordRequest, ManagementServerSetManagementServerPasswordResponse>
+internal sealed class ManagementServerSetManagementServerPasswordViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : ManualOperationViewModel<ManagementServerSetManagementServerPasswordRequest, ManagementServerSetManagementServerPasswordResponse>(deviceLoginInfo, logger, "SetManagementServerPassword", "Update ManagementServerPassword", (d, r) => d.ManagementServerSetManagementServerPasswordAsync(r))
 {
     private string? password;
 
-    public ManagementServerSetManagementServerPasswordViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "SetManagementServerPassword", "Update ManagementServerPassword", (d, r) => d.ManagementServerSetManagementServerPasswordAsync(r))
-    {
-    }
-
     public string? Password
     {
         get => password;
diff --git a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerUrlViewModel.cs b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerUrlViewModel.cs
index 09d32b0..f76be11 100644
--- a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerUrlViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerUrlViewModel.cs
@@ -2,15 +2,11 @@
 
 using System.ComponentModel;
 
-internal sealed class ManagementServerSetManagementServerUrlViewModel : ManualOperationViewModel<ManagementServerSetManagementServerUrlRequest, ManagementServerSetManagementServerUrlResponse>
+internal sealed class ManagementServerSetManagementServerUrlViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : ManualOperationViewModel<ManagementServerSetManagementServerUrlRequest, ManagementServerSetManagementServerUrlResponse>(deviceLoginInfo, logger, "SetManagementServerUrl", "Update ManagementServerUrl", (d, r) => d.ManagementServerSetManagementServerUrlAsync(r))
 {
     private string? url;
 
-    public ManagementServerSetManagementServerUrlViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "SetManagementServerUrl", "Update ManagementServerUrl", (d, r) => d.ManagementServerSetManagementServerUrlAsync(r))
-    {
-    }
-
     public string? Url
     {
         get => url;
diff --git a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerUsernameViewModel.cs b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerUsernameViewModel.cs
index da098e8..d9f9bf6 100644
--- a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerUsernameViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetManagementServerUsernameViewModel.cs
@@ -2,15 +2,11 @@
 
 using System.ComponentModel;
 
-internal sealed class ManagementServerSetManagementServerUsernameViewModel : ManualOperationViewModel<ManagementServerSetManagementServerUsernameRequest, ManagementServerSetManagementServerUsernameResponse>
+internal sealed class ManagementServerSetManagementServerUsernameViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : ManualOperationViewModel<ManagementServerSetManagementServerUsernameRequest, ManagementServerSetManagementServerUsernameResponse>(deviceLoginInfo, logger, "SetManagementServerUsername", "Update ManagementServerUsername", (d, r) => d.ManagementServerSetManagementServerUsernameAsync(r))
 {
     private string? username;
 
-    public ManagementServerSetManagementServerUsernameViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "SetManagementServerUsername", "Update ManagementServerUsername", (d, r) => d.ManagementServerSetManagementServerUsernameAsync(r))
-    {
-    }
-
     public string? Username
     {
         get => username;
diff --git a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetPeriodicInformViewModel.cs b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetPeriodicInformViewModel.cs
index b730d7f..28cfb96 100644
--- a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetPeriodicInformViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetPeriodicInformViewModel.cs
@@ -2,17 +2,13 @@
 
 using System.ComponentModel;
 
-internal sealed class ManagementServerSetPeriodicInformViewModel : ManualOperationViewModel<ManagementServerSetPeriodicInformRequest, ManagementServerSetPeriodicInformResponse>
+internal sealed class ManagementServerSetPeriodicInformViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : ManualOperationViewModel<ManagementServerSetPeriodicInformRequest, ManagementServerSetPeriodicInformResponse>(deviceLoginInfo, logger, "SetPeriodicInform", "Update PeriodicInform", (d, r) => d.ManagementServerSetPeriodicInformAsync(r))
 {
     private bool? periodicInformEnable;
     private ushort? periodicInformInterval;
     private DateTime? periodicInformTime;
 
-    public ManagementServerSetPeriodicInformViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "SetPeriodicInform", "Update PeriodicInform", (d, r) => d.ManagementServerSetPeriodicInformAsync(r))
-    {
-    }
-
     public bool? PeriodicInformEnable
     {
         get => periodicInformEnable;
diff --git a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetTr069EnableViewModel.cs b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetTr069EnableViewModel.cs
index c8f1fa9..595cb12 100644
--- a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetTr069EnableViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetTr069EnableViewModel.cs
@@ -2,15 +2,11 @@
 
 using System.ComponentModel;
 
-internal sealed class ManagementServerSetTr069EnableViewModel : ManualOperationViewModel<ManagementServerSetTr069EnableRequest, ManagementServerSetTr069EnableResponse>
+internal sealed class ManagementServerSetTr069EnableViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : ManualOperationViewModel<ManagementServerSetTr069EnableRequest, ManagementServerSetTr069EnableResponse>(deviceLoginInfo, logger, "SetTr069Enable", "Update Tr069Enable", (d, r) => d.ManagementServerSetTr069EnableAsync(r))
 {
     private bool? tr069Enabled;
 
-    public ManagementServerSetTr069EnableViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "SetTr069Enable", "Update Tr069Enable", (d, r) => d.ManagementServerSetTr069EnableAsync(r))
-    {
-    }
-
     public bool? Tr069Enabled
     {
         get => tr069Enabled;
diff --git a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetTr069FirmwareDownloadEnabledViewModel.cs b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetTr069FirmwareDownloadEnabledViewModel.cs
index 28afee1..e4d4954 100644
--- a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetTr069FirmwareDownloadEnabledViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetTr069FirmwareDownloadEnabledViewModel.cs
@@ -2,15 +2,11 @@
 
 using System.ComponentModel;
 
-internal sealed class ManagementServerSetTr069FirmwareDownloadEnabledViewModel : ManualOperationViewModel<ManagementServerSetTr069FirmwareDownloadEnabledRequest, ManagementServerSetTr069FirmwareDownloadEnabledResponse>
+internal sealed class ManagementServerSetTr069FirmwareDownloadEnabledViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : ManualOperationViewModel<ManagementServerSetTr069FirmwareDownloadEnabledRequest, ManagementServerSetTr069FirmwareDownloadEnabledResponse>(deviceLoginInfo, logger, "SetTr069FirmwareDownloadEnabled", "Update Tr069FirmwareDownloadEnabled", (d, r) => d.ManagementServerSetTr069FirmwareDownloadEnabledAsync(r))
 {
     private bool? tr069FirmwareDownloadEnabled;
 
-    public ManagementServerSetTr069FirmwareDownloadEnabledViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "SetTr069FirmwareDownloadEnabled", "Update Tr069FirmwareDownloadEnabled", (d, r) => d.ManagementServerSetTr069FirmwareDownloadEnabledAsync(r))
-    {
-    }
-
     public bool? Tr069FirmwareDownloadEnabled
     {
         get => tr069FirmwareDownloadEnabled;
diff --git a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetUpgradeManagementViewModel.cs b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetUpgradeManagementViewModel.cs
index febebb2..29b7b31 100644
--- a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetUpgradeManagementViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerSetUpgradeManagementViewModel.cs
@@ -2,15 +2,11 @@
 
 using System.ComponentModel;
 
-internal sealed class ManagementServerSetUpgradeManagementViewModel : ManualOperationViewModel<ManagementServerSetUpgradeManagementRequest, ManagementServerSetUpgradeManagementResponse>
+internal sealed class ManagementServerSetUpgradeManagementViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : ManualOperationViewModel<ManagementServerSetUpgradeManagementRequest, ManagementServerSetUpgradeManagementResponse>(deviceLoginInfo, logger, "SetUpgradeManagement", "Update UpgradeManagement", (d, r) => d.ManagementServerSetUpgradeManagementAsync(r))
 {
     private bool? upgradesManaged;
 
-    public ManagementServerSetUpgradeManagementViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "SetUpgradeManagement", "Update UpgradeManagement", (d, r) => d.ManagementServerSetUpgradeManagementAsync(r))
-    {
-    }
-
     public bool? UpgradesManaged
     {
         get => upgradesManaged;
diff --git a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerViewModel.cs b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerViewModel.cs
index c990a3e..30a2ab8 100644
--- a/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/ManagementServer/ManagementServerViewModel.cs
@@ -1,33 +1,21 @@
 namespace RS.Fritz.Manager.UI;
 
-internal sealed class ManagementServerViewModel : FritzServiceViewModel
+internal sealed class ManagementServerViewModel(
+    DeviceLoginInfo deviceLoginInfo,
+    ILogger logger,
+    ManagementServerSetManagementServerUrlViewModel managementServerSetManagementServerUrlViewModel,
+    ManagementServerSetManagementServerUsernameViewModel managementServerSetManagementServerUsernameViewModel,
+    ManagementServerSetManagementServerPasswordViewModel managementServerSetManagementServerPasswordViewModel,
+    ManagementServerSetPeriodicInformViewModel managementServerSetPeriodicInformViewModel,
+    ManagementServerSetConnectionRequestAuthenticationViewModel managementServerSetConnectionRequestAuthenticationViewModel,
+    ManagementServerSetUpgradeManagementViewModel managementServerSetUpgradeManagementViewModel,
+    ManagementServerSetTr069EnableViewModel managementServerSetTr069EnableViewModel,
+    ManagementServerSetTr069FirmwareDownloadEnabledViewModel managementServerSetTr069FirmwareDownloadEnabledViewModel)
+    : FritzServiceViewModel(deviceLoginInfo, logger, "ManagementServer")
 {
     private KeyValuePair<ManagementServerGetInfoResponse?, UPnPFault?>? managementServerGetInfoResponse;
     private KeyValuePair<ManagementServerGetTr069FirmwareDownloadEnabledResponse?, UPnPFault?>? managementServerGetTr069FirmwareDownloadEnabledResponse;
 
-    public ManagementServerViewModel(
-        DeviceLoginInfo deviceLoginInfo,
-        ILogger logger,
-        ManagementServerSetManagementServerUrlViewModel managementServerSetManagementServerUrlViewModel,
-        ManagementServerSetManagementServerUsernameViewModel managementServerSetManagementServerUsernameViewModel,
-        ManagementServerSetManagementServerPasswordViewModel managementServerSetManagementServerPasswordViewModel,
-        ManagementServerSetPeriodicInformViewModel managementServerSetPeriodicInformViewModel,
-        ManagementServerSetConnectionRequestAuthenticationViewModel managementServerSetConnectionRequestAuthenticationViewModel,
-        ManagementServerSetUpgradeManagementViewModel managementServerSetUpgradeManagementViewModel,
-        ManagementServerSetTr069EnableViewModel managementServerSetTr069EnableViewModel,
-        ManagementServerSetTr069FirmwareDownloadEnabledViewModel managementServerSetTr069FirmwareDownloadEnabledViewModel)
-        : base(deviceLoginInfo, logger, "ManagementServer")
-    {
-        ManagementServerSetManagementServerUrlViewModel = managementServerSetManagementServerUrlViewModel;
-        ManagementServerSetManagementServerUsernameViewModel = managementServerSetManagementServerUsernameViewModel;
-        ManagementServerSetManagementServerPasswordViewModel = managementServerSetManagementServerPasswordViewModel;
-        ManagementServerSetPeriodicInformViewModel = managementServerSetPeriodicInformViewModel;
-        ManagementServerSetConnectionRequestAuthenticationViewModel = managementServerSetConnectionRequestAuthenticationViewModel;
-        ManagementServerSetUpgradeManagementViewModel = managementServerSetUpgradeManagementViewModel;
-        ManagementServerSetTr069EnableViewModel = managementServerSetTr069EnableViewModel;
-        ManagementServerSetTr069FirmwareDownloadEnabledViewModel = managementServerSetTr069FirmwareDownloadEnabledViewModel;
-    }
-
     public KeyValuePair<ManagementServerGetInfoResponse?, UPnPFault?>? ManagementServerGetInfoResponse
     {
         get => managementServerGetInfoResponse;
@@ -40,21 +28,21 @@ public ManagementServerViewModel(
         private set => _ = SetProperty(ref managementServerGetTr069FirmwareDownloadEnabledResponse, value);
     }
 
-    public ManagementServerSetManagementServerUrlViewModel ManagementServerSetManagementServerUrlViewModel { get; }
+    public ManagementServerSetManagementServerUrlViewModel ManagementServerSetManagementServerUrlViewModel { get; } = managementServerSetManagementServerUrlViewModel;
 
-    public ManagementServerSetManagementServerUsernameViewModel ManagementServerSetManagementServerUsernameViewModel { get; }
+    public ManagementServerSetManagementServerUsernameViewModel ManagementServerSetManagementServerUsernameViewModel { get; } = managementServerSetManagementServerUsernameViewModel;
 
-    public ManagementServerSetManagementServerPasswordViewModel ManagementServerSetManagementServerPasswordViewModel { get; }
+    public ManagementServerSetManagementServerPasswordViewModel ManagementServerSetManagementServerPasswordViewModel { get; } = managementServerSetManagementServerPasswordViewModel;
 
-    public ManagementServerSetPeriodicInformViewModel ManagementServerSetPeriodicInformViewModel { get; }
+    public ManagementServerSetPeriodicInformViewModel ManagementServerSetPeriodicInformViewModel { get; } = managementServerSetPeriodicInformViewModel;
 
-    public ManagementServerSetConnectionRequestAuthenticationViewModel ManagementServerSetConnectionRequestAuthenticationViewModel { get; }
+    public ManagementServerSetConnectionRequestAuthenticationViewModel ManagementServerSetConnectionRequestAuthenticationViewModel { get; } = managementServerSetConnectionRequestAuthenticationViewModel;
 
-    public ManagementServerSetUpgradeManagementViewModel ManagementServerSetUpgradeManagementViewModel { get; }
+    public ManagementServerSetUpgradeManagementViewModel ManagementServerSetUpgradeManagementViewModel { get; } = managementServerSetUpgradeManagementViewModel;
 
-    public ManagementServerSetTr069EnableViewModel ManagementServerSetTr069EnableViewModel { get; }
+    public ManagementServerSetTr069EnableViewModel ManagementServerSetTr069EnableViewModel { get; } = managementServerSetTr069EnableViewModel;
 
-    public ManagementServerSetTr069FirmwareDownloadEnabledViewModel ManagementServerSetTr069FirmwareDownloadEnabledViewModel { get; }
+    public ManagementServerSetTr069FirmwareDownloadEnabledViewModel ManagementServerSetTr069FirmwareDownloadEnabledViewModel { get; } = managementServerSetTr069FirmwareDownloadEnabledViewModel;
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/Time/TimeSetNtpServersViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Time/TimeSetNtpServersViewModel.cs
index 8f110de..0433ce1 100644
--- a/RS.Fritz.Manager.UI/UserControls/Time/TimeSetNtpServersViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Time/TimeSetNtpServersViewModel.cs
@@ -2,16 +2,12 @@
 
 using System.ComponentModel;
 
-internal sealed class TimeSetNtpServersViewModel : ManualOperationViewModel<TimeSetNtpServersRequest, TimeSetNtpServersResponse>
+internal sealed class TimeSetNtpServersViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : ManualOperationViewModel<TimeSetNtpServersRequest, TimeSetNtpServersResponse>(deviceLoginInfo, logger, "SetNtpServers", "Update NtpServers", (d, r) => d.TimeSetNtpServersAsync(r))
 {
     private string? ntpServer1;
     private string? ntpServer2;
 
-    public TimeSetNtpServersViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "SetNtpServers", "Update NtpServers", (d, r) => d.TimeSetNtpServersAsync(r))
-    {
-    }
-
     public string? NtpServer1
     {
         get => ntpServer1;
diff --git a/RS.Fritz.Manager.UI/UserControls/Time/TimeViewModel.cs b/RS.Fritz.Manager.UI/UserControls/Time/TimeViewModel.cs
index 1783bb9..a9ec6d8 100644
--- a/RS.Fritz.Manager.UI/UserControls/Time/TimeViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/Time/TimeViewModel.cs
@@ -1,16 +1,11 @@
 namespace RS.Fritz.Manager.UI;
 
-internal sealed class TimeViewModel : FritzServiceViewModel
+internal sealed class TimeViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger, TimeSetNtpServersViewModel timeSetNtpServersViewModel)
+    : FritzServiceViewModel(deviceLoginInfo, logger, "Time")
 {
     private KeyValuePair<TimeGetInfoResponse?, UPnPFault?>? timeGetInfoResponse;
 
-    public TimeViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger, TimeSetNtpServersViewModel timeSetNtpServersViewModel)
-        : base(deviceLoginInfo, logger, "Time")
-    {
-        TimeSetNtpServersViewModel = timeSetNtpServersViewModel;
-    }
-
-    public TimeSetNtpServersViewModel TimeSetNtpServersViewModel { get; }
+    public TimeSetNtpServersViewModel TimeSetNtpServersViewModel { get; } = timeSetNtpServersViewModel;
 
     public KeyValuePair<TimeGetInfoResponse?, UPnPFault?>? TimeGetInfoResponse
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceCheckUpdateViewModel.cs b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceCheckUpdateViewModel.cs
index 27073fd..0d516cf 100644
--- a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceCheckUpdateViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceCheckUpdateViewModel.cs
@@ -1,9 +1,6 @@
 namespace RS.Fritz.Manager.UI;
 
-internal sealed class UserInterfaceCheckUpdateViewModel : ManualOperationViewModel<UserInterfaceCheckUpdateRequest, UserInterfaceCheckUpdateResponse>
+internal sealed class UserInterfaceCheckUpdateViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : ManualOperationViewModel<UserInterfaceCheckUpdateRequest, UserInterfaceCheckUpdateResponse>(deviceLoginInfo, logger, "CheckUpdate", "Check Update", (d, r) => d.UserInterfaceCheckUpdateAsync(r))
 {
-    public UserInterfaceCheckUpdateViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "CheckUpdate", "Check Update", (d, r) => d.UserInterfaceCheckUpdateAsync(r))
-    {
-    }
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceDoManualUpdateViewModel.cs b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceDoManualUpdateViewModel.cs
index afbeb74..db18ce7 100644
--- a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceDoManualUpdateViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceDoManualUpdateViewModel.cs
@@ -2,16 +2,12 @@
 
 using System.ComponentModel;
 
-internal sealed class UserInterfaceDoManualUpdateViewModel : ManualOperationViewModel<UserInterfaceDoManualUpdateRequest, UserInterfaceDoManualUpdateResponse>
+internal sealed class UserInterfaceDoManualUpdateViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : ManualOperationViewModel<UserInterfaceDoManualUpdateRequest, UserInterfaceDoManualUpdateResponse>(deviceLoginInfo, logger, "DoManualUpdate", "Manual Update", (d, r) => d.UserInterfaceDoManualUpdateAsync(r))
 {
     private string? downloadUrl;
     private bool? allowDowngrade;
 
-    public UserInterfaceDoManualUpdateViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "DoManualUpdate", "Manual Update", (d, r) => d.UserInterfaceDoManualUpdateAsync(r))
-    {
-    }
-
     public string? DownloadUrl
     {
         get => downloadUrl;
diff --git a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceDoPrepareCgiViewModel.cs b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceDoPrepareCgiViewModel.cs
index b519a7d..5bc9982 100644
--- a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceDoPrepareCgiViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceDoPrepareCgiViewModel.cs
@@ -1,8 +1,6 @@
 namespace RS.Fritz.Manager.UI;
-internal sealed class UserInterfaceDoPrepareCgiViewModel : ManualOperationViewModel<UserInterfaceDoPrepareCgiRequest, UserInterfaceDoPrepareCgiResponse>
+
+internal sealed class UserInterfaceDoPrepareCgiViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : ManualOperationViewModel<UserInterfaceDoPrepareCgiRequest, UserInterfaceDoPrepareCgiResponse>(deviceLoginInfo, logger, "DoPrepareCgi", "Prepare Cgi", (d, _) => d.UserInterfaceDoPrepareCgiAsync())
 {
-    public UserInterfaceDoPrepareCgiViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "DoPrepareCgi", "Prepare Cgi", (d, _) => d.UserInterfaceDoPrepareCgiAsync())
-    {
-    }
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceDoUpdateViewModel.cs b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceDoUpdateViewModel.cs
index 3342428..96ae912 100644
--- a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceDoUpdateViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceDoUpdateViewModel.cs
@@ -1,8 +1,6 @@
 namespace RS.Fritz.Manager.UI;
-internal sealed class UserInterfaceDoUpdateViewModel : ManualOperationViewModel<UserInterfaceDoUpdateRequest, UserInterfaceDoUpdateResponse>
+
+internal sealed class UserInterfaceDoUpdateViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : ManualOperationViewModel<UserInterfaceDoUpdateRequest, UserInterfaceDoUpdateResponse>(deviceLoginInfo, logger, "DoUpdate", "Update", (d, _) => d.UserInterfaceDoUpdateAsync())
 {
-    public UserInterfaceDoUpdateViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "DoUpdate", "Update", (d, _) => d.UserInterfaceDoUpdateAsync())
-    {
-    }
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceSetConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceSetConfigViewModel.cs
index 1774ba1..a510b3c 100644
--- a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceSetConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceSetConfigViewModel.cs
@@ -2,15 +2,11 @@
 
 using System.ComponentModel;
 
-internal sealed class UserInterfaceSetConfigViewModel : ManualOperationViewModel<UserInterfaceSetConfigRequest, UserInterfaceSetConfigResponse>
+internal sealed class UserInterfaceSetConfigViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : ManualOperationViewModel<UserInterfaceSetConfigRequest, UserInterfaceSetConfigResponse>(deviceLoginInfo, logger, "SetConfig", "Set Config", (d, r) => d.UserInterfaceSetConfigAsync(r))
 {
     private string? autoUpdateMode;
 
-    public UserInterfaceSetConfigViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "SetConfig", "Set Config", (d, r) => d.UserInterfaceSetConfigAsync(r))
-    {
-    }
-
     public string? AutoUpdateMode
     {
         get => autoUpdateMode;
diff --git a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceSetInternationalConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceSetInternationalConfigViewModel.cs
index b399825..d7dc79f 100644
--- a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceSetInternationalConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceSetInternationalConfigViewModel.cs
@@ -2,17 +2,13 @@
 
 using System.ComponentModel;
 
-internal sealed class UserInterfaceSetInternationalConfigViewModel : ManualOperationViewModel<UserInterfaceSetInternationalConfigRequest, UserInterfaceSetInternationalConfigResponse>
+internal sealed class UserInterfaceSetInternationalConfigViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : ManualOperationViewModel<UserInterfaceSetInternationalConfigRequest, UserInterfaceSetInternationalConfigResponse>(deviceLoginInfo, logger, "SetInternationalConfig", "Set InternationalConfig", (d, r) => d.UserInterfaceSetInternationalConfigAsync(r))
 {
     private string? language;
     private string? country;
     private string? annex;
 
-    public UserInterfaceSetInternationalConfigViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "SetInternationalConfig", "Set InternationalConfig", (d, r) => d.UserInterfaceSetInternationalConfigAsync(r))
-    {
-    }
-
     public string? Language
     {
         get => language;
diff --git a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceViewModel.cs b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceViewModel.cs
index da539c0..38a2537 100644
--- a/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/UserInterface/UserInterfaceViewModel.cs
@@ -1,30 +1,20 @@
 namespace RS.Fritz.Manager.UI;
 
-internal sealed class UserInterfaceViewModel : FritzServiceViewModel
+internal sealed class UserInterfaceViewModel(
+    DeviceLoginInfo deviceLoginInfo,
+    UserInterfaceCheckUpdateViewModel userInterfaceCheckUpdateViewModel,
+    UserInterfaceDoPrepareCgiViewModel userInterfaceDoPrepareCgiViewModel,
+    UserInterfaceDoUpdateViewModel userInterfaceDoUpdateViewModel,
+    UserInterfaceDoManualUpdateViewModel userInterfaceDoManualUpdateViewModel,
+    UserInterfaceSetInternationalConfigViewModel userInterfaceSetInternationalConfigViewModel,
+    UserInterfaceSetConfigViewModel userInterfaceSetConfigViewModel,
+    ILogger logger)
+    : FritzServiceViewModel(deviceLoginInfo, logger, "UserInterface")
 {
     private KeyValuePair<UserInterfaceGetInfoResponse?, UPnPFault?>? userInterfaceGetInfoResponse;
     private KeyValuePair<UserInterfaceGetInternationalConfigResponse?, UPnPFault?>? userInterfaceGetInternationalConfigResponse;
     private KeyValuePair<UserInterfaceAvmGetInfoResponse?, UPnPFault?>? userInterfaceAvmGetInfoResponse;
 
-    public UserInterfaceViewModel(
-        DeviceLoginInfo deviceLoginInfo,
-        UserInterfaceCheckUpdateViewModel userInterfaceCheckUpdateViewModel,
-        UserInterfaceDoPrepareCgiViewModel userInterfaceDoPrepareCgiViewModel,
-        UserInterfaceDoUpdateViewModel userInterfaceDoUpdateViewModel,
-        UserInterfaceDoManualUpdateViewModel userInterfaceDoManualUpdateViewModel,
-        UserInterfaceSetInternationalConfigViewModel userInterfaceSetInternationalConfigViewModel,
-        UserInterfaceSetConfigViewModel userInterfaceSetConfigViewModel,
-        ILogger logger)
-        : base(deviceLoginInfo, logger, "UserInterface")
-    {
-        UserInterfaceCheckUpdateViewModel = userInterfaceCheckUpdateViewModel;
-        UserInterfaceDoPrepareCgiViewModel = userInterfaceDoPrepareCgiViewModel;
-        UserInterfaceDoUpdateViewModel = userInterfaceDoUpdateViewModel;
-        UserInterfaceDoManualUpdateViewModel = userInterfaceDoManualUpdateViewModel;
-        UserInterfaceSetInternationalConfigViewModel = userInterfaceSetInternationalConfigViewModel;
-        UserInterfaceSetConfigViewModel = userInterfaceSetConfigViewModel;
-    }
-
     public KeyValuePair<UserInterfaceGetInfoResponse?, UPnPFault?>? UserInterfaceGetInfoResponse
     {
         get => userInterfaceGetInfoResponse;
@@ -43,17 +33,17 @@ public UserInterfaceViewModel(
         private set => _ = SetProperty(ref userInterfaceAvmGetInfoResponse, value);
     }
 
-    public UserInterfaceCheckUpdateViewModel UserInterfaceCheckUpdateViewModel { get; }
+    public UserInterfaceCheckUpdateViewModel UserInterfaceCheckUpdateViewModel { get; } = userInterfaceCheckUpdateViewModel;
 
-    public UserInterfaceDoPrepareCgiViewModel UserInterfaceDoPrepareCgiViewModel { get; }
+    public UserInterfaceDoPrepareCgiViewModel UserInterfaceDoPrepareCgiViewModel { get; } = userInterfaceDoPrepareCgiViewModel;
 
-    public UserInterfaceDoUpdateViewModel UserInterfaceDoUpdateViewModel { get; }
+    public UserInterfaceDoUpdateViewModel UserInterfaceDoUpdateViewModel { get; } = userInterfaceDoUpdateViewModel;
 
-    public UserInterfaceDoManualUpdateViewModel UserInterfaceDoManualUpdateViewModel { get; }
+    public UserInterfaceDoManualUpdateViewModel UserInterfaceDoManualUpdateViewModel { get; } = userInterfaceDoManualUpdateViewModel;
 
-    public UserInterfaceSetInternationalConfigViewModel UserInterfaceSetInternationalConfigViewModel { get; }
+    public UserInterfaceSetInternationalConfigViewModel UserInterfaceSetInternationalConfigViewModel { get; } = userInterfaceSetInternationalConfigViewModel;
 
-    public UserInterfaceSetConfigViewModel UserInterfaceSetConfigViewModel { get; }
+    public UserInterfaceSetConfigViewModel UserInterfaceSetConfigViewModel { get; } = userInterfaceSetConfigViewModel;
 
     protected override ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigSetWanAccessTypeViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigSetWanAccessTypeViewModel.cs
index 5b6e488..3a5772d 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigSetWanAccessTypeViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigSetWanAccessTypeViewModel.cs
@@ -2,15 +2,11 @@
 
 using System.ComponentModel;
 
-internal sealed class WanCommonInterfaceConfigSetWanAccessTypeViewModel : ManualOperationViewModel<WanCommonInterfaceConfigSetWanAccessTypeRequest, WanCommonInterfaceConfigSetWanAccessTypeResponse>
+internal sealed class WanCommonInterfaceConfigSetWanAccessTypeViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : ManualOperationViewModel<WanCommonInterfaceConfigSetWanAccessTypeRequest, WanCommonInterfaceConfigSetWanAccessTypeResponse>(deviceLoginInfo, logger, "SetWanAccessType", "Update WanAccessType", (d, r) => d.WanCommonInterfaceConfigSetWanAccessTypeAsync(r))
 {
     private string? wanAccessType;
 
-    public WanCommonInterfaceConfigSetWanAccessTypeViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, "SetWanAccessType", "Update WanAccessType", (d, r) => d.WanCommonInterfaceConfigSetWanAccessTypeAsync(r))
-    {
-    }
-
     public string? WanAccessType
     {
         get => wanAccessType;
diff --git a/RS.Fritz.Manager.UI/UserControls/WanDslLinkConfig/WanDslLinkConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanDslLinkConfig/WanDslLinkConfigViewModel.cs
index 4349519..c23bab3 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanDslLinkConfig/WanDslLinkConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanDslLinkConfig/WanDslLinkConfigViewModel.cs
@@ -1,6 +1,7 @@
 namespace RS.Fritz.Manager.UI;
 
-internal sealed class WanDslLinkConfigViewModel : WanAccessTypeAwareFritzServiceViewModel
+internal sealed class WanDslLinkConfigViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : WanAccessTypeAwareFritzServiceViewModel(deviceLoginInfo, logger, WanAccessType.Dsl, "WANDSLLinkConfig")
 {
     private KeyValuePair<WanDslLinkConfigGetInfoResponse?, UPnPFault?>? wanDslLinkConfigGetInfoResponse;
     private KeyValuePair<WanDslLinkConfigGetDslLinkInfoResponse?, UPnPFault?>? wanDslLinkConfigGetDslLinkInfoResponse;
@@ -9,11 +10,6 @@ internal sealed class WanDslLinkConfigViewModel : WanAccessTypeAwareFritzService
     private KeyValuePair<WanDslLinkConfigGetAutoConfigResponse?, UPnPFault?>? wanDslLinkConfigGetAutoConfigResponse;
     private KeyValuePair<WanDslLinkConfigGetStatisticsResponse?, UPnPFault?>? wanDslLinkConfigGetStatisticsResponse;
 
-    public WanDslLinkConfigViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger, WanAccessType.Dsl, "WANDSLLinkConfig")
-    {
-    }
-
     public KeyValuePair<WanDslLinkConfigGetInfoResponse?, UPnPFault?>? WanDslLinkConfigGetInfoResponse
     {
         get => wanDslLinkConfigGetInfoResponse;
diff --git a/RS.Fritz.Manager.UI/UserControls/WanEthernetLinkConfig/WanEthernetLinkConfigViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanEthernetLinkConfig/WanEthernetLinkConfigViewModel.cs
index db3f771..99a6cac 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanEthernetLinkConfig/WanEthernetLinkConfigViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanEthernetLinkConfig/WanEthernetLinkConfigViewModel.cs
@@ -1,14 +1,10 @@
 namespace RS.Fritz.Manager.UI;
 
-internal sealed class WanEthernetLinkConfigViewModel : FritzServiceViewModel
+internal sealed class WanEthernetLinkConfigViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : FritzServiceViewModel(deviceLoginInfo, logger)
 {
     private KeyValuePair<WanEthernetLinkConfigGetEthernetLinkStatusResponse?, UPnPFault?>? wanEthernetLinkConfigGetEthernetLinkStatusResponse;
 
-    public WanEthernetLinkConfigViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger)
-    {
-    }
-
     public KeyValuePair<WanEthernetLinkConfigGetEthernetLinkStatusResponse?, UPnPFault?>? WanEthernetLinkConfigGetEthernetLinkStatusResponse
     {
         get => wanEthernetLinkConfigGetEthernetLinkStatusResponse;
diff --git a/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionGetGenericPortMappingEntryViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionGetGenericPortMappingEntryViewModel.cs
index b54cbb1..4e05162 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionGetGenericPortMappingEntryViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionGetGenericPortMappingEntryViewModel.cs
@@ -1,12 +1,8 @@
 namespace RS.Fritz.Manager.UI;
 
-internal sealed class WanIpConnectionGetGenericPortMappingEntryViewModel : WanConnectionGetGenericPortMappingEntryViewModel
+internal sealed class WanIpConnectionGetGenericPortMappingEntryViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : WanConnectionGetGenericPortMappingEntryViewModel(deviceLoginInfo, logger)
 {
-    public WanIpConnectionGetGenericPortMappingEntryViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger)
-    {
-    }
-
     protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
         => WanConnectionGetGenericPortMappingEntryResponse = await ExecuteApiAsync(q => q.WanIpConnectionGetGenericPortMappingEntryAsync(new(Index!.Value))).ConfigureAwait(true);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionViewModel.cs
index 862947f..469e0f5 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanIpConnection/WanIpConnectionViewModel.cs
@@ -2,7 +2,8 @@
 
 using System.Collections.ObjectModel;
 
-internal sealed class WanIpConnectionViewModel : WanAccessTypeAwareFritzServiceViewModel
+internal sealed class WanIpConnectionViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger, WanIpConnectionGetGenericPortMappingEntryViewModel wanIpConnectionGetGenericPortMappingEntryViewModel)
+    : WanAccessTypeAwareFritzServiceViewModel(deviceLoginInfo, logger, WanAccessType.Ethernet, "WANIPConnection")
 {
     private KeyValuePair<WanIpConnectionGetInfoResponse?, UPnPFault?>? wanIpConnectionGetInfoResponse;
     private KeyValuePair<WanConnectionGetConnectionTypeInfoResponse?, UPnPFault?>? wanConnectionGetConnectionTypeInfoResponse;
@@ -13,13 +14,7 @@ internal sealed class WanIpConnectionViewModel : WanAccessTypeAwareFritzServiceV
     private KeyValuePair<WanConnectionGetExternalIpAddressResponse?, UPnPFault?>? wanConnectionGetExternalIpAddressResponse;
     private ObservableCollection<WanConnectionGetGenericPortMappingEntryResponse>? wanConnectionGetGenericPortMappingEntryResponses;
 
-    public WanIpConnectionViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger, WanIpConnectionGetGenericPortMappingEntryViewModel wanIpConnectionGetGenericPortMappingEntryViewModel)
-        : base(deviceLoginInfo, logger, WanAccessType.Ethernet, "WANIPConnection")
-    {
-        WanIpConnectionGetGenericPortMappingEntryViewModel = wanIpConnectionGetGenericPortMappingEntryViewModel;
-    }
-
-    public WanIpConnectionGetGenericPortMappingEntryViewModel WanIpConnectionGetGenericPortMappingEntryViewModel { get; }
+    public WanIpConnectionGetGenericPortMappingEntryViewModel WanIpConnectionGetGenericPortMappingEntryViewModel { get; } = wanIpConnectionGetGenericPortMappingEntryViewModel;
 
     public KeyValuePair<WanIpConnectionGetInfoResponse?, UPnPFault?>? WanIpConnectionGetInfoResponse
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionGetGenericPortMappingEntryViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionGetGenericPortMappingEntryViewModel.cs
index 15c1b36..d6774ee 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionGetGenericPortMappingEntryViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionGetGenericPortMappingEntryViewModel.cs
@@ -1,12 +1,8 @@
 namespace RS.Fritz.Manager.UI;
 
-internal sealed class WanPppConnectionGetGenericPortMappingEntryViewModel : WanConnectionGetGenericPortMappingEntryViewModel
+internal sealed class WanPppConnectionGetGenericPortMappingEntryViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
+    : WanConnectionGetGenericPortMappingEntryViewModel(deviceLoginInfo, logger)
 {
-    public WanPppConnectionGetGenericPortMappingEntryViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger)
-        : base(deviceLoginInfo, logger)
-    {
-    }
-
     protected override async ValueTask DoExecuteDefaultCommandAsync(CancellationToken cancellationToken)
         => WanConnectionGetGenericPortMappingEntryResponse = await ExecuteApiAsync(q => q.WanPppConnectionGetGenericPortMappingEntryAsync(new(Index!.Value))).ConfigureAwait(true);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionViewModel.cs
index 80dd0a5..e4f5660 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanPppConnection/WanPppConnectionViewModel.cs
@@ -2,7 +2,8 @@
 
 using System.Collections.ObjectModel;
 
-internal sealed class WanPppConnectionViewModel : WanAccessTypeAwareFritzServiceViewModel
+internal sealed class WanPppConnectionViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger, WanPppConnectionGetGenericPortMappingEntryViewModel wanPppConnectionGetGenericPortMappingEntryViewModel)
+    : WanAccessTypeAwareFritzServiceViewModel(deviceLoginInfo, logger, WanAccessType.Dsl, "WANPPPConnection")
 {
     private KeyValuePair<WanPppConnectionGetInfoResponse?, UPnPFault?>? wanPppConnectionGetInfoResponse;
     private KeyValuePair<WanConnectionGetConnectionTypeInfoResponse?, UPnPFault?>? wanConnectionGetConnectionTypeInfoResponse;
@@ -16,13 +17,7 @@ internal sealed class WanPppConnectionViewModel : WanAccessTypeAwareFritzService
     private KeyValuePair<WanPppConnectionGetAutoDisconnectTimeSpanResponse?, UPnPFault?>? wanPppConnectionGetAutoDisconnectTimeSpanResponse;
     private ObservableCollection<WanConnectionGetGenericPortMappingEntryResponse>? wanConnectionGetGenericPortMappingEntryResponses;
 
-    public WanPppConnectionViewModel(DeviceLoginInfo deviceLoginInfo, ILogger logger, WanPppConnectionGetGenericPortMappingEntryViewModel wanPppConnectionGetGenericPortMappingEntryViewModel)
-        : base(deviceLoginInfo, logger, WanAccessType.Dsl, "WANPPPConnection")
-    {
-        WanPppConnectionGetGenericPortMappingEntryViewModel = wanPppConnectionGetGenericPortMappingEntryViewModel;
-    }
-
-    public WanPppConnectionGetGenericPortMappingEntryViewModel WanPppConnectionGetGenericPortMappingEntryViewModel { get; }
+    public WanPppConnectionGetGenericPortMappingEntryViewModel WanPppConnectionGetGenericPortMappingEntryViewModel { get; } = wanPppConnectionGetGenericPortMappingEntryViewModel;
 
     public KeyValuePair<WanPppConnectionGetInfoResponse?, UPnPFault?>? WanPppConnectionGetInfoResponse
     {
diff --git a/RS.Fritz.Manager.UI/UserControls/WlanConfiguration/WlanConfigurationViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WlanConfiguration/WlanConfigurationViewModel.cs
index 2797825..cb16cc6 100644
--- a/RS.Fritz.Manager.UI/UserControls/WlanConfiguration/WlanConfigurationViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WlanConfiguration/WlanConfigurationViewModel.cs
@@ -2,10 +2,9 @@
 
 using System.Windows;
 
-internal sealed class WlanConfigurationViewModel : FritzServiceViewModel
+internal sealed class WlanConfigurationViewModel(DeviceLoginInfo deviceLoginInfo, IWlanDeviceService wlanDeviceService, ILogger logger)
+    : FritzServiceViewModel(deviceLoginInfo, logger, "WLANConfiguration")
 {
-    private readonly IWlanDeviceService wlanDeviceService;
-
     private WlanDeviceInfo? wlanDeviceInfo;
     private KeyValuePair<WlanConfigurationGetInfoResponse?, UPnPFault?>?[]? wlanConfigurationGetInfoResponses;
     private KeyValuePair<WlanConfigurationGetBasBeaconSecurityPropertiesResponse?, UPnPFault?>?[]? wlanConfigurationGetBasBeaconSecurityPropertiesResponses;
@@ -27,12 +26,6 @@ internal sealed class WlanConfigurationViewModel : FritzServiceViewModel
     private Visibility? interface3Visibility;
     private Visibility? interface4Visibility;
 
-    public WlanConfigurationViewModel(DeviceLoginInfo deviceLoginInfo, IWlanDeviceService wlanDeviceService, ILogger logger)
-        : base(deviceLoginInfo, logger, "WLANConfiguration")
-    {
-        this.wlanDeviceService = wlanDeviceService;
-    }
-
     public WlanDeviceInfo? WlanDeviceInfo
     {
         get => wlanDeviceInfo;

From d045845ce43af62942aa505af530012f8782d0d0 Mon Sep 17 00:00:00 2001
From: Rans4ckeR <ransacker@outlook.com>
Date: Thu, 14 Dec 2023 17:41:08 +0100
Subject: [PATCH 14/15] net8.0

---
 .editorconfig                                 | 153 ++++++++++++------
 .github/workflows/dotnet.yml                  |  20 +--
 README.md                                     |  10 +-
 .../RS.Fritz.Manager.API.csproj               |   9 +-
 .../Services/Capture/CaptureControlService.cs |   4 +-
 .../Services/Discovery/DeviceSearchService.cs |   2 +-
 .../AvmSpeedtest/IFritzAvmSpeedtestService.cs |   2 +-
 .../DeviceConfig/IFritzDeviceConfigService.cs |   2 +-
 .../DeviceInfo/IFritzDeviceInfoService.cs     |   2 +-
 .../Services/Hosts/IFritzHostsService.cs      |   2 +-
 .../IFritzLanConfigSecurityService.cs         |   2 +-
 ...IFritzLanEthernetInterfaceConfigService.cs |   2 +-
 .../IFritzLanHostConfigManagementService.cs   |   2 +-
 .../IFritzLayer3ForwardingService.cs          |   2 +-
 .../IFritzManagementServerService.cs          |   2 +-
 .../TR-064/Services/Time/IFritzTimeService.cs |   2 +-
 .../IFritzUserInterfaceService.cs             |   2 +-
 .../IFritzWanCommonInterfaceConfigService.cs  |   2 +-
 .../IFritzWanDslInterfaceConfigService.cs     |   2 +-
 .../IFritzWanDslLinkConfigService.cs          |   2 +-
 .../IFritzWanEthernetLinkConfigService.cs     |   2 +-
 .../IFritzWanIpConnectionService.cs           |   2 +-
 .../IFritzWanPppConnectionService.cs          |   2 +-
 .../IFritzWlanConfiguration1Service.cs        |   2 +-
 .../IFritzWlanConfiguration2Service.cs        |   2 +-
 .../IFritzWlanConfiguration3Service.cs        |   2 +-
 .../IFritzWlanConfiguration4Service.cs        |   2 +-
 .../FritzServiceOperationHandler.cs           |  11 +-
 .../SoapClient/ServiceOperationHandler.cs     |  15 --
 .../RS.Fritz.Manager.UI.csproj                |   8 +-
 30 files changed, 165 insertions(+), 109 deletions(-)
 delete mode 100644 RS.Fritz.Manager.API/Services/TR-064/SoapClient/ServiceOperationHandler.cs

diff --git a/.editorconfig b/.editorconfig
index 5d3d1dd..731a3ee 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,4 +1,4 @@
-###############################
+###############################
 # Core EditorConfig Options   #
 ###############################
 root = true
@@ -33,28 +33,28 @@ dotnet_style_qualification_for_property = false:silent
 dotnet_style_qualification_for_method = false:silent
 dotnet_style_qualification_for_event = false:silent
 # Language keywords vs BCL types preferences
-dotnet_style_predefined_type_for_locals_parameters_members = true:silent
-dotnet_style_predefined_type_for_member_access = true:silent
+dotnet_style_predefined_type_for_locals_parameters_members = true:warning
+dotnet_style_predefined_type_for_member_access = true:warning
 # Parentheses preferences
-dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
-dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
-dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
-dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:warning
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:warning
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:warning
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:warning
 # Modifier preferences
-dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
-dotnet_style_readonly_field = true:suggestion
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:warning
+dotnet_style_readonly_field = true:warning
 # Expression-level preferences
-dotnet_style_object_initializer = true:suggestion
-dotnet_style_collection_initializer = true:suggestion
-dotnet_style_explicit_tuple_names = true:suggestion
-dotnet_style_null_propagation = true:suggestion
-dotnet_style_coalesce_expression = true:suggestion
-dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
-dotnet_style_prefer_inferred_tuple_names = true:suggestion
-dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
-dotnet_style_prefer_auto_properties = true:silent
-dotnet_style_prefer_conditional_expression_over_assignment = true:silent
-dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_object_initializer = true:warning
+dotnet_style_collection_initializer = true:warning
+dotnet_style_explicit_tuple_names = true:warning
+dotnet_style_null_propagation = true:warning
+dotnet_style_coalesce_expression = true:warning
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning
+dotnet_style_prefer_inferred_tuple_names = true:warning
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning
+dotnet_style_prefer_auto_properties = true:warning
+dotnet_style_prefer_conditional_expression_over_assignment = true:warning
+dotnet_style_prefer_conditional_expression_over_return = true:warning
 ###############################
 # Naming Conventions          #
 ###############################
@@ -63,39 +63,63 @@ dotnet_naming_style.pascal_case_style.capitalization             = pascal_case
 # Use PascalCase for constant fields
 dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
 dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols  = constant_fields
-dotnet_naming_rule.constant_fields_should_be_pascal_case.style    = pascal_case_style
+dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
 dotnet_naming_symbols.constant_fields.applicable_kinds            = field
 dotnet_naming_symbols.constant_fields.applicable_accessibilities  = *
 dotnet_naming_symbols.constant_fields.required_modifiers          = const
+dotnet_style_prefer_simplified_boolean_expressions = true:warning
+dotnet_style_prefer_compound_assignment = true:warning
+dotnet_style_prefer_simplified_interpolation = true:warning
+dotnet_style_namespace_match_folder = true:warning
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+tab_width = 4
+dotnet_diagnostic.CA1303.severity = suggestion
+dotnet_diagnostic.CA1510.severity = warning
+dotnet_diagnostic.CA1511.severity = warning
+dotnet_diagnostic.CA1512.severity = warning
+dotnet_diagnostic.CA1513.severity = warning
+dotnet_diagnostic.CA1858.severity = warning
+dotnet_diagnostic.CA1859.severity = warning
+dotnet_diagnostic.CA1860.severity = warning
+dotnet_diagnostic.CA1861.severity = warning
+dotnet_diagnostic.CA1862.severity = warning
+dotnet_diagnostic.CA1863.severity = warning
+dotnet_diagnostic.CA1864.severity = warning
+dotnet_diagnostic.CA1868.severity = warning
+dotnet_diagnostic.CA1869.severity = warning
+dotnet_style_allow_multiple_blank_lines_experimental = false:warning
+dotnet_style_allow_statement_immediately_after_block_experimental = false:warning
+dotnet_code_quality_unused_parameters = all:warning
+dotnet_style_prefer_collection_expression = true:warning
 ###############################
 # C# Coding Conventions       #
 ###############################
 [*.cs]
 # var preferences
-csharp_style_var_for_built_in_types = false:silent
+csharp_style_var_for_built_in_types = false:warning
 csharp_style_var_when_type_is_apparent = true:silent
-csharp_style_var_elsewhere = false:silent
+csharp_style_var_elsewhere = false:warning
 # Expression-bodied members
-csharp_style_expression_bodied_methods = when_on_single_line:silent
-csharp_style_expression_bodied_constructors = false:silent
-csharp_style_expression_bodied_operators = false:silent
-csharp_style_expression_bodied_properties = true:silent
-csharp_style_expression_bodied_indexers = true:silent
-csharp_style_expression_bodied_accessors = true:silent
+csharp_style_expression_bodied_methods = when_on_single_line:warning
+csharp_style_expression_bodied_constructors = when_on_single_line:warning
+csharp_style_expression_bodied_operators = when_on_single_line:warning
+csharp_style_expression_bodied_properties = when_on_single_line:warning
+csharp_style_expression_bodied_indexers = when_on_single_line:warning
+csharp_style_expression_bodied_accessors = when_on_single_line:warning
 # Pattern matching preferences
-csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
-csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+csharp_style_pattern_matching_over_is_with_cast_check = true:warning
+csharp_style_pattern_matching_over_as_with_null_check = true:warning
 # Null-checking preferences
-csharp_style_throw_expression = true:suggestion
-csharp_style_conditional_delegate_call = true:suggestion
+csharp_style_throw_expression = true:warning
+csharp_style_conditional_delegate_call = true:warning
 # Modifier preferences
 csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
 # Expression-level preferences
 csharp_prefer_braces = true:silent
-csharp_style_deconstructed_variable_declaration = true:suggestion
-csharp_prefer_simple_default_expression = true:suggestion
-csharp_style_prefer_local_over_anonymous_function = true:suggestion
-csharp_style_inlined_variable_declaration = true:suggestion
+csharp_style_deconstructed_variable_declaration = true:warning
+csharp_prefer_simple_default_expression = true:warning
+csharp_style_prefer_local_over_anonymous_function = true:warning
+csharp_style_inlined_variable_declaration = true:warning
 ###############################
 # C# Formatting Rules         #
 ###############################
@@ -132,6 +156,7 @@ csharp_preserve_single_line_blocks = true
 [*.vb]
 # Modifier preferences
 visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion
+dotnet_diagnostic.CA1047.severity = warning
 
 [*.cs]
 
@@ -262,7 +287,7 @@ dotnet_diagnostic.IDE0055.severity = warning
 dotnet_diagnostic.IDE0056.severity = warning
 
 # IDE0058: Expression value is never used
-dotnet_diagnostic.IDE0058.severity = suggestion
+dotnet_diagnostic.IDE0058.severity = warning
 
 # IDE0059: Unnecessary assignment of a value
 dotnet_diagnostic.IDE0059.severity = warning
@@ -487,7 +512,7 @@ dotnet_diagnostic.IDE0161.severity = warning
 dotnet_diagnostic.IDE0100.severity = warning
 
 # IDE0072: Add missing cases
-dotnet_diagnostic.IDE0072.severity = warning
+dotnet_diagnostic.IDE0072.severity = suggestion
 
 # IDE0057: Use range operator
 dotnet_diagnostic.IDE0057.severity = warning
@@ -613,7 +638,7 @@ dotnet_diagnostic.CA1068.severity = warning
 dotnet_diagnostic.CA1069.severity = warning
 
 # CA1303: Do not pass literals as localized parameters
-dotnet_diagnostic.CA1303.severity = warning
+dotnet_diagnostic.CA1303.severity = suggestion
 
 # CA1304: Specify CultureInfo
 dotnet_diagnostic.CA1304.severity = warning
@@ -1252,13 +1277,13 @@ dotnet_diagnostic.SYSLIB1054.severity = warning
 dotnet_diagnostic.SYSLIB1045.severity = warning
 
 # IDE0160: Convert to block scoped namespace
-csharp_style_namespace_declarations = file_scoped
+csharp_style_namespace_declarations = file_scoped:warning
 
 # IDE0008: Use explicit type
-csharp_style_var_when_type_is_apparent = true
+csharp_style_var_when_type_is_apparent = true:warning
 
 # IDE0011: Add braces
-csharp_prefer_braces = when_multiline
+csharp_prefer_braces = when_multiline:warning
 
 # SA1305: Field names should not use Hungarian notation
 dotnet_diagnostic.SA1305.severity = warning
@@ -1279,7 +1304,7 @@ dotnet_diagnostic.SX1101.severity = warning
 dotnet_diagnostic.SA1101.severity = none
 
 # IDE0065: Misplaced using directive
-csharp_using_directive_placement = inside_namespace
+csharp_using_directive_placement = inside_namespace:silent
 
 # SA1633: File should have header
 dotnet_diagnostic.SA1633.severity = none
@@ -1297,10 +1322,10 @@ dotnet_diagnostic.SA1600.severity = none
 dotnet_diagnostic.SA1642.severity = suggestion
 
 # SA1615: Element return value should be documented
-dotnet_diagnostic.SA1615.severity = suggestion
+dotnet_diagnostic.SA1615.severity = none
 
 # SA1611: Element parameters should be documented
-dotnet_diagnostic.SA1611.severity = suggestion
+dotnet_diagnostic.SA1611.severity = none
 
 # SA1623: Property summary documentation should match accessors
 dotnet_diagnostic.SA1623.severity = suggestion
@@ -1319,3 +1344,39 @@ dotnet_diagnostic.SA0001.severity = none
 
 # SA1601: Partial element is missing a documentation header
 dotnet_diagnostic.SA1601.severity = none
+csharp_prefer_simple_using_statement = true:warning
+csharp_style_prefer_method_group_conversion = true:warning
+csharp_style_prefer_top_level_statements = true:silent
+csharp_style_prefer_primary_constructors = true:warning
+csharp_style_expression_bodied_lambdas = when_on_single_line:warning
+csharp_style_expression_bodied_local_functions = when_on_single_line:warning
+csharp_style_prefer_null_check_over_type_check = true:warning
+csharp_style_prefer_index_operator = true:warning
+dotnet_diagnostic.SA1618.severity = suggestion
+dotnet_diagnostic.CA1865.severity = warning
+dotnet_diagnostic.CA1866.severity = warning
+dotnet_diagnostic.IDE0251.severity = warning
+dotnet_diagnostic.IDE0290.severity = warning
+dotnet_diagnostic.IDE0300.severity = warning
+dotnet_diagnostic.IDE0301.severity = warning
+dotnet_diagnostic.IDE0302.severity = warning
+dotnet_diagnostic.IDE0303.severity = warning
+dotnet_diagnostic.IDE0304.severity = warning
+csharp_style_prefer_range_operator = true:warning
+csharp_style_implicit_object_creation_when_type_is_apparent = true:warning
+csharp_style_prefer_tuple_swap = true:warning
+csharp_style_prefer_utf8_string_literals = true:warning
+csharp_style_unused_value_assignment_preference = discard_variable:warning
+csharp_style_unused_value_expression_statement_preference = discard_variable:warning
+csharp_prefer_static_local_function = true:warning
+csharp_style_prefer_readonly_struct = true:warning
+csharp_style_prefer_readonly_struct_member = true:warning
+csharp_style_allow_embedded_statements_on_same_line_experimental = false:warning
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false:warning
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = false:warning
+csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true:warning
+csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:warning
+csharp_style_prefer_switch_expression = true:warning
+csharp_style_prefer_pattern_matching = true:warning
+csharp_style_prefer_not_pattern = true:warning
+csharp_style_prefer_extended_property_pattern = true:warning
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 6c3c456..0f57119 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Setup .NET Core SDK
       uses: actions/setup-dotnet@main
       with:
-        dotnet-version: '7.x.x'
+        dotnet-version: '8.x.x'
     - name: Install GitVersion
       uses: gittools/actions/gitversion/setup@main
       with:
@@ -27,20 +27,14 @@ jobs:
       uses: gittools/actions/gitversion/execute@main
     - name: Publish
       run: |
-        dotnet publish RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj --configuration Release --no-self-contained --framework net7.0-windows10.0.22621.0 --runtime win-x64 -p:PublishReadyToRun=true -p:PublishReadyToRunComposite=true -p:PublishSingleFile=true -p:DebugType=embedded -p:AssemblyVersion=$env:GitVersion_AssemblySemVer -p:FileVersion=$env:GitVersion_AssemblySemFileVer -p:InformationalVersion=$env:GitVersion_InformationalVersion
-        dotnet publish RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj --configuration Release --no-self-contained --framework net7.0-windows10.0.22621.0 --runtime win-arm64 -p:PublishReadyToRun=true -p:PublishReadyToRunComposite=true -p:PublishSingleFile=true -p:DebugType=embedded -p:AssemblyVersion=$env:GitVersion_AssemblySemVer -p:FileVersion=$env:GitVersion_AssemblySemFileVer -p:InformationalVersion=$env:GitVersion_InformationalVersion
+        dotnet publish RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj --configuration Release --no-self-contained --framework net8.0-windows10.0.22621.0 --runtime win-x64 -p:PublishReadyToRun=true -p:PublishReadyToRunComposite=true -p:PublishSingleFile=true -p:DebugType=embedded -p:AssemblyVersion=$env:GitVersion_AssemblySemVer -p:FileVersion=$env:GitVersion_AssemblySemFileVer -p:InformationalVersion=$env:GitVersion_InformationalVersion
+        dotnet publish RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj --configuration Release --no-self-contained --framework net8.0-windows10.0.22621.0 --runtime win-arm64 -p:PublishReadyToRun=true -p:PublishReadyToRunComposite=true -p:PublishSingleFile=true -p:DebugType=embedded -p:AssemblyVersion=$env:GitVersion_AssemblySemVer -p:FileVersion=$env:GitVersion_AssemblySemFileVer -p:InformationalVersion=$env:GitVersion_InformationalVersion
     - name: Zip
       run: |
-        7z a -r ${{ format('RS.Fritz.Manager-v{0}-net7.0-windows-x64.zip', env.GitVersion_SemVer) }} ./RS.Fritz.Manager.UI/bin/Release/net7.0-windows10.0.22621.0/win-x64/publish/*.*
-        7z a -r ${{ format('RS.Fritz.Manager-v{0}-net7.0-windows-ARM64.zip', env.GitVersion_SemVer) }} ./RS.Fritz.Manager.UI/bin/Release/net7.0-windows10.0.22621.0/win-arm64/publish/*.*
-    - name: Prerelease
-      if: ${{ env.GitVersion_PreReleaseTag != '' }}
-      run: gh release create ${{ format('v{0}', env.GitVersion_SemVer) }} (get-item *.zip) --generate-notes --target ${{ github.sha }} --prerelease
-      env:
-        GH_TOKEN: ${{ github.token }}
+        7z a -r "${{ format('RS.Fritz.Manager-v{0}-net8.0-windows-x64.zip', env.GitVersion_SemVer) }}" "./RS.Fritz.Manager.UI/bin/Release/net8.0-windows10.0.22621.0/win-x64/publish/*.*" "-x!*.xml"
+        7z a -r "${{ format('RS.Fritz.Manager-v{0}-net8.0-windows-ARM64.zip', env.GitVersion_SemVer) }}" "./RS.Fritz.Manager.UI/bin/Release/net8.0-windows10.0.22621.0/win-arm64/publish/*.*" "-x!*.xml"
     - name: Release
-      if: ${{ env.GitVersion_PreReleaseTag == '' }}
-      run: gh release create ${{ format('v{0}', env.GitVersion_SemVer) }} (get-item *.zip) --generate-notes --target ${{ github.sha }}
+      run: gh release create v${{ env.GitVersion_SemVer }} (get-item *.zip) --generate-notes --target ${{ github.sha }} ${{ env.PreReleaseTag != '' && '--prerelease' || '' }}
       env:
         GH_TOKEN: ${{ github.token }}
     - name: Package
@@ -48,4 +42,4 @@ jobs:
     - name: NuGet Push
       run: dotnet nuget push ${{ format('RS.Fritz.Manager.API/bin/Release/RS.Fritz.Manager.API.{0}.nupkg', env.GitVersion_NuGetVersionV2) }} --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json
     - name: GitHub Push
-      run: dotnet nuget push ${{ format('RS.Fritz.Manager.API/bin/Release/RS.Fritz.Manager.API.{0}.nupkg', env.GitVersion_NuGetVersionV2) }} --api-key ${{ secrets.GITHUB_TOKEN }} --source https://nuget.pkg.github.com/Rans4ckeR/index.json
+      run: dotnet nuget push ${{ format('RS.Fritz.Manager.API/bin/Release/RS.Fritz.Manager.API.{0}.nupkg', env.GitVersion_NuGetVersionV2) }} --api-key ${{ secrets.GITHUB_TOKEN }} --source https://nuget.pkg.github.com/Rans4ckeR/index.json
\ No newline at end of file
diff --git a/README.md b/README.md
index 494d0a3..5f6e529 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,14 @@
+
 # RS.Fritz.Manager
+
 Allows FritzBox device detection, monitoring, configuring and packet capturing.
 
 Available as a standalone Windows application ([UI](#rsfritzmanagerui)) and as a NuGet package ([API](#rsfritzmanagerapi)).
 
 For a list of implemented services check the [Service implementation status](#tr-064-service-implementation-status)
 
-
 ## RS.Fritz.Manager.UI
+
 A Windows .NET WPF application for x64 and ARM64.
 
 * [Releases](https://github.com/Rans4ckeR/RS.Fritz.Manager/releases)
@@ -20,6 +22,7 @@ A Windows .NET WPF application for x64 and ARM64.
 ![Untitled4](https://user-images.githubusercontent.com/25006126/163052588-4f1be776-9190-4ff9-8326-9c9615bf3e82.png)
 
 ## RS.Fritz.Manager.API
+
 A NuGet package to manage FritzBox devices using pure WCF calls.
 
 * [NuGet](https://www.nuget.org/packages/RS.Fritz.Manager.API)
@@ -109,6 +112,7 @@ static async Task StopCaptureAsync(InternetGatewayDevice device, CaptureInterfac
 ## TR-064 Service implementation status
 
 ### WAN
+
 * 🔶 urn:dslforum-org:service:WANIPConnection
   * ✅ GetInfo
   * ✅ GetConnectionTypeInfo
@@ -197,11 +201,13 @@ static async Task StopCaptureAsync(InternetGatewayDevice device, CaptureInterfac
   * ❌ SetForwardingEntryEnable
 
 ### Telephony
+
 * ❌ urn:dslforum-org:service:X_AVM-DE_OnTel
 * ❌ urn:dslforum-org:service:X_AVM-DE_TAM
 * ❌ urn:dslforum-org:service:X_VoIP
 
 ### Home network
+
 * 🔶 urn:dslforum-org:service:Hosts
   * ✅ GetHostNumberOfEntries
   * ❌ GetSpecificHostEntry
@@ -281,12 +287,14 @@ static async Task StopCaptureAsync(InternetGatewayDevice device, CaptureInterfac
 * ❌ urn:dslforum-org:service:X_AVM-DE_Homeplug
 
 ### Storage/NAS
+
 * ❌ urn:dslforum-org:service:X_AVM-DE_Storage
 * ❌ urn:dslforum-org:service:X_AVM-DE_UPnP
 * ❌ urn:dslforum-org:service:X_AVM-DE_WebDAVClient
 * ❌ urn:dslforum-org:service:X_AVM-DE_Filelinks
 
 ### System
+
 * ✅ urn:dslforum-org:service:DeviceInfo
   * ✅ GetInfo
   * ✅ SetProvisioningCode
diff --git a/RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj b/RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj
index af65a90..d808475 100644
--- a/RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj
+++ b/RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>RS.Fritz.Manager.API</AssemblyName>
     <RootNamespace>RS.Fritz.Manager.API</RootNamespace>
     <Title>RS.Fritz.Manager.API</Title>
@@ -15,6 +15,7 @@
     <AnalysisLevel>preview-all</AnalysisLevel>
     <LangVersion>preview</LangVersion>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <Version>0.0.0.1</Version>
@@ -30,7 +31,6 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
-    <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <EnablePackageValidation>true</EnablePackageValidation>
     <Platform>AnyCPU</Platform>
@@ -43,8 +43,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
-    <PackageReference Include="System.ServiceModel.Http" Version="6.0.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="System.ServiceModel.Http" Version="8.0.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/Capture/CaptureControlService.cs b/RS.Fritz.Manager.API/Services/Capture/CaptureControlService.cs
index b458bb7..e3d7d4a 100644
--- a/RS.Fritz.Manager.API/Services/Capture/CaptureControlService.cs
+++ b/RS.Fritz.Manager.API/Services/Capture/CaptureControlService.cs
@@ -34,10 +34,10 @@ public async ValueTask<IEnumerable<CaptureInterfaceGroup>> GetInterfacesAsync(In
                 int interfaceNameEndPosition = responseContent.IndexOf("</th>", interfaceNameBeginPosition + 1, StringComparison.OrdinalIgnoreCase);
                 string interfaceName = responseContent[(interfaceNameBeginPosition + "<th>".Length)..interfaceNameEndPosition];
                 int startParameterBeginPosition = responseContent.IndexOf("\" value=\"", interfaceNameEndPosition + 1, StringComparison.OrdinalIgnoreCase) + "\" value=\"".Length;
-                int startParameterEndPosition = responseContent.IndexOf("\"", startParameterBeginPosition + 1, StringComparison.OrdinalIgnoreCase);
+                int startParameterEndPosition = responseContent.IndexOf('"', startParameterBeginPosition + 1);
                 string startParameter = responseContent[startParameterBeginPosition..startParameterEndPosition];
                 int stopParameterBeginPosition = responseContent.IndexOf("\" value=\"", startParameterEndPosition + 1, StringComparison.OrdinalIgnoreCase) + "\" value=\"".Length;
-                int stopParameterEndPosition = responseContent.IndexOf("\"", stopParameterBeginPosition + 1, StringComparison.OrdinalIgnoreCase);
+                int stopParameterEndPosition = responseContent.IndexOf('"', stopParameterBeginPosition + 1);
                 string stopParameter = responseContent[stopParameterBeginPosition..stopParameterEndPosition];
                 string[] stopParameterParts = stopParameter.Split(';');
 
diff --git a/RS.Fritz.Manager.API/Services/Discovery/DeviceSearchService.cs b/RS.Fritz.Manager.API/Services/Discovery/DeviceSearchService.cs
index f022005..ebaa990 100644
--- a/RS.Fritz.Manager.API/Services/Discovery/DeviceSearchService.cs
+++ b/RS.Fritz.Manager.API/Services/Discovery/DeviceSearchService.cs
@@ -46,7 +46,7 @@ private static IEnumerable<Dictionary<string, string>> GetFormattedDeviceRespons
             {
                 string value = s[s.IndexOf(':', StringComparison.OrdinalIgnoreCase)..];
 
-                if (value.EndsWith(":", StringComparison.OrdinalIgnoreCase))
+                if (value.EndsWith(':'))
                     return value.Replace(":", null, StringComparison.OrdinalIgnoreCase);
 
                 return value.Replace(": ", null, StringComparison.OrdinalIgnoreCase);
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/IFritzAvmSpeedtestService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/IFritzAvmSpeedtestService.cs
index 9532dec..3c55f36 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/IFritzAvmSpeedtestService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/AvmSpeedtest/IFritzAvmSpeedtestService.cs
@@ -2,7 +2,7 @@
 
 [ServiceContract(Namespace = "urn:dslforum-org:service:X_AVM-DE_Speedtest:1")]
 [XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Encoded)]
-internal interface IFritzAvmSpeedtestService
+internal interface IFritzAvmSpeedtestService : IAsyncDisposable
 {
     [OperationContract(Action = "urn:dslforum-org:service:X_AVM-DE_Speedtest:1#GetInfo")]
     [FaultContract(typeof(UPnPFault1))]
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceConfig/IFritzDeviceConfigService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceConfig/IFritzDeviceConfigService.cs
index e9eb228..d4f343a 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceConfig/IFritzDeviceConfigService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceConfig/IFritzDeviceConfigService.cs
@@ -2,7 +2,7 @@
 
 [ServiceContract(Namespace = "urn:dslforum-org:service:DeviceConfig:1")]
 [XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Encoded)]
-internal interface IFritzDeviceConfigService
+internal interface IFritzDeviceConfigService : IAsyncDisposable
 {
     [OperationContract(Action = "urn:dslforum-org:service:DeviceConfig:1#GetPersistentData")]
     [FaultContract(typeof(UPnPFault1))]
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceInfo/IFritzDeviceInfoService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceInfo/IFritzDeviceInfoService.cs
index 03f612f..f48ca39 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceInfo/IFritzDeviceInfoService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/DeviceInfo/IFritzDeviceInfoService.cs
@@ -2,7 +2,7 @@
 
 [ServiceContract(Namespace = "urn:dslforum-org:service:DeviceInfo:1")]
 [XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Encoded)]
-internal interface IFritzDeviceInfoService
+internal interface IFritzDeviceInfoService : IAsyncDisposable
 {
     [OperationContract(Action = "urn:dslforum-org:service:DeviceInfo:1#GetSecurityPort")]
     [FaultContract(typeof(UPnPFault1))]
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/IFritzHostsService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/IFritzHostsService.cs
index 34f1e93..61b8acf 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/IFritzHostsService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/Hosts/IFritzHostsService.cs
@@ -2,7 +2,7 @@
 
 [ServiceContract(Namespace = "urn:dslforum-org:service:Hosts:1")]
 [XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Encoded)]
-internal interface IFritzHostsService
+internal interface IFritzHostsService : IAsyncDisposable
 {
     [OperationContract(Action = "urn:dslforum-org:service:Hosts:1#GetHostNumberOfEntries")]
     [FaultContract(typeof(UPnPFault1))]
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/LanConfigSecurity/IFritzLanConfigSecurityService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/LanConfigSecurity/IFritzLanConfigSecurityService.cs
index 40ccbf5..94380dd 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/LanConfigSecurity/IFritzLanConfigSecurityService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/LanConfigSecurity/IFritzLanConfigSecurityService.cs
@@ -2,7 +2,7 @@
 
 [ServiceContract(Namespace = "urn:dslforum-org:service:LANConfigSecurity:1")]
 [XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Encoded)]
-internal interface IFritzLanConfigSecurityService
+internal interface IFritzLanConfigSecurityService : IAsyncDisposable
 {
     [OperationContract(Action = "urn:dslforum-org:service:LANConfigSecurity:1#X_AVM-DE_GetCurrentUser")]
     [FaultContract(typeof(UPnPFault1))]
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/LanEthernetInterfaceConfig/IFritzLanEthernetInterfaceConfigService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/LanEthernetInterfaceConfig/IFritzLanEthernetInterfaceConfigService.cs
index 5d735c3..193a235 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/LanEthernetInterfaceConfig/IFritzLanEthernetInterfaceConfigService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/LanEthernetInterfaceConfig/IFritzLanEthernetInterfaceConfigService.cs
@@ -2,7 +2,7 @@
 
 [ServiceContract(Namespace = "urn:dslforum-org:service:LANEthernetInterfaceConfig:1")]
 [XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Encoded)]
-internal interface IFritzLanEthernetInterfaceConfigService
+internal interface IFritzLanEthernetInterfaceConfigService : IAsyncDisposable
 {
     [OperationContract(Action = "urn:dslforum-org:service:LANEthernetInterfaceConfig:1#GetInfo")]
     [FaultContract(typeof(UPnPFault1))]
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/LanHostConfigManagement/IFritzLanHostConfigManagementService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/LanHostConfigManagement/IFritzLanHostConfigManagementService.cs
index 64ea9bd..d8989b2 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/LanHostConfigManagement/IFritzLanHostConfigManagementService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/LanHostConfigManagement/IFritzLanHostConfigManagementService.cs
@@ -2,7 +2,7 @@
 
 [ServiceContract(Namespace = "urn:dslforum-org:service:LANHostConfigManagement:1")]
 [XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Encoded)]
-internal interface IFritzLanHostConfigManagementService
+internal interface IFritzLanHostConfigManagementService : IAsyncDisposable
 {
     [OperationContract(Action = "urn:dslforum-org:service:LANHostConfigManagement:1#GetInfo")]
     [FaultContract(typeof(UPnPFault1))]
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/Layer3Forwarding/IFritzLayer3ForwardingService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/Layer3Forwarding/IFritzLayer3ForwardingService.cs
index b17ca5c..6abbbf1 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/Layer3Forwarding/IFritzLayer3ForwardingService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/Layer3Forwarding/IFritzLayer3ForwardingService.cs
@@ -2,7 +2,7 @@
 
 [ServiceContract(Namespace = "urn:dslforum-org:service:Layer3Forwarding:1")]
 [XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Encoded)]
-internal interface IFritzLayer3ForwardingService
+internal interface IFritzLayer3ForwardingService : IAsyncDisposable
 {
     [OperationContract(Action = "urn:dslforum-org:service:Layer3Forwarding:1#GetDefaultConnectionService")]
     [FaultContract(typeof(UPnPFault1))]
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/ManagementServer/IFritzManagementServerService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/ManagementServer/IFritzManagementServerService.cs
index a6d1da8..ec75711 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/ManagementServer/IFritzManagementServerService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/ManagementServer/IFritzManagementServerService.cs
@@ -2,7 +2,7 @@
 
 [ServiceContract(Namespace = "urn:dslforum-org:service:ManagementServer:1")]
 [XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Encoded)]
-internal interface IFritzManagementServerService
+internal interface IFritzManagementServerService : IAsyncDisposable
 {
     [OperationContract(Action = "urn:dslforum-org:service:ManagementServer:1#GetInfo")]
     [FaultContract(typeof(UPnPFault1))]
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/Time/IFritzTimeService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/Time/IFritzTimeService.cs
index 41db0d7..b6a6098 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/Time/IFritzTimeService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/Time/IFritzTimeService.cs
@@ -2,7 +2,7 @@
 
 [ServiceContract(Namespace = "urn:dslforum-org:service:Time:1")]
 [XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Encoded)]
-internal interface IFritzTimeService
+internal interface IFritzTimeService : IAsyncDisposable
 {
     [OperationContract(Action = "urn:dslforum-org:service:Time:1#GetInfo")]
     [FaultContract(typeof(UPnPFault1))]
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/UserInterface/IFritzUserInterfaceService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/UserInterface/IFritzUserInterfaceService.cs
index 99300ba..14a07a0 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/UserInterface/IFritzUserInterfaceService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/UserInterface/IFritzUserInterfaceService.cs
@@ -2,7 +2,7 @@
 
 [ServiceContract(Namespace = "urn:dslforum-org:service:UserInterface:1")]
 [XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Encoded)]
-internal interface IFritzUserInterfaceService
+internal interface IFritzUserInterfaceService : IAsyncDisposable
 {
     [OperationContract(Action = "urn:dslforum-org:service:UserInterface:1#GetInfo")]
     [FaultContract(typeof(UPnPFault1))]
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WanCommonInterfaceConfig/IFritzWanCommonInterfaceConfigService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WanCommonInterfaceConfig/IFritzWanCommonInterfaceConfigService.cs
index 87eef3d..a6c438a 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WanCommonInterfaceConfig/IFritzWanCommonInterfaceConfigService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WanCommonInterfaceConfig/IFritzWanCommonInterfaceConfigService.cs
@@ -2,7 +2,7 @@
 
 [ServiceContract(Namespace = "urn:dslforum-org:service:WANCommonInterfaceConfig:1")]
 [XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Encoded)]
-internal interface IFritzWanCommonInterfaceConfigService
+internal interface IFritzWanCommonInterfaceConfigService : IAsyncDisposable
 {
     [OperationContract(Action = "urn:dslforum-org:service:WANCommonInterfaceConfig:1#GetTotalBytesReceived")]
     [FaultContract(typeof(UPnPFault1))]
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslInterfaceConfig/IFritzWanDslInterfaceConfigService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslInterfaceConfig/IFritzWanDslInterfaceConfigService.cs
index 87437ad..58ce31e 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslInterfaceConfig/IFritzWanDslInterfaceConfigService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslInterfaceConfig/IFritzWanDslInterfaceConfigService.cs
@@ -2,7 +2,7 @@
 
 [ServiceContract(Namespace = "urn:dslforum-org:service:WANDSLInterfaceConfig:1")]
 [XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Encoded)]
-internal interface IFritzWanDslInterfaceConfigService
+internal interface IFritzWanDslInterfaceConfigService : IAsyncDisposable
 {
     [OperationContract(Action = "urn:dslforum-org:service:WANDSLInterfaceConfig:1#GetInfo")]
     [FaultContract(typeof(UPnPFault1))]
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslLinkConfig/IFritzWanDslLinkConfigService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslLinkConfig/IFritzWanDslLinkConfigService.cs
index e4daed9..ddc0e5f 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslLinkConfig/IFritzWanDslLinkConfigService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WanDslLinkConfig/IFritzWanDslLinkConfigService.cs
@@ -2,7 +2,7 @@
 
 [ServiceContract(Namespace = "urn:dslforum-org:service:WANDSLLinkConfig:1")]
 [XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Encoded)]
-internal interface IFritzWanDslLinkConfigService
+internal interface IFritzWanDslLinkConfigService : IAsyncDisposable
 {
     [OperationContract(Action = "urn:dslforum-org:service:WANDSLLinkConfig:1#GetInfo")]
     [FaultContract(typeof(UPnPFault1))]
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WanEthernetLinkConfig/IFritzWanEthernetLinkConfigService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WanEthernetLinkConfig/IFritzWanEthernetLinkConfigService.cs
index c233cfc..cd7abb9 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WanEthernetLinkConfig/IFritzWanEthernetLinkConfigService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WanEthernetLinkConfig/IFritzWanEthernetLinkConfigService.cs
@@ -2,7 +2,7 @@
 
 [ServiceContract(Namespace = "urn:dslforum-org:service:WANEthernetLinkConfig:1")]
 [XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Encoded)]
-internal interface IFritzWanEthernetLinkConfigService
+internal interface IFritzWanEthernetLinkConfigService : IAsyncDisposable
 {
     [OperationContract(Action = "urn:dslforum-org:service:WANEthernetLinkConfig:1#GetEthernetLinkStatus")]
     [FaultContract(typeof(UPnPFault1))]
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WanIpConnection/IFritzWanIpConnectionService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WanIpConnection/IFritzWanIpConnectionService.cs
index 7d0d492..1437cc9 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WanIpConnection/IFritzWanIpConnectionService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WanIpConnection/IFritzWanIpConnectionService.cs
@@ -2,7 +2,7 @@
 
 [ServiceContract(Namespace = "urn:dslforum-org:service:WANIPConnection:1")]
 [XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Encoded)]
-internal interface IFritzWanIpConnectionService
+internal interface IFritzWanIpConnectionService : IAsyncDisposable
 {
     [OperationContract(Action = "urn:dslforum-org:service:WANIPConnection:1#GetInfo")]
     [FaultContract(typeof(UPnPFault1))]
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WanPppConnection/IFritzWanPppConnectionService.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WanPppConnection/IFritzWanPppConnectionService.cs
index 9be9a25..0a19ff2 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WanPppConnection/IFritzWanPppConnectionService.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WanPppConnection/IFritzWanPppConnectionService.cs
@@ -2,7 +2,7 @@
 
 [ServiceContract(Namespace = "urn:dslforum-org:service:WANPPPConnection:1")]
 [XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Encoded)]
-internal interface IFritzWanPppConnectionService
+internal interface IFritzWanPppConnectionService : IAsyncDisposable
 {
     [OperationContract(Action = "urn:dslforum-org:service:WANPPPConnection:1#GetInfo")]
     [FaultContract(typeof(UPnPFault1))]
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/IFritzWlanConfiguration1Service.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/IFritzWlanConfiguration1Service.cs
index 11dbe42..84a5d4e 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/IFritzWlanConfiguration1Service.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/IFritzWlanConfiguration1Service.cs
@@ -2,7 +2,7 @@
 
 [ServiceContract(Namespace = "urn:dslforum-org:service:WLANConfiguration:1")]
 [XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Encoded)]
-internal interface IFritzWlanConfiguration1Service
+internal interface IFritzWlanConfiguration1Service : IAsyncDisposable
 {
     [OperationContract(Action = "urn:dslforum-org:service:WLANConfiguration:1#GetInfo")]
     [FaultContract(typeof(UPnPFault1))]
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/IFritzWlanConfiguration2Service.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/IFritzWlanConfiguration2Service.cs
index 78fb01d..22812e7 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/IFritzWlanConfiguration2Service.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/IFritzWlanConfiguration2Service.cs
@@ -2,7 +2,7 @@
 
 [ServiceContract(Namespace = "urn:dslforum-org:service:WLANConfiguration:2")]
 [XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Encoded)]
-internal interface IFritzWlanConfiguration2Service
+internal interface IFritzWlanConfiguration2Service : IAsyncDisposable
 {
     [OperationContract(Action = "urn:dslforum-org:service:WLANConfiguration:2#GetInfo")]
     [FaultContract(typeof(UPnPFault1))]
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/IFritzWlanConfiguration3Service.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/IFritzWlanConfiguration3Service.cs
index 0be3a9a..fa06a59 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/IFritzWlanConfiguration3Service.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/IFritzWlanConfiguration3Service.cs
@@ -2,7 +2,7 @@
 
 [ServiceContract(Namespace = "urn:dslforum-org:service:WLANConfiguration:3")]
 [XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Encoded)]
-internal interface IFritzWlanConfiguration3Service
+internal interface IFritzWlanConfiguration3Service : IAsyncDisposable
 {
     [OperationContract(Action = "urn:dslforum-org:service:WLANConfiguration:3#GetInfo")]
     [FaultContract(typeof(UPnPFault1))]
diff --git a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/IFritzWlanConfiguration4Service.cs b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/IFritzWlanConfiguration4Service.cs
index 7096a1a..86aeeb2 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/IFritzWlanConfiguration4Service.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/Services/WlanConfiguration/IFritzWlanConfiguration4Service.cs
@@ -2,7 +2,7 @@
 
 [ServiceContract(Namespace = "urn:dslforum-org:service:WLANConfiguration:4")]
 [XmlSerializerFormat(Style = OperationFormatStyle.Rpc, Use = OperationFormatUse.Encoded)]
-internal interface IFritzWlanConfiguration4Service
+internal interface IFritzWlanConfiguration4Service : IAsyncDisposable
 {
     [OperationContract(Action = "urn:dslforum-org:service:WLANConfiguration:4#GetInfo")]
     [FaultContract(typeof(UPnPFault1))]
diff --git a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs b/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs
index 42fad02..1b0d87b 100644
--- a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs
+++ b/RS.Fritz.Manager.API/Services/TR-064/SoapClient/FritzServiceOperationHandler.cs
@@ -24,7 +24,7 @@ internal sealed class FritzServiceOperationHandler(
     IClientFactory<IFritzTimeService> fritzTimeServiceClientFactory,
     IClientFactory<IFritzUserInterfaceService> fritzUserInterfaceServiceClientFactory,
     IClientFactory<IFritzDeviceConfigService> fritzDeviceConfigServiceClientFactory)
-    : ServiceOperationHandler, IFritzServiceOperationHandler
+    : IFritzServiceOperationHandler
 {
     public Task<HostsGetHostNumberOfEntriesResponse> HostsGetHostNumberOfEntriesAsync(InternetGatewayDevice internetGatewayDevice)
         => ExecuteAsync(GetFritzServiceClient(internetGatewayDevice, fritzHostsServiceClientFactory, (q, r, t) => new FritzHostsService(q, r, t!), FritzHostsService.ControlUrl), q => q.GetHostNumberOfEntriesAsync(default));
@@ -508,4 +508,13 @@ public Task<DeviceConfigGetSupportDataInfoResponse> DeviceConfigGetSupportDataIn
 
     private static T GetFritzServiceClient<T>(InternetGatewayDevice internetGatewayDevice, IClientFactory<T> clientFactory, Func<FritzServiceEndpointConfiguration, EndpointAddress, NetworkCredential?, T> createService, string controlUrl, bool secure = true)
         => clientFactory.Build(createService, internetGatewayDevice.PreferredLocation, secure, controlUrl, secure ? internetGatewayDevice.SecurityPort : null, internetGatewayDevice.NetworkCredential);
+
+    private static async Task<TResult> ExecuteAsync<T, TResult>(T client, Func<T, Task<TResult>> operation)
+        where T : IAsyncDisposable
+    {
+        await using (client.ConfigureAwait(false))
+        {
+            return await operation(client).ConfigureAwait(false);
+        }
+    }
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/ServiceOperationHandler.cs b/RS.Fritz.Manager.API/Services/TR-064/SoapClient/ServiceOperationHandler.cs
deleted file mode 100644
index 6b41916..0000000
--- a/RS.Fritz.Manager.API/Services/TR-064/SoapClient/ServiceOperationHandler.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace RS.Fritz.Manager.API;
-
-internal abstract class ServiceOperationHandler
-{
-    protected static async Task<TResult> ExecuteAsync<T, TResult>(T client, Func<T, Task<TResult>> operation)
-    {
-        if (client is not ICommunicationObject)
-            throw new NotSupportedException();
-
-        await using (((IAsyncDisposable)client).ConfigureAwait(false))
-        {
-            return await operation(client).ConfigureAwait(false);
-        }
-    }
-}
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj b/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj
index a2ac54e..b826d5e 100644
--- a/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj
+++ b/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows10.0.22621.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <SupportedOSPlatformVersion>10.0.22621.0</SupportedOSPlatformVersion>
     <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
     <AssemblyName>RS.Fritz.Manager.UI</AssemblyName>
@@ -19,13 +19,13 @@
     <AnalysisLevel>preview-all</AnalysisLevel>
     <LangVersion>preview</LangVersion>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UseWPF>true</UseWPF>
     <Version>0.0.0.1</Version>
     <FileVersion>0.0.0.1</FileVersion>
     <InformationalVersion>0.0.0.1</InformationalVersion>
-    <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
     <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
     <Platforms>x64;ARM64</Platforms>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -39,8 +39,8 @@
     <None Remove="Images\Success.png" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

From 4fd7e70a07f5b1ad2e52a0ccfb0bb43e807b7410 Mon Sep 17 00:00:00 2001
From: Rans4ckeR <ransacker@outlook.com>
Date: Fri, 5 Jan 2024 21:31:58 +0100
Subject: [PATCH 15/15] Device SerialNumber

---
 .../Entities/InternetGatewayDevice.cs         |  6 ++---
 .../Extensions/DeviceExtensions.cs            |  2 +-
 .../RS.Fritz.Manager.API.csproj               |  4 ++--
 .../Services/Discovery/DeviceSearchService.cs |  2 +-
 .../Services/Discovery/Entities/Device.cs     | 11 +++++----
 .../MainWindow/MainWindowViewModel.cs         |  4 ++--
 .../RS.Fritz.Manager.UI.csproj                |  4 ++--
 .../Resources/UPnPResourceDictionary.xaml     | 23 +++++++++++--------
 ...nterfaceConfigGetOnlineMonitorViewModel.cs |  2 +-
 .../WanDslInterfaceConfigDslInfoViewModel.cs  |  4 ++--
 .../WanDslInterfaceConfigInfoViewModel.cs     | 22 +++++++++---------
 11 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/RS.Fritz.Manager.API/Entities/InternetGatewayDevice.cs b/RS.Fritz.Manager.API/Entities/InternetGatewayDevice.cs
index ee26907..99cd648 100644
--- a/RS.Fritz.Manager.API/Entities/InternetGatewayDevice.cs
+++ b/RS.Fritz.Manager.API/Entities/InternetGatewayDevice.cs
@@ -15,12 +15,12 @@ public sealed record InternetGatewayDevice(IFritzServiceOperationHandler FritzSe
     public IEnumerable<ServiceListItem> Services
         => services ??= UPnPDescription.Device.GetServices().ToArray();
 
-    internal Task<TResult> ExecuteAsync<TResult>(Func<IFritzServiceOperationHandler, InternetGatewayDevice, Task<TResult>> operation)
-        => operation(FritzServiceOperationHandler, this);
-
     public async ValueTask InitializeAsync()
     {
         SecurityPort = (await this.DeviceInfoGetSecurityPortAsync().ConfigureAwait(false)).SecurityPort;
         Users = (await UsersService.GetUsersAsync(this).ConfigureAwait(false)).ToArray();
     }
+
+    internal Task<TResult> ExecuteAsync<TResult>(Func<IFritzServiceOperationHandler, InternetGatewayDevice, Task<TResult>> operation)
+        => operation(FritzServiceOperationHandler, this);
 }
\ No newline at end of file
diff --git a/RS.Fritz.Manager.API/Extensions/DeviceExtensions.cs b/RS.Fritz.Manager.API/Extensions/DeviceExtensions.cs
index 08e760c..2fdfe53 100644
--- a/RS.Fritz.Manager.API/Extensions/DeviceExtensions.cs
+++ b/RS.Fritz.Manager.API/Extensions/DeviceExtensions.cs
@@ -6,7 +6,7 @@ public static IEnumerable<ServiceListItem> GetServices(this Device device)
     {
         IEnumerable<ServiceListItem> serviceListItems = device.ServiceList;
 
-        foreach (Device deviceListItem in device.DeviceList ?? Array.Empty<Device>())
+        foreach (Device deviceListItem in device.DeviceList ?? [])
         {
             serviceListItems = serviceListItems.Concat(GetServices(deviceListItem));
         }
diff --git a/RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj b/RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj
index d808475..8e5d940 100644
--- a/RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj
+++ b/RS.Fritz.Manager.API/RS.Fritz.Manager.API.csproj
@@ -5,7 +5,7 @@
     <RootNamespace>RS.Fritz.Manager.API</RootNamespace>
     <Title>RS.Fritz.Manager.API</Title>
     <Product>RS.Fritz.Manager.API</Product>
-    <Copyright>Copyright 2023 (c) RS. All rights reserved.</Copyright>
+    <Copyright>Copyright 2021-2024 (c) RS. All rights reserved.</Copyright>
     <Company>Rans4ckeR</Company>
     <Configuration></Configuration>
     <Trademark></Trademark>
@@ -39,7 +39,7 @@
     <None Include="..\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/RS.Fritz.Manager.API/Services/Discovery/DeviceSearchService.cs b/RS.Fritz.Manager.API/Services/Discovery/DeviceSearchService.cs
index ebaa990..65956f3 100644
--- a/RS.Fritz.Manager.API/Services/Discovery/DeviceSearchService.cs
+++ b/RS.Fritz.Manager.API/Services/Discovery/DeviceSearchService.cs
@@ -54,7 +54,7 @@ private static IEnumerable<Dictionary<string, string>> GetFormattedDeviceRespons
             StringComparer.OrdinalIgnoreCase));
     }
 
-    private static async ValueTask ReceiveAsync(Socket socket, ICollection<string> responses, int receiveTimeout, CancellationToken cancellationToken)
+    private static async ValueTask ReceiveAsync(Socket socket, List<string> responses, int receiveTimeout, CancellationToken cancellationToken)
     {
         using IMemoryOwner<byte> memoryOwner = MemoryPool<byte>.Shared.Rent(4096);
         using var timeoutCancellationTokenSource = new CancellationTokenSource(receiveTimeout);
diff --git a/RS.Fritz.Manager.API/Services/Discovery/Entities/Device.cs b/RS.Fritz.Manager.API/Services/Discovery/Entities/Device.cs
index dfdbfa1..7a99041 100644
--- a/RS.Fritz.Manager.API/Services/Discovery/Entities/Device.cs
+++ b/RS.Fritz.Manager.API/Services/Discovery/Entities/Device.cs
@@ -13,8 +13,9 @@ public readonly record struct Device(
     [property: DataMember(Name = "modelNumber", Order = 6)] string ModelNumber,
     [property: DataMember(Name = "modelURL", Order = 7)] string ModelUrl,
     [property: DataMember(Name = "UDN", Order = 8)] string UniqueDeviceName,
-    [property: DataMember(Name = "UPC", Order = 9)] string Upc,
-    [property: DataMember(Name = "iconList", Order = 10)] IconListItem[] IconList,
-    [property: DataMember(Name = "serviceList", Order = 11)] ServiceListItem[] ServiceList,
-    [property: DataMember(Name = "deviceList", Order = 12)] Device[]? DeviceList,
-    [property: DataMember(Name = "presentationURL", Order = 13)] string PresentationUrl);
\ No newline at end of file
+    [property: DataMember(Name = "serialNumber", Order = 9)] string SerialNumber,
+    [property: DataMember(Name = "UPC", Order = 10)] string Upc,
+    [property: DataMember(Name = "iconList", Order = 11)] IconListItem[] IconList,
+    [property: DataMember(Name = "serviceList", Order = 12)] ServiceListItem[] ServiceList,
+    [property: DataMember(Name = "deviceList", Order = 13)] Device[]? DeviceList,
+    [property: DataMember(Name = "presentationURL", Order = 14)] string PresentationUrl);
\ No newline at end of file
diff --git a/RS.Fritz.Manager.UI/MainWindow/MainWindowViewModel.cs b/RS.Fritz.Manager.UI/MainWindow/MainWindowViewModel.cs
index fcb63af..f8d9428 100644
--- a/RS.Fritz.Manager.UI/MainWindow/MainWindowViewModel.cs
+++ b/RS.Fritz.Manager.UI/MainWindow/MainWindowViewModel.cs
@@ -19,8 +19,8 @@ internal sealed class MainWindowViewModel : FritzServiceViewModel
     private const int ZIndexNoOverlay = -1;
 
     private readonly IDeviceSearchService deviceSearchService;
-    private ObservableCollection<ObservableInternetGatewayDevice> devices = new();
-    private ObservableCollection<User> users = new();
+    private ObservableCollection<ObservableInternetGatewayDevice> devices = [];
+    private ObservableCollection<User> users = [];
     private ObservableObject? activeView;
     private string? userMessage;
     private bool deviceAndLoginControlsEnabled = true;
diff --git a/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj b/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj
index b826d5e..da68801 100644
--- a/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj
+++ b/RS.Fritz.Manager.UI/RS.Fritz.Manager.UI.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>RS.Fritz.Manager.UI</RootNamespace>
     <Title>RS.Fritz.Manager.UI</Title>
     <Product>RS.Fritz.Manager.UI</Product>
-    <Copyright>Copyright 2023 (c) RS. All rights reserved.</Copyright>
+    <Copyright>Copyright 2021-2024 (c) RS. All rights reserved.</Copyright>
     <Company>Rans4ckeR</Company>
     <Configuration></Configuration>
     <Trademark></Trademark>
@@ -41,7 +41,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
-    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.507">
+    <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/RS.Fritz.Manager.UI/Resources/UPnPResourceDictionary.xaml b/RS.Fritz.Manager.UI/Resources/UPnPResourceDictionary.xaml
index 9041c02..07952de 100644
--- a/RS.Fritz.Manager.UI/Resources/UPnPResourceDictionary.xaml
+++ b/RS.Fritz.Manager.UI/Resources/UPnPResourceDictionary.xaml
@@ -137,6 +137,7 @@
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto"/>
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto"/>
@@ -151,11 +152,12 @@
                     <Label Grid.Row="6" Grid.Column="0" Target="{Binding ElementName=ModelNumber}" Content="_ModelNumber" ToolTip="Model number of the device."/>
                     <Label Grid.Row="7" Grid.Column="0" Target="{Binding ElementName=ModelUrl}" Content="_ModelUrl" ToolTip="URL to the Web site for this model."/>
                     <Label Grid.Row="8" Grid.Column="0" Target="{Binding ElementName=UniqueDeviceName}" Content="_UniqueDeviceName" ToolTip="Name that uniquely identifies a specific device."/>
-                    <Label Grid.Row="9" Grid.Column="0" Target="{Binding ElementName=Upc}" Content="_Upc" ToolTip="Universal Product Code."/>
-                    <Label Grid.Row="10" Grid.Column="0" Target="{Binding ElementName=PresentationUrl}" Content="_PresentationUrl" ToolTip="URL to a device representation Web page."/>
-                    <Label Grid.Row="11" Grid.Column="0" Target="{Binding ElementName=IconList}" Content="_IconList" ToolTip="Icon to depict device in a control point UI."/>
-                    <Label Grid.Row="12" Grid.Column="0" Target="{Binding ElementName=ServiceList}" Content="_ServiceList" ToolTip="List of UPnP services."/>
-                    <Label Grid.Row="13" Grid.Column="0" Target="{Binding ElementName=DeviceList}" Content="_DeviceList" ToolTip="List of embedded UPnP devices."/>
+                    <Label Grid.Row="9" Grid.Column="0" Target="{Binding ElementName=SerialNumber}" Content="_SerialNumber"/>
+                    <Label Grid.Row="10" Grid.Column="0" Target="{Binding ElementName=Upc}" Content="_Upc" ToolTip="Universal Product Code."/>
+                    <Label Grid.Row="11" Grid.Column="0" Target="{Binding ElementName=PresentationUrl}" Content="_PresentationUrl" ToolTip="URL to a device representation Web page."/>
+                    <Label Grid.Row="12" Grid.Column="0" Target="{Binding ElementName=IconList}" Content="_IconList" ToolTip="Icon to depict device in a control point UI."/>
+                    <Label Grid.Row="13" Grid.Column="0" Target="{Binding ElementName=ServiceList}" Content="_ServiceList" ToolTip="List of UPnP services."/>
+                    <Label Grid.Row="14" Grid.Column="0" Target="{Binding ElementName=DeviceList}" Content="_DeviceList" ToolTip="List of embedded UPnP devices."/>
                     <TextBlock x:Name="DeviceType" Grid.Row="0" Grid.Column="1" Text="{Binding DeviceType}"/>
                     <TextBlock x:Name="FriendlyName" Grid.Row="1" Grid.Column="1" Text="{Binding FriendlyName}"/>
                     <TextBlock x:Name="Manufacturer" Grid.Row="2" Grid.Column="1" Text="{Binding Manufacturer}"/>
@@ -165,15 +167,16 @@
                     <TextBlock x:Name="ModelNumber" Grid.Row="6" Grid.Column="1" Text="{Binding ModelNumber}"/>
                     <ContentControl x:Name="ModelUrl" ContentTemplate="{StaticResource UrlDataTemplate}" Content="{Binding ModelUrl}" Grid.Row="7" Grid.Column="1"/>
                     <TextBlock x:Name="UniqueDeviceName" Grid.Row="8" Grid.Column="1" Text="{Binding UniqueDeviceName}"/>
-                    <TextBlock x:Name="Upc" Grid.Row="9" Grid.Column="1" Text="{Binding Upc}"/>
-                    <ContentControl x:Name="PresentationUrl" ContentTemplate="{StaticResource UrlDataTemplate}" Content="{Binding PresentationUrl}" Grid.Row="10" Grid.Column="1"/>
-                    <ItemsControl x:Name="IconList" Grid.Row="11" Grid.Column="1" ItemsSource="{Binding IconList}"/>
-                    <Border Style="{StaticResource BorderStyle}" Grid.Row="12" Grid.Column="1">
+                    <TextBlock x:Name="SerialNumber" Grid.Row="9" Grid.Column="1" Text="{Binding SerialNumber}"/>
+                    <TextBlock x:Name="Upc" Grid.Row="10" Grid.Column="1" Text="{Binding Upc}"/>
+                    <ContentControl x:Name="PresentationUrl" ContentTemplate="{StaticResource UrlDataTemplate}" Content="{Binding PresentationUrl}" Grid.Row="11" Grid.Column="1"/>
+                    <ItemsControl x:Name="IconList" Grid.Row="12" Grid.Column="1" ItemsSource="{Binding IconList}"/>
+                    <Border Style="{StaticResource BorderStyle}" Grid.Row="13" Grid.Column="1">
                         <Expander Header="ServiceList">
                             <ui:NoScrollDataGrid x:Name="ServiceList" ItemsSource="{Binding ServiceList}"/>
                         </Expander>
                     </Border>
-                    <ItemsControl x:Name="DeviceList" Grid.Row="13" Grid.Column="1" ItemsSource="{Binding DeviceList}"/>
+                    <ItemsControl x:Name="DeviceList" Grid.Row="14" Grid.Column="1" ItemsSource="{Binding DeviceList}"/>
                 </Grid>
             </Expander>
         </Border>
diff --git a/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigGetOnlineMonitorViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigGetOnlineMonitorViewModel.cs
index ed8dde0..723f139 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigGetOnlineMonitorViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanCommonInterfaceConfig/WanCommonInterfaceConfigGetOnlineMonitorViewModel.cs
@@ -172,7 +172,7 @@ protected override void FritzServiceViewModelPropertyChanged(object? sender, Pro
     protected override bool GetCanExecuteDefaultCommand()
         => base.GetCanExecuteDefaultCommand() && (WanCommonInterfaceConfigGetOnlineMonitorResponse is null || SyncGroupIndex < WanCommonInterfaceConfigGetOnlineMonitorResponse!.Value.Key!.Value.TotalNumberSyncGroups);
 
-    private static void CreateUiElements(double yScale, double xScale, uint min, uint range, ICollection<UIElement> uiElements, IReadOnlyList<uint> values, Brush brush)
+    private static void CreateUiElements(double yScale, double xScale, uint min, uint range, List<UIElement> uiElements, IReadOnlyList<uint> values, Brush brush)
     {
         for (int i = 1; i < values.Count; i++)
         {
diff --git a/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigDslInfoViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigDslInfoViewModel.cs
index 59d0e0d..e9c7145 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigDslInfoViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigDslInfoViewModel.cs
@@ -19,7 +19,7 @@ internal sealed class WanDslInterfaceConfigDslInfoViewModel : ObservableObject
 
     public WanDslInterfaceConfigDslInfoViewModel()
     {
-        DownstreamSnrElements = new();
+        DownstreamSnrElements = [];
 
         maxBrush.Freeze();
         minBrush.Freeze();
@@ -43,7 +43,7 @@ public List<UIElement>? DownstreamSnrElements
         private set => _ = SetProperty(ref downstreamSnrElements, value);
     }
 
-    private static void CreateUiElements(double yScale, double xScale, uint min, uint range, ICollection<UIElement> uiElements, IReadOnlyList<uint> values, Brush brush)
+    private static void CreateUiElements(double yScale, double xScale, uint min, uint range, List<UIElement> uiElements, IReadOnlyList<uint> values, Brush brush)
     {
         for (int i = 1; i < values.Count; i++)
         {
diff --git a/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigInfoViewModel.cs b/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigInfoViewModel.cs
index b263e36..9c40b74 100644
--- a/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigInfoViewModel.cs
+++ b/RS.Fritz.Manager.UI/UserControls/WanDslInterfaceConfig/WanDslInterfaceConfigInfoViewModel.cs
@@ -12,7 +12,7 @@ internal sealed class WanDslInterfaceConfigInfoViewModel : ObservableObject
     private readonly Brush minBrush = Brushes.Orange;
     private readonly Brush lineBrush = Brushes.Green;
     private readonly ScaleTransform scaleYTransform = new() { ScaleY = -1d };
-    private readonly List<WanDslInterfaceConfigGetInfoResponse> wanDslInterfaceConfigGetInfoResponses = new();
+    private readonly List<WanDslInterfaceConfigGetInfoResponse> wanDslInterfaceConfigGetInfoResponses = [];
 
     private KeyValuePair<WanDslInterfaceConfigGetInfoResponse?, UPnPFault?>? wanDslInterfaceConfigGetInfoResponse;
     private List<UIElement>? downstreamMaxRateHistory;
@@ -27,16 +27,16 @@ internal sealed class WanDslInterfaceConfigInfoViewModel : ObservableObject
 
     public WanDslInterfaceConfigInfoViewModel()
     {
-        UpstreamCurrRateHistory = new();
-        DownstreamCurrRateHistory = new();
-        UpstreamMaxRateHistory = new();
-        DownstreamMaxRateHistory = new();
-        UpstreamNoiseMarginHistory = new();
-        DownstreamNoiseMarginHistory = new();
-        UpstreamAttenuationHistory = new();
-        DownstreamAttenuationHistory = new();
-        UpstreamPowerHistory = new();
-        DownstreamPowerHistory = new();
+        UpstreamCurrRateHistory = [];
+        DownstreamCurrRateHistory = [];
+        UpstreamMaxRateHistory = [];
+        DownstreamMaxRateHistory = [];
+        UpstreamNoiseMarginHistory = [];
+        DownstreamNoiseMarginHistory = [];
+        UpstreamAttenuationHistory = [];
+        DownstreamAttenuationHistory = [];
+        UpstreamPowerHistory = [];
+        DownstreamPowerHistory = [];
 
         maxBrush.Freeze();
         minBrush.Freeze();