TimeService refactored