Getting access token improved