Updated time tracking