Added more time measurements