Updated NewScenarioWorkflow and Workflow classes