Continued adding time/user based tracking