Update for WorkflowBuilder Overhaul