From ed080618a7daa1b47f791224d193a7f6121104b4 Mon Sep 17 00:00:00 2001
From: Petri Asikainen <petri.asikainen@sataedu.fi>
Date: Mon, 2 Aug 2021 08:14:38 +0300
Subject: [PATCH] Use new connect method

---
 SnipeitPS/Public/Get-SnipeitAccessory.ps1     | 25 ++++++---
 .../Public/Get-SnipeitAccessoryOwner.ps1      | 23 +++++---
 SnipeitPS/Public/Get-SnipeitActivity.ps1      | 23 +++++---
 SnipeitPS/Public/Get-SnipeitAsset.ps1         | 37 ++++++++-----
 .../Public/Get-SnipeitAssetMaintenance.ps1    | 28 ++++++----
 SnipeitPS/Public/Get-SnipeitCategory.ps1      | 26 +++++----
 SnipeitPS/Public/Get-SnipeitCompany.ps1       | 26 +++++----
 SnipeitPS/Public/Get-SnipeitComponent.ps1     | 23 +++++---
 SnipeitPS/Public/Get-SnipeitConsumable.ps1    | 33 +++++++++---
 SnipeitPS/Public/Get-SnipeitCustomField.ps1   | 33 ++++++++----
 SnipeitPS/Public/Get-SnipeitDepartment.ps1    | 28 ++++++----
 SnipeitPS/Public/Get-SnipeitFieldset.ps1      | 27 +++++++---
 SnipeitPS/Public/Get-SnipeitLicense.ps1       | 27 ++++++----
 SnipeitPS/Public/Get-SnipeitLicenseSeat.ps1   | 23 +++++---
 SnipeitPS/Public/Get-SnipeitLocation.ps1      | 26 +++++----
 SnipeitPS/Public/Get-SnipeitManufacturer.ps1  | 26 +++++----
 SnipeitPS/Public/Get-SnipeitModel.ps1         | 26 +++++----
 SnipeitPS/Public/Get-SnipeitStatus.ps1        | 26 +++++----
 SnipeitPS/Public/Get-SnipeitSupplier.ps1      | 26 +++++----
 SnipeitPS/Public/Get-SnipeitUser.ps1          | 25 ++++++---
 SnipeitPS/Public/New-SnipeitAccessory.ps1     | 19 +++++--
 SnipeitPS/Public/New-SnipeitAsset.ps1         | 34 +++++++-----
 .../Public/New-SnipeitAssetMaintenance.ps1    | 19 +++++--
 SnipeitPS/Public/New-SnipeitAudit.ps1         | 22 +++++---
 SnipeitPS/Public/New-SnipeitCategory.ps1      | 27 ++++++----
 SnipeitPS/Public/New-SnipeitCompany.ps1       | 24 ++++++---
 SnipeitPS/Public/New-SnipeitComponent.ps1     | 24 ++++++---
 SnipeitPS/Public/New-SnipeitConsumable.ps1    | 23 +++++---
 SnipeitPS/Public/New-SnipeitCustomField.ps1   | 21 +++++---
 SnipeitPS/Public/New-SnipeitDepartment.ps1    | 19 +++++--
 SnipeitPS/Public/New-SnipeitLicense.ps1       | 19 +++++--
 SnipeitPS/Public/New-SnipeitLocation.ps1      | 19 +++++--
 SnipeitPS/Public/New-SnipeitManufacturer.ps1  | 23 +++++---
 SnipeitPS/Public/New-SnipeitModel.ps1         | 23 +++++---
 SnipeitPS/Public/New-SnipeitSupplier.ps1      | 19 +++++--
 SnipeitPS/Public/New-SnipeitUser.ps1          | 19 +++++--
 SnipeitPS/Public/Remove-SnipeitAccessory.ps1  | 32 ++++++-----
 SnipeitPS/Public/Remove-SnipeitAsset.ps1      | 32 ++++++-----
 .../Public/Remove-SnipeitAssetMaintenance.ps1 | 54 +++++++++++--------
 SnipeitPS/Public/Remove-SnipeitCategory.ps1   | 34 +++++++-----
 SnipeitPS/Public/Remove-SnipeitCompany.ps1    | 34 +++++++-----
 SnipeitPS/Public/Remove-SnipeitComponent.ps1  | 34 +++++++-----
 SnipeitPS/Public/Remove-SnipeitConsumable.ps1 | 36 ++++++++-----
 .../Public/Remove-SnipeitCustomField.ps1      | 32 ++++++-----
 SnipeitPS/Public/Remove-SnipeitDepartment.ps1 | 34 +++++++-----
 SnipeitPS/Public/Remove-SnipeitLicense.ps1    | 34 +++++++-----
 SnipeitPS/Public/Remove-SnipeitLocation.ps1   | 34 +++++++-----
 .../Public/Remove-SnipeitManufacturer.ps1     | 34 +++++++-----
 SnipeitPS/Public/Remove-SnipeitModel.ps1      | 34 +++++++-----
 SnipeitPS/Public/Remove-SnipeitSupplier.ps1   | 32 ++++++-----
 SnipeitPS/Public/Remove-SnipeitUser.ps1       | 23 +++++---
 .../Public/Reset-SnipeitAccessoryOwner.ps1    | 23 +++++---
 SnipeitPS/Public/Reset-SnipeitAssetOwner.ps1  | 23 +++++---
 SnipeitPS/Public/Set-SnipeitAccessory.ps1     | 22 +++++---
 .../Public/Set-SnipeitAccessoryOwner.ps1      | 25 +++++----
 SnipeitPS/Public/Set-SnipeitAsset.ps1         | 28 ++++++----
 SnipeitPS/Public/Set-SnipeitAssetOwner.ps1    | 30 ++++++-----
 SnipeitPS/Public/Set-SnipeitCategory.ps1      | 25 +++++----
 SnipeitPS/Public/Set-SnipeitCompany.ps1       | 25 +++++----
 SnipeitPS/Public/Set-SnipeitComponent.ps1     | 30 ++++++-----
 SnipeitPS/Public/Set-SnipeitConsumable.ps1    | 25 +++++----
 SnipeitPS/Public/Set-SnipeitCustomField.ps1   | 23 +++++---
 SnipeitPS/Public/Set-SnipeitDepartment.ps1    | 19 +++++--
 SnipeitPS/Public/Set-SnipeitInfo.ps1          | 50 ++++-------------
 SnipeitPS/Public/Set-SnipeitLicense.ps1       | 21 +++++---
 SnipeitPS/Public/Set-SnipeitLicenseSeat.ps1   | 23 +++++---
 SnipeitPS/Public/Set-SnipeitLocation.ps1      | 19 +++++--
 SnipeitPS/Public/Set-SnipeitManufacturer.ps1  | 22 +++++---
 SnipeitPS/Public/Set-SnipeitModel.ps1         | 19 +++++--
 SnipeitPS/Public/Set-SnipeitStatus.ps1        | 22 +++++---
 SnipeitPS/Public/Set-SnipeitSupplier.ps1      | 19 +++++--
 SnipeitPS/Public/Set-SnipeitUser.ps1          | 19 +++++--
 SnipeitPS/Public/Update-SnipeitAlias.ps1      |  7 ++-
 73 files changed, 1237 insertions(+), 686 deletions(-)

diff --git a/SnipeitPS/Public/Get-SnipeitAccessory.ps1 b/SnipeitPS/Public/Get-SnipeitAccessory.ps1
index eccaff9..3e8b0e1 100644
--- a/SnipeitPS/Public/Get-SnipeitAccessory.ps1
+++ b/SnipeitPS/Public/Get-SnipeitAccessory.ps1
@@ -21,10 +21,10 @@ Result offset to use
 A return all results, works with -offset and other parameters
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
 .EXAMPLE
 Get-SnipeitAccessory -search Keyboard
@@ -88,22 +88,31 @@ function Get-SnipeitAccessory() {
     Test-SnipeitAlias -invocationName $MyInvocation.InvocationName -commandName $MyInvocation.MyCommand.Name
 
     switch($PsCmdlet.ParameterSetName) {
-        'Search' {$apiurl = "$url/api/v1/accessories"}
-        'Get by ID' {$apiurl= "$url/api/v1/accessories/$id"}
-        'Accessories checked out to user id' {$apiurl = "$url/api/v1/users/$user_id/accessories"}
+        'Search' {$api = "/api/v1/accessories"}
+        'Get by ID' {$api= "/api/v1/accessories/$id"}
+        'Accessories checked out to user id' {$api = "/api/v1/users/$user_id/accessories"}
     }
 
     $SearchParameter = . Get-ParameterValue -Parameters $MyInvocation.MyCommand.Parameters -BoundParameters $PSBoundParameters
 
     $Parameters = @{
-        Uri           = $apiurl
+        Api           = $api
         Method        = 'Get'
         GetParameters = $SearchParameter
-        Token         = $apiKey
+    }
+
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
     }
 
     if ($all) {
-        $offstart = $(if($offset){$offset} Else {0})
+        $offstart = $(if ($offset) {$offset} Else {0})
         $callargs = $SearchParameter
         $callargs.Remove('all')
 
diff --git a/SnipeitPS/Public/Get-SnipeitAccessoryOwner.ps1 b/SnipeitPS/Public/Get-SnipeitAccessoryOwner.ps1
index 8c96762..e5dda79 100644
--- a/SnipeitPS/Public/Get-SnipeitAccessoryOwner.ps1
+++ b/SnipeitPS/Public/Get-SnipeitAccessoryOwner.ps1
@@ -8,16 +8,15 @@
     Unique ID For accessory to list
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. User's API Key for Snipeit.
 
     .EXAMPLE
     Get-SnipeitAccessoryOwner -id 1
 #>
-function Get-SnipeitAccessoryOwner()
-{
+function Get-SnipeitAccessoryOwner() {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Medium"
@@ -35,13 +34,21 @@ function Get-SnipeitAccessoryOwner()
     )
 
     $Parameters = @{
-        Uri    = "$url/api/v1/accessories/$id/checkedout"
+        Api    = "/api/v1/accessories/$id/checkedout"
         Method = 'GET'
-        Token  = $apiKey
     }
 
-    If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-    {
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
+    if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
         $result = Invoke-SnipeitMethod @Parameters
     }
 
diff --git a/SnipeitPS/Public/Get-SnipeitActivity.ps1 b/SnipeitPS/Public/Get-SnipeitActivity.ps1
index 0e0e337..19f703e 100644
--- a/SnipeitPS/Public/Get-SnipeitActivity.ps1
+++ b/SnipeitPS/Public/Get-SnipeitActivity.ps1
@@ -30,10 +30,10 @@ Result offset to use
 A return all results, works with -offset and other parameters
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
 .EXAMPLE
 Get-SnipeitAccessory -search Keyboard
@@ -78,12 +78,12 @@ function Get-SnipeitActivity() {
         [string]$apiKey
     )
 
-    if(($target_type -and -not $target_id) -or
+    if (($target_type -and -not $target_id) -or
         ($target_id -and -not $target_type)) {
         throw "Please specify both target_type and target_id"
     }
 
-    if(($item_type -and -not $item_id) -or
+    if (($item_type -and -not $item_id) -or
         ($item_id -and -not $item_type)) {
         throw "Please specify both item_type and item_id"
     }
@@ -92,14 +92,23 @@ function Get-SnipeitActivity() {
 
 
     $Parameters = @{
-        Uri           = "$url/api/v1/reports/activity"
+        Api           = "/api/v1/reports/activity"
         Method        = 'Get'
         GetParameters = $SearchParameter
-        Token         = $apiKey
+    }
+
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
     }
 
     if ($all) {
-        $offstart = $(if($offset){$offset} Else {0})
+        $offstart = $(if ($offset) {$offset} Else {0})
         $callargs = $SearchParameter
         $callargs.Remove('all')
 
diff --git a/SnipeitPS/Public/Get-SnipeitAsset.ps1 b/SnipeitPS/Public/Get-SnipeitAsset.ps1
index 3384b0d..525c623 100644
--- a/SnipeitPS/Public/Get-SnipeitAsset.ps1
+++ b/SnipeitPS/Public/Get-SnipeitAsset.ps1
@@ -60,13 +60,13 @@ Offset to use
 A return all results, works with -offset and other parameters
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
 .EXAMPLE
-Get-SnipeitAsset -all -url "https://assets.example.com"-token "token..."
+Get-SnipeitAsset -all
 Returens all assets
 
 .EXAMPLE
@@ -211,25 +211,34 @@ function Get-SnipeitAsset() {
     $SearchParameter = . Get-ParameterValue -Parameters $MyInvocation.MyCommand.Parameters -BoundParameters $PSBoundParameters
 
     switch ($PsCmdlet.ParameterSetName) {
-        'Search' { $apiurl = "$url/api/v1/hardware" }
-        'Get with id'  {$apiurl= "$url/api/v1/hardware/$id"}
-        'Get with asset tag' {$apiurl= "$url/api/v1/hardware/bytag/$asset_tag"}
-        'Get with serial' { $apiurl= "$url/api/v1/hardware/byserial/$serial"}
-        'Assets due auditing soon' {$apiurl = "$url/api/v1/hardware/audit/due"}
-        'Assets overdue for auditing' {$apiurl = "$url/api/v1/hardware/audit/overdue"}
-        'Assets checked out to user id'{$apiurl = "$url/api/v1/users/$user_id/assets"}
-        'Assets with component id' {$apiurl = "$url/api/v1/components/$component_id/assets"}
+        'Search' { $api = "/api/v1/hardware" }
+        'Get with id'  {$api= "/api/v1/hardware/$id"}
+        'Get with asset tag' {$api= "/api/v1/hardware/bytag/$asset_tag"}
+        'Get with serial' { $api= "/api/v1/hardware/byserial/$serial"}
+        'Assets due auditing soon' {$api = "/api/v1/hardware/audit/due"}
+        'Assets overdue for auditing' {$api = "/api/v1/hardware/audit/overdue"}
+        'Assets checked out to user id'{$api = "/api/v1/users/$user_id/assets"}
+        'Assets with component id' {$api = "/api/v1/components/$component_id/assets"}
     }
 
     $Parameters = @{
-        Uri           = $apiurl
+        Api           = $api
         Method        = 'Get'
         GetParameters = $SearchParameter
-        Token         = $apiKey
+     }
+
+     if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
     }
 
     if ($all) {
-        $offstart = $(if ($offset){$offset} Else {0})
+        $offstart = $(if ($offset) {$offset} Else {0})
         $callargs = $SearchParameter
         Write-Verbose "Callargs: $($callargs | convertto-json)"
         $callargs.Remove('all')
diff --git a/SnipeitPS/Public/Get-SnipeitAssetMaintenance.ps1 b/SnipeitPS/Public/Get-SnipeitAssetMaintenance.ps1
index bbdd2e2..a2478bc 100644
--- a/SnipeitPS/Public/Get-SnipeitAssetMaintenance.ps1
+++ b/SnipeitPS/Public/Get-SnipeitAssetMaintenance.ps1
@@ -24,19 +24,18 @@ Offset to use
 A return all results, works with -offset and other parameters
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
 .EXAMPLE
-Get-SnipeitAssetMaintenances -url "https://assets.example.com" -token "token..."
+Get-SnipeitAssetMaintenances
+.EXAMPLE
+Get-SnipeitAssetMaintenances -search "myMachine"
 
 .EXAMPLE
-Get-SnipeitAssetMaintenances -search "myMachine" -url "https://assets.example.com" -token "token..."
-
-.EXAMPLE
-Get-SnipeitAssetMaintenances -search "myMachine" -url "https://assets.example.com" -token "token..."
+Get-SnipeitAssetMaintenances -search "myMachine"
 #>
 function Get-SnipeitAssetMaintenance() {
     Param(
@@ -67,14 +66,23 @@ function Get-SnipeitAssetMaintenance() {
     $SearchParameter = . Get-ParameterValue -Parameters $MyInvocation.MyCommand.Parameters -BoundParameters $PSBoundParameters
 
     $Parameters = @{
-        Uri           = "$url/api/v1/maintenances"
+        Api           = "/api/v1/maintenances"
         Method        = 'Get'
         GetParameters = $SearchParameter
-        Token         = $apiKey
+     }
+
+     if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
     }
 
     if ($all) {
-        $offstart = $(if($offset){$offset} Else {0})
+        $offstart = $(if ($offset) {$offset} Else {0})
         $callargs = $SearchParameter
         $callargs.Remove('all')
 
diff --git a/SnipeitPS/Public/Get-SnipeitCategory.ps1 b/SnipeitPS/Public/Get-SnipeitCategory.ps1
index 8050780..37b21d8 100644
--- a/SnipeitPS/Public/Get-SnipeitCategory.ps1
+++ b/SnipeitPS/Public/Get-SnipeitCategory.ps1
@@ -18,10 +18,10 @@ Offset to use
 A return all results, works with -offset and other parameters
 
 .PARAMETER url
-Url of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Url of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
 .EXAMPLE
 Get-SnipeitCategory -id 1
@@ -31,8 +31,7 @@ Get-SnipeitCategory -search "Laptop"
 
 #>
 
-function Get-SnipeitCategory()
-{
+function Get-SnipeitCategory() {
     [CmdletBinding(DefaultParameterSetName = 'Search')]
     Param(
         [parameter(ParameterSetName='Search')]
@@ -64,25 +63,34 @@ function Get-SnipeitCategory()
 
     $SearchParameter = . Get-ParameterValue -Parameters $MyInvocation.MyCommand.Parameters -BoundParameters $PSBoundParameters
 
-    $apiurl = "$url/api/v1/categories"
+    $api = "/api/v1/categories"
 
     if ($search -and $id ) {
          Throw "[$($MyInvocation.MyCommand.Name)] Please specify only -search or -id parameter , not both "
     }
 
     if ($id) {
-       $apiurl= "$url/api/v1/categories/$id"
+       $api= "/api/v1/categories/$id"
     }
 
     $Parameters = @{
-        Uri           = $apiurl
+        Api           = $api
         Method        = 'Get'
-        Token         = $apiKey
         GetParameters = $SearchParameter
     }
 
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
     if ($all) {
-        $offstart = $(if($offset){$offset} Else {0})
+        $offstart = $(if ($offset) {$offset} Else {0})
         $callargs = $SearchParameter
         $callargs.Remove('all')
 
diff --git a/SnipeitPS/Public/Get-SnipeitCompany.ps1 b/SnipeitPS/Public/Get-SnipeitCompany.ps1
index f2428c8..64530e3 100644
--- a/SnipeitPS/Public/Get-SnipeitCompany.ps1
+++ b/SnipeitPS/Public/Get-SnipeitCompany.ps1
@@ -17,10 +17,10 @@ Offset to use
 .PARAMETER all
 A return all results, works with -offset and other parameters
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
 .EXAMPLE
 Get-SnipeitCompany
@@ -32,8 +32,7 @@ Gets specific company
 
 #>
 
-function Get-SnipeitCompany()
-{
+function Get-SnipeitCompany() {
     [CmdletBinding(DefaultParameterSetName = 'Search')]
     Param(
         [parameter(ParameterSetName='Search')]
@@ -66,25 +65,34 @@ function Get-SnipeitCompany()
 
     $SearchParameter = . Get-ParameterValue -Parameters $MyInvocation.MyCommand.Parameters -BoundParameters $PSBoundParameters
 
-    $apiurl = "$url/api/v1/companies"
+    $api = "/api/v1/companies"
 
     if ($search -and $id ) {
          Throw "[$($MyInvocation.MyCommand.Name)] Please specify only -search or -id parameter , not both "
     }
 
     if ($id) {
-       $apiurl= "$url/api/v1/companies/$id"
+       $api= "/api/v1/companies/$id"
     }
 
     $Parameters = @{
-        Uri           = $apiurl
+        Api           = $api
         Method        = 'Get'
-        Token         = $apiKey
         GetParameters = $SearchParameter
     }
 
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
     if ($all) {
-        $offstart = $(if($offset){$offset} Else {0})
+        $offstart = $(if ($offset) {$offset} Else {0})
         $callargs = $SearchParameter
         $callargs.Remove('all')
 
diff --git a/SnipeitPS/Public/Get-SnipeitComponent.ps1 b/SnipeitPS/Public/Get-SnipeitComponent.ps1
index 4e378fc..1bcc2e9 100644
--- a/SnipeitPS/Public/Get-SnipeitComponent.ps1
+++ b/SnipeitPS/Public/Get-SnipeitComponent.ps1
@@ -18,10 +18,10 @@ Offset to use
 A return all results, works with -offset and other parameters
 
 .PARAMETER url
-URL of Snipeit system,can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
 .EXAMPLE
 Get-SnipeitComponent
@@ -82,25 +82,34 @@ function Get-SnipeitComponent() {
 
     $SearchParameter = . Get-ParameterValue -Parameters $MyInvocation.MyCommand.Parameters -BoundParameters $PSBoundParameters
 
-    $apiurl = "$url/api/v1/components"
+    $api = "/api/v1/components"
 
     if ($search -and $id ) {
          Throw "[$($MyInvocation.MyCommand.Name)] Please specify only -search or -id parameter , not both "
     }
 
     if ($id) {
-       $apiurl= "$url/api/v1/components/$id"
+       $api= "/api/v1/components/$id"
     }
 
     $Parameters = @{
-        Uri           = $apiurl
+        Api           = $api
         Method        = 'Get'
-        Token         = $apiKey
         GetParameters = $SearchParameter
     }
 
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
     if ($all) {
-        $offstart = $(if($offset){$offset} Else {0})
+        $offstart = $(if ($offset) {$offset} Else {0})
         $callargs = $SearchParameter
         $callargs.Remove('all')
 
diff --git a/SnipeitPS/Public/Get-SnipeitConsumable.ps1 b/SnipeitPS/Public/Get-SnipeitConsumable.ps1
index b63c378..a0520c7 100644
--- a/SnipeitPS/Public/Get-SnipeitConsumable.ps1
+++ b/SnipeitPS/Public/Get-SnipeitConsumable.ps1
@@ -36,10 +36,10 @@ Offset to use
 A return all results
 
 .PARAMETER url
-URL of Snipeit system,can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
 .EXAMPLE
 Get-SnipeitConsumable -all
@@ -111,14 +111,23 @@ function Get-SnipeitConsumable() {
         switch ($PSCmdlet.ParameterSetName) {
             'Search' {
                 $Parameters = @{
-                    Uri           = "$url/api/v1/consumables"
+                    Api           = "/api/v1/consumables"
                     Method        = 'Get'
-                    Token         = $apiKey
                     GetParameters = $SearchParameter
                 }
 
+                if ($PSBoundParameters.ContainsKey('apiKey')) {
+                    Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                    Set-SnipeitPSSessionApiKey -apiKey $apikey
+                }
+
+                if ($PSBoundParameters.ContainsKey('url')) {
+                    Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                    Set-SnipeitPSSessionApiKey -url $url
+                }
+
                 if ($all) {
-                    $offstart = $(if($offset){$offset} Else {0})
+                    $offstart = $(if ($offset) {$offset} Else {0})
                     $callargs = $SearchParameter
                     $callargs.Remove('all')
 
@@ -141,11 +150,21 @@ function Get-SnipeitConsumable() {
             'Get with ID' {
                 foreach($consumable_id in $id) {
                     $Parameters = @{
-                        Uri           =  "$url/api/v1/consumables/$consumable_id"
+                        Api           =  "$url/api/v1/consumables/$consumable_id"
                         Method        = 'Get'
-                        Token         = $apiKey
                         GetParameters = $SearchParameter
                     }
+
+                    if ($PSBoundParameters.ContainsKey('apiKey')) {
+                        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                        Set-SnipeitPSSessionApiKey -apiKey $apikey
+                    }
+
+                    if ($PSBoundParameters.ContainsKey('url')) {
+                        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                        Set-SnipeitPSSessionApiKey -url $url
+                    }
+
                     $result = Invoke-SnipeitMethod @Parameters
                     $result
                 }
diff --git a/SnipeitPS/Public/Get-SnipeitCustomField.ps1 b/SnipeitPS/Public/Get-SnipeitCustomField.ps1
index 659924a..ad93862 100644
--- a/SnipeitPS/Public/Get-SnipeitCustomField.ps1
+++ b/SnipeitPS/Public/Get-SnipeitCustomField.ps1
@@ -6,18 +6,23 @@
     A id of specific field
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
     .EXAMPLE
-    Get-SnipeitCustomField -url "https://assets.example.com" -token "token..."
+    Get-SnipeitCustomField
+    Get all custom fields
+
+    .EXAMPLE
+    Get-SnipeitCustomField -id 1
+    Get custom field with ID 1
+
 
 #>
 
-function Get-SnipeitCustomField()
-{
+function Get-SnipeitCustomField() {
     Param(
         [int]$id,
 
@@ -31,17 +36,27 @@ function Get-SnipeitCustomField()
     Test-SnipeitAlias -invocationName $MyInvocation.InvocationName -commandName $MyInvocation.MyCommand.Name
 
     if ($id) {
-        $apiurl= "$url/api/v1/fields/$id"
+        $api= "/api/v1/fields/$id"
     } else {
-        $apiurl = "$url/api/v1/fields"
+        $api = "/api/v1/fields"
     }
 
     $Parameters = @{
-        Uri           = $apiurl
+        Api           = $api
         Method        = 'Get'
-        Token         = $apiKey
+     }
+
+     if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
     }
 
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
+
 
     $result = Invoke-SnipeitMethod @Parameters
 
diff --git a/SnipeitPS/Public/Get-SnipeitDepartment.ps1 b/SnipeitPS/Public/Get-SnipeitDepartment.ps1
index 18c6d2f..34b6ab9 100644
--- a/SnipeitPS/Public/Get-SnipeitDepartment.ps1
+++ b/SnipeitPS/Public/Get-SnipeitDepartment.ps1
@@ -18,13 +18,13 @@ Offset to use
 A return all results, works with -offset and other parameters
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
 .EXAMPLE
-Get-SnipeitDepartment -url "https://assets.example.com" -token "token..."
+Get-SnipeitDepartment
 
 .EXAMPLE
 Get-SnipeitDepartment -search  Department1
@@ -34,8 +34,7 @@ Get-SnipeitDepartment -id 1
 
 #>
 
-function Get-SnipeitDepartment()
-{
+function Get-SnipeitDepartment() {
     [CmdletBinding(DefaultParameterSetName = 'Search')]
     Param(
         [parameter(ParameterSetName='Search')]
@@ -72,25 +71,34 @@ function Get-SnipeitDepartment()
 
     $SearchParameter = . Get-ParameterValue -Parameters $MyInvocation.MyCommand.Parameters -BoundParameters $PSBoundParameters
 
-    $apiurl = "$url/api/v1/departments"
+    $api = "/api/v1/departments"
 
     if ($search -and $id ) {
          Throw "[$($MyInvocation.MyCommand.Name)] Please specify only -search or -id parameter , not both "
     }
 
     if ($id) {
-       $apiurl= "$url/api/v1/departments/$id"
+       $api= "/api/v1/departments/$id"
     }
 
     $Parameters = @{
-        Uri           = $apiurl
+        Api           = $api
         Method        = 'Get'
-        Token         = $apiKey
         GetParameters = $SearchParameter
     }
 
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
     if ($all) {
-        $offstart = $(if($offset){$offset} Else {0})
+        $offstart = $(if ($offset) {$offset} Else {0})
         $callargs = $SearchParameter
         $callargs.Remove('all')
 
diff --git a/SnipeitPS/Public/Get-SnipeitFieldset.ps1 b/SnipeitPS/Public/Get-SnipeitFieldset.ps1
index 9398f75..78bf722 100644
--- a/SnipeitPS/Public/Get-SnipeitFieldset.ps1
+++ b/SnipeitPS/Public/Get-SnipeitFieldset.ps1
@@ -6,16 +6,18 @@ Returns a fieldset or list of Snipe-it Fieldsets
 A id of specific fieldset
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
 .EXAMPLE
-Get-SnipeitFieldset -url "https://assets.example.com" -token "token..."
+Get-SnipeitFieldset
+Get all fieldsets
 
 .EXAMPLE
-Get-SnipeitFieldset -url "https://assets.example.com" -token "token..." | Where-Object {$_.name -eq "Windows" }
+Get-SnipeitFieldset  | Where-Object {$_.name -eq "Windows" }
+Gets fieldset by name
 
 #>
 
@@ -33,15 +35,24 @@ function Get-SnipeitFieldset() {
     Test-SnipeitAlias -invocationName $MyInvocation.InvocationName -commandName $MyInvocation.MyCommand.Name
 
     if ($id) {
-        $apiurl = "$url/api/v1/fieldsets/$id"
+        $api = "/api/v1/fieldsets/$id"
     } else {
-        $apiurl = "$url/api/v1/fieldsets"
+        $api = "/api/v1/fieldsets"
     }
 
     $Parameters = @{
-        Uri           = $apiurl
+        Api           = $api
         Method        = 'Get'
-        Token         = $apiKey
+    }
+
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
     }
 
     $result = Invoke-SnipeitMethod @Parameters
diff --git a/SnipeitPS/Public/Get-SnipeitLicense.ps1 b/SnipeitPS/Public/Get-SnipeitLicense.ps1
index b45d8c1..4df1fd3 100644
--- a/SnipeitPS/Public/Get-SnipeitLicense.ps1
+++ b/SnipeitPS/Public/Get-SnipeitLicense.ps1
@@ -19,10 +19,10 @@ A return all results, works with -offset and other parameters
 
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
 .EXAMPLE
 Get-SnipeitLicense -search SomeLicense
@@ -110,21 +110,30 @@ function Get-SnipeitLicense() {
     $SearchParameter = . Get-ParameterValue -Parameters $MyInvocation.MyCommand.Parameters -BoundParameters $PSBoundParameters
 
     switch($PsCmdlet.ParameterSetName) {
-        'Search' {$apiurl = "$url/api/v1/licenses"}
-        'Get with ID' {$apiurl= "$url/api/v1/licenses/$id"}
-        'Get licenses checked out to user ID' {$apiurl= "$url/api/v1/users/$user_id/licenses"}
-        'Get licenses checked out to asset ID' {$apiurl= "$url/api/v1/hardware/$asset_id/licenses"}
+        'Search' {$api = "/api/v1/licenses"}
+        'Get with ID' {$api= "/api/v1/licenses/$id"}
+        'Get licenses checked out to user ID' {$api= "/api/v1/users/$user_id/licenses"}
+        'Get licenses checked out to asset ID' {$api= "/api/v1/hardware/$asset_id/licenses"}
     }
 
     $Parameters = @{
-        Uri           = $apiurl
+        Api           = $api
         Method        = 'Get'
-        Token         = $apiKey
         GetParameters = $SearchParameter
     }
 
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
     if ($all) {
-        $offstart = $(if($offset){$offset} Else {0})
+        $offstart = $(if ($offset) {$offset} Else {0})
         $callargs = $SearchParameter
         $callargs.Remove('all')
 
diff --git a/SnipeitPS/Public/Get-SnipeitLicenseSeat.ps1 b/SnipeitPS/Public/Get-SnipeitLicenseSeat.ps1
index d20fe08..84ebea2 100644
--- a/SnipeitPS/Public/Get-SnipeitLicenseSeat.ps1
+++ b/SnipeitPS/Public/Get-SnipeitLicenseSeat.ps1
@@ -22,10 +22,10 @@ A return all results, works with -offset and other parameters
 
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
 .EXAMPLE
 Get-SnipeitLicenseSeat -id 1
@@ -58,22 +58,31 @@ function Get-SnipeitLicenseSeat() {
 
     $SearchParameter = . Get-ParameterValue -Parameters $MyInvocation.MyCommand.Parameters -BoundParameters $PSBoundParameters
 
-    $apiurl = "$url/api/v1/licenses/$id/seats"
+    $api = "/api/v1/licenses/$id/seats"
 
 
     if ($seat_id) {
-       $apiurl= "$url/api/v1/licenses/$id/seats/$seat_id"
+       $api= "/api/v1/licenses/$id/seats/$seat_id"
     }
 
     $Parameters = @{
-        Uri           = $apiurl
+        Api           = $api
         Method        = 'Get'
-        Token         = $apiKey
         GetParameters = $SearchParameter
     }
 
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
     if ($all) {
-        $offstart = $(if($offset){$offset} Else {0})
+        $offstart = $(if ($offset) {$offset} Else {0})
         $callargs = $SearchParameter
         $callargs.Remove('all')
 
diff --git a/SnipeitPS/Public/Get-SnipeitLocation.ps1 b/SnipeitPS/Public/Get-SnipeitLocation.ps1
index 6d72769..8897e87 100644
--- a/SnipeitPS/Public/Get-SnipeitLocation.ps1
+++ b/SnipeitPS/Public/Get-SnipeitLocation.ps1
@@ -18,10 +18,10 @@ Offset to use
 A return all results, works with -offset and other parameters
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfoeItInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
 .EXAMPLE
 Get-SnipeitLocation -search Location1
@@ -31,8 +31,7 @@ Get-SnipeitLocation -id 3
 
 #>
 
-function Get-SnipeitLocation()
-{
+function Get-SnipeitLocation() {
     [CmdletBinding(DefaultParameterSetName = 'Search')]
     Param(
         [parameter(ParameterSetName='Search')]
@@ -65,25 +64,34 @@ function Get-SnipeitLocation()
 
     $SearchParameter = . Get-ParameterValue -Parameters $MyInvocation.MyCommand.Parameters -BoundParameters $PSBoundParameters
 
-    $apiurl = "$url/api/v1/locations"
+    $api = "/api/v1/locations"
 
     if ($search -and $id ) {
          Throw "[$($MyInvocation.MyCommand.Name)] Please specify only -search or -id parameter , not both "
     }
 
     if ($id) {
-       $apiurl= "$url/api/v1/locations/$id"
+       $api= "/api/v1/locations/$id"
     }
 
     $Parameters = @{
-        Uri           = $apiurl
+        Api           = $api
         Method        = 'Get'
-        Token         = $apiKey
         GetParameters = $SearchParameter
     }
 
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
     if ($all) {
-        $offstart = $(if($offset){$offset} Else {0})
+        $offstart = $(if ($offset) {$offset} Else {0})
         $callargs = $SearchParameter
         $callargs.Remove('all')
 
diff --git a/SnipeitPS/Public/Get-SnipeitManufacturer.ps1 b/SnipeitPS/Public/Get-SnipeitManufacturer.ps1
index 61c242b..5f1e1fa 100644
--- a/SnipeitPS/Public/Get-SnipeitManufacturer.ps1
+++ b/SnipeitPS/Public/Get-SnipeitManufacturer.ps1
@@ -18,10 +18,10 @@
     A return all results, works with -offset and other parameters
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
     .EXAMPLE
     Get-SnipeitManufacturer -search HP
@@ -32,8 +32,7 @@
     Returns manufacturer with id 3
 
 #>
-function Get-SnipeitManufacturer()
-{
+function Get-SnipeitManufacturer() {
     [CmdletBinding(DefaultParameterSetName = 'Search')]
     Param(
         [parameter(ParameterSetName='Search')]
@@ -66,25 +65,34 @@ function Get-SnipeitManufacturer()
 
     $SearchParameter = . Get-ParameterValue -Parameters $MyInvocation.MyCommand.Parameters -BoundParameters $PSBoundParameters
 
-    $apiurl = "$url/api/v1/manufacturers"
+    $api = "/api/v1/manufacturers"
 
     if ($search -and $id ) {
          Throw "[$($MyInvocation.MyCommand.Name)] Please specify only -search or -id parameter , not both "
     }
 
     if ($id) {
-       $apiurl= "$url/api/v1/manufacturers/$id"
+       $api= "/api/v1/manufacturers/$id"
     }
 
     $Parameters = @{
-        Uri           = $apiurl
+        Api           = $api
         Method        = 'Get'
-        Token         = $apiKey
         GetParameters = $SearchParameter
     }
 
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
     if ($all) {
-        $offstart = $(if($offset){$offset} Else {0})
+        $offstart = $(if ($offset) {$offset} Else {0})
         $callargs = $SearchParameter
         $callargs.Remove('all')
 
diff --git a/SnipeitPS/Public/Get-SnipeitModel.ps1 b/SnipeitPS/Public/Get-SnipeitModel.ps1
index 606761c..257189a 100644
--- a/SnipeitPS/Public/Get-SnipeitModel.ps1
+++ b/SnipeitPS/Public/Get-SnipeitModel.ps1
@@ -18,10 +18,10 @@ Offset to use
 A return all results, works with -offset and other parameters
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
 .EXAMPLE
 Get-SnipeitModel -search "DL380"
@@ -31,8 +31,7 @@ Get-SnipeitModel -id 1
 
 #>
 
-function Get-SnipeitModel()
-{
+function Get-SnipeitModel() {
     [CmdletBinding(DefaultParameterSetName = 'Search')]
     Param(
         [parameter(ParameterSetName='Search')]
@@ -65,25 +64,34 @@ function Get-SnipeitModel()
 
     $SearchParameter = . Get-ParameterValue -Parameters $MyInvocation.MyCommand.Parameters -BoundParameters $PSBoundParameters
 
-    $apiurl = "$url/api/v1/models"
+    $api = "/api/v1/models"
 
     if ($search -and $id ) {
          Throw "[$($MyInvocation.MyCommand.Name)] Please specify only -search or -id parameter , not both "
     }
 
     if ($id) {
-       $apiurl= "$url/api/v1/models/$id"
+       $api= "/api/v1/models/$id"
     }
 
     $Parameters = @{
-        Uri           = $apiurl
+        Api           = $api
         Method        = 'Get'
-        Token         = $apiKey
         GetParameters = $SearchParameter
     }
 
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
     if ($all) {
-        $offstart = $(if($offset){$offset} Else {0})
+        $offstart = $(if ($offset) {$offset} Else {0})
         $callargs = $SearchParameter
         $callargs.Remove('all')
 
diff --git a/SnipeitPS/Public/Get-SnipeitStatus.ps1 b/SnipeitPS/Public/Get-SnipeitStatus.ps1
index 92dfe65..86979af 100644
--- a/SnipeitPS/Public/Get-SnipeitStatus.ps1
+++ b/SnipeitPS/Public/Get-SnipeitStatus.ps1
@@ -18,10 +18,10 @@ Offset to use
 A return all results, works with -offset and other parameters
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
 .EXAMPLE
 Get-SnipeitStatus -search  "Ready to Deploy"
@@ -31,8 +31,7 @@ Get-SnipeitStatus -id 3
 
 #>
 
-function Get-SnipeitStatus()
-{
+function Get-SnipeitStatus() {
     [CmdletBinding(DefaultParameterSetName = 'Search')]
     Param(
         [parameter(ParameterSetName='Search')]
@@ -65,25 +64,34 @@ function Get-SnipeitStatus()
 
     $SearchParameter = . Get-ParameterValue -Parameters $MyInvocation.MyCommand.Parameters -BoundParameters $PSBoundParameters
 
-    $apiurl = "$url/api/v1/statuslabels"
+    $api = "/api/v1/statuslabels"
 
     if ($search -and $id ) {
          Throw "[$($MyInvocation.MyCommand.Name)] Please specify only -search or -id parameter , not both "
     }
 
     if ($id) {
-       $apiurl= "$url/api/v1/statuslabels/$id"
+       $api= "/api/v1/statuslabels/$id"
     }
 
     $Parameters = @{
-        Uri           = $apiurl
+        Api           = $api
         Method        = 'Get'
-        Token         = $apiKey
         GetParameters = $SearchParameter
     }
 
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
     if ($all) {
-        $offstart = $(if($offset){$offset} Else {0})
+        $offstart = $(if ($offset) {$offset} Else {0})
         $callargs = $SearchParameter
         $callargs.Remove('all')
 
diff --git a/SnipeitPS/Public/Get-SnipeitSupplier.ps1 b/SnipeitPS/Public/Get-SnipeitSupplier.ps1
index 74c0091..ab10d02 100644
--- a/SnipeitPS/Public/Get-SnipeitSupplier.ps1
+++ b/SnipeitPS/Public/Get-SnipeitSupplier.ps1
@@ -18,10 +18,10 @@ Offset to use
 A return all results, works with -offset and other parameters
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
 .EXAMPLE
 Get-SnipeitSupplier -search MySupplier
@@ -30,8 +30,7 @@ Get-SnipeitSupplier -search MySupplier
 Get-SnipeitSupplier -id 2
 
 #>
-function Get-SnipeitSupplier()
-{
+function Get-SnipeitSupplier() {
     [CmdletBinding(DefaultParameterSetName = 'Search')]
     Param(
         [parameter(ParameterSetName='Search')]
@@ -64,25 +63,34 @@ function Get-SnipeitSupplier()
 
     $SearchParameter = . Get-ParameterValue -Parameters $MyInvocation.MyCommand.Parameters -BoundParameters $PSBoundParameters
 
-    $apiurl = "$url/api/v1/suppliers"
+    $api = "/api/v1/suppliers"
 
     if ($search -and $id ) {
          Throw "[$($MyInvocation.MyCommand.Name)] Please specify only -search or -id parameter , not both "
     }
 
     if ($id) {
-       $apiurl= "$url/api/v1/suppliers/$id"
+       $api= "/api/v1/suppliers/$id"
     }
 
     $Parameters = @{
-        Uri           = $apiurl
+        Api           = $api
         Method        = 'Get'
-        Token         = $apiKey
         GetParameters = $SearchParameter
     }
 
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
     if ($all) {
-        $offstart = $(if($offset){$offset} Else {0})
+        $offstart = $(if ($offset) {$offset} Else {0})
         $callargs = $SearchParameter
         $callargs.Remove('all')
 
diff --git a/SnipeitPS/Public/Get-SnipeitUser.ps1 b/SnipeitPS/Public/Get-SnipeitUser.ps1
index ed87d69..9d94b39 100644
--- a/SnipeitPS/Public/Get-SnipeitUser.ps1
+++ b/SnipeitPS/Public/Get-SnipeitUser.ps1
@@ -24,10 +24,10 @@ Offset to use
 A return all results, works with -offset and other parameters
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
 .EXAMPLE
 Get-SnipeitUser -search SomeSurname
@@ -101,20 +101,29 @@ function Get-SnipeitUser() {
 
     $SearchParameter = . Get-ParameterValue -Parameters $MyInvocation.MyCommand.Parameters -BoundParameters $PSBoundParameters
     switch ($PsCmdlet.ParameterSetName) {
-        'Search' { $apiurl = "$url/api/v1/users"}
-        'Get with id'  {$apiurl= "$url/api/v1/users/$id"}
-        'Get users a specific accessory id has been checked out to' {$apiurl= "$url/api/v1/accessories/$accessory_id/checkedout"}
+        'Search' { $api = "/api/v1/users"}
+        'Get with id'  {$api= "/api/v1/users/$id"}
+        'Get users a specific accessory id has been checked out to' {$api= "/api/v1/accessories/$accessory_id/checkedout"}
     }
 
     $Parameters = @{
-        Uri           = $apiurl
+        Api           = $api
         Method        = 'Get'
         GetParameters = $SearchParameter
-        Token         = $apiKey
+     }
+
+     if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
     }
 
     if ($all) {
-        $offstart = $(if($offset){$offset} Else {0})
+        $offstart = $(if ($offset) {$offset} Else {0})
         $callargs = $SearchParameter
         $callargs.Remove('all')
 
diff --git a/SnipeitPS/Public/New-SnipeitAccessory.ps1 b/SnipeitPS/Public/New-SnipeitAccessory.ps1
index 5ada523..66691cf 100644
--- a/SnipeitPS/Public/New-SnipeitAccessory.ps1
+++ b/SnipeitPS/Public/New-SnipeitAccessory.ps1
@@ -57,10 +57,10 @@ Min quantity of the accessory before alert is triggered
 Accessory image fileame and path
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
 .EXAMPLE
 New-SnipeitAccessory -name "Accessory" -qty 3  -category_id 1
@@ -125,13 +125,22 @@ function New-SnipeitAccessory() {
     }
 
     $Parameters = @{
-        Uri    = "$url/api/v1/accessories"
+        Api    = "/api/v1/accessories"
         Method = 'POST'
         Body   = $Values
-        Token  = $apiKey
     }
 
-    If ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
+    if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
         $result = Invoke-SnipeitMethod @Parameters
     }
 
diff --git a/SnipeitPS/Public/New-SnipeitAsset.ps1 b/SnipeitPS/Public/New-SnipeitAsset.ps1
index 5b78d42..ffec33c 100644
--- a/SnipeitPS/Public/New-SnipeitAsset.ps1
+++ b/SnipeitPS/Public/New-SnipeitAsset.ps1
@@ -52,10 +52,10 @@ Id of target user , location or asset
 Checkout asset when creating to one of following types user, location or asset.
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
 .PARAMETER customfields
 Hastable of custom fields and extra fields that need passing through to Snipeit.
@@ -74,8 +74,7 @@ New-SnipeitAsset -status_id 1 -model_id 1 -name "Machine1" -customfields = @{ "_
 Using customfields when creating asset.
 #>
 
-function New-SnipeitAsset()
-{
+function New-SnipeitAsset() {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low",
@@ -153,33 +152,40 @@ function New-SnipeitAsset()
         $values['purchase_date'] = $values['purchase_date'].ToString("yyyy-MM-dd")
     }
 
-    if ($customfields)
-    {
+    if ($customfields) {
         $Values += $customfields
     }
 
     #Checkout asset when creating it
-    if ($PsCmdlet.ParameterSetName -eq 'Checkout asset when creating'){
-        switch ($checkout_to_type){
+    if ($PsCmdlet.ParameterSetName -eq 'Checkout asset when creating') {
+        switch ($checkout_to_type) {
                 'location' { $Values += @{ "assigned_location" = $assigned_id } }
                 'user' { $Values += @{ "assigned_user" = $assigned_id } }
                 'asset' { $Values += @{ "assigned_asset" = $assigned_id } }
         }
 
         #This are not needed for API
-        if($Values.ContainsKey('assigned_id')){$Values.Remove('assigned_id')}
-        if($Values.ContainsKey('checkout_to_type')){$Values.Remove('checkout_to_type')}
+        if ($Values.ContainsKey('assigned_id')) {$Values.Remove('assigned_id')}
+        if ($Values.ContainsKey('checkout_to_type')) {$Values.Remove('checkout_to_type')}
     }
 
     $Parameters = @{
-        Uri    = "$url/api/v1/hardware"
+        Api    = "/api/v1/hardware"
         Method = 'Post'
         Body   = $Values
-        Token  = $apiKey
     }
 
-    If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-    {
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
+    if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
         $result = Invoke-SnipeitMethod @Parameters
     }
 
diff --git a/SnipeitPS/Public/New-SnipeitAssetMaintenance.ps1 b/SnipeitPS/Public/New-SnipeitAssetMaintenance.ps1
index a5cf553..cda5b29 100644
--- a/SnipeitPS/Public/New-SnipeitAssetMaintenance.ps1
+++ b/SnipeitPS/Public/New-SnipeitAssetMaintenance.ps1
@@ -31,10 +31,10 @@ Optional completion date
 Optional cost
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
 .EXAMPLE
 New-SnipeitAssetMaintenence -asset_id 1 -supplier_id 1 -title "replace keyboard" -start_date 2021-01-01
@@ -91,13 +91,22 @@ function New-SnipeitAssetMaintenance() {
 
 
     $Parameters = @{
-        Uri    = "$url/api/v1/maintenances"
+        Api    = "/api/v1/maintenances"
         Method = 'Post'
         Body   = $Values
-        Token  = $apiKey
     }
 
-    If ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
+    if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
         $result = Invoke-SnipeitMethod @Parameters
     }
 
diff --git a/SnipeitPS/Public/New-SnipeitAudit.ps1 b/SnipeitPS/Public/New-SnipeitAudit.ps1
index 971d41a..6efff0e 100644
--- a/SnipeitPS/Public/New-SnipeitAudit.ps1
+++ b/SnipeitPS/Public/New-SnipeitAudit.ps1
@@ -16,8 +16,7 @@ New-SnipeitAudit -tag 1 -location_id 1
 
 #>
 
-function New-SnipeitAudit()
-{
+function New-SnipeitAudit() {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -43,20 +42,27 @@ function New-SnipeitAudit()
         "location_id" = $location_id
     }
 
-    if ($PSBoundParameters.ContainsKey('tag'))
-    {
+    if ($PSBoundParameters.ContainsKey('tag')) {
         $Values += @{"asset_tag" = $tag}
     }
 
     $Parameters = @{
-        Uri    = "$url/api/v1/hardware/audit"
+        Api    = "/api/v1/hardware/audit"
         Method = 'Post'
         Body   = $Values
-        Token  = $apiKey
     }
 
-    If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-    {
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
+    if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
         $result = Invoke-SnipeitMethod @Parameters
     }
 
diff --git a/SnipeitPS/Public/New-SnipeitCategory.ps1 b/SnipeitPS/Public/New-SnipeitCategory.ps1
index f56258e..8eda278 100644
--- a/SnipeitPS/Public/New-SnipeitCategory.ps1
+++ b/SnipeitPS/Public/New-SnipeitCategory.ps1
@@ -24,17 +24,16 @@ If switch is present, send email to user on checkin/checkout
 Category image filename and path
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key API Key for Snipeit.
 
 .EXAMPLE
-New-SnipeitCategory -name "Laptops" -category_type asset -url "Snipe-IT URL here..." -apiKey "API key here..."
+New-SnipeitCategory -name "Laptops" -category_type asset
 #>
 
-function New-SnipeitCategory()
-{
+function New-SnipeitCategory() {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -69,7 +68,7 @@ function New-SnipeitCategory()
     begin {
         Test-SnipeitAlias -invocationName $MyInvocation.InvocationName -commandName $MyInvocation.MyCommand.Name
 
-        if($eula_text -and $use_default_eula){
+        if ($eula_text -and $use_default_eula) {
             throw 'Dont use -use_defalt_eula if -eula_text is set'
         }
 
@@ -79,14 +78,22 @@ function New-SnipeitCategory()
     process {
 
         $Parameters = @{
-            Uri    = "$url/api/v1/categories"
+            Api    = "/api/v1/categories"
             Method = 'POST'
             Body   = $Values
-            Token  = $apiKey
         }
 
-        If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-        {
+        if ($PSBoundParameters.ContainsKey('apiKey')) {
+            Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+            Set-SnipeitPSSessionApiKey -apiKey $apikey
+        }
+
+        if ($PSBoundParameters.ContainsKey('url')) {
+            Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+            Set-SnipeitPSSessionApiKey -url $url
+        }
+
+        if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
             $result = Invoke-SnipeitMethod @Parameters
         }
 
diff --git a/SnipeitPS/Public/New-SnipeitCompany.ps1 b/SnipeitPS/Public/New-SnipeitCompany.ps1
index 56d2381..217f6ec 100644
--- a/SnipeitPS/Public/New-SnipeitCompany.ps1
+++ b/SnipeitPS/Public/New-SnipeitCompany.ps1
@@ -12,18 +12,17 @@ Comapany name
 Company image filename and path
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key API Key for Snipeit.
 
 .EXAMPLE
 New-SnipeitCompany -name "Acme Company"
 
 #>
 
-function New-SnipeitCompany()
-{
+function New-SnipeitCompany() {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -48,17 +47,26 @@ function New-SnipeitCompany()
     $Values = . Get-ParameterValue -Parameters $MyInvocation.MyCommand.Parameters -BoundParameters $PSBoundParameters
 
     $Parameters = @{
-        Uri    = "$url/api/v1/companies"
+        Api    = "/api/v1/companies"
         Method = 'POST'
         Body   = $Values
-        Token  = $apiKey
     }
 
-    If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-    {
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
+    if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
         $result = Invoke-SnipeitMethod @Parameters
     }
 
     $result
+    $result
 }
 
diff --git a/SnipeitPS/Public/New-SnipeitComponent.ps1 b/SnipeitPS/Public/New-SnipeitComponent.ps1
index 4a4a195..e6391d1 100644
--- a/SnipeitPS/Public/New-SnipeitComponent.ps1
+++ b/SnipeitPS/Public/New-SnipeitComponent.ps1
@@ -30,16 +30,15 @@ Cost of item being purchased.
 Component image filename and path
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key API Key for Snipeit.
 
 .EXAMPLE
-An example
+New-SnipeitComponent -name 'Display adapter' -catecory_id 3 -qty 10
+
 
-.NOTES
-General notes
 #>
 
 function New-SnipeitComponent() {
@@ -87,13 +86,22 @@ function New-SnipeitComponent() {
     }
 
     $Parameters = @{
-        Uri    = "$url/api/v1/components"
+        Api    = "/api/v1/components"
         Method = 'POST'
         Body   = $Values
-        Token  = $apiKey
     }
 
-    If ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
+    if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
         $result = Invoke-SnipeitMethod @Parameters
     }
 
diff --git a/SnipeitPS/Public/New-SnipeitConsumable.ps1 b/SnipeitPS/Public/New-SnipeitConsumable.ps1
index 3dce2f1..7ed9a5a 100644
--- a/SnipeitPS/Public/New-SnipeitConsumable.ps1
+++ b/SnipeitPS/Public/New-SnipeitConsumable.ps1
@@ -48,10 +48,10 @@ Item number for the consumable
 Consumable Image filename and path
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
 
 .EXAMPLE
@@ -60,8 +60,7 @@ Create consumable with stock count 20 , alert when stock is  5 or lower
 
 #>
 
-function New-SnipeitConsumable()
-{
+function New-SnipeitConsumable() {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -127,14 +126,22 @@ function New-SnipeitConsumable()
 
     process {
         $Parameters = @{
-            Uri    = "$url/api/v1/consumables"
+            Api    = "/api/v1/consumables"
             Method = 'Post'
             Body   = $Values
-            Token  = $apiKey
         }
 
-        If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-        {
+        if ($PSBoundParameters.ContainsKey('apiKey')) {
+            Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+            Set-SnipeitPSSessionApiKey -apiKey $apikey
+        }
+
+        if ($PSBoundParameters.ContainsKey('url')) {
+            Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+            Set-SnipeitPSSessionApiKey -url $url
+        }
+
+        if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
             $result = Invoke-SnipeitMethod @Parameters
         }
 
diff --git a/SnipeitPS/Public/New-SnipeitCustomField.ps1 b/SnipeitPS/Public/New-SnipeitCustomField.ps1
index b2c2a0f..4b7debd 100644
--- a/SnipeitPS/Public/New-SnipeitCustomField.ps1
+++ b/SnipeitPS/Public/New-SnipeitCustomField.ps1
@@ -30,17 +30,16 @@
     Any additional text you wish to display under the new form field to make it clearer what the gauges should be.
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
     .EXAMPLE
     New-SnipeitCustomField -Name "AntivirusInstalled" -Format "BOOLEAN" -HelpText "Is AntiVirus installed on Asset"
 #>
 
-function New-SnipeitCustomField()
-{
+function New-SnipeitCustomField() {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -84,16 +83,22 @@ function New-SnipeitCustomField()
         $Values = . Get-ParameterValue -Parameters $MyInvocation.MyCommand.Parameters -BoundParameters $PSBoundParameters
 
         $Parameters = @{
-            Uri    = "$url/api/v1/fields"
+            Api    = "/api/v1/fields"
             Method = 'post'
             Body   = $Values
-            Token  = $apiKey
+        }
+
+        if ($PSBoundParameters.ContainsKey('apiKey')) {
+            Set-SnipeitPSSessionApiKey -apiKey $apikey
+        }
+
+        if ($PSBoundParameters.ContainsKey('url')) {
+            Set-SnipeitPSSessionApiKey -url $url
         }
     }
 
     process{
-        If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-        {
+        if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
             $result = Invoke-SnipeitMethod @Parameters
         }
 
diff --git a/SnipeitPS/Public/New-SnipeitDepartment.ps1 b/SnipeitPS/Public/New-SnipeitDepartment.ps1
index f36dbd0..9770dc6 100644
--- a/SnipeitPS/Public/New-SnipeitDepartment.ps1
+++ b/SnipeitPS/Public/New-SnipeitDepartment.ps1
@@ -21,10 +21,10 @@
     Department Image filename and path
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
     .EXAMPLE
     New-SnipeitDepartment -name "Department1" -company_id 1 -localtion_id 1 -manager_id 3
@@ -66,13 +66,22 @@ function New-SnipeitDepartment() {
     $Values = . Get-ParameterValue -Parameters $MyInvocation.MyCommand.Parameters -BoundParameters $PSBoundParameters
 
     $Parameters = @{
-        Uri    = "$url/api/v1/departments"
+        Api    = "/api/v1/departments"
         Method = 'POST'
         Body   = $Values
-        Token  = $apiKey
     }
 
-    If ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
+    if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
         $result = Invoke-SnipeitMethod @Parameters
     }
 
diff --git a/SnipeitPS/Public/New-SnipeitLicense.ps1 b/SnipeitPS/Public/New-SnipeitLicense.ps1
index 13c2844..9cd327b 100644
--- a/SnipeitPS/Public/New-SnipeitLicense.ps1
+++ b/SnipeitPS/Public/New-SnipeitLicense.ps1
@@ -57,10 +57,10 @@
     Termination date for license.
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
     .EXAMPLE
     New-SnipeitLicence -name "License" -seats 3 -company_id 1
@@ -141,13 +141,22 @@ function New-SnipeitLicense() {
     }
 
     $Parameters = @{
-        Uri    = "$url/api/v1/licenses"
+        Api    = "/api/v1/licenses"
         Method = 'POST'
         Body   = $Values
-        Token  = $apiKey
     }
 
-    If ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
+    if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
         $result = Invoke-SnipeitMethod @Parameters
     }
 
diff --git a/SnipeitPS/Public/New-SnipeitLocation.ps1 b/SnipeitPS/Public/New-SnipeitLocation.ps1
index dda4c0e..7f98622 100644
--- a/SnipeitPS/Public/New-SnipeitLocation.ps1
+++ b/SnipeitPS/Public/New-SnipeitLocation.ps1
@@ -42,10 +42,10 @@
     Location Image filename and path
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
     .EXAMPLE
     New-SnipeitLocation -name "Room 1" -address "123 Asset Street" -parent_id 14
@@ -98,13 +98,22 @@ function New-SnipeitLocation() {
     $Values = . Get-ParameterValue -Parameters $MyInvocation.MyCommand.Parameters -BoundParameters $PSBoundParameters
 
     $Parameters = @{
-        Uri    = "$url/api/v1/locations"
+        Api    = "/api/v1/locations"
         Method = 'post'
         Body   = $Values
-        Token  = $apiKey
     }
 
-    If ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
+    if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
         $result = Invoke-SnipeitMethod @Parameters
     }
 
diff --git a/SnipeitPS/Public/New-SnipeitManufacturer.ps1 b/SnipeitPS/Public/New-SnipeitManufacturer.ps1
index 91d5885..4bf49ec 100644
--- a/SnipeitPS/Public/New-SnipeitManufacturer.ps1
+++ b/SnipeitPS/Public/New-SnipeitManufacturer.ps1
@@ -15,17 +15,16 @@
     Remove current image
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
     .EXAMPLE
     New-SnipeitManufacturer -name "HP"
 #>
 
-function New-SnipeitManufacturer()
-{
+function New-SnipeitManufacturer() {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -54,14 +53,22 @@ function New-SnipeitManufacturer()
     }
 
     $Parameters = @{
-        Uri    = "$url/api/v1/manufacturers"
+        Api    = "/api/v1/manufacturers"
         Method = 'post'
         Body   = $Values
-        Token  = $apiKey
     }
 
-    If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-    {
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
+    if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
         $result = Invoke-SnipeitMethod @Parameters
     }
 
diff --git a/SnipeitPS/Public/New-SnipeitModel.ps1 b/SnipeitPS/Public/New-SnipeitModel.ps1
index 95e0f14..b9722bd 100644
--- a/SnipeitPS/Public/New-SnipeitModel.ps1
+++ b/SnipeitPS/Public/New-SnipeitModel.ps1
@@ -24,17 +24,16 @@
     Asset model Image filename and path
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
     .EXAMPLE
     New-SnipeitModel -name "DL380" -manufacturer_id 2 -fieldset_id 2 -category_id 1
 #>
 
-function New-SnipeitModel()
-{
+function New-SnipeitModel() {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -81,14 +80,22 @@ function New-SnipeitModel()
 
 
     $Parameters = @{
-        Uri    = "$url/api/v1/models"
+        Api    = "/api/v1/models"
         Method = 'post'
         Body   = $Values
-        Token  = $apiKey
     }
 
-    If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-    {
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
+    if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
         $result = Invoke-SnipeitMethod @Parameters
     }
 
diff --git a/SnipeitPS/Public/New-SnipeitSupplier.ps1 b/SnipeitPS/Public/New-SnipeitSupplier.ps1
index a79e78c..db36ef8 100644
--- a/SnipeitPS/Public/New-SnipeitSupplier.ps1
+++ b/SnipeitPS/Public/New-SnipeitSupplier.ps1
@@ -45,10 +45,10 @@
     Image file name and path for item
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
     .EXAMPLE
     New-SnipeitDepartment -name "Department1" -company_id 1 -localtion_id 1 -manager_id 3
@@ -102,13 +102,22 @@ function New-SnipeitSupplier() {
     $Values = . Get-ParameterValue -Parameters $MyInvocation.MyCommand.Parameters -BoundParameters $PSBoundParameters
 
     $Parameters = @{
-        Uri    = "$url/api/v1/suppilers"
+        Api    = "/api/v1/suppilers"
         Method = 'POST'
         Body   = $Values
-        Token  = $apiKey
     }
 
-    If ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
+    if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
         $result = Invoke-SnipeitMethod @Parameters
     }
 
diff --git a/SnipeitPS/Public/New-SnipeitUser.ps1 b/SnipeitPS/Public/New-SnipeitUser.ps1
index 08d9380..139c73c 100644
--- a/SnipeitPS/Public/New-SnipeitUser.ps1
+++ b/SnipeitPS/Public/New-SnipeitUser.ps1
@@ -54,10 +54,10 @@
     User Image file name and path
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. User's API Key for Snipeit.
 
     .EXAMPLE
     New-Snipeituser -fist_name It -lastname Snipe -username snipeit -activated $false -company_id 1 -location_id 1 -department_id 1
@@ -126,13 +126,22 @@ function New-SnipeitUser() {
     }
 
     $Parameters = @{
-        Uri    = "$url/api/v1/users"
+        Api    = "/api/v1/users"
         Method = 'post'
         Body   = $Values
-        Token  = $apiKey
     }
 
-    If ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
+    if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
         $result = Invoke-SnipeitMethod @Parameters
     }
 
diff --git a/SnipeitPS/Public/Remove-SnipeitAccessory.ps1 b/SnipeitPS/Public/Remove-SnipeitAccessory.ps1
index b876fbd..719e9b9 100644
--- a/SnipeitPS/Public/Remove-SnipeitAccessory.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitAccessory.ps1
@@ -6,10 +6,10 @@
     .PARAMETER ID
     Unique ID For accessory to be removed
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. User's API Key for Snipeit.
 
     .EXAMPLE
     Remove-SnipeitAccessory -ID 44 -Verbose
@@ -18,8 +18,7 @@
     Get-SnipeitAccessory -search needle  | Remove-SnipeitAccessory
 #>
 
-function Remove-SnipeitAccessory ()
-{
+function Remove-SnipeitAccessory () {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -40,18 +39,27 @@ function Remove-SnipeitAccessory ()
     }
 
     process {
-        foreach($accessory_id in $id){
+        foreach($accessory_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/accessories/$accessory_id"
+                Api    = "/api/v1/accessories/$accessory_id"
                 Method = 'Delete'
-                Token  = $apiKey
             }
 
-        If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-        {
-            $result = Invoke-SnipeitMethod @Parameters
-        }
-        $result
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+                $result = Invoke-SnipeitMethod @Parameters
+            }
+
+            $result
         }
     }
 }
diff --git a/SnipeitPS/Public/Remove-SnipeitAsset.ps1 b/SnipeitPS/Public/Remove-SnipeitAsset.ps1
index 3c90e76..8ea9333 100644
--- a/SnipeitPS/Public/Remove-SnipeitAsset.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitAsset.ps1
@@ -6,10 +6,10 @@
     .PARAMETER ID
     Unique ID For Asset to be removed
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. User's API Key for Snipeit.
 
     .EXAMPLE
     Remove-SnipeitAsset -ID 44 -Verbose
@@ -18,8 +18,7 @@
     Get-SnipeitAsset -serial 123456789  | Remove-SnipeitAsset
 #>
 
-function Remove-SnipeitAsset ()
-{
+function Remove-SnipeitAsset () {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -41,18 +40,27 @@ function Remove-SnipeitAsset ()
     }
 
     process {
-        foreach($asset_id in $id){
+        foreach($asset_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/hardware/$asset_id"
+                Api    = "/api/v1/hardware/$asset_id"
                 Method = 'Delete'
-                Token  = $apiKey
             }
 
-        If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-        {
-            $result = Invoke-SnipeitMethod @Parameters
-        }
-        $result
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+                $result = Invoke-SnipeitMethod @Parameters
+            }
+
+            $result
         }
     }
 }
diff --git a/SnipeitPS/Public/Remove-SnipeitAssetMaintenance.ps1 b/SnipeitPS/Public/Remove-SnipeitAssetMaintenance.ps1
index d0b0d70..3967402 100644
--- a/SnipeitPS/Public/Remove-SnipeitAssetMaintenance.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitAssetMaintenance.ps1
@@ -1,23 +1,23 @@
+<#
+    .SYNOPSIS
+    Remove asset maintenance from Snipe-it asset system
+
+    .DESCRIPTION
+    Removes asset maintenance event or events from Snipe-it asset system by ID
+
+    .PARAMETER ID
+    Unique ID of the asset maintenance to be removed
+
+    .PARAMETER url
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
+    .PARAMETER url
+    Deprecated parameter, please use Connect-SnipeitPS instead. User's API Key for Snipeit.
+
+    .EXAMPLE
+    Remove-SnipeitAssetMaintenance -ID 44
+#>
 function Remove-SnipeitAssetMaintenance {
-    <#
-        .SYNOPSIS
-        Remove asset maintenance from Snipe-it asset system
 
-        .DESCRIPTION
-        Removes asset maintenance event or events from Snipe-it asset system by ID
-
-        .PARAMETER ID
-        Unique ID of the asset maintenance to be removed
-
-        .PARAMETER url
-        URL of Snipeit system, can be set using Set-SnipeitInfoeItInfo command
-
-        .PARAMETER apiKey
-        User's API Key for Snipeit, can be set using Set-SnipeitInfo command
-
-        .EXAMPLE
-        Remove-SnipeitAssetMaintenance -ID 44 -url $url -apiKey $secret -Verbose
-    #>
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -39,15 +39,23 @@ function Remove-SnipeitAssetMaintenance {
     }
 
     process {
-        foreach($maintenance_id in $id){
+        foreach($maintenance_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/maintenances/$maintenance_id"
+                Api    = "/api/v1/maintenances/$maintenance_id"
                 Method = 'Delete'
-                Token  = $apiKey
             }
 
-            If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-            {
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
                 $result = Invoke-SnipeitMethod @Parameters
             }
 
diff --git a/SnipeitPS/Public/Remove-SnipeitCategory.ps1 b/SnipeitPS/Public/Remove-SnipeitCategory.ps1
index 419ef90..ccbb2bf 100644
--- a/SnipeitPS/Public/Remove-SnipeitCategory.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitCategory.ps1
@@ -6,20 +6,19 @@
     .PARAMETER ID
     Unique ID For categoryto be removed
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. User's API Key for Snipeit.
 
     .EXAMPLE
-    Remove-SnipeitCategory -ID 44 -Verbose
+    Remove-SnipeitCategory -ID 44
 
     .EXAMPLE
     Get-SnipeitCategory -search something  | Remove-SnipeitCategory
 #>
 
-function Remove-SnipeitCategory ()
-{
+function Remove-SnipeitCategory () {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -39,18 +38,27 @@ function Remove-SnipeitCategory ()
     begin {
     }
     process {
-        foreach($category_id in $id){
+        foreach($category_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/categories/$category_id"
+                Api    = "/api/v1/categories/$category_id"
                 Method = 'Delete'
-                Token  = $apiKey
             }
 
-        If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-        {
-            $result = Invoke-SnipeitMethod @Parameters
-        }
-        $result
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+                $result = Invoke-SnipeitMethod @Parameters
+            }
+
+            $result
         }
     }
 }
diff --git a/SnipeitPS/Public/Remove-SnipeitCompany.ps1 b/SnipeitPS/Public/Remove-SnipeitCompany.ps1
index 468bda8..63ab48d 100644
--- a/SnipeitPS/Public/Remove-SnipeitCompany.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitCompany.ps1
@@ -6,20 +6,19 @@
     .PARAMETER ID
     Unique ID For Company to be removed
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. User's API Key for Snipeit.
 
     .EXAMPLE
-    Remove-SnipeitCompany -ID 44 -Verbose
+    Remove-SnipeitCompany -ID 44
 
     .EXAMPLE
     Get-SnipeitCompany | | Where-object {$_.name -like '*some*'} | Remove-SnipeitCompany
 #>
 
-function Remove-SnipeitCompany ()
-{
+function Remove-SnipeitCompany () {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -39,18 +38,27 @@ function Remove-SnipeitCompany ()
     begin {
     }
     process {
-        foreach($company_id in $id){
+        foreach($company_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/companies/$company_id"
+                Api    = "/api/v1/companies/$company_id"
                 Method = 'Delete'
-                Token  = $apiKey
             }
 
-        If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-        {
-            $result = Invoke-SnipeitMethod @Parameters
-        }
-        $result
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+                $result = Invoke-SnipeitMethod @Parameters
+            }
+
+            $result
         }
     }
 }
diff --git a/SnipeitPS/Public/Remove-SnipeitComponent.ps1 b/SnipeitPS/Public/Remove-SnipeitComponent.ps1
index a9d8156..7757279 100644
--- a/SnipeitPS/Public/Remove-SnipeitComponent.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitComponent.ps1
@@ -6,20 +6,19 @@
     .PARAMETER IDs
     Unique ID For component to be removed
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. User's API Key for Snipeit.
 
     .EXAMPLE
-    Remove-SnipeitComponent -ID 44 -Verbose
+    Remove-SnipeitComponent -ID 44
 
     .EXAMPLE
     Get-SnipeitComponent -search 123456789  | Remove-SnipeitComponent
 #>
 
-function Remove-SnipeitComponent ()
-{
+function Remove-SnipeitComponent () {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -40,18 +39,27 @@ function Remove-SnipeitComponent ()
     }
 
     process {
-        foreach($component_id in $id){
+        foreach($component_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/components/$component_id"
+                Api    = "/api/v1/components/$component_id"
                 Method = 'Delete'
-                Token  = $apiKey
             }
 
-        If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-        {
-            $result = Invoke-SnipeitMethod @Parameters
-        }
-        $result
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+                $result = Invoke-SnipeitMethod @Parameters
+            }
+
+            $result
         }
     }
 }
diff --git a/SnipeitPS/Public/Remove-SnipeitConsumable.ps1 b/SnipeitPS/Public/Remove-SnipeitConsumable.ps1
index cea96c8..04a2925 100644
--- a/SnipeitPS/Public/Remove-SnipeitConsumable.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitConsumable.ps1
@@ -7,20 +7,19 @@
     Unique ID For consumable to be removed
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. User's API Key for Snipeit.
 
     .EXAMPLE
-    Remove-SnipeitConsumable -ID 44 -Verbose
+    Remove-SnipeitConsumable -ID 44
 
     .EXAMPLE
-    Get-SnipeitConsumable -search "paper"  | Remove-Snipeitconsumable
+    Get-SnipeitConsumable -search "paper"  | Remove-SnipeitConsumable
 #>
 
-function Remove-SnipeitConsumable ()
-{
+function Remove-SnipeitConsumable () {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -41,18 +40,27 @@ function Remove-SnipeitConsumable ()
     }
 
     process {
-        foreach($consumable_id in $id){
+        foreach($consumable_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/consumables/$consumable_id"
+                Api    = "/api/v1/consumables/$consumable_id"
                 Method = 'Delete'
-                Token  = $apiKey
             }
 
-        If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-        {
-            $result = Invoke-SnipeitMethod @Parameters
-        }
-        $result
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+                $result = Invoke-SnipeitMethod @Parameters
+            }
+
+            $result
         }
     }
 }
diff --git a/SnipeitPS/Public/Remove-SnipeitCustomField.ps1 b/SnipeitPS/Public/Remove-SnipeitCustomField.ps1
index 6f11ee2..a82f479 100644
--- a/SnipeitPS/Public/Remove-SnipeitCustomField.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitCustomField.ps1
@@ -6,10 +6,10 @@
     .PARAMETER ID
     Unique ID For field to be removed
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. User's API Key for Snipeit.
 
     .EXAMPLE
     Remove-SnipeitCustomField -ID 44 -Verbose
@@ -18,8 +18,7 @@
     Get-SnipeitCustomField | Where-object {$_.name -like '*address*'}  | Remove-SnipeitCustomField
 #>
 
-function Remove-SnipeitCustomField ()
-{
+function Remove-SnipeitCustomField () {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -38,18 +37,27 @@ function Remove-SnipeitCustomField ()
     begin {
     }
     process {
-        foreach($field_id in $id){
+        foreach($field_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/fields/$field_id"
+                Api    = "/api/v1/fields/$field_id"
                 Method = 'Delete'
-                Token  = $apiKey
             }
 
-        If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-        {
-            $result = Invoke-SnipeitMethod @Parameters
-        }
-        $result
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+                $result = Invoke-SnipeitMethod @Parameters
+            }
+
+            $result
         }
     }
 }
diff --git a/SnipeitPS/Public/Remove-SnipeitDepartment.ps1 b/SnipeitPS/Public/Remove-SnipeitDepartment.ps1
index b916f7c..a80492e 100644
--- a/SnipeitPS/Public/Remove-SnipeitDepartment.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitDepartment.ps1
@@ -6,20 +6,19 @@
     .PARAMETER ID
     Unique ID For department to be removed
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. User's API Key for Snipeit.
 
     .EXAMPLE
-    Remove-SnipeitDepartment -ID 44 -Verbose
+    Remove-SnipeitDepartment -ID 44
 
     .EXAMPLE
     Get-SnipeitDepartment | Where-object {$_.name -like '*head*'} | Remove-SnipeitDepartment
 #>
 
-function Remove-SnipeitDepartment ()
-{
+function Remove-SnipeitDepartment () {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -39,18 +38,27 @@ function Remove-SnipeitDepartment ()
     begin {
     }
     process {
-        foreach($department_id in $id){
+        foreach($department_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/departments/$department_id"
+                Api    = "/api/v1/departments/$department_id"
                 Method = 'Delete'
-                Token  = $apiKey
             }
 
-        If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-        {
-            $result = Invoke-SnipeitMethod @Parameters
-        }
-        $result
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+                $result = Invoke-SnipeitMethod @Parameters
+            }
+
+            $result
         }
     }
 }
diff --git a/SnipeitPS/Public/Remove-SnipeitLicense.ps1 b/SnipeitPS/Public/Remove-SnipeitLicense.ps1
index 23b06e7..e0de3f9 100644
--- a/SnipeitPS/Public/Remove-SnipeitLicense.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitLicense.ps1
@@ -6,20 +6,19 @@
     .PARAMETER ID
     Unique ID For licence to be removed
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. User's API Key for Snipeit.
 
     .EXAMPLE
-    Remove-SnipeitLicence -ID 44 -Verbose
+    Remove-SnipeitLicence -ID 44
 
     .EXAMPLE
     Get-SnipeitLicence -product_key 123456789  | Remove-SnipeitLicense
 #>
 
-function Remove-SnipeitLicense ()
-{
+function Remove-SnipeitLicense () {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -40,18 +39,27 @@ function Remove-SnipeitLicense ()
     }
 
     process {
-        foreach($license_id in $id){
+        foreach($license_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/licenses/$license_id"
+                Api    = "/api/v1/licenses/$license_id"
                 Method = 'Delete'
-                Token  = $apiKey
             }
 
-        If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-        {
-            $result = Invoke-SnipeitMethod @Parameters
-        }
-        $result
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+                $result = Invoke-SnipeitMethod @Parameters
+            }
+
+            $result
         }
     }
 }
diff --git a/SnipeitPS/Public/Remove-SnipeitLocation.ps1 b/SnipeitPS/Public/Remove-SnipeitLocation.ps1
index effd576..ef74d41 100644
--- a/SnipeitPS/Public/Remove-SnipeitLocation.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitLocation.ps1
@@ -6,20 +6,19 @@
     .PARAMETER ID
     Unique ID For location to be removed
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. User's API Key for Snipeit.
 
     .EXAMPLE
-    Remove-SnipeitLocation -ID 44 -Verbose
+    Remove-SnipeitLocation -ID 44
 
     .EXAMPLE
     Get-SnipeitLocation -city Arkham  | Remove-SnipeitLocation
 #>
 
-function Remove-SnipeitLocation ()
-{
+function Remove-SnipeitLocation () {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -40,18 +39,27 @@ function Remove-SnipeitLocation ()
     }
 
     process {
-        foreach($location_id in $id){
+        foreach($location_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/locations/$asset_id"
+                Api    = "/api/v1/locations/$asset_id"
                 Method = 'Delete'
-                Token  = $apiKey
             }
 
-        If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-        {
-            $result = Invoke-SnipeitMethod @Parameters
-        }
-        $result
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+                $result = Invoke-SnipeitMethod @Parameters
+            }
+
+            $result
         }
     }
 }
diff --git a/SnipeitPS/Public/Remove-SnipeitManufacturer.ps1 b/SnipeitPS/Public/Remove-SnipeitManufacturer.ps1
index 1505237..6b09dbf 100644
--- a/SnipeitPS/Public/Remove-SnipeitManufacturer.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitManufacturer.ps1
@@ -6,20 +6,19 @@
     .PARAMETER ID
     Unique ID For manufacturer to be removed
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. User's API Key for Snipeit.
 
     .EXAMPLE
-    Remove-SnipeitManufacturer -ID 44 -Verbose
+    Remove-SnipeitManufacturer -ID 44
 
     .EXAMPLE
     Get-SnipeitManufacturer | Where-object {$_.name -like '*something*'}  | Remove-SnipeitManufacturer
 #>
 
-function Remove-SnipeitManufacturer ()
-{
+function Remove-SnipeitManufacturer () {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -40,18 +39,27 @@ function Remove-SnipeitManufacturer ()
     }
 
     process {
-        foreach($manufacturer_id in $id){
+        foreach($manufacturer_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/manufacturers/$manufacturer_id"
+                Api    = "/api/v1/manufacturers/$manufacturer_id"
                 Method = 'Delete'
-                Token  = $apiKey
             }
 
-        If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-        {
-            $result = Invoke-SnipeitMethod @Parameters
-        }
-        $result
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+                $result = Invoke-SnipeitMethod @Parameters
+            }
+
+            $result
         }
     }
 }
diff --git a/SnipeitPS/Public/Remove-SnipeitModel.ps1 b/SnipeitPS/Public/Remove-SnipeitModel.ps1
index daf2640..40d8b94 100644
--- a/SnipeitPS/Public/Remove-SnipeitModel.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitModel.ps1
@@ -6,20 +6,19 @@
     .PARAMETER ID
     Unique ID For Model to be removed
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. User's API Key for Snipeit.
 
     .EXAMPLE
-    Remove-SnipeitModel -ID 44 -Verbose
+    Remove-SnipeitModel -ID 44
 
     .EXAMPLE
     Get-SnipeitModel -search needle  | Remove-SnipeitModel
 #>
 
-function Remove-SnipeitModel ()
-{
+function Remove-SnipeitModel () {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -40,18 +39,27 @@ function Remove-SnipeitModel ()
     }
 
     process {
-        foreach($model_id in $id){
+        foreach($model_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/models/$model_id"
+                Api    = "/api/v1/models/$model_id"
                 Method = 'Delete'
-                Token  = $apiKey
             }
 
-        If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-        {
-            $result = Invoke-SnipeitMethod @Parameters
-        }
-        $result
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+                $result = Invoke-SnipeitMethod @Parameters
+            }
+
+            $result
         }
     }
 }
diff --git a/SnipeitPS/Public/Remove-SnipeitSupplier.ps1 b/SnipeitPS/Public/Remove-SnipeitSupplier.ps1
index eceaafc..652f17e 100644
--- a/SnipeitPS/Public/Remove-SnipeitSupplier.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitSupplier.ps1
@@ -6,10 +6,10 @@
     .PARAMETER ID
     Unique ID For supplier to be removed
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. User's API Key for Snipeit.
 
     .EXAMPLE
     Remove-SnipeitSupplier -ID 44
@@ -18,8 +18,7 @@
     Get-SnipeitSupplier | Where-object {$_.name -like '*something*'}  | Remove-SnipeitSupplier
 #>
 
-function Remove-SnipeitSupplier ()
-{
+function Remove-SnipeitSupplier () {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -40,18 +39,27 @@ function Remove-SnipeitSupplier ()
     }
 
     process {
-        foreach($suppliers_id in $id){
+        foreach($suppliers_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/suppliers/$supplier_id"
+                Api    = "/api/v1/suppliers/$supplier_id"
                 Method = 'Delete'
-                Token  = $apiKey
             }
 
-        If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-        {
-            $result = Invoke-SnipeitMethod @Parameters
-        }
-        $result
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+                $result = Invoke-SnipeitMethod @Parameters
+            }
+
+            $result
         }
     }
 }
diff --git a/SnipeitPS/Public/Remove-SnipeitUser.ps1 b/SnipeitPS/Public/Remove-SnipeitUser.ps1
index 8400246..56e7f57 100644
--- a/SnipeitPS/Public/Remove-SnipeitUser.ps1
+++ b/SnipeitPS/Public/Remove-SnipeitUser.ps1
@@ -7,17 +7,16 @@
     Unique ID For User to be removed
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. User's API Key for Snipeit.
 
     .EXAMPLE
     Remove-SnipeitUser -ID 44 -url $url -apiKey $secret -Verbose
 #>
 
-function Remove-SnipeitUser ()
-{
+function Remove-SnipeitUser () {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -41,13 +40,21 @@ function Remove-SnipeitUser ()
     process {
         foreach($user_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/users/$user_id"
+                Api    = "/api/v1/users/$user_id"
                 Method = 'Delete'
-                Token  = $apiKey
             }
 
-            If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-            {
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
                 $result = Invoke-SnipeitMethod @Parameters
             }
 
diff --git a/SnipeitPS/Public/Reset-SnipeitAccessoryOwner.ps1 b/SnipeitPS/Public/Reset-SnipeitAccessoryOwner.ps1
index 2451350..2741986 100644
--- a/SnipeitPS/Public/Reset-SnipeitAccessoryOwner.ps1
+++ b/SnipeitPS/Public/Reset-SnipeitAccessoryOwner.ps1
@@ -10,10 +10,10 @@
     Use Get-SnipeitAccessoryOwner to find out nooded value
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. User's API Key for Snipeit.
 
        .EXAMPLE
     To get the accessories_users table for specific accessory id number
@@ -25,8 +25,7 @@
     Get-SnipeitAccessoryOwner -assigned_pivot_id xxx
 
 #>
-function Reset-SnipeitAccessoryOwner()
-{
+function Reset-SnipeitAccessoryOwner() {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Medium"
@@ -44,14 +43,22 @@ function Reset-SnipeitAccessoryOwner()
     )
 
     $Parameters = @{
-        Uri    = "$url/api/v1/accessories/$assigned_pivot_id/checkin"
+        Api    = "/api/v1/accessories/$assigned_pivot_id/checkin"
         Method = 'Post'
         Body   = @{}
-        Token  = $apiKey
     }
 
-    If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-    {
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
+    if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
         $result = Invoke-SnipeitMethod @Parameters
     }
 
diff --git a/SnipeitPS/Public/Reset-SnipeitAssetOwner.ps1 b/SnipeitPS/Public/Reset-SnipeitAssetOwner.ps1
index 5a43b76..1483250 100644
--- a/SnipeitPS/Public/Reset-SnipeitAssetOwner.ps1
+++ b/SnipeitPS/Public/Reset-SnipeitAssetOwner.ps1
@@ -17,13 +17,11 @@
     Notes about checkin
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfoeItInfo command
-
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
     .PARAMETER apiKey
-    User's API Key for Snipeit, can be set using Set-SnipeitInfoeItInfo command
-
+    Deprecated parameter, please use Connect-SnipeitPS instead. User's API Key for Snipeit.
     .EXAMPLE
-    Remove-SnipeitUser -ID 44 -url $url -apiKey $secret -Verbose
+    Remove-SnipeitUser -ID 44
 #>
 function Reset-SnipeitAssetOwner() {
     [CmdletBinding(
@@ -58,13 +56,22 @@ function Reset-SnipeitAssetOwner() {
     if ($PSBoundParameters.ContainsKey('status_id')) { $Values.Add("status_id", $status_id) }
 
     $Parameters = @{
-        Uri    = "$url/api/v1/hardware/$id/checkin"
+        Api    = "/api/v1/hardware/$id/checkin"
         Method = 'POST'
         Body   = $Values
-        Token  = $apiKey
     }
 
-    If ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+    if ($PSBoundParameters.ContainsKey('apiKey')) {
+        Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -apiKey $apikey
+    }
+
+    if ($PSBoundParameters.ContainsKey('url')) {
+        Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+        Set-SnipeitPSSessionApiKey -url $url
+    }
+
+    if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
         $result = Invoke-SnipeitMethod @Parameters
     }
 
diff --git a/SnipeitPS/Public/Set-SnipeitAccessory.ps1 b/SnipeitPS/Public/Set-SnipeitAccessory.ps1
index 963669b..ce5ea74 100644
--- a/SnipeitPS/Public/Set-SnipeitAccessory.ps1
+++ b/SnipeitPS/Public/Set-SnipeitAccessory.ps1
@@ -54,11 +54,10 @@ Remove current image
 Http request type to send Snipe IT system. Defaults to Patch you could use Put if needed.
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfoeItInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfoeItInfoeItInfo command
-
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 .EXAMPLE
 Set-SnipeitAccessory -id 1 -qty 3
 
@@ -126,15 +125,24 @@ function Set-SnipeitAccessory() {
         }
 
     process {
-        foreach($accessory_id in $id){
+        foreach($accessory_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/accessories/$accessory_id"
+                Api    = "/api/v1/accessories/$accessory_id"
                 Method = $RequestType
                 Body   = $Values
-                Token  = $apiKey
             }
 
-            If ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
                 $result = Invoke-SnipeitMethod @Parameters
             }
 
diff --git a/SnipeitPS/Public/Set-SnipeitAccessoryOwner.ps1 b/SnipeitPS/Public/Set-SnipeitAccessoryOwner.ps1
index cf3f01d..bc3d1b5 100644
--- a/SnipeitPS/Public/Set-SnipeitAccessoryOwner.ps1
+++ b/SnipeitPS/Public/Set-SnipeitAccessoryOwner.ps1
@@ -14,16 +14,15 @@
     Notes about checkout
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. User's API Key for Snipeit.
 
     .EXAMPLE
     Set-SnipeitAccessoryOwner -id 1 -assigned_id 1  -note "testing check out to user"
 #>
-function Set-SnipeitAccessoryOwner()
-{
+function Set-SnipeitAccessoryOwner() {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Medium"
@@ -49,16 +48,24 @@ function Set-SnipeitAccessoryOwner()
     }
 
     process {
-        foreach($accessory_id in $id){
+        foreach($accessory_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/accessories/$accessory_id/checkout"
+                Api    = "/api/v1/accessories/$accessory_id/checkout"
                 Method = 'POST'
                 Body   = $Values
-                Token  = $apiKey
             }
 
-            If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-            {
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
                 $result = Invoke-SnipeitMethod @Parameters
             }
 
diff --git a/SnipeitPS/Public/Set-SnipeitAsset.ps1 b/SnipeitPS/Public/Set-SnipeitAsset.ps1
index 8cbbd62..d8a0fa8 100644
--- a/SnipeitPS/Public/Set-SnipeitAsset.ps1
+++ b/SnipeitPS/Public/Set-SnipeitAsset.ps1
@@ -63,10 +63,10 @@
     Http request type to send Snipe IT system. Defaults to Patch you could use Put if needed.
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfoeItInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    Users API Key for Snipeit, can be set using Set-SnipeitInfoeItInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
     .PARAMETER customfields
     Hastable of custom fields and extra fields that need passing through to Snipeit
@@ -81,8 +81,7 @@
     Get-SnipeitAsset -serial 12345678 | Set-SnipeitAsset -notes 'Just updated'
 #>
 
-function Set-SnipeitAsset()
-{
+function Set-SnipeitAsset() {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Medium"
@@ -151,24 +150,31 @@ function Set-SnipeitAsset()
             $Values['purchase_date'] = $Values['purchase_date'].ToString("yyyy-MM-dd")
         }
 
-        if ($customfields)
-        {
+        if ($customfields) {
             $Values += $customfields
         }
 
     }
 
     process {
-        foreach($asset_id in $id){
+        foreach($asset_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/hardware/$asset_id"
+                Api    = "/api/v1/hardware/$asset_id"
                 Method = $RequestType
                 Body   = $Values
-                Token  = $apiKey
             }
 
-            If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-            {
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
                 $result = Invoke-SnipeitMethod @Parameters
             }
 
diff --git a/SnipeitPS/Public/Set-SnipeitAssetOwner.ps1 b/SnipeitPS/Public/Set-SnipeitAssetOwner.ps1
index b1ed177..2c9ffcf 100644
--- a/SnipeitPS/Public/Set-SnipeitAssetOwner.ps1
+++ b/SnipeitPS/Public/Set-SnipeitAssetOwner.ps1
@@ -28,16 +28,15 @@
     Optional date to override the checkout time of now
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. User's API Key for Snipeit.
 
     .EXAMPLE
     Set-SnipeitAssetOwner -id 1 -assigned_id 1 -checkout_to_type user -note "testing check out to user"
 #>
-function Set-SnipeitAssetOwner()
-{
+function Set-SnipeitAssetOwner() {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Medium"
@@ -81,29 +80,36 @@ function Set-SnipeitAssetOwner()
             $Values['checkout_at'] = $Values['checkout_at'].ToString("yyyy-MM-dd")
         }
 
-        switch ($checkout_to_type)
-        {
+        switch ($checkout_to_type) {
             'location' { $Values += @{ "assigned_location" = $assigned_id } }
             'user' { $Values += @{ "assigned_user" = $assigned_id } }
             'asset' { $Values += @{ "assigned_asset" = $assigned_id } }
         }
 
         #This can be removed now
-        if($Values.ContainsKey('assigned_id')){$Values.Remove('assigned_id')}
+        if ($Values.ContainsKey('assigned_id')) {$Values.Remove('assigned_id')}
 
     }
 
     process{
-        foreach($asset_id in $id){
+        foreach($asset_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/hardware/$asset_id/checkout"
+                Api    = "/api/v1/hardware/$asset_id/checkout"
                 Method = 'POST'
                 Body   = $Values
-                Token  = $apiKey
             }
 
-            If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-            {
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
                 $result = Invoke-SnipeitMethod @Parameters
             }
 
diff --git a/SnipeitPS/Public/Set-SnipeitCategory.ps1 b/SnipeitPS/Public/Set-SnipeitCategory.ps1
index 8a4fae8..7fabc54 100644
--- a/SnipeitPS/Public/Set-SnipeitCategory.ps1
+++ b/SnipeitPS/Public/Set-SnipeitCategory.ps1
@@ -30,17 +30,16 @@ Remove current image
 Http request type to send Snipe IT system. Defaults to Patch you could use Put if needed.
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key API Key for Snipeit.
 
 .EXAMPLE
 Set-SnipeitCategory -id 4 -name "Laptops"
 #>
 
-function Set-SnipeitCategory()
-{
+function Set-SnipeitCategory() {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -86,16 +85,24 @@ function Set-SnipeitCategory()
     }
 
     process {
-        foreach($category_id in $id){
+        foreach($category_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/categories/$category_id"
+                Api    = "/api/v1/categories/$category_id"
                 Method = $RequestType
                 Body   = $values
-                Token  = $apiKey
             }
 
-            If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-            {
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
                 $result = Invoke-SnipeitMethod @Parameters
             }
 
diff --git a/SnipeitPS/Public/Set-SnipeitCompany.ps1 b/SnipeitPS/Public/Set-SnipeitCompany.ps1
index 5a20b48..f229fb9 100644
--- a/SnipeitPS/Public/Set-SnipeitCompany.ps1
+++ b/SnipeitPS/Public/Set-SnipeitCompany.ps1
@@ -21,10 +21,10 @@ Remove current image
 Http request type to send Snipe IT system. Defaults to Patch you could use Put if needed.
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key API Key for Snipeit.
 
 .EXAMPLE
 An example
@@ -32,8 +32,7 @@ An example
 .NOTES
 General notes
 #>
-function Set-SnipeitCompany()
-{
+function Set-SnipeitCompany() {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Medium"
@@ -66,16 +65,24 @@ function Set-SnipeitCompany()
     }
 
     process{
-        foreach($company_id in $id){
+        foreach($company_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/companies/$company_id"
+                Api    = "/api/v1/companies/$company_id"
                 Method = $RequestType
                 Body   = $Values
-                Token  = $apiKey
             }
 
-            If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-            {
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
                 $result = Invoke-SnipeitMethod @Parameters
             }
 
diff --git a/SnipeitPS/Public/Set-SnipeitComponent.ps1 b/SnipeitPS/Public/Set-SnipeitComponent.ps1
index 192682c..4532dd1 100644
--- a/SnipeitPS/Public/Set-SnipeitComponent.ps1
+++ b/SnipeitPS/Public/Set-SnipeitComponent.ps1
@@ -42,19 +42,17 @@ Remove current image
 Http request type to send Snipe IT system. Defaults to Patch you could use Put if needed.
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key API Key for Snipeit.
 
 .EXAMPLE
-An example
+Set-SnipeitComponent -id 42 -qty 12
+Sets count of component with ID 42 to 12
 
-.NOTES
-General notes
 #>
-function Set-SnipeitComponent()
-{
+function Set-SnipeitComponent() {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Medium"
@@ -107,16 +105,24 @@ function Set-SnipeitComponent()
     }
 
     process {
-        foreach($component_id in $id){
+        foreach($component_id in $id) {
         $Parameters = @{
-            Uri    = "$url/api/v1/components/$component_id"
+            Api    = "/api/v1/components/$component_id"
             Method = $RequestType
             Body   = $Values
-            Token  = $apiKey
         }
 
-        If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-        {
+        if ($PSBoundParameters.ContainsKey('apiKey')) {
+            Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+            Set-SnipeitPSSessionApiKey -apiKey $apikey
+        }
+
+        if ($PSBoundParameters.ContainsKey('url')) {
+            Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+            Set-SnipeitPSSessionApiKey -url $url
+        }
+
+        if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
             $result = Invoke-SnipeitMethod @Parameters
         }
 
diff --git a/SnipeitPS/Public/Set-SnipeitConsumable.ps1 b/SnipeitPS/Public/Set-SnipeitConsumable.ps1
index 5aadc7d..3f900bf 100644
--- a/SnipeitPS/Public/Set-SnipeitConsumable.ps1
+++ b/SnipeitPS/Public/Set-SnipeitConsumable.ps1
@@ -57,10 +57,10 @@ Remove current image
 Http request type to send Snipe IT system. Defaults to Patch you could use Put if needed.
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
 
 .EXAMPLE
@@ -69,8 +69,7 @@ Create consumable with stock count 20 , alert when stock is  5 or lower
 
 #>
 
-function Set-SnipeitConsumable()
-{
+function Set-SnipeitConsumable() {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -146,16 +145,24 @@ function Set-SnipeitConsumable()
     }
 
     process {
-        foreach($consumable_id in $id ){
+        foreach($consumable_id in $id ) {
             $Parameters = @{
-                Uri    = "$url/api/v1/consumables/$consumable_id"
+                Api    = "/api/v1/consumables/$consumable_id"
                 Method = $RequestType
                 Body   = $Values
-                Token  = $apiKey
             }
 
-            If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-            {
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
                 $result = Invoke-SnipeitMethod @Parameters
             }
 
diff --git a/SnipeitPS/Public/Set-SnipeitCustomField.ps1 b/SnipeitPS/Public/Set-SnipeitCustomField.ps1
index 5ad9b9c..cfe7bdf 100644
--- a/SnipeitPS/Public/Set-SnipeitCustomField.ps1
+++ b/SnipeitPS/Public/Set-SnipeitCustomField.ps1
@@ -33,17 +33,16 @@
     Http request type to send Snipe IT system. Defaults to Put you could use Patch if needed.
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
     .EXAMPLE
     New-SnipeitCustomField -Name "AntivirusInstalled" -Format "BOOLEAN" -HelpText "Is AntiVirus installed on Asset"
 #>
 
-function Set-SnipeitCustomField()
-{
+function Set-SnipeitCustomField() {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -93,14 +92,22 @@ function Set-SnipeitCustomField()
     process{
         foreach($field_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/fields/$field_id"
+                Api    = "/api/v1/fields/$field_id"
                 Method = $RequestType
                 Body   = $Values
-                Token  = $apiKey
             }
 
-            If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-            {
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
                 $result = Invoke-SnipeitMethod @Parameters
             }
 
diff --git a/SnipeitPS/Public/Set-SnipeitDepartment.ps1 b/SnipeitPS/Public/Set-SnipeitDepartment.ps1
index e27e8aa..49ed279 100644
--- a/SnipeitPS/Public/Set-SnipeitDepartment.ps1
+++ b/SnipeitPS/Public/Set-SnipeitDepartment.ps1
@@ -30,10 +30,10 @@
     Http request type to send Snipe IT system. Defaults to Patch you could use Put if needed.
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
     .EXAMPLE
     Set-SnipeitDepartment -id 4  -manager_id 3
@@ -83,13 +83,22 @@ function Set-SnipeitDepartment() {
     process {
         foreach ($department_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/departments/$department_id"
+                Api    = "/api/v1/departments/$department_id"
                 Method = $RequestType
                 Body   = $Values
-                Token  = $apiKey
             }
 
-            If ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
                 $result = Invoke-SnipeitMethod @Parameters
             }
 
diff --git a/SnipeitPS/Public/Set-SnipeitInfo.ps1 b/SnipeitPS/Public/Set-SnipeitInfo.ps1
index 3788c2b..d0c7fbd 100644
--- a/SnipeitPS/Public/Set-SnipeitInfo.ps1
+++ b/SnipeitPS/Public/Set-SnipeitInfo.ps1
@@ -1,14 +1,16 @@
 <#
     .SYNOPSIS
-    Sets authetication information
+    Sets authetication information. Deprecated, use Connect-SnipeitPS instead.
+
     .DESCRIPTION
-    Set apikey and url user to connect Snipe-It system
+    Deprecated combatibilty function that Set apikey and url user to connect Snipe-It system.
+    Please use Connect-SnipeitPS instead.
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    URL of Snipeit system.
 
     .PARAMETER apiKey
-    User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+    User's API Key for Snipeit.
 
     .EXAMPLE
     Set-SnipeitInfo -url $url -apiKey -Verbose
@@ -17,50 +19,18 @@ function Set-SnipeitInfo {
     [CmdletBinding()]
     [System.Diagnostics.CodeAnalysis.SuppressMessage('PSUseShouldProcessForStateChangingFunctions', '')]
     param (
+        [parameter(Mandatory=$true)]
         [Uri]$url,
-
+        [parameter(Mandatory=$true)]
         [String]$apiKey
     )
 
     BEGIN {
-        Test-SnipeitAlias -invocationName $MyInvocation.InvocationName -commandName $MyInvocation.MyCommand.Name
-        function Add-DefaultParameter {
-            param(
-                [Parameter(Mandatory = $true)]
-                [string]$Command,
 
-                [Parameter(Mandatory = $true)]
-                [string]$Parameter,
-
-                [Parameter(Mandatory = $true)]
-                $Value
-            )
-
-            PROCESS {
-                #Write-Verbose "[$($MyInvocation.MyCommand.Name)] Setting [$command : $parameter] = $value"
-
-                # Needs to set both global and module scope for the private functions:
-                # http://stackoverflow.com/questions/30427110/set-psdefaultparametersvalues-for-use-within-module-scope
-                $PSDefaultParameterValues["${command}:${parameter}"] = $Value
-                $global:PSDefaultParameterValues["${command}:${parameter}"] = $Value
-
-            }
-        }
-
-        $moduleCommands = Get-Command -Module SnipeitPS -CommandType Function
+        Write-Warning "Deprecated $($MyInvocation.InvocationName)  is still working, please use Connect-SnipeitPS instead."
     }
 
     PROCESS {
-        foreach ($command in $moduleCommands) {
-            $parameter = "url"
-            if ($url -and ($command.Parameters.Keys -contains $parameter)) {
-                Add-DefaultParameter -Command $command -Parameter $parameter -Value ($url.AbsoluteUri.TrimEnd('/'))
-            }
-
-            $parameter = "apiKey"
-            if ($apiKey -and ($command.Parameters.Keys -contains $parameter)) {
-                Add-DefaultParameter -Command $command -Parameter $parameter -Value $apiKey
-            }
-        }
+        Connect-SnipeitPS -Url $url -apiKey $apiKey
     }
 }
diff --git a/SnipeitPS/Public/Set-SnipeitLicense.ps1 b/SnipeitPS/Public/Set-SnipeitLicense.ps1
index a8d395e..92b5b13 100644
--- a/SnipeitPS/Public/Set-SnipeitLicense.ps1
+++ b/SnipeitPS/Public/Set-SnipeitLicense.ps1
@@ -63,10 +63,10 @@
     Http request type to send Snipe IT system. Defaults to Patch you could use Put if needed.
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
     .EXAMPLE
     Set-SnipeitLicence -name "License" -seats 3 -company_id 1
@@ -154,15 +154,24 @@ function Set-SnipeitLicense() {
     }
 
     process {
-        foreach($license_id in $id){
+        foreach($license_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/licenses/$license_id"
+                Api    = "/api/v1/licenses/$license_id"
                 Method = $RequestType
                 Body   = $Values
-                Token  = $apiKey
             }
 
-            If ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                 Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
                 $result = Invoke-SnipeitMethod @Parameters
             }
 
diff --git a/SnipeitPS/Public/Set-SnipeitLicenseSeat.ps1 b/SnipeitPS/Public/Set-SnipeitLicenseSeat.ps1
index 7c58997..e5d361f 100644
--- a/SnipeitPS/Public/Set-SnipeitLicenseSeat.ps1
+++ b/SnipeitPS/Public/Set-SnipeitLicenseSeat.ps1
@@ -20,10 +20,10 @@
     Http request type to send Snipe IT system. Defaults to Patch you could use Put if needed.
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. User's API Key for Snipeit.
 
     .EXAMPLE
     Set-SnipeitLicenceSeat -ID 1 -seat_id 1 -assigned_id 3
@@ -38,8 +38,7 @@
     Checkin licence seat id 1 of licence id 1
 
 #>
-function Set-SnipeitLicenseSeat()
-{
+function Set-SnipeitLicenseSeat() {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Medium"
@@ -78,14 +77,22 @@ function Set-SnipeitLicenseSeat()
     process{
         foreach($license_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/licenses/$license_id/seats/$seat_id"
+                Api    = "/api/v1/licenses/$license_id/seats/$seat_id"
                 Method = $RequestType
                 Body   = $Values
-                Token  = $apiKey
             }
 
-            If ($PSCmdlet.ShouldProcess("ShouldProcess?"))
-            {
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
                 $result = Invoke-SnipeitMethod @Parameters
             }
 
diff --git a/SnipeitPS/Public/Set-SnipeitLocation.ps1 b/SnipeitPS/Public/Set-SnipeitLocation.ps1
index 21103f3..e2c6d78 100644
--- a/SnipeitPS/Public/Set-SnipeitLocation.ps1
+++ b/SnipeitPS/Public/Set-SnipeitLocation.ps1
@@ -54,10 +54,10 @@
     Http request type to send Snipe IT system. Defaults to Patch you could use Put if needed.
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
     .EXAMPLE
     Set-SnipeitLocation -id 123 -name "Some storage"  -parent_id 100
@@ -121,13 +121,22 @@ function Set-SnipeitLocation() {
     process{
         foreach ($location_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/locations/$location_id"
+                Api    = "/api/v1/locations/$location_id"
                 Method = $RequestType
                 Body   = $Values
-                Token  = $apiKey
             }
 
-            If ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
                 $result = Invoke-SnipeitMethod @Parameters
             }
 
diff --git a/SnipeitPS/Public/Set-SnipeitManufacturer.ps1 b/SnipeitPS/Public/Set-SnipeitManufacturer.ps1
index 9f9b6fe..69a7731 100644
--- a/SnipeitPS/Public/Set-SnipeitManufacturer.ps1
+++ b/SnipeitPS/Public/Set-SnipeitManufacturer.ps1
@@ -18,17 +18,16 @@
     Http request type to send Snipe IT system. Defaults to Patch you could use Put if needed.
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
     .EXAMPLE
     New-SnipeitManufacturer -name "HP"
 #>
 
-function Set-SnipeitManufacturer()
-{
+function Set-SnipeitManufacturer() {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -62,13 +61,22 @@ function Set-SnipeitManufacturer()
     process{
         foreach ($manufacturer_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/manufacturers/$manufacturer_id"
+                Api    = "/api/v1/manufacturers/$manufacturer_id"
                 Method = $RequestType
                 Body   = $Values
-                Token  = $apiKey
             }
 
-            If ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
                 $result = Invoke-SnipeitMethod @Parameters
             }
 
diff --git a/SnipeitPS/Public/Set-SnipeitModel.ps1 b/SnipeitPS/Public/Set-SnipeitModel.ps1
index c1f4ccb..c280ef8 100644
--- a/SnipeitPS/Public/Set-SnipeitModel.ps1
+++ b/SnipeitPS/Public/Set-SnipeitModel.ps1
@@ -33,10 +33,10 @@
     Http request type to send Snipe IT system. Defaults to Patch you could use Put if needed.
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
     .EXAMPLE
     New-SnipeitModel -name "DL380" -manufacturer_id 2 -fieldset_id 2 -category_id 1
@@ -90,13 +90,22 @@ function Set-SnipeitModel() {
     process {
         foreach ($model_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/models/$model_id"
+                Api    = "/api/v1/models/$model_id"
                 Method = $RequestType
                 Body   = $Values
-                Token  = $apiKey
             }
 
-            If ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
                 $result = Invoke-SnipeitMethod @Parameters
             }
 
diff --git a/SnipeitPS/Public/Set-SnipeitStatus.ps1 b/SnipeitPS/Public/Set-SnipeitStatus.ps1
index a5fd3d2..3fac468 100644
--- a/SnipeitPS/Public/Set-SnipeitStatus.ps1
+++ b/SnipeitPS/Public/Set-SnipeitStatus.ps1
@@ -19,10 +19,10 @@ Hex code showing what color the status label should be on the pie chart in the d
 Http request type to send Snipe IT system. Defaults to Patch you could use Put if needed.
 
 .PARAMETER url
-URL of Snipeit system, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
 .PARAMETER apiKey
-Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
 .EXAMPLE
 Get-SnipeitStatus -search  "Ready to Deploy"
@@ -32,8 +32,7 @@ Set-SnipeitStatus -id 3 -name 'Waiting for arrival' -type pending
 
 #>
 
-function Set-SnipeitStatus()
-{
+function Set-SnipeitStatus() {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Medium"
@@ -73,13 +72,22 @@ function Set-SnipeitStatus()
     process {
         foreach($status_id in $id) {
             $Parameters = @{
-                Uri           = "$url/api/v1/statuslabels/$status_id"
+                Api           = "/api/v1/statuslabels/$status_id"
                 Method        = $RequestType
                 Body          = $Values
-                Token         = $apiKey
             }
 
-            If ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
                 $result = Invoke-SnipeitMethod @Parameters
             }
             $result
diff --git a/SnipeitPS/Public/Set-SnipeitSupplier.ps1 b/SnipeitPS/Public/Set-SnipeitSupplier.ps1
index 084332c..f952f3d 100644
--- a/SnipeitPS/Public/Set-SnipeitSupplier.ps1
+++ b/SnipeitPS/Public/Set-SnipeitSupplier.ps1
@@ -51,10 +51,10 @@
     Http request type to send Snipe IT system. Defaults to Patch you could use Put if needed.
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    Users API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. Users API Key for Snipeit.
 
     .EXAMPLE
     New-SnipeitDepartment -name "Department1" -company_id 1 -localtion_id 1 -manager_id 3
@@ -117,13 +117,22 @@ function Set-SnipeitSupplier() {
     process {
         foreach ($supplier_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/suppliers/$supplier_id"
+                Api    = "/api/v1/suppliers/$supplier_id"
                 Method = $RequestType
                 Body   = $Values
-                Token  = $apiKey
             }
 
-            If ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
                 $result = Invoke-SnipeitMethod @Parameters
             }
 
diff --git a/SnipeitPS/Public/Set-SnipeitUser.ps1 b/SnipeitPS/Public/Set-SnipeitUser.ps1
index b0c8f40..c6cda85 100644
--- a/SnipeitPS/Public/Set-SnipeitUser.ps1
+++ b/SnipeitPS/Public/Set-SnipeitUser.ps1
@@ -63,10 +63,10 @@
     Http request type to send Snipe IT system. Defaults to Patch you could use Put if needed.
 
     .PARAMETER url
-    URL of Snipeit system, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. URL of Snipeit system.
 
     .PARAMETER apiKey
-    User's API Key for Snipeit, can be set using Set-SnipeitInfo command
+    Deprecated parameter, please use Connect-SnipeitPS instead. User's API Key for Snipeit.
 
     .EXAMPLE
     Update-SnipeitUser -id 3 -fist_name It -lastname Snipe -username snipeit -activated $false -company_id 1 -location_id 1 -department_id 1
@@ -144,13 +144,22 @@ function Set-SnipeitUser() {
     process{
         foreach($user_id in $id) {
             $Parameters = @{
-                Uri    = "$url/api/v1/users/$user_id"
+                Api    = "/api/v1/users/$user_id"
                 Method = 'PATCH'
                 Body   = $Values
-                Token  = $apiKey
             }
 
-            If ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+            if ($PSBoundParameters.ContainsKey('apiKey')) {
+                Write-Warning "-apiKey parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -apiKey $apikey
+            }
+
+            if ($PSBoundParameters.ContainsKey('url')) {
+                Write-Warning "-url parameter is deprecated, please use Connect-SnipeitPS instead."
+                Set-SnipeitPSSessionApiKey -url $url
+            }
+
+            if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
                 $result = Invoke-SnipeitMethod @Parameters
             }
 
diff --git a/SnipeitPS/Public/Update-SnipeitAlias.ps1 b/SnipeitPS/Public/Update-SnipeitAlias.ps1
index 8ba3323..ca9d2fb 100644
--- a/SnipeitPS/Public/Update-SnipeitAlias.ps1
+++ b/SnipeitPS/Public/Update-SnipeitAlias.ps1
@@ -15,8 +15,7 @@ Replaces old command from file "your-script.ps1" and creates new script "new-scr
 After testing new file you can replace old file with new.
 
 #>
-function Update-SnipeitAlias()
-{
+function Update-SnipeitAlias() {
     [CmdletBinding(
         SupportsShouldProcess = $true,
         ConfirmImpact = "Low"
@@ -34,8 +33,8 @@ function Update-SnipeitAlias()
 
     }
     process {
-        If ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
-            ForEach ($st in $String){
+        if ($PSCmdlet.ShouldProcess("ShouldProcess?")) {
+            ForEach ($st in $String) {
                 $result = $st
                 ForEach ($key in $SnipeitAliases.Keys ) {
                     #Write-Verbose "Replacing $key with $($SnipeitAliases[$key])"