Working on token refresh and revocation handling