Adding to get_token()