Added some time tracking