Reimplemented stopwatch adapter according to new architecture