diff --git a/docs/en-US/Add-AzWorkspaceManagerAssignments.md b/docs/en-US/Add-AzWorkspaceManagerAssignment.md
similarity index 100%
rename from docs/en-US/Add-AzWorkspaceManagerAssignments.md
rename to docs/en-US/Add-AzWorkspaceManagerAssignment.md
diff --git a/docs/en-US/Add-AzWorkspaceManagerAssignmentJobs.md b/docs/en-US/Add-AzWorkspaceManagerAssignmentJob.md
similarity index 100%
rename from docs/en-US/Add-AzWorkspaceManagerAssignmentJobs.md
rename to docs/en-US/Add-AzWorkspaceManagerAssignmentJob.md
diff --git a/docs/en-US/Add-AzWorkspaceManagerGroups.md b/docs/en-US/Add-AzWorkspaceManagerGroup.md
similarity index 100%
rename from docs/en-US/Add-AzWorkspaceManagerGroups.md
rename to docs/en-US/Add-AzWorkspaceManagerGroup.md
diff --git a/docs/en-US/Add-AzWorkspaceManagerMembers.md b/docs/en-US/Add-AzWorkspaceManagerMember.md
similarity index 100%
rename from docs/en-US/Add-AzWorkspaceManagerMembers.md
rename to docs/en-US/Add-AzWorkspaceManagerMember.md
diff --git a/docs/en-US/Get-AzWorkspaceManagerAssignments.md b/docs/en-US/Get-AzWorkspaceManagerAssignment.md
similarity index 100%
rename from docs/en-US/Get-AzWorkspaceManagerAssignments.md
rename to docs/en-US/Get-AzWorkspaceManagerAssignment.md
diff --git a/docs/en-US/Get-AzWorkspaceManagerAssignmentJobs.md b/docs/en-US/Get-AzWorkspaceManagerAssignmentJob.md
similarity index 100%
rename from docs/en-US/Get-AzWorkspaceManagerAssignmentJobs.md
rename to docs/en-US/Get-AzWorkspaceManagerAssignmentJob.md
diff --git a/docs/en-US/Get-AzWorkspaceManagerGroups.md b/docs/en-US/Get-AzWorkspaceManagerGroup.md
similarity index 100%
rename from docs/en-US/Get-AzWorkspaceManagerGroups.md
rename to docs/en-US/Get-AzWorkspaceManagerGroup.md
diff --git a/docs/en-US/Get-AzWorkspaceManagerItems.md b/docs/en-US/Get-AzWorkspaceManagerItem.md
similarity index 100%
rename from docs/en-US/Get-AzWorkspaceManagerItems.md
rename to docs/en-US/Get-AzWorkspaceManagerItem.md
diff --git a/docs/en-US/Get-AzWorkspaceManagerMembers.md b/docs/en-US/Get-AzWorkspaceManagerMember.md
similarity index 100%
rename from docs/en-US/Get-AzWorkspaceManagerMembers.md
rename to docs/en-US/Get-AzWorkspaceManagerMember.md
diff --git a/docs/en-US/Remove-AzWorkspaceManagerAssignments.md b/docs/en-US/Remove-AzWorkspaceManagerAssignment.md
similarity index 100%
rename from docs/en-US/Remove-AzWorkspaceManagerAssignments.md
rename to docs/en-US/Remove-AzWorkspaceManagerAssignment.md
diff --git a/docs/en-US/Remove-AzWorkspaceManagerAssignmentJobs.md b/docs/en-US/Remove-AzWorkspaceManagerAssignmentJob.md
similarity index 100%
rename from docs/en-US/Remove-AzWorkspaceManagerAssignmentJobs.md
rename to docs/en-US/Remove-AzWorkspaceManagerAssignmentJob.md
diff --git a/docs/en-US/Remove-AzWorkspaceManagerGroups.md b/docs/en-US/Remove-AzWorkspaceManagerGroup.md
similarity index 100%
rename from docs/en-US/Remove-AzWorkspaceManagerGroups.md
rename to docs/en-US/Remove-AzWorkspaceManagerGroup.md
diff --git a/docs/en-US/Remove-AzWorkspaceManagerMembers.md b/docs/en-US/Remove-AzWorkspaceManagerMember.md
similarity index 100%
rename from docs/en-US/Remove-AzWorkspaceManagerMembers.md
rename to docs/en-US/Remove-AzWorkspaceManagerMember.md
diff --git a/src/AzWorkspaceManager.psd1 b/src/AzWorkspaceManager.psd1
index 5409380..d4a847a 100644
--- a/src/AzWorkspaceManager.psd1
+++ b/src/AzWorkspaceManager.psd1
@@ -12,7 +12,7 @@
     RootModule        = 'AzWorkspaceManager.psm1'
 
     # Version number of this module.
-    ModuleVersion     = '0.2.0'
+    ModuleVersion     = '0.2.1'
 
     # Supported PSEditions
     # CompatiblePSEditions = @('Core')
diff --git a/src/Public/Add-AzWorkspaceManagerAssignment.ps1 b/src/Public/Add-AzWorkspaceManagerAssignment.ps1
index 32c036c..f783d44 100644
--- a/src/Public/Add-AzWorkspaceManagerAssignment.ps1
+++ b/src/Public/Add-AzWorkspaceManagerAssignment.ps1
@@ -42,13 +42,16 @@ function Add-AzWorkspaceManagerAssignment {
                 )
             }
         }
+
         $payload = @{
             properties = @{
                 targetResourceName = $GroupName
-                items              = @($items)
             }
         }
-        write-Output $payload | ConvertTo-Json -Depth 10
+
+        if ($items ) {
+            $payload.properties.items = @($items)
+        }
 
         if ($SessionVariables.workspaceManagerConfiguration -eq 'Enabled') {
             try {