Improved verbosity with token and surl values