Added support for refresh tokens