diff --git a/examples-java/src/main/java/com/embabel/example/crew/bookwriter/BookWriter.java b/examples-java/src/main/java/com/embabel/example/crew/bookwriter/BookWriter.java
index 587e882..03d71b0 100644
--- a/examples-java/src/main/java/com/embabel/example/crew/bookwriter/BookWriter.java
+++ b/examples-java/src/main/java/com/embabel/example/crew/bookwriter/BookWriter.java
@@ -18,6 +18,7 @@
 import com.embabel.agent.api.annotation.*;
 import com.embabel.agent.api.common.OperationContext;
 import com.embabel.agent.core.CoreToolGroups;
+import com.embabel.agent.core.hitl.WaitFor;
 import com.embabel.agent.domain.library.ResearchReport;
 import com.embabel.agent.prompt.persona.RoleGoalBackstory;
 import com.embabel.agent.tools.file.FileTools;
diff --git a/examples-java/src/main/java/com/embabel/example/handoff/Handoff.java b/examples-java/src/main/java/com/embabel/example/handoff/Handoff.java
index ea72de5..2acab91 100644
--- a/examples-java/src/main/java/com/embabel/example/handoff/Handoff.java
+++ b/examples-java/src/main/java/com/embabel/example/handoff/Handoff.java
@@ -18,6 +18,7 @@
 import com.embabel.agent.api.annotation.*;
 import com.embabel.agent.api.common.OperationContext;
 import com.embabel.agent.api.tool.Subagent;
+import com.embabel.agent.core.hitl.WaitFor;
 import com.embabel.agent.domain.io.UserInput;
 import com.embabel.example.horoscope.StarNewsFinder;
 import com.embabel.example.horoscope.StarPerson;
diff --git a/examples-java/src/main/java/com/embabel/example/handoff/Subagents.java b/examples-java/src/main/java/com/embabel/example/handoff/Subagents.java
index c981b6e..38e7194 100644
--- a/examples-java/src/main/java/com/embabel/example/handoff/Subagents.java
+++ b/examples-java/src/main/java/com/embabel/example/handoff/Subagents.java
@@ -18,9 +18,9 @@
 import com.embabel.agent.api.annotation.AchievesGoal;
 import com.embabel.agent.api.annotation.Action;
 import com.embabel.agent.api.annotation.Agent;
-import com.embabel.agent.api.annotation.WaitFor;
 import com.embabel.agent.api.common.OperationContext;
 import com.embabel.agent.api.tool.Subagent;
+import com.embabel.agent.core.hitl.WaitFor;
 import com.embabel.agent.domain.io.UserInput;
 import com.embabel.common.ai.model.LlmOptions;
 import com.embabel.example.horoscope.StarNewsFinder;
diff --git a/examples-java/src/main/java/com/embabel/example/horoscope/StarNewsFinder.java b/examples-java/src/main/java/com/embabel/example/horoscope/StarNewsFinder.java
index 55e2fbd..52ef6f2 100644
--- a/examples-java/src/main/java/com/embabel/example/horoscope/StarNewsFinder.java
+++ b/examples-java/src/main/java/com/embabel/example/horoscope/StarNewsFinder.java
@@ -20,6 +20,7 @@
 import com.embabel.agent.api.models.AnthropicModels;
 import com.embabel.agent.api.models.OpenAiModels;
 import com.embabel.agent.core.CoreToolGroups;
+import com.embabel.agent.core.hitl.WaitFor;
 import com.embabel.agent.domain.io.UserInput;
 import com.embabel.agent.domain.library.Person;
 import com.embabel.agent.domain.library.PersonImpl;
diff --git a/examples-java/src/main/java/com/embabel/example/wikipedia/WikiAgent.java b/examples-java/src/main/java/com/embabel/example/wikipedia/WikiAgent.java
index b637a86..70af3f2 100644
--- a/examples-java/src/main/java/com/embabel/example/wikipedia/WikiAgent.java
+++ b/examples-java/src/main/java/com/embabel/example/wikipedia/WikiAgent.java
@@ -18,6 +18,7 @@
 import com.embabel.agent.api.annotation.*;
 import com.embabel.agent.api.common.OperationContext;
 import com.embabel.agent.core.CoreToolGroups;
+import com.embabel.agent.core.hitl.WaitFor;
 import com.embabel.common.ai.model.LlmOptions;
 import org.springframework.beans.factory.annotation.Value;
 
diff --git a/examples-kotlin/src/main/kotlin/com/embabel/example/horoscope/StarNewsFinder.kt b/examples-kotlin/src/main/kotlin/com/embabel/example/horoscope/StarNewsFinder.kt
index 9e4afd2..eb35212 100644
--- a/examples-kotlin/src/main/kotlin/com/embabel/example/horoscope/StarNewsFinder.kt
+++ b/examples-kotlin/src/main/kotlin/com/embabel/example/horoscope/StarNewsFinder.kt
@@ -19,12 +19,12 @@ import com.embabel.agent.api.annotation.AchievesGoal
 import com.embabel.agent.api.annotation.Action
 import com.embabel.agent.api.annotation.Agent
 import com.embabel.agent.api.annotation.Export
-import com.embabel.agent.api.annotation.fromForm
 import com.embabel.agent.api.common.OperationContext
 import com.embabel.agent.api.common.createObject
 import com.embabel.agent.api.common.createObjectIfPossible
 import com.embabel.agent.api.models.OpenAiModels
 import com.embabel.agent.core.CoreToolGroups
+import com.embabel.agent.core.hitl.fromForm
 import com.embabel.agent.domain.io.UserInput
 import com.embabel.agent.domain.library.HasContent
 import com.embabel.agent.domain.library.Person