Add more time instrumentation