diff --git a/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/BaseLoadTestingCommand.cs b/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/BaseLoadTestingCommand.cs
index 1d465449aa..e0f3441aa7 100644
--- a/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/BaseLoadTestingCommand.cs
+++ b/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/BaseLoadTestingCommand.cs
@@ -13,11 +13,18 @@ namespace Azure.Mcp.Tools.LoadTesting.Commands;
 
 public abstract class BaseLoadTestingCommand<
     [DynamicallyAccessedMembers(TrimAnnotations.CommandAnnotations)] TOptions>
+    (bool resourceGroupRequired = false, bool testResourceRequired = false)
     : SubscriptionCommand<TOptions> where TOptions : BaseLoadTestingOptions, new()
 {
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
+        command.Options.Add(resourceGroupRequired
+            ? OptionDefinitions.Common.ResourceGroup.AsRequired()
+            : OptionDefinitions.Common.ResourceGroup.AsOptional());
+        command.Options.Add(testResourceRequired
+            ? LoadTestingOptionDefinitions.TestResource.AsRequired()
+            : LoadTestingOptionDefinitions.TestResource.AsOptional());
     }
 
     protected override TOptions BindOptions(ParseResult parseResult)
diff --git a/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTest/TestCreateCommand.cs b/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTest/TestCreateCommand.cs
index 897c3632e0..fd4b36626f 100644
--- a/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTest/TestCreateCommand.cs
+++ b/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTest/TestCreateCommand.cs
@@ -15,7 +15,7 @@
 namespace Azure.Mcp.Tools.LoadTesting.Commands.LoadTest;
 
 public sealed class TestCreateCommand(ILogger<TestCreateCommand> logger)
-    : BaseLoadTestingCommand<TestCreateOptions>
+    : BaseLoadTestingCommand<TestCreateOptions>(resourceGroupRequired: false, testResourceRequired: true)
 {
     private const string _commandTitle = "Test Create";
     private readonly ILogger<TestCreateCommand> _logger = logger;
@@ -44,15 +44,13 @@ It will only create a test in an already existing load test resource.
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(LoadTestingOptionDefinitions.TestResource.AsRequired());
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsOptional());
-        command.Options.Add(LoadTestingOptionDefinitions.Test);
-        command.Options.Add(LoadTestingOptionDefinitions.Description);
-        command.Options.Add(LoadTestingOptionDefinitions.DisplayName);
-        command.Options.Add(LoadTestingOptionDefinitions.Endpoint);
-        command.Options.Add(LoadTestingOptionDefinitions.VirtualUsers);
-        command.Options.Add(LoadTestingOptionDefinitions.Duration);
-        command.Options.Add(LoadTestingOptionDefinitions.RampUpTime);
+        command.Options.Add(LoadTestingOptionDefinitions.Test.AsRequired());
+        command.Options.Add(LoadTestingOptionDefinitions.Description.AsOptional());
+        command.Options.Add(LoadTestingOptionDefinitions.DisplayName.AsOptional());
+        command.Options.Add(LoadTestingOptionDefinitions.Endpoint.AsOptional());
+        command.Options.Add(LoadTestingOptionDefinitions.VirtualUsers.AsOptional());
+        command.Options.Add(LoadTestingOptionDefinitions.Duration.AsOptional());
+        command.Options.Add(LoadTestingOptionDefinitions.RampUpTime.AsOptional());
     }
 
     protected override TestCreateOptions BindOptions(ParseResult parseResult)
diff --git a/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTest/TestGetCommand.cs b/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTest/TestGetCommand.cs
index 494a17d360..a8c8509168 100644
--- a/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTest/TestGetCommand.cs
+++ b/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTest/TestGetCommand.cs
@@ -14,7 +14,7 @@
 namespace Azure.Mcp.Tools.LoadTesting.Commands.LoadTest;
 
 public sealed class TestGetCommand(ILogger<TestGetCommand> logger)
-    : BaseLoadTestingCommand<TestGetOptions>
+    : BaseLoadTestingCommand<TestGetOptions>(resourceGroupRequired: false, testResourceRequired: true)
 {
     private const string _commandTitle = "Test Get";
     private readonly ILogger<TestGetCommand> _logger = logger;
@@ -41,9 +41,7 @@ public sealed class TestGetCommand(ILogger<TestGetCommand> logger)
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(LoadTestingOptionDefinitions.TestResource.AsRequired());
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsOptional());
-        command.Options.Add(LoadTestingOptionDefinitions.Test);
+        command.Options.Add(LoadTestingOptionDefinitions.Test.AsRequired());
     }
 
     protected override TestGetOptions BindOptions(ParseResult parseResult)
diff --git a/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTestResource/TestResourceCreateCommand.cs b/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTestResource/TestResourceCreateCommand.cs
index 6e42e0b797..2101a37e0f 100644
--- a/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTestResource/TestResourceCreateCommand.cs
+++ b/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTestResource/TestResourceCreateCommand.cs
@@ -14,7 +14,7 @@
 namespace Azure.Mcp.Tools.LoadTesting.Commands.LoadTestResource;
 
 public sealed class TestResourceCreateCommand(ILogger<TestResourceCreateCommand> logger)
-    : BaseLoadTestingCommand<TestResourceCreateOptions>
+    : BaseLoadTestingCommand<TestResourceCreateOptions>(resourceGroupRequired: true, testResourceRequired: false)
 {
     private const string _commandTitle = "Test Resource Create";
     private readonly ILogger<TestResourceCreateCommand> _logger = logger;
@@ -40,8 +40,6 @@ Returns the created Load Testing resource. This creates the resource in Azure on
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(LoadTestingOptionDefinitions.TestResource);
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsRequired());
     }
 
     public override async Task<CommandResponse> ExecuteAsync(CommandContext context, ParseResult parseResult, CancellationToken cancellationToken)
diff --git a/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTestResource/TestResourceListCommand.cs b/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTestResource/TestResourceListCommand.cs
index 22aa708b53..2949dd10b5 100644
--- a/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTestResource/TestResourceListCommand.cs
+++ b/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTestResource/TestResourceListCommand.cs
@@ -14,7 +14,7 @@
 namespace Azure.Mcp.Tools.LoadTesting.Commands.LoadTestResource;
 
 public sealed class TestResourceListCommand(ILogger<TestResourceListCommand> logger)
-    : BaseLoadTestingCommand<TestResourceListOptions>
+    : BaseLoadTestingCommand<TestResourceListOptions>(resourceGroupRequired: false, testResourceRequired: false)
 {
     private const string _commandTitle = "Test Resource List";
     private readonly ILogger<TestResourceListCommand> _logger = logger;
@@ -40,8 +40,6 @@ Lists all Azure Load Testing resources available in the selected subscription an
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(LoadTestingOptionDefinitions.TestResource);
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsOptional());
     }
 
     public override async Task<CommandResponse> ExecuteAsync(CommandContext context, ParseResult parseResult, CancellationToken cancellationToken)
diff --git a/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTestRun/TestRunCreateOrUpdateCommand.cs b/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTestRun/TestRunCreateOrUpdateCommand.cs
index 35f8ef7160..8edc288608 100644
--- a/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTestRun/TestRunCreateOrUpdateCommand.cs
+++ b/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTestRun/TestRunCreateOrUpdateCommand.cs
@@ -15,7 +15,7 @@
 namespace Azure.Mcp.Tools.LoadTesting.Commands.LoadTestRun;
 
 public sealed class TestRunCreateOrUpdateCommand(ILogger<TestRunCreateOrUpdateCommand> logger)
-    : BaseLoadTestingCommand<TestRunCreateOrUpdateOptions>
+    : BaseLoadTestingCommand<TestRunCreateOrUpdateOptions>(resourceGroupRequired: false, testResourceRequired: true)
 {
     private const string _commandTitle = "Test Run Create or Update";
     private readonly ILogger<TestRunCreateOrUpdateCommand> _logger = logger;
@@ -44,10 +44,8 @@ Create or update a load test run execution.
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(LoadTestingOptionDefinitions.TestResource.AsRequired());
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsOptional());
         command.Options.Add(LoadTestingOptionDefinitions.TestRun.AsRequired());
-        command.Options.Add(LoadTestingOptionDefinitions.Test);
+        command.Options.Add(LoadTestingOptionDefinitions.Test.AsRequired());
         command.Options.Add(LoadTestingOptionDefinitions.DisplayName.AsOptional());
         command.Options.Add(LoadTestingOptionDefinitions.Description.AsOptional());
         command.Options.Add(LoadTestingOptionDefinitions.OldTestRunId.AsOptional());
diff --git a/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTestRun/TestRunGetCommand.cs b/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTestRun/TestRunGetCommand.cs
index 52334234f4..6a85688106 100644
--- a/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTestRun/TestRunGetCommand.cs
+++ b/tools/Azure.Mcp.Tools.LoadTesting/src/Commands/LoadTestRun/TestRunGetCommand.cs
@@ -16,7 +16,7 @@
 namespace Azure.Mcp.Tools.LoadTesting.Commands.LoadTestRun;
 
 public sealed class TestRunGetCommand(ILogger<TestRunGetCommand> logger)
-    : BaseLoadTestingCommand<TestRunGetOptions>
+    : BaseLoadTestingCommand<TestRunGetOptions>(resourceGroupRequired: false, testResourceRequired: true)
 {
     private const string _commandTitle = "Test Run Get";
     private readonly ILogger<TestRunGetCommand> _logger = logger;
@@ -43,8 +43,6 @@ public sealed class TestRunGetCommand(ILogger<TestRunGetCommand> logger)
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(LoadTestingOptionDefinitions.TestResource.AsRequired());
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsOptional());
         command.Options.Add(LoadTestingOptionDefinitions.TestRun.AsOptional());
         command.Options.Add(LoadTestingOptionDefinitions.Test.AsOptional());
 
diff --git a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/BaseStorageSyncCommand.cs b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/BaseStorageSyncCommand.cs
index b04dd8b5b5..a0b1524bc6 100644
--- a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/BaseStorageSyncCommand.cs
+++ b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/BaseStorageSyncCommand.cs
@@ -4,7 +4,10 @@
 using System.Diagnostics.CodeAnalysis;
 using Azure.Mcp.Core.Commands;
 using Azure.Mcp.Core.Commands.Subscription;
+using Azure.Mcp.Core.Extensions;
+using Azure.Mcp.Core.Models.Option;
 using Azure.Mcp.Tools.StorageSync.Options;
+using Microsoft.Mcp.Core.Models.Option;
 
 namespace Azure.Mcp.Tools.StorageSync.Commands;
 
@@ -14,11 +17,17 @@ namespace Azure.Mcp.Tools.StorageSync.Commands;
 /// </summary>
 public abstract class BaseStorageSyncCommand<
     [DynamicallyAccessedMembers(TrimAnnotations.CommandAnnotations)] TOptions>
+    (bool resourceGroupRequired = true, bool storageSyncServiceRequired = true)
     : SubscriptionCommand<TOptions> where TOptions : BaseStorageSyncOptions, new()
 {
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        // Additional option registration can be added here for common Storage Sync options
+        command.Options.Add(resourceGroupRequired 
+            ? OptionDefinitions.Common.ResourceGroup.AsRequired() 
+            : OptionDefinitions.Common.ResourceGroup.AsOptional());
+        command.Options.Add(storageSyncServiceRequired 
+            ? StorageSyncOptionDefinitions.StorageSyncService.Name.AsRequired() 
+            : StorageSyncOptionDefinitions.StorageSyncService.Name.AsOptional());
     }
 }
diff --git a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/CloudEndpoint/CloudEndpointCreateCommand.cs b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/CloudEndpoint/CloudEndpointCreateCommand.cs
index a098501d49..8ca099c18b 100644
--- a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/CloudEndpoint/CloudEndpointCreateCommand.cs
+++ b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/CloudEndpoint/CloudEndpointCreateCommand.cs
@@ -15,7 +15,8 @@
 
 namespace Azure.Mcp.Tools.StorageSync.Commands.CloudEndpoint;
 
-public sealed class CloudEndpointCreateCommand(ILogger<CloudEndpointCreateCommand> logger, IStorageSyncService service) : BaseStorageSyncCommand<CloudEndpointCreateOptions>
+public sealed class CloudEndpointCreateCommand(ILogger<CloudEndpointCreateCommand> logger, IStorageSyncService service) : 
+BaseStorageSyncCommand<CloudEndpointCreateOptions>(resourceGroupRequired: true, storageSyncServiceRequired: true)
 {
     private const string CommandTitle = "Create Cloud Endpoint";
     private readonly IStorageSyncService _service = service;
@@ -42,8 +43,6 @@ public sealed class CloudEndpointCreateCommand(ILogger<CloudEndpointCreateComman
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsRequired());
-        command.Options.Add(StorageSyncOptionDefinitions.StorageSyncService.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.SyncGroup.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.CloudEndpoint.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.CloudEndpoint.StorageAccountResourceId.AsRequired());
diff --git a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/CloudEndpoint/CloudEndpointDeleteCommand.cs b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/CloudEndpoint/CloudEndpointDeleteCommand.cs
index 14ae41065b..83e42d0b16 100644
--- a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/CloudEndpoint/CloudEndpointDeleteCommand.cs
+++ b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/CloudEndpoint/CloudEndpointDeleteCommand.cs
@@ -14,7 +14,8 @@
 
 namespace Azure.Mcp.Tools.StorageSync.Commands.CloudEndpoint;
 
-public sealed class CloudEndpointDeleteCommand(ILogger<CloudEndpointDeleteCommand> logger, IStorageSyncService service) : BaseStorageSyncCommand<CloudEndpointDeleteOptions>
+public sealed class CloudEndpointDeleteCommand(ILogger<CloudEndpointDeleteCommand> logger, IStorageSyncService service) : 
+BaseStorageSyncCommand<CloudEndpointDeleteOptions>(resourceGroupRequired: true, storageSyncServiceRequired: true)
 {
     private const string CommandTitle = "Delete Cloud Endpoint";
     private readonly IStorageSyncService _service = service;
@@ -41,8 +42,6 @@ public sealed class CloudEndpointDeleteCommand(ILogger<CloudEndpointDeleteComman
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsRequired());
-        command.Options.Add(StorageSyncOptionDefinitions.StorageSyncService.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.SyncGroup.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.CloudEndpoint.Name.AsRequired());
     }
diff --git a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/CloudEndpoint/CloudEndpointGetCommand.cs b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/CloudEndpoint/CloudEndpointGetCommand.cs
index df6d417c31..71dd62037b 100644
--- a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/CloudEndpoint/CloudEndpointGetCommand.cs
+++ b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/CloudEndpoint/CloudEndpointGetCommand.cs
@@ -16,7 +16,8 @@
 
 namespace Azure.Mcp.Tools.StorageSync.Commands.CloudEndpoint;
 
-public sealed class CloudEndpointGetCommand(ILogger<CloudEndpointGetCommand> logger, IStorageSyncService service) : BaseStorageSyncCommand<CloudEndpointGetOptions>
+public sealed class CloudEndpointGetCommand(ILogger<CloudEndpointGetCommand> logger, IStorageSyncService service) : 
+BaseStorageSyncCommand<CloudEndpointGetOptions>(resourceGroupRequired: true, storageSyncServiceRequired: true)
 {
     private const string CommandTitle = "Get Cloud Endpoint";
     private readonly IStorageSyncService _service = service;
@@ -43,8 +44,6 @@ public sealed class CloudEndpointGetCommand(ILogger<CloudEndpointGetCommand> log
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsRequired());
-        command.Options.Add(StorageSyncOptionDefinitions.StorageSyncService.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.SyncGroup.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.CloudEndpoint.Name.AsOptional());
     }
diff --git a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/CloudEndpoint/CloudEndpointTriggerChangeDetectionCommand.cs b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/CloudEndpoint/CloudEndpointTriggerChangeDetectionCommand.cs
index 2a10119e01..a0e9569519 100644
--- a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/CloudEndpoint/CloudEndpointTriggerChangeDetectionCommand.cs
+++ b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/CloudEndpoint/CloudEndpointTriggerChangeDetectionCommand.cs
@@ -14,7 +14,8 @@
 
 namespace Azure.Mcp.Tools.StorageSync.Commands.CloudEndpoint;
 
-public sealed class CloudEndpointTriggerChangeDetectionCommand(ILogger<CloudEndpointTriggerChangeDetectionCommand> logger, IStorageSyncService service) : BaseStorageSyncCommand<CloudEndpointTriggerChangeDetectionOptions>
+public sealed class CloudEndpointTriggerChangeDetectionCommand(ILogger<CloudEndpointTriggerChangeDetectionCommand> logger, IStorageSyncService service) : 
+BaseStorageSyncCommand<CloudEndpointTriggerChangeDetectionOptions>(resourceGroupRequired: true, storageSyncServiceRequired: true)
 {
     private const string CommandTitle = "Trigger Change Detection";
     private readonly IStorageSyncService _service = service;
@@ -41,8 +42,6 @@ public sealed class CloudEndpointTriggerChangeDetectionCommand(ILogger<CloudEndp
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsRequired());
-        command.Options.Add(StorageSyncOptionDefinitions.StorageSyncService.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.SyncGroup.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.CloudEndpoint.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.CloudEndpoint.DirectoryPath.AsRequired());
diff --git a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/RegisteredServer/RegisteredServerGetCommand.cs b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/RegisteredServer/RegisteredServerGetCommand.cs
index 1b8b1619fc..7c0b263021 100644
--- a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/RegisteredServer/RegisteredServerGetCommand.cs
+++ b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/RegisteredServer/RegisteredServerGetCommand.cs
@@ -16,7 +16,8 @@
 
 namespace Azure.Mcp.Tools.StorageSync.Commands.RegisteredServer;
 
-public sealed class RegisteredServerGetCommand(ILogger<RegisteredServerGetCommand> logger, IStorageSyncService service) : BaseStorageSyncCommand<RegisteredServerGetOptions>
+public sealed class RegisteredServerGetCommand(ILogger<RegisteredServerGetCommand> logger, IStorageSyncService service) : 
+BaseStorageSyncCommand<RegisteredServerGetOptions>(resourceGroupRequired: true, storageSyncServiceRequired: true)
 {
     private const string CommandTitle = "Get Registered Server";
     private readonly IStorageSyncService _service = service;
@@ -43,8 +44,6 @@ public sealed class RegisteredServerGetCommand(ILogger<RegisteredServerGetComman
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsRequired());
-        command.Options.Add(StorageSyncOptionDefinitions.StorageSyncService.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.RegisteredServer.ServerId.AsOptional());
     }
 
diff --git a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/RegisteredServer/RegisteredServerUnregisterCommand.cs b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/RegisteredServer/RegisteredServerUnregisterCommand.cs
index 8e0b086154..af41552bbe 100644
--- a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/RegisteredServer/RegisteredServerUnregisterCommand.cs
+++ b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/RegisteredServer/RegisteredServerUnregisterCommand.cs
@@ -14,7 +14,8 @@
 
 namespace Azure.Mcp.Tools.StorageSync.Commands.RegisteredServer;
 
-public sealed class RegisteredServerUnregisterCommand(ILogger<RegisteredServerUnregisterCommand> logger, IStorageSyncService service) : BaseStorageSyncCommand<RegisteredServerUnregisterOptions>
+public sealed class RegisteredServerUnregisterCommand(ILogger<RegisteredServerUnregisterCommand> logger, IStorageSyncService service) : 
+BaseStorageSyncCommand<RegisteredServerUnregisterOptions>(resourceGroupRequired: true, storageSyncServiceRequired: true)
 {
     private const string CommandTitle = "Unregister Server";
     private readonly IStorageSyncService _service = service;
@@ -41,8 +42,6 @@ public sealed class RegisteredServerUnregisterCommand(ILogger<RegisteredServerUn
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsRequired());
-        command.Options.Add(StorageSyncOptionDefinitions.StorageSyncService.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.RegisteredServer.ServerId.AsRequired());
     }
 
diff --git a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/RegisteredServer/RegisteredServerUpdateCommand.cs b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/RegisteredServer/RegisteredServerUpdateCommand.cs
index 8a6a4d254a..c033d86d88 100644
--- a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/RegisteredServer/RegisteredServerUpdateCommand.cs
+++ b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/RegisteredServer/RegisteredServerUpdateCommand.cs
@@ -15,7 +15,8 @@
 
 namespace Azure.Mcp.Tools.StorageSync.Commands.RegisteredServer;
 
-public sealed class RegisteredServerUpdateCommand(ILogger<RegisteredServerUpdateCommand> logger, IStorageSyncService service) : BaseStorageSyncCommand<RegisteredServerUpdateOptions>
+public sealed class RegisteredServerUpdateCommand(ILogger<RegisteredServerUpdateCommand> logger, IStorageSyncService service) : 
+BaseStorageSyncCommand<RegisteredServerUpdateOptions>(resourceGroupRequired: true, storageSyncServiceRequired: true)
 {
     private const string CommandTitle = "Update Registered Server";
     private readonly IStorageSyncService _service = service;
@@ -42,8 +43,6 @@ public sealed class RegisteredServerUpdateCommand(ILogger<RegisteredServerUpdate
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsRequired());
-        command.Options.Add(StorageSyncOptionDefinitions.StorageSyncService.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.RegisteredServer.ServerId.AsRequired());
     }
 
diff --git a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/ServerEndpoint/ServerEndpointCreateCommand.cs b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/ServerEndpoint/ServerEndpointCreateCommand.cs
index ca9d2d38a7..ffc3bb9ac0 100644
--- a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/ServerEndpoint/ServerEndpointCreateCommand.cs
+++ b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/ServerEndpoint/ServerEndpointCreateCommand.cs
@@ -15,7 +15,8 @@
 
 namespace Azure.Mcp.Tools.StorageSync.Commands.ServerEndpoint;
 
-public sealed class ServerEndpointCreateCommand(ILogger<ServerEndpointCreateCommand> logger, IStorageSyncService service) : BaseStorageSyncCommand<ServerEndpointCreateOptions>
+public sealed class ServerEndpointCreateCommand(ILogger<ServerEndpointCreateCommand> logger, IStorageSyncService service) : 
+BaseStorageSyncCommand<ServerEndpointCreateOptions>(resourceGroupRequired: true, storageSyncServiceRequired: true)
 {
     private const string CommandTitle = "Create Server Endpoint";
     private readonly IStorageSyncService _service = service;
@@ -42,8 +43,6 @@ public sealed class ServerEndpointCreateCommand(ILogger<ServerEndpointCreateComm
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsRequired());
-        command.Options.Add(StorageSyncOptionDefinitions.StorageSyncService.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.SyncGroup.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.ServerEndpoint.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.ServerEndpoint.ServerResourceId.AsRequired());
diff --git a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/ServerEndpoint/ServerEndpointDeleteCommand.cs b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/ServerEndpoint/ServerEndpointDeleteCommand.cs
index 175870480c..e07d65f847 100644
--- a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/ServerEndpoint/ServerEndpointDeleteCommand.cs
+++ b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/ServerEndpoint/ServerEndpointDeleteCommand.cs
@@ -14,7 +14,8 @@
 
 namespace Azure.Mcp.Tools.StorageSync.Commands.ServerEndpoint;
 
-public sealed class ServerEndpointDeleteCommand(ILogger<ServerEndpointDeleteCommand> logger, IStorageSyncService service) : BaseStorageSyncCommand<ServerEndpointDeleteOptions>
+public sealed class ServerEndpointDeleteCommand(ILogger<ServerEndpointDeleteCommand> logger, IStorageSyncService service) : 
+BaseStorageSyncCommand<ServerEndpointDeleteOptions>(resourceGroupRequired: true, storageSyncServiceRequired: true)
 {
     private const string CommandTitle = "Delete Server Endpoint";
     private readonly IStorageSyncService _service = service;
@@ -41,8 +42,6 @@ public sealed class ServerEndpointDeleteCommand(ILogger<ServerEndpointDeleteComm
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsRequired());
-        command.Options.Add(StorageSyncOptionDefinitions.StorageSyncService.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.SyncGroup.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.ServerEndpoint.Name.AsRequired());
     }
diff --git a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/ServerEndpoint/ServerEndpointGetCommand.cs b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/ServerEndpoint/ServerEndpointGetCommand.cs
index 10fa04a9b3..c413f950d8 100644
--- a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/ServerEndpoint/ServerEndpointGetCommand.cs
+++ b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/ServerEndpoint/ServerEndpointGetCommand.cs
@@ -16,7 +16,8 @@
 
 namespace Azure.Mcp.Tools.StorageSync.Commands.ServerEndpoint;
 
-public sealed class ServerEndpointGetCommand(ILogger<ServerEndpointGetCommand> logger, IStorageSyncService service) : BaseStorageSyncCommand<ServerEndpointGetOptions>
+public sealed class ServerEndpointGetCommand(ILogger<ServerEndpointGetCommand> logger, IStorageSyncService service) : 
+BaseStorageSyncCommand<ServerEndpointGetOptions>(resourceGroupRequired: true, storageSyncServiceRequired: true)
 {
     private const string CommandTitle = "Get Server Endpoint";
     private readonly IStorageSyncService _service = service;
@@ -43,8 +44,6 @@ public sealed class ServerEndpointGetCommand(ILogger<ServerEndpointGetCommand> l
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsRequired());
-        command.Options.Add(StorageSyncOptionDefinitions.StorageSyncService.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.SyncGroup.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.ServerEndpoint.Name.AsOptional());
     }
diff --git a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/ServerEndpoint/ServerEndpointUpdateCommand.cs b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/ServerEndpoint/ServerEndpointUpdateCommand.cs
index 1c378e398d..f6ba217318 100644
--- a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/ServerEndpoint/ServerEndpointUpdateCommand.cs
+++ b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/ServerEndpoint/ServerEndpointUpdateCommand.cs
@@ -15,7 +15,8 @@
 
 namespace Azure.Mcp.Tools.StorageSync.Commands.ServerEndpoint;
 
-public sealed class ServerEndpointUpdateCommand(ILogger<ServerEndpointUpdateCommand> logger, IStorageSyncService service) : BaseStorageSyncCommand<ServerEndpointUpdateOptions>
+public sealed class ServerEndpointUpdateCommand(ILogger<ServerEndpointUpdateCommand> logger, IStorageSyncService service) : 
+BaseStorageSyncCommand<ServerEndpointUpdateOptions>(resourceGroupRequired: true, storageSyncServiceRequired: true)
 {
     private const string CommandTitle = "Update Server Endpoint";
     private readonly IStorageSyncService _service = service;
@@ -42,8 +43,6 @@ public sealed class ServerEndpointUpdateCommand(ILogger<ServerEndpointUpdateComm
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsRequired());
-        command.Options.Add(StorageSyncOptionDefinitions.StorageSyncService.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.SyncGroup.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.ServerEndpoint.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.ServerEndpoint.CloudTiering.AsOptional());
diff --git a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/StorageSyncService/StorageSyncServiceCreateCommand.cs b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/StorageSyncService/StorageSyncServiceCreateCommand.cs
index 2d516cfaa6..d89f4b79e8 100644
--- a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/StorageSyncService/StorageSyncServiceCreateCommand.cs
+++ b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/StorageSyncService/StorageSyncServiceCreateCommand.cs
@@ -16,7 +16,8 @@
 
 namespace Azure.Mcp.Tools.StorageSync.Commands.StorageSyncService;
 
-public sealed class StorageSyncServiceCreateCommand(ILogger<StorageSyncServiceCreateCommand> logger, IStorageSyncService service) : BaseStorageSyncCommand<StorageSyncServiceCreateOptions>
+public sealed class StorageSyncServiceCreateCommand(ILogger<StorageSyncServiceCreateCommand> logger, IStorageSyncService service) : 
+BaseStorageSyncCommand<StorageSyncServiceCreateOptions>(resourceGroupRequired: true, storageSyncServiceRequired: false)
 {
     private const string CommandTitle = "Create Storage Sync Service";
     private readonly IStorageSyncService _service = service;
@@ -43,8 +44,6 @@ public sealed class StorageSyncServiceCreateCommand(ILogger<StorageSyncServiceCr
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsRequired());
-        command.Options.Add(StorageSyncOptionDefinitions.StorageSyncService.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.StorageSyncService.Location.AsRequired());
     }
 
diff --git a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/StorageSyncService/StorageSyncServiceDeleteCommand.cs b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/StorageSyncService/StorageSyncServiceDeleteCommand.cs
index 054190ba55..c14eac4ed8 100644
--- a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/StorageSyncService/StorageSyncServiceDeleteCommand.cs
+++ b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/StorageSyncService/StorageSyncServiceDeleteCommand.cs
@@ -14,7 +14,8 @@
 
 namespace Azure.Mcp.Tools.StorageSync.Commands.StorageSyncService;
 
-public sealed class StorageSyncServiceDeleteCommand(ILogger<StorageSyncServiceDeleteCommand> logger, IStorageSyncService service) : BaseStorageSyncCommand<StorageSyncServiceDeleteOptions>
+public sealed class StorageSyncServiceDeleteCommand(ILogger<StorageSyncServiceDeleteCommand> logger, IStorageSyncService service) : 
+BaseStorageSyncCommand<StorageSyncServiceDeleteOptions>(resourceGroupRequired: true, storageSyncServiceRequired: true)
 {
     private const string CommandTitle = "Delete Storage Sync Service";
     private readonly IStorageSyncService _service = service;
@@ -41,8 +42,6 @@ public sealed class StorageSyncServiceDeleteCommand(ILogger<StorageSyncServiceDe
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsRequired());
-        command.Options.Add(StorageSyncOptionDefinitions.StorageSyncService.Name.AsRequired());
     }
 
     protected override StorageSyncServiceDeleteOptions BindOptions(ParseResult parseResult)
diff --git a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/StorageSyncService/StorageSyncServiceGetCommand.cs b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/StorageSyncService/StorageSyncServiceGetCommand.cs
index df6c340d1d..00233c2e0f 100644
--- a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/StorageSyncService/StorageSyncServiceGetCommand.cs
+++ b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/StorageSyncService/StorageSyncServiceGetCommand.cs
@@ -16,7 +16,8 @@
 
 namespace Azure.Mcp.Tools.StorageSync.Commands.StorageSyncService;
 
-public sealed class StorageSyncServiceGetCommand(ILogger<StorageSyncServiceGetCommand> logger, IStorageSyncService service) : BaseStorageSyncCommand<StorageSyncServiceGetOptions>
+public sealed class StorageSyncServiceGetCommand(ILogger<StorageSyncServiceGetCommand> logger, IStorageSyncService service) : 
+BaseStorageSyncCommand<StorageSyncServiceGetOptions>(resourceGroupRequired: false, storageSyncServiceRequired: false)
 {
     private const string CommandTitle = "Get Storage Sync Service";
     private readonly IStorageSyncService _service = service;
@@ -43,8 +44,6 @@ public sealed class StorageSyncServiceGetCommand(ILogger<StorageSyncServiceGetCo
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsOptional());
-        command.Options.Add(StorageSyncOptionDefinitions.StorageSyncService.Name.AsOptional());
     }
 
     protected override StorageSyncServiceGetOptions BindOptions(ParseResult parseResult)
diff --git a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/StorageSyncService/StorageSyncServiceUpdateCommand.cs b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/StorageSyncService/StorageSyncServiceUpdateCommand.cs
index 1b46b1b910..c5a93410d4 100644
--- a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/StorageSyncService/StorageSyncServiceUpdateCommand.cs
+++ b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/StorageSyncService/StorageSyncServiceUpdateCommand.cs
@@ -15,7 +15,8 @@
 
 namespace Azure.Mcp.Tools.StorageSync.Commands.StorageSyncService;
 
-public sealed class StorageSyncServiceUpdateCommand(ILogger<StorageSyncServiceUpdateCommand> logger, IStorageSyncService service) : BaseStorageSyncCommand<StorageSyncServiceUpdateOptions>
+public sealed class StorageSyncServiceUpdateCommand(ILogger<StorageSyncServiceUpdateCommand> logger, IStorageSyncService service) : 
+BaseStorageSyncCommand<StorageSyncServiceUpdateOptions>(resourceGroupRequired: true, storageSyncServiceRequired: true)
 {
     private const string CommandTitle = "Update Storage Sync Service";
     private readonly IStorageSyncService _service = service;
@@ -42,8 +43,6 @@ public sealed class StorageSyncServiceUpdateCommand(ILogger<StorageSyncServiceUp
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsRequired());
-        command.Options.Add(StorageSyncOptionDefinitions.StorageSyncService.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.StorageSyncService.IncomingTrafficPolicy.AsOptional());
         command.Options.Add(StorageSyncOptionDefinitions.StorageSyncService.Tags.AsOptional());
         command.Options.Add(StorageSyncOptionDefinitions.StorageSyncService.IdentityType.AsOptional());
diff --git a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/SyncGroup/SyncGroupCreateCommand.cs b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/SyncGroup/SyncGroupCreateCommand.cs
index 35149d4f09..2974d45dc1 100644
--- a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/SyncGroup/SyncGroupCreateCommand.cs
+++ b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/SyncGroup/SyncGroupCreateCommand.cs
@@ -15,7 +15,8 @@
 
 namespace Azure.Mcp.Tools.StorageSync.Commands.SyncGroup;
 
-public sealed class SyncGroupCreateCommand(ILogger<SyncGroupCreateCommand> logger, IStorageSyncService service) : BaseStorageSyncCommand<SyncGroupCreateOptions>
+public sealed class SyncGroupCreateCommand(ILogger<SyncGroupCreateCommand> logger, IStorageSyncService service) : 
+BaseStorageSyncCommand<SyncGroupCreateOptions>(resourceGroupRequired: true, storageSyncServiceRequired: true)
 {
     private const string CommandTitle = "Create Sync Group";
     private readonly IStorageSyncService _service = service;
@@ -42,8 +43,6 @@ public sealed class SyncGroupCreateCommand(ILogger<SyncGroupCreateCommand> logge
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsRequired());
-        command.Options.Add(StorageSyncOptionDefinitions.StorageSyncService.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.SyncGroup.Name.AsRequired());
     }
 
diff --git a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/SyncGroup/SyncGroupDeleteCommand.cs b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/SyncGroup/SyncGroupDeleteCommand.cs
index 13a76274a1..643d71f6a8 100644
--- a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/SyncGroup/SyncGroupDeleteCommand.cs
+++ b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/SyncGroup/SyncGroupDeleteCommand.cs
@@ -14,7 +14,8 @@
 
 namespace Azure.Mcp.Tools.StorageSync.Commands.SyncGroup;
 
-public sealed class SyncGroupDeleteCommand(ILogger<SyncGroupDeleteCommand> logger, IStorageSyncService service) : BaseStorageSyncCommand<SyncGroupDeleteOptions>
+public sealed class SyncGroupDeleteCommand(ILogger<SyncGroupDeleteCommand> logger, IStorageSyncService service) : 
+BaseStorageSyncCommand<SyncGroupDeleteOptions>(resourceGroupRequired: true, storageSyncServiceRequired: true)
 {
     private const string CommandTitle = "Delete Sync Group";
     private readonly IStorageSyncService _service = service;
@@ -41,8 +42,6 @@ public sealed class SyncGroupDeleteCommand(ILogger<SyncGroupDeleteCommand> logge
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsRequired());
-        command.Options.Add(StorageSyncOptionDefinitions.StorageSyncService.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.SyncGroup.Name.AsRequired());
     }
 
diff --git a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/SyncGroup/SyncGroupGetCommand.cs b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/SyncGroup/SyncGroupGetCommand.cs
index 36cf875a82..4b5ffc9139 100644
--- a/tools/Azure.Mcp.Tools.StorageSync/src/Commands/SyncGroup/SyncGroupGetCommand.cs
+++ b/tools/Azure.Mcp.Tools.StorageSync/src/Commands/SyncGroup/SyncGroupGetCommand.cs
@@ -16,7 +16,8 @@
 
 namespace Azure.Mcp.Tools.StorageSync.Commands.SyncGroup;
 
-public sealed class SyncGroupGetCommand(ILogger<SyncGroupGetCommand> logger, IStorageSyncService service) : BaseStorageSyncCommand<SyncGroupGetOptions>
+public sealed class SyncGroupGetCommand(ILogger<SyncGroupGetCommand> logger, IStorageSyncService service) : 
+BaseStorageSyncCommand<SyncGroupGetOptions>(resourceGroupRequired: true, storageSyncServiceRequired: true)
 {
     private const string CommandTitle = "Get Sync Group";
     private readonly IStorageSyncService _service = service;
@@ -43,8 +44,6 @@ public sealed class SyncGroupGetCommand(ILogger<SyncGroupGetCommand> logger, ISt
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsRequired());
-        command.Options.Add(StorageSyncOptionDefinitions.StorageSyncService.Name.AsRequired());
         command.Options.Add(StorageSyncOptionDefinitions.SyncGroup.Name.AsOptional());
     }
 
diff --git a/tools/Azure.Mcp.Tools.VirtualDesktop/src/Options/VirtualDesktopOptionDefinitions.cs b/tools/Azure.Mcp.Tools.VirtualDesktop/src/Options/VirtualDesktopOptionDefinitions.cs
index a7c32d4e8c..fc534c7eaf 100644
--- a/tools/Azure.Mcp.Tools.VirtualDesktop/src/Options/VirtualDesktopOptionDefinitions.cs
+++ b/tools/Azure.Mcp.Tools.VirtualDesktop/src/Options/VirtualDesktopOptionDefinitions.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+using System.ComponentModel.DataAnnotations;
+
 namespace Azure.Mcp.Tools.VirtualDesktop.Options;
 
 public static class VirtualDesktopOptionDefinitions
@@ -14,16 +16,16 @@ public static class VirtualDesktopOptionDefinitions
         $"--{HostPoolName}"
     )
     {
-        Description = "The name of the Azure Virtual Desktop host pool. This is the unique name you chose for your hostpool."
-
+        Description = "The name of the Azure Virtual Desktop host pool. This is the unique name you chose for your hostpool.",
+        Required = false
     };
 
     public static readonly Option<string> HostPoolResourceIdOption = new(
         $"--{HostPoolResourceId}"
     )
     {
-        Description = "The Azure resource ID of the host pool. When provided, this will be used instead of searching by name."
-
+        Description = "The Azure resource ID of the host pool. When provided, this will be used instead of searching by name.",
+        Required = false
     };
 
 
@@ -34,11 +36,4 @@ public static class VirtualDesktopOptionDefinitions
         Description = "The name of the session host. This is the computer name of the virtual machine in the host pool.",
         Required = true
     };
-
-    public static readonly Option<string> ResourceGroup = new(
-        $"--{ResourceGroupName}"
-    )
-    {
-        Description = "The name of the Azure resource group. This is a logical container for Azure resources.",
-    };
 }
diff --git a/tools/Azure.Mcp.Tools.Workbooks/src/Commands/Workbooks/CreateWorkbooksCommand.cs b/tools/Azure.Mcp.Tools.Workbooks/src/Commands/Workbooks/CreateWorkbooksCommand.cs
index 3430585fb1..559f9723fd 100644
--- a/tools/Azure.Mcp.Tools.Workbooks/src/Commands/Workbooks/CreateWorkbooksCommand.cs
+++ b/tools/Azure.Mcp.Tools.Workbooks/src/Commands/Workbooks/CreateWorkbooksCommand.cs
@@ -46,8 +46,8 @@ protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
         command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsRequired());
-        command.Options.Add(WorkbooksOptionDefinitions.DisplayNameRequired);
-        command.Options.Add(WorkbooksOptionDefinitions.SerializedContentRequired);
+        command.Options.Add(WorkbooksOptionDefinitions.DisplayName.AsRequired());
+        command.Options.Add(WorkbooksOptionDefinitions.SerializedContent.AsRequired());
         command.Options.Add(WorkbooksOptionDefinitions.SourceId);
     }
 
@@ -55,8 +55,8 @@ protected override CreateWorkbookOptions BindOptions(ParseResult parseResult)
     {
         var options = base.BindOptions(parseResult);
         options.ResourceGroup ??= parseResult.GetValueOrDefault<string>(OptionDefinitions.Common.ResourceGroup.Name);
-        options.DisplayName = parseResult.GetValueOrDefault<string>(WorkbooksOptionDefinitions.DisplayNameRequired.Name);
-        options.SerializedContent = parseResult.GetValueOrDefault<string>(WorkbooksOptionDefinitions.SerializedContentRequired.Name);
+        options.DisplayName = parseResult.GetValueOrDefault<string>(WorkbooksOptionDefinitions.DisplayName.Name);
+        options.SerializedContent = parseResult.GetValueOrDefault<string>(WorkbooksOptionDefinitions.SerializedContent.Name);
         options.SourceId = parseResult.GetValueOrDefault<string>(WorkbooksOptionDefinitions.SourceId.Name);
         return options;
     }
diff --git a/tools/Azure.Mcp.Tools.Workbooks/src/Commands/Workbooks/DeleteWorkbooksCommand.cs b/tools/Azure.Mcp.Tools.Workbooks/src/Commands/Workbooks/DeleteWorkbooksCommand.cs
index 2c693ccac0..95ceee151b 100644
--- a/tools/Azure.Mcp.Tools.Workbooks/src/Commands/Workbooks/DeleteWorkbooksCommand.cs
+++ b/tools/Azure.Mcp.Tools.Workbooks/src/Commands/Workbooks/DeleteWorkbooksCommand.cs
@@ -13,7 +13,7 @@
 
 namespace Azure.Mcp.Tools.Workbooks.Commands.Workbooks;
 
-public sealed class DeleteWorkbooksCommand(ILogger<DeleteWorkbooksCommand> logger) : GlobalCommand<DeleteWorkbookOptions>
+public sealed class DeleteWorkbooksCommand(ILogger<DeleteWorkbooksCommand> logger) : BaseWorkbooksCommand<DeleteWorkbookOptions>
 {
     private const string CommandTitle = "Delete Workbook";
     private readonly ILogger<DeleteWorkbooksCommand> _logger = logger;
diff --git a/tools/Azure.Mcp.Tools.Workbooks/src/Options/Workbook/DeleteWorkbookOptions.cs b/tools/Azure.Mcp.Tools.Workbooks/src/Options/Workbook/DeleteWorkbookOptions.cs
index f4af157d74..c853ba9ed4 100644
--- a/tools/Azure.Mcp.Tools.Workbooks/src/Options/Workbook/DeleteWorkbookOptions.cs
+++ b/tools/Azure.Mcp.Tools.Workbooks/src/Options/Workbook/DeleteWorkbookOptions.cs
@@ -2,11 +2,10 @@
 // Licensed under the MIT License.
 
 using System.Text.Json.Serialization;
-using Azure.Mcp.Core.Options;
 
 namespace Azure.Mcp.Tools.Workbooks.Options.Workbook;
 
-public class DeleteWorkbookOptions : GlobalOptions
+public class DeleteWorkbookOptions : BaseWorkbooksOptions
 {
     [JsonPropertyName(WorkbooksOptionDefinitions.WorkbookIdsText)]
     public string[]? WorkbookIds { get; set; }
diff --git a/tools/Azure.Mcp.Tools.Workbooks/src/Options/WorkbooksOptionDefinitions.cs b/tools/Azure.Mcp.Tools.Workbooks/src/Options/WorkbooksOptionDefinitions.cs
index af66a14527..12de5b2de3 100644
--- a/tools/Azure.Mcp.Tools.Workbooks/src/Options/WorkbooksOptionDefinitions.cs
+++ b/tools/Azure.Mcp.Tools.Workbooks/src/Options/WorkbooksOptionDefinitions.cs
@@ -60,21 +60,21 @@ public static class WorkbooksOptionDefinitions
     };
 
     // Command-specific variations for required fields
-    public static readonly Option<string> DisplayNameRequired = new(
-        $"--{DisplayNameText}"
-    )
-    {
-        Description = "The display name of the workbook.",
-        Required = true
-    };
-
-    public static readonly Option<string> SerializedContentRequired = new(
-        $"--{SerializedContentText}"
-    )
-    {
-        Description = "The serialized JSON content of the workbook.",
-        Required = true
-    };
+    // public static readonly Option<string> DisplayNameRequired = new(
+    //     $"--{DisplayNameText}"
+    // )
+    // {
+    //     Description = "The display name of the workbook.",
+    //     Required = true
+    // };
+
+    // public static readonly Option<string> SerializedContentRequired = new(
+    //     $"--{SerializedContentText}"
+    // )
+    // {
+    //     Description = "The serialized JSON content of the workbook.",
+    //     Required = true
+    // };
 
     // Filter options for listing workbooks
     public static readonly Option<string> Kind = new(