Added support for refresh token