diff --git a/d365bap.tools/functions/Confirm-BapEnvironmentIntegration.ps1 b/d365bap.tools/functions/Confirm-BapEnvironmentIntegration.ps1
index bed50e0..27f7b48 100644
--- a/d365bap.tools/functions/Confirm-BapEnvironmentIntegration.ps1
+++ b/d365bap.tools/functions/Confirm-BapEnvironmentIntegration.ps1
@@ -68,6 +68,8 @@ function Confirm-BapEnvironmentIntegration {
     }
     
     process {
+        if (Test-PSFFunctionInterrupt) { return }
+
         $resValidate = Invoke-RestMethod -Method Get -Uri $($baseUri + '/api/data/v9.2/RetrieveFinanceAndOperationsIntegrationDetails') -Headers $headersWebApi
 
         $temp = $resValidate | Select-PSFObject -TypeName "D365Bap.Tools.Environment.Integration" -ExcludeProperty "@odata.context" -Property "Id as LinkedAppLcsEnvId",
diff --git a/d365bap.tools/functions/Get-BapEnvironment.ps1 b/d365bap.tools/functions/Get-BapEnvironment.ps1
index 0a2edb6..c3ace85 100644
--- a/d365bap.tools/functions/Get-BapEnvironment.ps1
+++ b/d365bap.tools/functions/Get-BapEnvironment.ps1
@@ -67,7 +67,6 @@ function Get-BapEnvironment {
     }
     
     process {
-        
         $resCol = @(
             foreach ($envObj in $resEnvs) {
                 if (-not ($envObj.Name -like $EnvironmentId)) { continue }
diff --git a/d365bap.tools/functions/Get-BapEnvironmentApplicationUser.ps1 b/d365bap.tools/functions/Get-BapEnvironmentApplicationUser.ps1
index 04740a2..d33f047 100644
--- a/d365bap.tools/functions/Get-BapEnvironmentApplicationUser.ps1
+++ b/d365bap.tools/functions/Get-BapEnvironmentApplicationUser.ps1
@@ -71,6 +71,8 @@ function Get-BapEnvironmentApplicationUser {
     }
     
     process {
+        if (Test-PSFFunctionInterrupt) { return }
+
         $resAppUsers = Invoke-RestMethod -Method Get -Uri $($baseUri + '/api/data/v9.2/applicationusers') -Headers $headersWebApi
         $resCol = @(
             foreach ($appUsrObj in  $($resAppUsers.value | Sort-Object -Property applicationname)) {
diff --git a/d365bap.tools/functions/Get-BapEnvironmentUser.ps1 b/d365bap.tools/functions/Get-BapEnvironmentUser.ps1
index 7a06e59..2e5e40b 100644
--- a/d365bap.tools/functions/Get-BapEnvironmentUser.ps1
+++ b/d365bap.tools/functions/Get-BapEnvironmentUser.ps1
@@ -94,6 +94,8 @@ function Get-BapEnvironmentUser {
     }
     
     process {
+        if (Test-PSFFunctionInterrupt) { return }
+        
         $resUsers = Invoke-RestMethod -Method Get -Uri $($baseUri + '/api/data/v9.2/systemusers?$select=fullname,internalemailaddress,applicationid&$expand=user_settings($select=uilanguageid)') -Headers $headersWebApi
 
         $resCol = @(
diff --git a/d365bap.tools/functions/Get-BapEnvironmentVirtualEntity.ps1 b/d365bap.tools/functions/Get-BapEnvironmentVirtualEntity.ps1
index 29f0107..ba64fef 100644
--- a/d365bap.tools/functions/Get-BapEnvironmentVirtualEntity.ps1
+++ b/d365bap.tools/functions/Get-BapEnvironmentVirtualEntity.ps1
@@ -124,6 +124,8 @@ function Get-BapEnvironmentVirtualEntity {
     }
     
     process {
+        if (Test-PSFFunctionInterrupt) { return }
+        
         $localUri = $($baseUri + '/api/data/v9.2/mserp_financeandoperationsentities')
 
         [System.Collections.Generic.List[System.String]]$filters = @()