Updated dataflow