Better handling of session tokens.