Updated token generation.