Better handling of token generation