diff --git a/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramActivationAttribute.cs b/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramActivationAttribute.cs
index c3e377a..ac23662 100644
--- a/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramActivationAttribute.cs
+++ b/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramActivationAttribute.cs
@@ -1,7 +1,9 @@
-namespace Synergy.Architecture.Annotations.Diagrams.Sequence;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 
-// TODO: Marcin Celej [from: Marcin Celej on: 08-04-2023]: Add optional attributes when compilation constant CODE_ANALYSIS (or other) is present
+namespace Synergy.Architecture.Annotations.Diagrams.Sequence;
 
+[Conditional("CODE_ANALYSIS")]
 [AttributeUsage(AttributeTargets.All, AllowMultiple = true)]
 public class SequenceDiagramActivationAttribute : Attribute, SequenceDiagramElement, SequenceDiagramGroup
 {
diff --git a/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramCallAttribute.cs b/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramCallAttribute.cs
index 0098fb4..18c5997 100644
--- a/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramCallAttribute.cs
+++ b/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramCallAttribute.cs
@@ -1,5 +1,8 @@
-namespace Synergy.Architecture.Annotations.Diagrams.Sequence;
+using System.Diagnostics;
 
+namespace Synergy.Architecture.Annotations.Diagrams.Sequence;
+
+[Conditional("CODE_ANALYSIS")]
 [AttributeUsage(AttributeTargets.All, AllowMultiple = true)]
 public class SequenceDiagramCallAttribute : Attribute, SequenceDiagramElement, SequenceDiagramGroup
 {
diff --git a/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramDatabaseCallAttribute.cs b/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramDatabaseCallAttribute.cs
index 344fce7..1bc482e 100644
--- a/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramDatabaseCallAttribute.cs
+++ b/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramDatabaseCallAttribute.cs
@@ -1,5 +1,8 @@
+using System.Diagnostics;
+
 namespace Synergy.Architecture.Annotations.Diagrams.Sequence;
 
+[Conditional("CODE_ANALYSIS")]
 [AttributeUsage(AttributeTargets.All, AllowMultiple = true)]
 public class SequenceDiagramDatabaseCallAttribute : SequenceDiagramExternalCallAttribute
 {
diff --git a/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramDeactivationAttribute.cs b/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramDeactivationAttribute.cs
index 86e873c..0f38d3d 100644
--- a/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramDeactivationAttribute.cs
+++ b/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramDeactivationAttribute.cs
@@ -1,5 +1,8 @@
-namespace Synergy.Architecture.Annotations.Diagrams.Sequence;
+using System.Diagnostics;
 
+namespace Synergy.Architecture.Annotations.Diagrams.Sequence;
+
+[Conditional("CODE_ANALYSIS")]
 [AttributeUsage(AttributeTargets.All, AllowMultiple = true)]
 public class SequenceDiagramDeactivationAttribute : Attribute, SequenceDiagramElement
 {
diff --git a/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramElementAttribute.cs b/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramElementAttribute.cs
index ed2441b..1e8fd5f 100644
--- a/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramElementAttribute.cs
+++ b/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramElementAttribute.cs
@@ -1,5 +1,8 @@
-namespace Synergy.Architecture.Annotations.Diagrams.Sequence;
+using System.Diagnostics;
 
+namespace Synergy.Architecture.Annotations.Diagrams.Sequence;
+
+[Conditional("CODE_ANALYSIS")]
 [AttributeUsage(AttributeTargets.All, AllowMultiple = true)]
 public class SequenceDiagramElementAttribute : Attribute, SequenceDiagramElement
 {
diff --git a/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramExternalActivationAttribute.cs b/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramExternalActivationAttribute.cs
index 3232280..d4d158a 100644
--- a/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramExternalActivationAttribute.cs
+++ b/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramExternalActivationAttribute.cs
@@ -1,5 +1,8 @@
-namespace Synergy.Architecture.Annotations.Diagrams.Sequence;
+using System.Diagnostics;
 
+namespace Synergy.Architecture.Annotations.Diagrams.Sequence;
+
+[Conditional("CODE_ANALYSIS")]
 [AttributeUsage(AttributeTargets.All, AllowMultiple = true)]
 public class SequenceDiagramExternalActivationAttribute : Attribute, SequenceDiagramElement, SequenceDiagramGroup
 {
diff --git a/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramExternalCallAttribute.cs b/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramExternalCallAttribute.cs
index df3a2b5..ab209b0 100644
--- a/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramExternalCallAttribute.cs
+++ b/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramExternalCallAttribute.cs
@@ -1,5 +1,8 @@
-namespace Synergy.Architecture.Annotations.Diagrams.Sequence;
+using System.Diagnostics;
 
+namespace Synergy.Architecture.Annotations.Diagrams.Sequence;
+
+[Conditional("CODE_ANALYSIS")]
 [AttributeUsage(AttributeTargets.All, AllowMultiple = true)]
 public class SequenceDiagramExternalCallAttribute : Attribute, SequenceDiagramElement, SequenceDiagramGroup
 {
diff --git a/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramNoteAttribute.cs b/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramNoteAttribute.cs
index 3c8e2a2..f19525c 100644
--- a/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramNoteAttribute.cs
+++ b/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramNoteAttribute.cs
@@ -1,5 +1,8 @@
-namespace Synergy.Architecture.Annotations.Diagrams.Sequence;
+using System.Diagnostics;
 
+namespace Synergy.Architecture.Annotations.Diagrams.Sequence;
+
+[Conditional("CODE_ANALYSIS")]
 [AttributeUsage(AttributeTargets.All, AllowMultiple = true)]
 public class SequenceDiagramNoteAttribute : Attribute, SequenceDiagramElement
 {
diff --git a/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramSelfCallAttribute.cs b/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramSelfCallAttribute.cs
index a2c65eb..b46da70 100644
--- a/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramSelfCallAttribute.cs
+++ b/Architecture/Synergy.Architecture.Annotations/Diagrams/Sequence/SequenceDiagramSelfCallAttribute.cs
@@ -1,5 +1,8 @@
-namespace Synergy.Architecture.Annotations.Diagrams.Sequence;
+using System.Diagnostics;
 
+namespace Synergy.Architecture.Annotations.Diagrams.Sequence;
+
+[Conditional("CODE_ANALYSIS")]
 [AttributeUsage(AttributeTargets.All, AllowMultiple = true)]
 public class SequenceDiagramSelfCallAttribute : Attribute, SequenceDiagramElement, SequenceDiagramGroup
 {
diff --git a/Web/Sample/Synergy.Sample.Web.API.Services/Synergy.Sample.Web.API.Services.csproj b/Web/Sample/Synergy.Sample.Web.API.Services/Synergy.Sample.Web.API.Services.csproj
index 3432d30..845871c 100644
--- a/Web/Sample/Synergy.Sample.Web.API.Services/Synergy.Sample.Web.API.Services.csproj
+++ b/Web/Sample/Synergy.Sample.Web.API.Services/Synergy.Sample.Web.API.Services.csproj
@@ -6,6 +6,14 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DefineConstants>TRACE;CODE_ANALYSIS</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DefineConstants>TRACE;CODE_ANALYSIS</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Castle.Windsor" Version="5.0.1" />
     <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
diff --git a/Web/Sample/Synergy.Sample.Web.API/Synergy.Sample.Web.API.csproj b/Web/Sample/Synergy.Sample.Web.API/Synergy.Sample.Web.API.csproj
index 08549b0..e32ccf4 100644
--- a/Web/Sample/Synergy.Sample.Web.API/Synergy.Sample.Web.API.csproj
+++ b/Web/Sample/Synergy.Sample.Web.API/Synergy.Sample.Web.API.csproj
@@ -5,6 +5,14 @@
     <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DefineConstants>TRACE;CODE_ANALYSIS</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DefineConstants>TRACE;CODE_ANALYSIS</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Castle.Windsor" Version="5.0.1" />
     <PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.4.0" />