Refactored timer signals