TimerService Changes