diff --git a/src/clients/Elsa.Api.Client/Resources/ActivityDescriptors/Models/ActivityDescriptor.cs b/src/clients/Elsa.Api.Client/Resources/ActivityDescriptors/Models/ActivityDescriptor.cs
index adcb69983..f43558eb9 100644
--- a/src/clients/Elsa.Api.Client/Resources/ActivityDescriptors/Models/ActivityDescriptor.cs
+++ b/src/clients/Elsa.Api.Client/Resources/ActivityDescriptors/Models/ActivityDescriptor.cs
@@ -43,12 +43,12 @@ public record ActivityDescriptor
     /// <summary>
     /// The input properties of the activity type.
     /// </summary>
-    public ICollection<InputDescriptor> Inputs { get; init; } = new List<InputDescriptor>();
+    public IReadOnlyCollection<InputDescriptor> Inputs { get; init; } = new List<InputDescriptor>();
     
     /// <summary>
     /// The output properties of the activity type.
     /// </summary>
-    public ICollection<OutputDescriptor> Outputs { get; init; } = new List<OutputDescriptor>();
+    public IReadOnlyCollection<OutputDescriptor> Outputs { get; init; } = new List<OutputDescriptor>();
 
     /// <summary>
     /// The kind of activity.
@@ -58,12 +58,12 @@ public record ActivityDescriptor
     /// <summary>
     /// The ports of the activity type.
     /// </summary>
-    public ICollection<Port> Ports { get; init; } = new List<Port>();
+    public IReadOnlyCollection<Port> Ports { get; init; } = new List<Port>();
     
     /// <summary>
     /// The custom properties of the activity type.
     /// </summary>
-    public IDictionary<string, object> CustomProperties { get; set; } = new Dictionary<string, object>();
+    public IReadOnlyDictionary<string, object> CustomProperties { get; set; } = new Dictionary<string, object>();
 
     /// <summary>
     /// A value indicating whether this activity is a container of child activities.
diff --git a/src/modules/Elsa.Workflows.Core/Activities/Switch.cs b/src/modules/Elsa.Workflows.Core/Activities/Switch.cs
index f776f814f..56d9c9048 100644
--- a/src/modules/Elsa.Workflows.Core/Activities/Switch.cs
+++ b/src/modules/Elsa.Workflows.Core/Activities/Switch.cs
@@ -30,12 +30,6 @@ public class Switch : Activity
     {
     }
 
-    /// <summary>
-    /// The value to switch on.
-    /// </summary>
-    [Input(Description = "The value to switch on.")]
-    public Input<object> Expression { get; set; } = default!;
-
     /// <summary>
     /// The value to switch on, made available as output for capturing.
     /// </summary>
@@ -64,10 +58,8 @@ public class Switch : Activity
     /// <inheritdoc />
     protected override async ValueTask ExecuteAsync(ActivityExecutionContext context)
     {
-        context.Set(Output, Expression);
-        var matchingCases = await FindMatchingCasesAsync(context.ExpressionExecutionContext);
+        var matchingCases = (await FindMatchingCasesAsync(context.ExpressionExecutionContext)).ToList();
         var hasAnyMatches = matchingCases.Any();
-
         var mode = context.Get(Mode);
         var results = mode == SwitchMode.MatchFirst ? hasAnyMatches ? new[] { matchingCases.First() } : Array.Empty<SwitchCase>() : matchingCases.ToArray();