[UPDATE] Add timers