diff --git a/src/modules/Elsa.Workflows.Core/Activities/Break.cs b/src/modules/Elsa.Workflows.Core/Activities/Break.cs
index 2fcb811e8..e7a220374 100644
--- a/src/modules/Elsa.Workflows.Core/Activities/Break.cs
+++ b/src/modules/Elsa.Workflows.Core/Activities/Break.cs
@@ -2,6 +2,7 @@ using System.Runtime.CompilerServices;
 using Elsa.Extensions;
 using Elsa.Workflows.Core.Activities.Flowchart.Contracts;
 using Elsa.Workflows.Core.Attributes;
+using Elsa.Workflows.Core.Contracts;
 using Elsa.Workflows.Core.Signals;
 using JetBrains.Annotations;
 
diff --git a/src/modules/Elsa.Workflows.Core/Activities/Complete.cs b/src/modules/Elsa.Workflows.Core/Activities/Complete.cs
index c5e477a77..ffe3f678e 100644
--- a/src/modules/Elsa.Workflows.Core/Activities/Complete.cs
+++ b/src/modules/Elsa.Workflows.Core/Activities/Complete.cs
@@ -2,8 +2,10 @@ using System.Runtime.CompilerServices;
 using System.Text.Json;
 using Elsa.Expressions.Models;
 using Elsa.Extensions;
+using Elsa.Workflows.Core.Activities.Flowchart.Contracts;
 using Elsa.Workflows.Core.Activities.Flowchart.Models;
 using Elsa.Workflows.Core.Attributes;
+using Elsa.Workflows.Core.Contracts;
 using Elsa.Workflows.Core.Models;
 using Elsa.Workflows.Core.Signals;
 using JetBrains.Annotations;
@@ -15,7 +17,7 @@ namespace Elsa.Workflows.Core.Activities;
 /// </summary>
 [Activity("Elsa", "Composition", "Signals the current composite activity to complete itself as a whole.")]
 [PublicAPI]
-public class Complete : Activity
+public class Complete : Activity, ITerminalNode
 {
     /// <inheritdoc />
     public Complete([CallerFilePath] string? source = default, [CallerLineNumber] int? line = default) : base(source, line)
diff --git a/src/modules/Elsa.Workflows.Core/Activities/End.cs b/src/modules/Elsa.Workflows.Core/Activities/End.cs
index 4a7d29e0e..e3f89e77c 100644
--- a/src/modules/Elsa.Workflows.Core/Activities/End.cs
+++ b/src/modules/Elsa.Workflows.Core/Activities/End.cs
@@ -1,6 +1,7 @@
 using System.Runtime.CompilerServices;
 using Elsa.Workflows.Core.Activities.Flowchart.Contracts;
 using Elsa.Workflows.Core.Attributes;
+using Elsa.Workflows.Core.Contracts;
 using JetBrains.Annotations;
 
 namespace Elsa.Workflows.Core.Activities;
diff --git a/src/modules/Elsa.Workflows.Core/Activities/Finish.cs b/src/modules/Elsa.Workflows.Core/Activities/Finish.cs
index 521b27791..0e6b4dd6f 100644
--- a/src/modules/Elsa.Workflows.Core/Activities/Finish.cs
+++ b/src/modules/Elsa.Workflows.Core/Activities/Finish.cs
@@ -1,6 +1,7 @@
 using System.Runtime.CompilerServices;
 using Elsa.Workflows.Core.Activities.Flowchart.Contracts;
 using Elsa.Workflows.Core.Attributes;
+using Elsa.Workflows.Core.Contracts;
 using JetBrains.Annotations;
 
 namespace Elsa.Workflows.Core.Activities;
diff --git a/src/modules/Elsa.Workflows.Core/Activities/Sequence.cs b/src/modules/Elsa.Workflows.Core/Activities/Sequence.cs
index 4e33e901a..b085dc320 100644
--- a/src/modules/Elsa.Workflows.Core/Activities/Sequence.cs
+++ b/src/modules/Elsa.Workflows.Core/Activities/Sequence.cs
@@ -3,6 +3,7 @@ using System.Runtime.CompilerServices;
 using Elsa.Extensions;
 using Elsa.Workflows.Core.Activities.Flowchart.Contracts;
 using Elsa.Workflows.Core.Attributes;
+using Elsa.Workflows.Core.Contracts;
 using Elsa.Workflows.Core.Signals;
 using JetBrains.Annotations;
 
diff --git a/src/modules/Elsa.Workflows.Core/Activities/Flowchart/Contracts/ITerminalNode.cs b/src/modules/Elsa.Workflows.Core/Contracts/ITerminalNode.cs
similarity index 63%
rename from src/modules/Elsa.Workflows.Core/Activities/Flowchart/Contracts/ITerminalNode.cs
rename to src/modules/Elsa.Workflows.Core/Contracts/ITerminalNode.cs
index 59aaf1323..b510f73a3 100644
--- a/src/modules/Elsa.Workflows.Core/Activities/Flowchart/Contracts/ITerminalNode.cs
+++ b/src/modules/Elsa.Workflows.Core/Contracts/ITerminalNode.cs
@@ -1,4 +1,4 @@
-namespace Elsa.Workflows.Core.Activities.Flowchart.Contracts;
+namespace Elsa.Workflows.Core.Contracts;
 
 /// <summary>
 /// Marks an activity as a terminal activity.