diff --git a/scripts/Common/Scripts/Software.ps1 b/scripts/Common/Scripts/Software.ps1
index d676c060..fb0e578c 100644
--- a/scripts/Common/Scripts/Software.ps1
+++ b/scripts/Common/Scripts/Software.ps1
@@ -197,6 +197,7 @@ $null = New-Module {
     function Start-SoftwareInstaller {
         param(
             [string] $Name,
+            [scriptblock] $Backup = $null,
             [scriptblock] $Installer = $null,
             [scriptblock] $Configurator = $null,
             [scriptblock] $UserConfigurator = $null,
@@ -236,31 +237,40 @@ $null = New-Module {
                     arguments = $Arguments;
                 };
 
-                if ($action -eq ([InstallerAction]::Install)) {
-                    if ($Installer) {
-                        Write-Host "Installing $Name…";
-                        & $Installer @argumentList;
+                switch ($Action) {
+                    ([InstallerAction]::Backup)  {
+                        if ($Backup) {
+                            Write-Host "Backing up $Name…";
+                            & $Backup @argumentList;
+                        }
                     }
+                    ([InstallerAction]::Install) {
+                        if ($Installer) {
+                            Write-Host "Installing $Name…";
+                            & $Installer @argumentList;
+                        }
 
-                    & $installHandler @argumentList -Action ([InstallerAction]::Configure);
+                        & $installHandler @argumentList -Action ([InstallerAction]::Configure);
 
-                    if ($UserConfigurator -and (-not (Test-SetupUser))) {
-                        & $installHandler @argumentList -Action ([InstallerAction]::ConfigureUser);
+                        if ($UserConfigurator -and (-not (Test-SetupUser))) {
+                            & $installHandler @argumentList -Action ([InstallerAction]::ConfigureUser);
+                        }
                     }
-                    # ToDo: Automatically configure after installation
-                } elseif ($Action -eq ([InstallerAction]::Configure)) {
-                    if ($Configurator) {
-                        Write-Host "Configuring $Name…";
-                        & $Configurator @argumentList;
-                    }
-                } elseif ($Action -eq ([InstallerAction]::ConfigureUser)) {
-                    if ((-not $Arguments.ContainsKey($userArgument)) -or (-not $Arguments[$userArgument])) {
-                        $Arguments.Add($userArgument, ($IsWindows ? $env:UserName : $env:USER));
+                    ([InstallerAction]::Configure) {
+                        if ($Configurator) {
+                            Write-Host "Configuring $Name…";
+                            & $Configurator @argumentList;
+                        }
                     }
+                    ([InstallerAction]::ConfigureUser) {
+                        if ((-not $Arguments.ContainsKey($userArgument)) -or (-not $Arguments[$userArgument])) {
+                            $Arguments.Add($userArgument, ($IsWindows ? $env:UserName : $env:USER));
+                        }
 
-                    if ($UserConfigurator) {
-                        Write-Host "Configuring $Name for user ``$($Arguments[$userArgument])``…";
-                        & $UserConfigurator @argumentList;
+                        if ($UserConfigurator) {
+                            Write-Host "Configuring $Name for user ``$($Arguments[$userArgument])``…";
+                            & $UserConfigurator @argumentList;
+                        }
                     }
                 }
             };