Prepare for resuming flows WIP