Added code to save tokens