Adding refresh token mechanism