Add stopwatch support