Incorporate IdToken management in the forked bits