More changes to workflow structure