Expand verification timer to more events