Added more data flow