Add more correct timing information