diff --git a/src/Nitride.Temporal/NitrideTemporalBuilderExtensions.cs b/src/Nitride.Temporal/NitrideTemporalBuilderExtensions.cs
index 0385f9c..c153d63 100644
--- a/src/Nitride.Temporal/NitrideTemporalBuilderExtensions.cs
+++ b/src/Nitride.Temporal/NitrideTemporalBuilderExtensions.cs
@@ -17,23 +17,16 @@ public static class NitrideTemporalBuilderExtensions
     /// Extends the builder to allow for configuring the temporal
     /// settings for generation.
     /// </summary>
-    /// <param name="builder">The host builder being configured.</param>
-    /// <param name="callback">The callback to configure the clock.</param>
-    /// <returns>The builder passed in.</returns>
-    public static NitrideBuilder ConfigureClock(this NitrideBuilder builder, Action<Timekeeper> callback)
+    public static NitrideBuilder UseTemporal(this NitrideBuilder builder, Action<Timekeeper>? configure = null)
     {
-        return builder.UseTemporal()
-            .ConfigureSite(
-                (_, scope) =>
-                {
-                    Timekeeper? clock = scope.Resolve<Timekeeper>();
-                    callback(clock);
-                });
-    }
+        builder.ConfigureContainer(x => x.RegisterModule<NitrideTemporalModule>());
 
-    public static NitrideBuilder UseTemporal(this NitrideBuilder builder)
-    {
-        return builder.ConfigureContainer(x => x.RegisterModule<NitrideTemporalModule>());
+        if (configure != null)
+        {
+            builder.ConfigureSite((_, scope) => configure(scope.Resolve<Timekeeper>()));
+        }
+
+        return builder;
     }
 
     /// <summary>
diff --git a/src/Nitride.Temporal/NitrideTemporalModule.cs b/src/Nitride.Temporal/NitrideTemporalModule.cs
index 6fa02c8..88dd383 100644
--- a/src/Nitride.Temporal/NitrideTemporalModule.cs
+++ b/src/Nitride.Temporal/NitrideTemporalModule.cs
@@ -9,6 +9,7 @@ public class NitrideTemporalModule : Module
     {
         builder.RegisterOperators(this);
         builder.RegisterValidators(this);
+        builder.RegisterType<Timekeeper>().AsSelf().SingleInstance();
         builder.RegisterGeneric(typeof(SetInstantFromComponent<>)).As(typeof(SetInstantFromComponent<>));
     }
 }