diff --git a/Aetheria.State.Daemon/Program.cs b/Aetheria.State.Daemon/Program.cs
index f433552c1..195186b17 100644
--- a/Aetheria.State.Daemon/Program.cs
+++ b/Aetheria.State.Daemon/Program.cs
@@ -648,14 +648,16 @@ static async Task InjectEveSurfaceSnapshotAsync(
 
 static Task<EveSurfaceState?> ReadEveSurfacePublicationAsync(AetheriaStateNode node, string surfaceKind)
 {
-    return surfaceKind switch
+    var key = surfaceKind switch
     {
-        "game" => node.GetDaemonGameSurfaceAsync(),
-        "game-tui" => node.GetDaemonGameTuiSurfaceAsync(),
-        "editor" => node.GetDaemonEditorSurfaceAsync(),
-        "editor-tui" => node.GetDaemonEditorTuiSurfaceAsync(),
+        "game" => AetheriaRuntimeVerseRecordKeys.DaemonGameSurface,
+        "game-tui" => AetheriaRuntimeVerseRecordKeys.DaemonGameTuiSurface,
+        "editor" => AetheriaRuntimeVerseRecordKeys.DaemonEditorSurface,
+        "editor-tui" => AetheriaRuntimeVerseRecordKeys.DaemonEditorTuiSurface,
         _ => throw new ArgumentOutOfRangeException(nameof(surfaceKind), surfaceKind, "Unknown Eve surface publication.")
     };
+
+    return LatestOrDefaultAsync(node.Document<EveSurfaceState>(key));
 }
 
 static async Task RunRtsCultMeshPumpAsync(
diff --git a/Aetheria.State.Verify/Program.cs b/Aetheria.State.Verify/Program.cs
index 239d36e91..81d78f0db 100644
--- a/Aetheria.State.Verify/Program.cs
+++ b/Aetheria.State.Verify/Program.cs
@@ -8993,10 +8993,11 @@ static void RequireDaemonVersePublication(string root)
         "LatestOrDefaultAsync(",
         "InjectEveSurfaceSnapshotAsync(",
         "ReadEveSurfacePublicationAsync(",
-        "node.GetDaemonGameSurfaceAsync()",
-        "node.GetDaemonGameTuiSurfaceAsync()",
-        "node.GetDaemonEditorSurfaceAsync()",
-        "node.GetDaemonEditorTuiSurfaceAsync()",
+        "AetheriaRuntimeVerseRecordKeys.DaemonGameSurface",
+        "AetheriaRuntimeVerseRecordKeys.DaemonGameTuiSurface",
+        "AetheriaRuntimeVerseRecordKeys.DaemonEditorSurface",
+        "AetheriaRuntimeVerseRecordKeys.DaemonEditorTuiSurface",
+        "LatestOrDefaultAsync(node.Document<EveSurfaceState>(key))",
         "AetheriaEveCommandBridge.AcceptObservedAsync(",
         "ReadObservedDaemonCommands()",
         "currentFrame?.AccountedCommandIds ?? Array.Empty<string>()",