Added timetracking capability