Better handling of tokens