More work on the TimerService