Added onetime tokens to prevent replay attacks