Major update of the workflow