TimeEntry refactoring