WorkflowExecutor refactoring