Added more data recording