diff --git a/src/MfGames.Nitride.Exec/ExecOperation.cs b/src/MfGames.Nitride.Exec/ExecOperation.cs
index d451704..935ecdc 100644
--- a/src/MfGames.Nitride.Exec/ExecOperation.cs
+++ b/src/MfGames.Nitride.Exec/ExecOperation.cs
@@ -90,7 +90,7 @@ public partial class ExecOperation : AsyncOperationBase
             CommandResult result = await command.ExecuteAsync(cancellationToken);
 
             this.logger.Debug(
-                "Execute: {Command} {Arguments} = {ExitCode}",
+                "Execute non-buffered: {Command} {Arguments} = {ExitCode}",
                 command.TargetFilePath,
                 command.Arguments,
                 result.ExitCode
diff --git a/src/MfGames.Nitride.Feeds/HasFeed.cs b/src/MfGames.Nitride.Feeds/HasFeed.cs
index 5ad6436..06f2f8f 100644
--- a/src/MfGames.Nitride.Feeds/HasFeed.cs
+++ b/src/MfGames.Nitride.Feeds/HasFeed.cs
@@ -1,12 +1,10 @@
+using MfGames.Nitride.Generators;
+
 namespace MfGames.Nitride.Feeds;
 
 /// <summary>
 /// A marker component that indicates this entity has a feed associated with
 /// it.
 /// </summary>
-public class HasFeed
-{
-    public HasFeed() { }
-
-    public static HasFeed Instance { get; } = new();
-}
+[SingletonComponent]
+public partial class HasFeed { }
diff --git a/src/MfGames.Nitride.Handlebars/HasHandlebarsTemplate.cs b/src/MfGames.Nitride.Handlebars/HasHandlebarsTemplate.cs
index e4d1c38..099110a 100644
--- a/src/MfGames.Nitride.Handlebars/HasHandlebarsTemplate.cs
+++ b/src/MfGames.Nitride.Handlebars/HasHandlebarsTemplate.cs
@@ -1,10 +1,10 @@
+using MfGames.Nitride.Generators;
+
 namespace MfGames.Nitride.Handlebars;
 
 /// <summary>
 /// A marker component that indicates that a given file with text component
 /// has a Handlebars template in it.
 /// </summary>
-public record HasHandlebarsTemplate
-{
-    public static HasHandlebarsTemplate Instance { get; } = new();
-}
+[SingletonComponent]
+public partial class HasHandlebarsTemplate { }
diff --git a/src/MfGames.Nitride.Yaml/HasYamlModel.cs b/src/MfGames.Nitride.Yaml/HasYamlModel.cs
index da59beb..4b44e27 100644
--- a/src/MfGames.Nitride.Yaml/HasYamlModel.cs
+++ b/src/MfGames.Nitride.Yaml/HasYamlModel.cs
@@ -1,9 +1,9 @@
+using MfGames.Nitride.Generators;
+
 namespace MfGames.Nitride.Yaml;
 
 /// <summary>
 /// A marker class that indicates that entity has a YAML model.
 /// </summary>
-public record HasYamlModel
-{
-    public static HasYamlModel Instance { get; } = new();
-}
+[SingletonComponent]
+public partial class HasYamlModel { }