Workflow refactor