Added timer support