Better handling of token params