Added refresh token handling