diff --git a/experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaForExecutorBuilder.java b/experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaForExecutorBuilder.java
index 2f8ec073..aa608f27 100644
--- a/experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaForExecutorBuilder.java
+++ b/experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaForExecutorBuilder.java
@@ -20,6 +20,7 @@
 import io.serverlessworkflow.api.types.ForTask;
 import io.serverlessworkflow.api.types.Workflow;
 import io.serverlessworkflow.api.types.func.ForTaskFunction;
+import io.serverlessworkflow.api.types.func.LoopPredicateIndex;
 import io.serverlessworkflow.api.types.func.TypedFunction;
 import io.serverlessworkflow.impl.WorkflowApplication;
 import io.serverlessworkflow.impl.WorkflowMutablePosition;
@@ -27,7 +28,6 @@
 import io.serverlessworkflow.impl.WorkflowValueResolver;
 import io.serverlessworkflow.impl.executors.ForExecutor.ForExecutorBuilder;
 import io.serverlessworkflow.impl.expressions.ExpressionDescriptor;
-import io.serverlessworkflow.impl.expressions.LoopPredicateIndex;
 import io.serverlessworkflow.impl.resources.ResourceLoader;
 import java.util.Collection;
 import java.util.Optional;
diff --git a/experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaLoopFunctionCallExecutor.java b/experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaLoopFunctionCallExecutor.java
index 71d6bb6a..6eaba85b 100644
--- a/experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaLoopFunctionCallExecutor.java
+++ b/experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaLoopFunctionCallExecutor.java
@@ -20,13 +20,13 @@
 import io.serverlessworkflow.api.types.TaskBase;
 import io.serverlessworkflow.api.types.Workflow;
 import io.serverlessworkflow.api.types.func.CallJava;
+import io.serverlessworkflow.api.types.func.LoopFunction;
 import io.serverlessworkflow.impl.TaskContext;
 import io.serverlessworkflow.impl.WorkflowApplication;
 import io.serverlessworkflow.impl.WorkflowContext;
 import io.serverlessworkflow.impl.WorkflowModel;
 import io.serverlessworkflow.impl.WorkflowModelFactory;
 import io.serverlessworkflow.impl.executors.CallableTask;
-import io.serverlessworkflow.impl.expressions.LoopFunction;
 import io.serverlessworkflow.impl.resources.ResourceLoader;
 import java.util.concurrent.CompletableFuture;
 
diff --git a/experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaLoopFunctionIndexCallExecutor.java b/experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaLoopFunctionIndexCallExecutor.java
index fadc1245..5f8bc000 100644
--- a/experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaLoopFunctionIndexCallExecutor.java
+++ b/experimental/lambda/src/main/java/io/serverlessworkflow/impl/executors/func/JavaLoopFunctionIndexCallExecutor.java
@@ -20,13 +20,13 @@
 import io.serverlessworkflow.api.types.TaskBase;
 import io.serverlessworkflow.api.types.Workflow;
 import io.serverlessworkflow.api.types.func.CallJava;
+import io.serverlessworkflow.api.types.func.LoopFunctionIndex;
 import io.serverlessworkflow.impl.TaskContext;
 import io.serverlessworkflow.impl.WorkflowApplication;
 import io.serverlessworkflow.impl.WorkflowContext;
 import io.serverlessworkflow.impl.WorkflowModel;
 import io.serverlessworkflow.impl.WorkflowModelFactory;
 import io.serverlessworkflow.impl.executors.CallableTask;
-import io.serverlessworkflow.impl.expressions.LoopFunctionIndex;
 import io.serverlessworkflow.impl.resources.ResourceLoader;
 import java.util.concurrent.CompletableFuture;
 
diff --git a/experimental/lambda/src/main/java/io/serverlessworkflow/impl/expressions/func/JavaExpressionFactory.java b/experimental/lambda/src/main/java/io/serverlessworkflow/impl/expressions/func/JavaExpressionFactory.java
index af0468cf..69f81239 100644
--- a/experimental/lambda/src/main/java/io/serverlessworkflow/impl/expressions/func/JavaExpressionFactory.java
+++ b/experimental/lambda/src/main/java/io/serverlessworkflow/impl/expressions/func/JavaExpressionFactory.java
@@ -18,6 +18,7 @@
 import io.cloudevents.CloudEventData;
 import io.serverlessworkflow.api.types.TaskBase;
 import io.serverlessworkflow.api.types.TaskMetadata;
+import io.serverlessworkflow.api.types.func.TaskMetadataKeys;
 import io.serverlessworkflow.api.types.func.TypedFunction;
 import io.serverlessworkflow.api.types.func.TypedPredicate;
 import io.serverlessworkflow.impl.WorkflowModelFactory;
@@ -25,7 +26,6 @@
 import io.serverlessworkflow.impl.expressions.AbstractExpressionFactory;
 import io.serverlessworkflow.impl.expressions.ExpressionDescriptor;
 import io.serverlessworkflow.impl.expressions.ObjectExpression;
-import io.serverlessworkflow.impl.expressions.TaskMetadataKeys;
 import java.time.OffsetDateTime;
 import java.util.Collection;
 import java.util.Map;
diff --git a/experimental/lambda/src/test/java/io/serverless/workflow/impl/CallTest.java b/experimental/lambda/src/test/java/io/serverless/workflow/impl/CallTest.java
index 43625509..078d8c66 100644
--- a/experimental/lambda/src/test/java/io/serverless/workflow/impl/CallTest.java
+++ b/experimental/lambda/src/test/java/io/serverless/workflow/impl/CallTest.java
@@ -31,10 +31,10 @@
 import io.serverlessworkflow.api.types.func.CallTaskJava;
 import io.serverlessworkflow.api.types.func.ForTaskFunction;
 import io.serverlessworkflow.api.types.func.SwitchCaseFunction;
+import io.serverlessworkflow.api.types.func.TaskMetadataKeys;
 import io.serverlessworkflow.impl.WorkflowApplication;
 import io.serverlessworkflow.impl.WorkflowDefinition;
 import io.serverlessworkflow.impl.WorkflowModel;
-import io.serverlessworkflow.impl.expressions.TaskMetadataKeys;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
diff --git a/experimental/types/src/main/java/io/serverlessworkflow/api/types/func/CallJava.java b/experimental/types/src/main/java/io/serverlessworkflow/api/types/func/CallJava.java
index 6423fdae..c23e36fd 100644
--- a/experimental/types/src/main/java/io/serverlessworkflow/api/types/func/CallJava.java
+++ b/experimental/types/src/main/java/io/serverlessworkflow/api/types/func/CallJava.java
@@ -16,8 +16,6 @@
 package io.serverlessworkflow.api.types.func;
 
 import io.serverlessworkflow.api.types.TaskBase;
-import io.serverlessworkflow.impl.expressions.LoopFunction;
-import io.serverlessworkflow.impl.expressions.LoopFunctionIndex;
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Function;
diff --git a/experimental/types/src/main/java/io/serverlessworkflow/api/types/func/ForTaskFunction.java b/experimental/types/src/main/java/io/serverlessworkflow/api/types/func/ForTaskFunction.java
index eb4ac716..6a2732d6 100644
--- a/experimental/types/src/main/java/io/serverlessworkflow/api/types/func/ForTaskFunction.java
+++ b/experimental/types/src/main/java/io/serverlessworkflow/api/types/func/ForTaskFunction.java
@@ -16,8 +16,6 @@
 package io.serverlessworkflow.api.types.func;
 
 import io.serverlessworkflow.api.types.ForTask;
-import io.serverlessworkflow.impl.expressions.LoopPredicate;
-import io.serverlessworkflow.impl.expressions.LoopPredicateIndex;
 import java.util.Collection;
 import java.util.Optional;
 import java.util.function.Function;
diff --git a/experimental/types/src/main/java/io/serverlessworkflow/impl/expressions/LoopFunction.java b/experimental/types/src/main/java/io/serverlessworkflow/api/types/func/LoopFunction.java
similarity index 94%
rename from experimental/types/src/main/java/io/serverlessworkflow/impl/expressions/LoopFunction.java
rename to experimental/types/src/main/java/io/serverlessworkflow/api/types/func/LoopFunction.java
index 6e23b97b..094cff1c 100644
--- a/experimental/types/src/main/java/io/serverlessworkflow/impl/expressions/LoopFunction.java
+++ b/experimental/types/src/main/java/io/serverlessworkflow/api/types/func/LoopFunction.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.impl.expressions;
+package io.serverlessworkflow.api.types.func;
 
 import java.util.function.BiFunction;
 
diff --git a/experimental/types/src/main/java/io/serverlessworkflow/impl/expressions/LoopFunctionIndex.java b/experimental/types/src/main/java/io/serverlessworkflow/api/types/func/LoopFunctionIndex.java
similarity index 93%
rename from experimental/types/src/main/java/io/serverlessworkflow/impl/expressions/LoopFunctionIndex.java
rename to experimental/types/src/main/java/io/serverlessworkflow/api/types/func/LoopFunctionIndex.java
index 783092dd..b5831d09 100644
--- a/experimental/types/src/main/java/io/serverlessworkflow/impl/expressions/LoopFunctionIndex.java
+++ b/experimental/types/src/main/java/io/serverlessworkflow/api/types/func/LoopFunctionIndex.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.impl.expressions;
+package io.serverlessworkflow.api.types.func;
 
 @FunctionalInterface
 public interface LoopFunctionIndex<T, V, R> {
diff --git a/experimental/types/src/main/java/io/serverlessworkflow/impl/expressions/LoopPredicate.java b/experimental/types/src/main/java/io/serverlessworkflow/api/types/func/LoopPredicate.java
similarity index 94%
rename from experimental/types/src/main/java/io/serverlessworkflow/impl/expressions/LoopPredicate.java
rename to experimental/types/src/main/java/io/serverlessworkflow/api/types/func/LoopPredicate.java
index ecbeda77..38b6b304 100644
--- a/experimental/types/src/main/java/io/serverlessworkflow/impl/expressions/LoopPredicate.java
+++ b/experimental/types/src/main/java/io/serverlessworkflow/api/types/func/LoopPredicate.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.impl.expressions;
+package io.serverlessworkflow.api.types.func;
 
 import java.util.function.BiPredicate;
 
diff --git a/experimental/types/src/main/java/io/serverlessworkflow/impl/expressions/LoopPredicateIndex.java b/experimental/types/src/main/java/io/serverlessworkflow/api/types/func/LoopPredicateIndex.java
similarity index 93%
rename from experimental/types/src/main/java/io/serverlessworkflow/impl/expressions/LoopPredicateIndex.java
rename to experimental/types/src/main/java/io/serverlessworkflow/api/types/func/LoopPredicateIndex.java
index dc897683..0e0a39a0 100644
--- a/experimental/types/src/main/java/io/serverlessworkflow/impl/expressions/LoopPredicateIndex.java
+++ b/experimental/types/src/main/java/io/serverlessworkflow/api/types/func/LoopPredicateIndex.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.impl.expressions;
+package io.serverlessworkflow.api.types.func;
 
 @FunctionalInterface
 public interface LoopPredicateIndex<T, V> {
diff --git a/experimental/types/src/main/java/io/serverlessworkflow/impl/expressions/TaskMetadataKeys.java b/experimental/types/src/main/java/io/serverlessworkflow/api/types/func/TaskMetadataKeys.java
similarity index 94%
rename from experimental/types/src/main/java/io/serverlessworkflow/impl/expressions/TaskMetadataKeys.java
rename to experimental/types/src/main/java/io/serverlessworkflow/api/types/func/TaskMetadataKeys.java
index 879dc5ea..c0ea43cd 100644
--- a/experimental/types/src/main/java/io/serverlessworkflow/impl/expressions/TaskMetadataKeys.java
+++ b/experimental/types/src/main/java/io/serverlessworkflow/api/types/func/TaskMetadataKeys.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.impl.expressions;
+package io.serverlessworkflow.api.types.func;
 
 public final class TaskMetadataKeys {
 
diff --git a/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentAdapters.java b/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentAdapters.java
index 8127174d..53b53d2d 100644
--- a/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentAdapters.java
+++ b/fluent/agentic/src/main/java/io/serverlessworkflow/fluent/agentic/AgentAdapters.java
@@ -21,7 +21,7 @@
 import dev.langchain4j.agentic.internal.AgentSpecification;
 import dev.langchain4j.agentic.scope.AgenticScope;
 import dev.langchain4j.agentic.scope.DefaultAgenticScope;
-import io.serverlessworkflow.impl.expressions.LoopPredicateIndex;
+import io.serverlessworkflow.api.types.func.LoopPredicateIndex;
 import java.util.List;
 import java.util.function.Function;
 import java.util.function.Predicate;
diff --git a/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncForTaskBuilder.java b/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncForTaskBuilder.java
index 9c345178..d8c63e6f 100644
--- a/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncForTaskBuilder.java
+++ b/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/FuncForTaskBuilder.java
@@ -21,13 +21,13 @@
 import io.serverlessworkflow.api.types.func.CallJava;
 import io.serverlessworkflow.api.types.func.CallTaskJava;
 import io.serverlessworkflow.api.types.func.ForTaskFunction;
+import io.serverlessworkflow.api.types.func.LoopFunction;
+import io.serverlessworkflow.api.types.func.LoopPredicate;
+import io.serverlessworkflow.api.types.func.LoopPredicateIndex;
 import io.serverlessworkflow.fluent.func.spi.ConditionalTaskBuilder;
 import io.serverlessworkflow.fluent.func.spi.FuncTransformations;
 import io.serverlessworkflow.fluent.spec.TaskBaseBuilder;
 import io.serverlessworkflow.fluent.spec.spi.ForEachTaskFluent;
-import io.serverlessworkflow.impl.expressions.LoopFunction;
-import io.serverlessworkflow.impl.expressions.LoopPredicate;
-import io.serverlessworkflow.impl.expressions.LoopPredicateIndex;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
diff --git a/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/ConditionalTaskBuilderHelper.java b/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/ConditionalTaskBuilderHelper.java
index 2ffd1d91..839dce07 100644
--- a/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/ConditionalTaskBuilderHelper.java
+++ b/fluent/func/src/main/java/io/serverlessworkflow/fluent/func/spi/ConditionalTaskBuilderHelper.java
@@ -17,7 +17,7 @@
 
 import io.serverlessworkflow.api.types.TaskBase;
 import io.serverlessworkflow.api.types.TaskMetadata;
-import io.serverlessworkflow.impl.expressions.TaskMetadataKeys;
+import io.serverlessworkflow.api.types.func.TaskMetadataKeys;
 
 class ConditionalTaskBuilderHelper {