Add timer restart and onetime options