Update 'duration' and 'cpuTime' as per latest discussion