Improve TimeTracker service