diff --git a/main.go b/main.go
index fae722c..dab6a67 100644
--- a/main.go
+++ b/main.go
@@ -46,6 +46,8 @@ func main() {
 
 	toolBox := server.NewDefaultToolBox()
 
+	// TODO: Artifacts server will be implemented in the ADK, since most agents need it and it could be plugged in when needed
+
 	// Initialize services
 	playwrightSvc, err := playwright.NewPlaywrightService(l, &cfg)
 	if err != nil {
diff --git a/skills/take_screenshot.go b/skills/take_screenshot.go
index 9ef7d8b..cc7eb98 100644
--- a/skills/take_screenshot.go
+++ b/skills/take_screenshot.go
@@ -147,6 +147,8 @@ func (s *TakeScreenshotSkill) TakeScreenshotHandler(ctx context.Context, args ma
 		screenshotArtifact.Metadata = metadata
 	}
 
+	// TODO: Artifact registration will be handled by the ADK
+
 	s.logger.Info("screenshot completed successfully",
 		zap.String("path", generatedPath),
 		zap.String("sessionID", session.ID),