Some changes in the workflow