Added Fixes for Refresh for Legacy Token