Update to the design of the overall workflow