WorkflowBuilder Overhaul