TimeTracker-related changes