Improvement of the Workflow