Workflow improvements