Updated timer implementation